Commit 928a726b 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: (96 commits)
  sh: add support for SMSC Polaris platform
  sh: fix the HD64461 level-triggered interrupts handling
  sh: sh-rtc wakeup support
  sh: sh-rtc invalid time rework
  sh: sh-rtc carry interrupt rework
  sh: disallow kexec virtual entry
  sh: kexec jump: fix for ftrace.
  sh: kexec: Drop SR.BL bit toggling.
  sh: add kexec jump support
  sh: rework kexec segment code
  sh: simplify kexec vbr code
  sh: Flush only the needed range when unmapping a VMA.
  sh: Update debugfs ASID dumping for 16-bit ASID support.
  sh: tlb-pteaex: Kill off legacy PTEA updates.
  sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.
  sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp
  sh: espt-giga board support
  sh: dma: Make G2 DMA configurable.
  sh: dma: Make PVR2 DMA configurable.
  sh: Move IRQ multi definition of DMAC to defconfig
  ...
parents 8ff64b53 eaeed5d3

arch/sh/Kconfig

+54 −9
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ config SYS_SUPPORTS_NUMA 
config SYS_SUPPORTS_PCI

	bool



config SYS_SUPPORTS_CMT

	bool



config STACKTRACE_SUPPORT

	def_bool y
@@ -176,6 +179,10 @@ config CPU_SHX2 
config CPU_SHX3

	bool



config ARCH_SHMOBILE

	bool

	select ARCH_SUSPEND_POSSIBLE



choice

	prompt "Processor sub-type selection"
@@ -188,6 +195,7 @@ choice 
config CPU_SUBTYPE_SH7619

	bool "Support SH7619 processor"

	select CPU_SH2

	select SYS_SUPPORTS_CMT



# SH-2A Processor Support
@@ -200,15 +208,18 @@ config CPU_SUBTYPE_SH7203 
	bool "Support SH7203 processor"

	select CPU_SH2A

	select CPU_HAS_FPU

	select SYS_SUPPORTS_CMT



config CPU_SUBTYPE_SH7206

	bool "Support SH7206 processor"

	select CPU_SH2A

	select SYS_SUPPORTS_CMT



config CPU_SUBTYPE_SH7263

	bool "Support SH7263 processor"

	select CPU_SH2A

	select CPU_HAS_FPU

	select SYS_SUPPORTS_CMT



config CPU_SUBTYPE_MXG

	bool "Support MX-G processor"
@@ -323,7 +334,9 @@ config CPU_SUBTYPE_SH7723 
	bool "Support SH7723 processor"

	select CPU_SH4A

	select CPU_SHX2

	select ARCH_SHMOBILE

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_CMT

	help

	  Select SH7723 if you have an SH-MobileR2 CPU.
@@ -348,6 +361,14 @@ config CPU_SUBTYPE_SH7785 
	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA



config CPU_SUBTYPE_SH7786

	bool "Support SH7786 processor"

	select CPU_SH4A

	select CPU_SHX3

	select CPU_HAS_PTEAEX

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA



config CPU_SUBTYPE_SHX3

	bool "Support SH-X3 processor"

	select CPU_SH4A
@@ -362,20 +383,26 @@ config CPU_SUBTYPE_SHX3 
config CPU_SUBTYPE_SH7343

	bool "Support SH7343 processor"

	select CPU_SH4AL_DSP

	select ARCH_SHMOBILE

	select SYS_SUPPORTS_CMT



config CPU_SUBTYPE_SH7722

	bool "Support SH7722 processor"

	select CPU_SH4AL_DSP

	select CPU_SHX2

	select ARCH_SHMOBILE

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_CMT



config CPU_SUBTYPE_SH7366

	bool "Support SH7366 processor"

	select CPU_SH4AL_DSP

	select CPU_SHX2

	select ARCH_SHMOBILE

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_CMT



# SH-5 Processor Support
@@ -398,25 +425,34 @@ source "arch/sh/boards/Kconfig" 
menu "Timer and clock configuration"



config SH_TMU

	def_bool y

	prompt "TMU timer support"

	bool "TMU timer support"

	depends on CPU_SH3 || CPU_SH4

	default y

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  This enables the use of the TMU as the system timer.



config SH_CMT

	def_bool y

	prompt "CMT timer support"

	depends on CPU_SH2 && !CPU_SUBTYPE_MXG

	bool "CMT timer support"

	depends on SYS_SUPPORTS_CMT && CPU_SH2

	default y

	help

	  This enables the use of the CMT as the system timer.



#

# Support for the new-style CMT driver. This will replace SH_CMT

# once its other dependencies are merged.

#

config SH_TIMER_CMT

	bool "CMT clockevents driver"

	depends on SYS_SUPPORTS_CMT && !SH_CMT

	select GENERIC_CLOCKEVENTS



config SH_MTU2

	def_bool n

	prompt "MTU2 timer support"

	bool "MTU2 timer support"

	depends on CPU_SH2A

	default y

	help

	  This enables the use of the MTU2 as the system timer.
@@ -426,7 +462,8 @@ config SH_TIMER_IRQ 
			CPU_SUBTYPE_SH7763

	default "86" if CPU_SUBTYPE_SH7619

	default "140" if CPU_SUBTYPE_SH7206

	default "142" if CPU_SUBTYPE_SH7203

	default "142" if CPU_SUBTYPE_SH7203 && SH_CMT

	default "153" if CPU_SUBTYPE_SH7203 && SH_MTU2

	default "238" if CPU_SUBTYPE_MXG

	default "16"
@@ -438,7 +475,8 @@ config SH_PCLK_FREQ 
	default "33333333" if CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7723 || \

			      CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \

			      CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \

			      CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG

			      CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG    || \

			      CPU_SUBTYPE_SH7786

	default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R

	default "66000000" if CPU_SUBTYPE_SH4_202

	default "50000000"
@@ -521,6 +559,13 @@ config CRASH_DUMP 


	  For more details see Documentation/kdump/kdump.txt



config KEXEC_JUMP

	bool "kexec jump (EXPERIMENTAL)"

	depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL

	help

	  Jump between original kernel and kexeced kernel and invoke

	  code via KEXEC



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS

arch/sh/Kconfig.cpu

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ config CPU_HAS_SR_RB 
config CPU_HAS_PTEA

	bool



config CPU_HAS_PTEAEX

	bool



config CPU_HAS_DSP

	bool

arch/sh/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \ 
defaultimage-$(CONFIG_SUPERH32)			:= zImage

defaultimage-$(CONFIG_SH_SH7785LCR)		:= uImage

defaultimage-$(CONFIG_SH_RSK)			:= uImage

defaultimage-$(CONFIG_SH_URQUELL)		:= uImage

defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux

arch/sh/boards/Kconfig

+23 −4
Original line number Diff line number Diff line
@@ -155,17 +155,22 @@ config SH_SH7785LCR 


config SH_SH7785LCR_29BIT_PHYSMAPS

	bool "SH7785LCR 29bit physmaps"

	depends on SH_SH7785LCR

	depends on SH_SH7785LCR && 29BIT

	default y

	help

	  This board has 2 physical memory maps. It can be changed with

	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,

	  you can access all on-board device in 29bit address mode.



config SH_URQUELL

	bool "Urquell"

	depends on CPU_SUBTYPE_SH7786

	select ARCH_REQUIRE_GPIOLIB



config SH_MIGOR

	bool "Migo-R"

	depends on CPU_SUBTYPE_SH7722

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

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

          by Renesas System Solutions Asia Pte. Ltd.
@@ -173,7 +178,7 @@ config SH_MIGOR 
config SH_AP325RXA

	bool "AP-325RXA"

	depends on CPU_SUBTYPE_SH7723

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
@@ -185,6 +190,13 @@ config SH_SH7763RDP 
	  Select SH7763RDP if configuring for a Renesas SH7763

	  evaluation board.



config SH_ESPT

	bool "ESPT"

	depends on CPU_SUBTYPE_SH7763

	help

	  Select ESPT if configuring for a Renesas SH7763

	  with gigabit ether evaluation board.



config SH_EDOSK7705

	bool "EDOSK7705"

	depends on CPU_SUBTYPE_SH7705
@@ -240,7 +252,7 @@ config SH_X3PROTO 
config SH_MAGIC_PANEL_R2

	bool "Magic Panel R2"

	depends on CPU_SUBTYPE_SH7720

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.
@@ -249,6 +261,13 @@ config SH_CAYMAN 
	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103

	select SYS_SUPPORTS_PCI



config SH_POLARIS

	bool "SMSC Polaris"

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7709

	help

	  Select if configuring for an SMSC Polaris development board



endmenu



source "arch/sh/boards/mach-r2d/Kconfig"

arch/sh/boards/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4,5 +4,8 @@ 
obj-$(CONFIG_SH_AP325RXA)	+= board-ap325rxa.o

obj-$(CONFIG_SH_MAGIC_PANEL_R2)	+= board-magicpanelr2.o

obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o

obj-$(CONFIG_SH_URQUELL)	+= board-urquell.o

obj-$(CONFIG_SH_SHMIN)		+= board-shmin.o

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE