Commit 0b03befa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - fix WARNING splat in pmac_zilog driver

 - fix ADB input device regression

 - assume maintainership for adb-iop and via-macii

 - minor fixes and improvements

 - defconfig updates

* tag 'm68k-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  MAINTAINERS: Update m68k Mac entry
  macintosh/adb-iop: Send correct poll command
  macintosh/adb-iop: Always wait for reply message from IOP
  m68k: Fix WARNING splat in pmac_zilog driver
  m68k: Add a missing ELF_DETAILS in link script
  m68k: Drop redundant NOTES in link script
  m68k: mac: Update Kconfig help
  m68k: mac: Remove redundant VIA register writes
  m68k: mac: Remove dead code
  m68k: mac: Refactor iop_preinit() and iop_init()
  m68k: defconfig: Enable KUnit tests
  m68k: defconfig: Update defconfigs for v5.10-rc1
  m68k: Remove unused mach_max_dma_address
  m68k: Avoid xchg() warning
parents 2c075f38 2ae92e8b

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -10426,6 +10426,8 @@ L: linux-m68k@lists.linux-m68k.org 
S:	Maintained

W:	http://www.mac.linux-m68k.org/

F:	arch/m68k/mac/

F:	drivers/macintosh/adb-iop.c

F:	drivers/macintosh/via-macii.c









M68K ON HP9000/300









M:	Philip Blundell <philb@gnu.org>
































arch/m68k/Kconfig.machine



+3
−5






























Original line number
Diff line number
Diff line







@@ -30,11 +30,9 @@ config MAC







	select HAVE_ARCH_NVRAM_OPS









	help









	  This option enables support for the Apple Macintosh series of









	  computers (yes, there is experimental support now, at least for part









	  of the series).



















	  Say N unless you're willing to code the remaining necessary support.









	  ;)









	  computers. If you plan to use this kernel on a Mac, say Y here and









	  browse the documentation available at <http://www.mac.linux-m68k.org/>;









	  otherwise say N.



















config APOLLO









	bool "Apollo support"
































arch/m68k/amiga/config.c



+0
−8






























Original line number
Diff line number
Diff line







@@ -383,14 +383,6 @@ void __init config_amiga(void)







	mach_init_IRQ        = amiga_init_IRQ;









	mach_get_model       = amiga_get_model;









	mach_get_hardware_list = amiga_get_hardware_list;



















	/*









	 * default MAX_DMA=0xffffffff on all machines. If we don't do so, the SCSI









	 * code will not be able to allocate any mem for transfers, unless we are









	 * dealing with a Z2 mem only system.                  /Jes









	 */









	mach_max_dma_address = 0xffffffff;



















	mach_reset           = amiga_reset;









#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)









	mach_beep            = amiga_mksound;
































arch/m68k/apollo/config.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -150,7 +150,6 @@ void __init config_apollo(void)

















	mach_sched_init=dn_sched_init; /* */









	mach_init_IRQ=dn_init_IRQ;









	mach_max_dma_address = 0xffffffff;









	mach_hwclk           = dn_dummy_hwclk; /* */









	mach_reset	     = dn_dummy_reset;  /* */









#ifdef CONFIG_HEARTBEAT
































arch/m68k/atari/config.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -205,7 +205,6 @@ void __init config_atari(void)







	mach_get_model	 = atari_get_model;









	mach_get_hardware_list = atari_get_hardware_list;









	mach_reset           = atari_reset;









	mach_max_dma_address = 0xffffff;









#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)









	mach_beep          = atari_mksound;









#endif