Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64d497f5 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: (187 commits)
  sh: remove dead LED code for migo-r and ms7724se
  sh: ecovec build fix for CONFIG_I2C=n
  sh: ecovec r-standby support
  sh: ms7724se r-standby support
  sh: SH-Mobile R-standby register save/restore
  clocksource: Fix up a registration/IRQ race in the sh drivers.
  sh: ms7724: modify scan_timing for KEYSC
  sh: ms7724: Add sh_sir support
  sh: mach-ecovec24: Add sh_sir support
  sh: wire up SET/GET_UNALIGN_CTL.
  sh: allow alignment fault mode to be configured at kernel boot.
  sh: sh7724: Update FSI/SPU2 clock
  sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
  sh: add sh7724 kick callback to clk_div4_table
  sh: introduce struct clk_div4_table
  sh: clock-cpg div4 set_rate() shift fix
  sh: Turn on speculative return for SH7785 and SH7786
  sh: Merge legacy and dynamic PMB modes.
  sh: Use uncached I/O helpers in PMB setup.
  sh: Provide uncached I/O helpers.
  ...
parents 37d40084 b5f5fe80

arch/sh/Kconfig

+14 −18
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ config SUPERH 
	select HAVE_LMB

	select HAVE_LMB

	select HAVE_OPROFILE

	select HAVE_OPROFILE

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IOREMAP_PROT if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_DMA_ATTRS
@@ -22,6 +21,7 @@ config SUPERH 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_SYSCALL_TRACEPOINTS

	select RTC_LIB

	select RTC_LIB

	select GENERIC_ATOMIC64

	select GENERIC_ATOMIC64
@@ -35,6 +35,7 @@ config SUPERH32 
	def_bool ARCH = "sh"

	def_bool ARCH = "sh"

	select HAVE_KPROBES

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_KRETPROBES

	select HAVE_IOREMAP_PROT if MMU && !X2TLB

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE
@@ -42,6 +43,8 @@ config SUPERH32 
	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB

	select HAVE_HW_BREAKPOINT

	select PERF_EVENTS if HAVE_HW_BREAKPOINT

	select ARCH_HIBERNATION_POSSIBLE if MMU

	select ARCH_HIBERNATION_POSSIBLE if MMU





config SUPERH64

config SUPERH64
@@ -78,11 +81,12 @@ config GENERIC_HARDIRQS 
config GENERIC_HARDIRQS_NO__DO_IRQ

config GENERIC_HARDIRQS_NO__DO_IRQ

	def_bool y

	def_bool y





config GENERIC_IRQ_PROBE

config IRQ_PER_CPU

	def_bool y

	def_bool y





config IRQ_PER_CPU

config SPARSE_IRQ

	def_bool y

	def_bool y

	depends on SUPERH32





config GENERIC_GPIO

config GENERIC_GPIO

	def_bool n

	def_bool n
@@ -548,8 +552,7 @@ config SH_PCLK_FREQ 
			      CPU_SUBTYPE_SH7203 || \

			      CPU_SUBTYPE_SH7203 || \

			      CPU_SUBTYPE_SH7206 || \

			      CPU_SUBTYPE_SH7206 || \

			      CPU_SUBTYPE_SH7263 || \

			      CPU_SUBTYPE_SH7263 || \

			      CPU_SUBTYPE_MXG    || \

			      CPU_SUBTYPE_MXG

			      CPU_SUBTYPE_SH7786

	default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R

	default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R

	default "66000000" if CPU_SUBTYPE_SH4_202

	default "66000000" if CPU_SUBTYPE_SH4_202

	default "50000000"

	default "50000000"
@@ -563,7 +566,8 @@ config SH_CLK_CPG 




config SH_CLK_CPG_LEGACY

config SH_CLK_CPG_LEGACY

	depends on SH_CLK_CPG

	depends on SH_CLK_CPG

	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE

	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \

		      !CPU_SUBTYPE_SH7786





config SH_CLK_MD

config SH_CLK_MD

	int "CPU Mode Pin Setting"

	int "CPU Mode Pin Setting"
@@ -725,18 +729,6 @@ config GUSA_RB 
	  LLSC, this should be more efficient than the other alternative of

	  LLSC, this should be more efficient than the other alternative of

	  disabling interrupts around the atomic sequence.

	  disabling interrupts around the atomic sequence.





config SPARSE_IRQ

	bool "Support sparse irq numbering"

	depends on EXPERIMENTAL

	help

	  This enables support for sparse irqs. This is useful in general

	  as most CPUs have a fairly sparse array of IRQ vectors, which

	  the irq_desc then maps directly on to. Systems with a high

	  number of off-chip IRQs will want to treat this as

	  experimental until they have been independently verified.



	  If you don't know what to do here, say N.



endmenu

endmenu





menu "Boot options"

menu "Boot options"
@@ -822,11 +814,15 @@ config MAPLE 
config PCI

config PCI

	bool "PCI support"

	bool "PCI support"

	depends on SYS_SUPPORTS_PCI

	depends on SYS_SUPPORTS_PCI

	select PCI_DOMAINS

	help

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  your box. If you have PCI, say Y, otherwise N.

	  your box. If you have PCI, say Y, otherwise N.





config PCI_DOMAINS

	bool



source "drivers/pci/pcie/Kconfig"

source "drivers/pci/pcie/Kconfig"





source "drivers/pci/Kconfig"

source "drivers/pci/Kconfig"

arch/sh/Kconfig.cpu

+2 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,8 @@ config SH_STORE_QUEUES 




config SPECULATIVE_EXECUTION

config SPECULATIVE_EXECUTION

	bool "Speculative subroutine return"

	bool "Speculative subroutine return"

	depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL

	depends on EXPERIMENTAL

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786

	help

	help

	  This enables support for a speculative instruction fetch for

	  This enables support for a speculative instruction fetch for

	  subroutine return. There are various pitfalls associated with

	  subroutine return. There are various pitfalls associated with

arch/sh/Makefile

+7 −3
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ defaultimage-$(CONFIG_SH_AP325RXA) := uImage 
defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE)	:= uImage

defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE)	:= uImage

defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_SDK7786)		:= vmlinux.bin





# Set some sensible Kbuild defaults

# Set some sensible Kbuild defaults

KBUILD_IMAGE		:= $(defaultimage-y)

KBUILD_IMAGE		:= $(defaultimage-y)
@@ -143,11 +144,11 @@ machdir-$(CONFIG_SH_AP325RXA) += mach-ap325rxa 
machdir-$(CONFIG_SH_KFR2R09)			+= mach-kfr2r09

machdir-$(CONFIG_SH_KFR2R09)			+= mach-kfr2r09

machdir-$(CONFIG_SH_ECOVEC)			+= mach-ecovec24

machdir-$(CONFIG_SH_ECOVEC)			+= mach-ecovec24

machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780

machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780

machdir-$(CONFIG_SH_SDK7786)			+= mach-sdk7786

machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto

machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto

machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp

machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp

machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= mach-microdev

machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= mach-microdev

machdir-$(CONFIG_SH_LANDISK)			+= mach-landisk

machdir-$(CONFIG_SH_LANDISK)			+= mach-landisk

machdir-$(CONFIG_SH_TITAN)			+= mach-titan

machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2

machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman

machdir-$(CONFIG_SH_RSK)			+= mach-rsk

machdir-$(CONFIG_SH_RSK)			+= mach-rsk
@@ -203,8 +204,9 @@ endif 
libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)





BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \

BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.lzo \

	       zImage vmlinux.srec romImage

	       uImage.srec uImage.bin zImage vmlinux.bin vmlinux.srec \

	       romImage

PHONY += $(BOOT_TARGETS)

PHONY += $(BOOT_TARGETS)





all: $(KBUILD_IMAGE)

all: $(KBUILD_IMAGE)
@@ -225,10 +227,12 @@ define archhelp 
	@echo '  zImage 	           - Compressed kernel image'

	@echo '  zImage 	           - Compressed kernel image'

	@echo '  romImage	           - Compressed ROM image, if supported'

	@echo '  romImage	           - Compressed ROM image, if supported'

	@echo '  vmlinux.srec	           - Create an ELF S-record'

	@echo '  vmlinux.srec	           - Create an ELF S-record'

	@echo '  vmlinux.bin	           - Create an uncompressed binary image'

	@echo '* uImage  	           - Alias to bootable U-Boot image'

	@echo '* uImage  	           - Alias to bootable U-Boot image'

	@echo '  uImage.srec	           - Create an S-record for U-Boot'

	@echo '  uImage.srec	           - Create an S-record for U-Boot'

	@echo '  uImage.bin	           - Kernel-only image for U-Boot (bin)'

	@echo '  uImage.bin	           - Kernel-only image for U-Boot (bin)'

	@echo '* uImage.gz	           - Kernel-only image for U-Boot (gzip)'

	@echo '* uImage.gz	           - Kernel-only image for U-Boot (gzip)'

	@echo '  uImage.bz2	           - Kernel-only image for U-Boot (bzip2)'

	@echo '  uImage.bz2	           - Kernel-only image for U-Boot (bzip2)'

	@echo '  uImage.lzma	           - Kernel-only image for U-Boot (lzma)'

	@echo '  uImage.lzma	           - Kernel-only image for U-Boot (lzma)'

	@echo '  uImage.lzo	           - Kernel-only image for U-Boot (lzo)'

endef
 
endef

arch/sh/boards/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,14 @@ config SH_SDK7780 
	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3

	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3

	  evaluation board.

	  evaluation board.





config SH_SDK7786

	bool "SDK7786"

	depends on CPU_SUBTYPE_SH7786

	select SYS_SUPPORTS_PCI

	help

	  Select SDK7786 if configuring for a Renesas Technology Europe

	  SH7786-65nm board.



config SH_HIGHLANDER

config SH_HIGHLANDER

	bool "Highlander"

	bool "Highlander"

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

arch/sh/boards/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,3 +8,4 @@ obj-$(CONFIG_SH_SHMIN) += board-shmin.o 
obj-$(CONFIG_SH_EDOSK7760)	+= board-edosk7760.o

obj-$(CONFIG_SH_EDOSK7760)	+= board-edosk7760.o

obj-$(CONFIG_SH_ESPT)		+= board-espt.o

obj-$(CONFIG_SH_ESPT)		+= board-espt.o

obj-$(CONFIG_SH_POLARIS)	+= board-polaris.o

obj-$(CONFIG_SH_POLARIS)	+= board-polaris.o

obj-$(CONFIG_SH_TITAN)		+= board-titan.o