Commit ed402af3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (112 commits)
  sh: Move SH-4 CPU headers down one more level.
  sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected.
  sh: Migrate common board headers to mach-common/.
  sh: Move the CPU definition headers from asm/ to cpu/.
  serial: sh-sci: Add support SCIF of SH7723
  video: add sh_mobile_lcdc platform flags
  video: remove unused sh_mobile_lcdc platform data
  sh: remove consistent alloc cruft
  sh: add dynamic crash base address support
  sh: reduce Migo-R smc91x overruns
  sh: Fix up some merge damage.
  Fix debugfs_create_file's error checking method for arch/sh/mm/
  Fix debugfs_create_dir's error checking method for arch/sh/kernel/
  sh: ap325rxa: Add support RTC RX-8564LC in AP325RXA board
  sh: Use sh7720 GPIO on magicpanelr2 board
  sh: Add sh7720 pinmux code
  sh: Use sh7203 GPIO on rsk7203 board
  sh: Add sh7203 pinmux code
  sh: Use sh7723 GPIO on AP325RXA board
  sh: Add sh7723 pinmux code
  ...
parents 096e6f67 40e24c40

Documentation/kernel-parameters.txt

+11 −1
Original line number Diff line number Diff line
@@ -796,6 +796,8 @@ and is between 256 and 4096 characters. It is defined in the file 
			Defaults to the default architecture's huge page size

			if not specified.



	hlt		[BUGS=ARM,SH]



	i8042.debug	[HW] Toggle i8042 debug mode

	i8042.direct	[HW] Put keyboard port into non-translated mode

	i8042.dumbkbd	[HW] Pretend that controller can only read data from
@@ -1211,6 +1213,10 @@ and is between 256 and 4096 characters. It is defined in the file 
	mem=nopentium	[BUGS=X86-32] Disable usage of 4MB pages for kernel

			memory.



	memchunk=nn[KMG]

			[KNL,SH] Allow user to override the default size for

			per-device physically contiguous DMA buffers.



	memmap=exactmap	[KNL,X86-32,X86_64] Enable setting of an exact

			E820 memory map, as specified by the user.

			Such memmap=exactmap lines can be constructed based on
@@ -1393,6 +1399,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	nodisconnect	[HW,SCSI,M68K] Disables SCSI disconnects.



	nodsp		[SH] Disable hardware DSP at boot time.



	noefi		[X86-32,X86-64] Disable EFI runtime services support.



	noexec		[IA-64]
@@ -1409,13 +1417,15 @@ and is between 256 and 4096 characters. It is defined in the file 
			noexec32=off: disable non-executable mappings

				read implies executable mappings



	nofpu		[SH] Disable hardware FPU at boot time.



	nofxsr		[BUGS=X86-32] Disables x86 floating point extended

			register save and restore. The kernel will only save

			legacy floating-point registers on task switch.



	noclflush	[BUGS=X86] Don't use the CLFLUSH instruction



	nohlt		[BUGS=ARM]

	nohlt		[BUGS=ARM,SH]



	no-hlt		[BUGS=X86-32] Tells the kernel that the hlt

			instruction doesn't work correctly and not to

arch/sh/Kconfig

+17 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config SUPERH 
	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IOREMAP_PROT if MMU

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast
@@ -20,6 +21,10 @@ config SUPERH 


config SUPERH32

	def_bool !SUPERH64

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_ARCH_TRACEHOOK

	select HAVE_FTRACE



config SUPERH64

	def_bool y if CPU_SH5
@@ -54,8 +59,11 @@ config GENERIC_HARDIRQS_NO__DO_IRQ 
config GENERIC_IRQ_PROBE

	def_bool y



config GENERIC_GPIO

	def_bool n



config GENERIC_CALIBRATE_DELAY

	def_bool y

	bool



config GENERIC_IOMAP

	bool
@@ -66,6 +74,9 @@ config GENERIC_TIME 
config GENERIC_CLOCKEVENTS

	def_bool n



config GENERIC_CLOCKEVENTS_BROADCAST

	bool



config GENERIC_LOCKBREAK

	def_bool y

	depends on SMP && PREEMPT
@@ -92,6 +103,10 @@ config STACKTRACE_SUPPORT 
config LOCKDEP_SUPPORT

	def_bool y



config HAVE_LATENCYTOP_SUPPORT

	def_bool y

	depends on !SMP



config ARCH_HAS_ILOG2_U32

	def_bool n
@@ -325,6 +340,7 @@ config CPU_SUBTYPE_SHX3 
	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP



# SH4AL-DSP Processor Support
@@ -492,7 +508,6 @@ config CRASH_DUMP 
config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

arch/sh/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ config DEBUG_STACK_USAGE 


config 4KSTACKS

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

	depends on DEBUG_KERNEL && (MMU || BROKEN)

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

	help

	  If you say Y here the kernel will use a 4Kb stacksize for the

	  kernel stack attached to each process/thread. This facilitates

arch/sh/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -76,8 +76,10 @@ KBUILD_IMAGE := $(defaultimage-y) 
# error messages during linking.

#

ifdef CONFIG_SUPERH32

UTS_MACHINE	:= sh

LDFLAGS_vmlinux	+= -e _stext

else

UTS_MACHINE	:= sh64

LDFLAGS_vmlinux	+= --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \

		   --defsym phys_stext_shmedia=phys_stext+1 \

		   -e phys_stext_shmedia
@@ -123,6 +125,9 @@ core-y += $(addprefix arch/sh/boards/, \ 
	     $(filter-out ., $(patsubst %,%/,$(machdir-y))))

endif



# Common machine type headers. Not part of the arch/sh/boards/ hierarchy.

machdir-y	+= mach-common



# Companion chips

core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/

arch/sh/boards/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ config SH_RTS7751R2D 


config SH_RSK7203

	bool "RSK7203"

	select GENERIC_GPIO

	depends on CPU_SUBTYPE_SH7203



config SH_SDK7780
@@ -162,6 +163,7 @@ config SH_SH7785LCR_29BIT_PHYSMAPS 
config SH_MIGOR

	bool "Migo-R"

	depends on CPU_SUBTYPE_SH7722

	select GENERIC_GPIO

	help

	  Select Migo-R if configuring for the SH7722 Migo-R platform

          by Renesas System Solutions Asia Pte. Ltd.
@@ -169,6 +171,7 @@ config SH_MIGOR 
config SH_AP325RXA

	bool "AP-325RXA"

	depends on CPU_SUBTYPE_SH7723

	select GENERIC_GPIO

	help

	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
@@ -184,6 +187,13 @@ config SH_EDOSK7705 
	bool "EDOSK7705"

	depends on CPU_SUBTYPE_SH7705



config SH_EDOSK7760

	bool "EDOSK7760"

	depends on CPU_SUBTYPE_SH7760

	help

	  Select if configuring for a Renesas EDOSK7760

	  evaluation board.



config SH_SH4202_MICRODEV

	bool "SH4-202 MicroDev"

	depends on CPU_SUBTYPE_SH4_202
@@ -228,6 +238,7 @@ config SH_X3PROTO 
config SH_MAGIC_PANEL_R2

	bool "Magic Panel R2"

	depends on CPU_SUBTYPE_SH7720

	select GENERIC_GPIO

	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.

CRA Git | Maintained and supported by SUSTech CRA and CCSE