Commit 5be99114 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux 

Pull sh updates from John Paul Adrian Glaubitz:
 "While the previously announced patch series for converting arch/sh to
  device trees is not yet ready for inclusion to mainline and therefore
  didn't make it for this pull request, there are still a small number
  changes for v6.7 which include one platform (board plus CPU and driver
  code) removal plus two fixes.

  The removal sent in by Arnd Bergmann concerns the microdev board which
  was an early SuperH prototype board that was never used in production.
  With the board removed, we were able to drop the now unused code for
  the SH4-202 CPU and well as the driver code for the superhyway bus and
  a custom implementation for ioport_map() and ioport_unmap() which will
  allow us to simplify ioport handling in the future.

  Another patch set by Geert Uytterhoeven revives SuperH BIOS
  earlyprintk support which got accidentally disabled in
  e76fe574 ("sh: Remove old early serial console code V2"), the
  second patch in the series updates the documentation.

  Finally, a patch by Masami Hiramatsu fixes a regression reported by
  the kernel test robot which uncovered that arch/sh is not implementing
  arch_cmpxchg_local() and therefore needs use __generic_cmpxchg_local()
  instead"

* tag 'sh-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
  locking/atomic: sh: Use generic_cmpxchg_local for arch_cmpxchg_local()
  Documentation: kernel-parameters: Add earlyprintk=bios on SH
  sh: bios: Revive earlyprintk support
  sh: machvec: Remove custom ioport_{un,}map()
  sh: Remove superhyway bus support
  sh: Remove unused SH4-202 support
  sh: Remove stale microdev board
parents c9cacf7d 63f1ee20

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1335,6 +1335,7 @@ 
			earlyprintk=dbgp[debugController#]

			earlyprintk=pciserial[,force],bus:device.function[,baudrate]

			earlyprintk=xdbc[xhciController#]

			earlyprintk=bios



			earlyprintk is useful when the kernel crashes before

			the normal console is initialized. It is not enabled by
@@ -1365,6 +1366,8 @@ 


			The sclp output can only be used on s390.



			The bios output can only be used on SuperH.



			The optional "force" to "pciserial" enables use of a

			PCI device even when its classcode is not of the

			UART class.

Documentation/arch/sh/index.rst

+0 −6
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ mach-x3proto 
Busses

======



SuperHyway

----------



.. kernel-doc:: drivers/sh/superhyway/superhyway.c

   :export:



Maple

-----

arch/sh/Kconfig

+1 −11
Original line number Diff line number Diff line
@@ -124,8 +124,7 @@ config ARCH_HAS_ILOG2_U64 


config NO_IOPORT_MAP

	def_bool !PCI

	depends on !SH_SH4202_MICRODEV && !SH_SHMIN && !SH_HP6XX && \

		   !SH_SOLUTION_ENGINE

	depends on !SH_SHMIN && !SH_HP6XX && !SH_SOLUTION_ENGINE



config IO_TRAPPED

	bool
@@ -384,10 +383,6 @@ config CPU_SUBTYPE_SH7760 
	bool "Support SH7760 processor"

	select CPU_SH4



config CPU_SUBTYPE_SH4_202

	bool "Support SH4-202 processor"

	select CPU_SH4



# SH-4A Processor Support



config CPU_SUBTYPE_SH7723
@@ -518,7 +513,6 @@ config SH_PCLK_FREQ 
			      CPU_SUBTYPE_SH7263 || \

			      CPU_SUBTYPE_MXG

	default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R

	default "66000000" if CPU_SUBTYPE_SH4_202

	default "50000000"

	help

	  This option is used to specify the peripheral clock frequency.
@@ -743,10 +737,6 @@ endmenu 


menu "Bus options"



config SUPERHYWAY

	tristate "SuperHyway Bus support"

	depends on CPU_SUBTYPE_SH4_202



config MAPLE

	bool "Maple Bus support"

	depends on SH_DREAMCAST

arch/sh/Kconfig.debug

+11 −0
Original line number Diff line number Diff line
@@ -22,6 +22,17 @@ config STACK_DEBUG 
	  every function call and will therefore incur a major

	  performance hit. Most users should say N.



config EARLY_PRINTK

	bool "Early printk"

	depends on SH_STANDARD_BIOS

	help

	  Say Y here to redirect kernel printk messages to the serial port

	  used by the SH-IPL bootloader, starting very early in the boot

	  process and ending when the kernel's serial console is initialised.

	  This option is only useful while porting the kernel to a new machine,

	  when the kernel may crash or hang before the serial console is

	  initialised.  If unsure, say N.



config 4KSTACKS

	bool "Use 4Kb for kernel stacks instead of 8Kb"

	depends on DEBUG_KERNEL && (MMU || BROKEN) && !PAGE_SIZE_64KB

arch/sh/boards/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -289,13 +289,6 @@ config SH_EDOSK7760 
	  Select if configuring for a Renesas EDOSK7760

	  evaluation board.



config SH_SH4202_MICRODEV

	bool "SH4-202 MicroDev"

	depends on CPU_SUBTYPE_SH4_202

	help

	  Select SH4-202 MicroDev if configuring for a SuperH MicroDev board

	  with an SH4-202 CPU.



config SH_LANDISK

	bool "LANDISK"

	depends on CPU_SUBTYPE_SH7751R