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

Commit 86f6f9b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (31 commits)
  sh: Add support for AP-SH4AD-0A board.
  sh: Add support for AP-SH4A-3A board.
  sh: Add a new mach type for alpha project boards.
  serial: sh-sci: build fixes.
  sh: sh7372 SH4AL-DSP probe support
  sh: sh7366 Enable SDIO IRQs
  sh: sh7343 Enable SDIO IRQs
  sh: mach-ecovec24: enable runtime PM for SDHI
  sh: sh7723 / ap325rxa enable SDIO IRQs
  sh: sh7722 Enable SDIO IRQs
  sh: sh7724 Enable SDIO IRQs
  sh: Fix up legacy PTEA space attribute mapping.
  sh: Stub out legacy PCC pgprot encoding for X2 TLBs.
  sh: constify prefetch pointers.
  sh: Add a machvec callback for early memblock reservations.
  sh: update sh7757lcr_defconfig
  sh: add PVR probing for SH7757 3rd cut
  sh: Use device_initcall() instead of __initcall()
  sh: intc - convert board specific landisk code
  sh: Move init_landisk_IRQ to header file
  ...
parents d33a6291 8b6f08ea

arch/arm/mach-shmobile/setup-sh7367.c

+14 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc00), evt2irq(0xc00),

			    evt2irq(0xc00), evt2irq(0xc00) },
@@ -52,6 +54,8 @@ static struct platform_device scif0_device = { 
static struct plat_sci_port scif1_platform_data = {

	.mapbase	= 0xe6c50000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc20), evt2irq(0xc20),

			    evt2irq(0xc20), evt2irq(0xc20) },
@@ -69,6 +73,8 @@ static struct platform_device scif1_device = { 
static struct plat_sci_port scif2_platform_data = {

	.mapbase	= 0xe6c60000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc40), evt2irq(0xc40),

			    evt2irq(0xc40), evt2irq(0xc40) },
@@ -86,6 +92,8 @@ static struct platform_device scif2_device = { 
static struct plat_sci_port scif3_platform_data = {

	.mapbase	= 0xe6c70000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc60), evt2irq(0xc60),

			    evt2irq(0xc60), evt2irq(0xc60) },
@@ -103,6 +111,8 @@ static struct platform_device scif3_device = { 
static struct plat_sci_port scif4_platform_data = {

	.mapbase	= 0xe6c80000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xd20), evt2irq(0xd20),

			    evt2irq(0xd20), evt2irq(0xd20) },
@@ -120,6 +130,8 @@ static struct platform_device scif4_device = { 
static struct plat_sci_port scif5_platform_data = {

	.mapbase	= 0xe6cb0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xd40), evt2irq(0xd40),

			    evt2irq(0xd40), evt2irq(0xd40) },
@@ -137,6 +149,8 @@ static struct platform_device scif5_device = { 
static struct plat_sci_port scif6_platform_data = {

	.mapbase	= 0xe6c30000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xd60), evt2irq(0xd60),

			    evt2irq(0xd60), evt2irq(0xd60) },

arch/arm/mach-shmobile/setup-sh7372.c

+14 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0x0c00), evt2irq(0x0c00),

			    evt2irq(0x0c00), evt2irq(0x0c00) },
@@ -55,6 +57,8 @@ static struct platform_device scif0_device = { 
static struct plat_sci_port scif1_platform_data = {

	.mapbase	= 0xe6c50000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0x0c20), evt2irq(0x0c20),

			    evt2irq(0x0c20), evt2irq(0x0c20) },
@@ -72,6 +76,8 @@ static struct platform_device scif1_device = { 
static struct plat_sci_port scif2_platform_data = {

	.mapbase	= 0xe6c60000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0x0c40), evt2irq(0x0c40),

			    evt2irq(0x0c40), evt2irq(0x0c40) },
@@ -89,6 +95,8 @@ static struct platform_device scif2_device = { 
static struct plat_sci_port scif3_platform_data = {

	.mapbase	= 0xe6c70000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0x0c60), evt2irq(0x0c60),

			    evt2irq(0x0c60), evt2irq(0x0c60) },
@@ -106,6 +114,8 @@ static struct platform_device scif3_device = { 
static struct plat_sci_port scif4_platform_data = {

	.mapbase	= 0xe6c80000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0x0d20), evt2irq(0x0d20),

			    evt2irq(0x0d20), evt2irq(0x0d20) },
@@ -123,6 +133,8 @@ static struct platform_device scif4_device = { 
static struct plat_sci_port scif5_platform_data = {

	.mapbase	= 0xe6cb0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0x0d40), evt2irq(0x0d40),

			    evt2irq(0x0d40), evt2irq(0x0d40) },
@@ -140,6 +152,8 @@ static struct platform_device scif5_device = { 
static struct plat_sci_port scif6_platform_data = {

	.mapbase	= 0xe6c30000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFB,

	.irqs		= { evt2irq(0x0d60), evt2irq(0x0d60),

			    evt2irq(0x0d60), evt2irq(0x0d60) },

arch/arm/mach-shmobile/setup-sh7377.c

+16 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc00), evt2irq(0xc00),

			    evt2irq(0xc00), evt2irq(0xc00) },
@@ -53,6 +55,8 @@ static struct platform_device scif0_device = { 
static struct plat_sci_port scif1_platform_data = {

	.mapbase	= 0xe6c50000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc20), evt2irq(0xc20),

			    evt2irq(0xc20), evt2irq(0xc20) },
@@ -70,6 +74,8 @@ static struct platform_device scif1_device = { 
static struct plat_sci_port scif2_platform_data = {

	.mapbase	= 0xe6c60000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc40), evt2irq(0xc40),

			    evt2irq(0xc40), evt2irq(0xc40) },
@@ -87,6 +93,8 @@ static struct platform_device scif2_device = { 
static struct plat_sci_port scif3_platform_data = {

	.mapbase	= 0xe6c70000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xc60), evt2irq(0xc60),

			    evt2irq(0xc60), evt2irq(0xc60) },
@@ -104,6 +112,8 @@ static struct platform_device scif3_device = { 
static struct plat_sci_port scif4_platform_data = {

	.mapbase	= 0xe6c80000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xd20), evt2irq(0xd20),

			    evt2irq(0xd20), evt2irq(0xd20) },
@@ -121,6 +131,8 @@ static struct platform_device scif4_device = { 
static struct plat_sci_port scif5_platform_data = {

	.mapbase	= 0xe6cb0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xd40), evt2irq(0xd40),

			    evt2irq(0xd40), evt2irq(0xd40) },
@@ -138,6 +150,8 @@ static struct platform_device scif5_device = { 
static struct plat_sci_port scif6_platform_data = {

	.mapbase	= 0xe6cc0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { intcs_evt2irq(0x1a80), intcs_evt2irq(0x1a80),

			    intcs_evt2irq(0x1a80), intcs_evt2irq(0x1a80) },
@@ -155,6 +169,8 @@ static struct platform_device scif6_device = { 
static struct plat_sci_port scif7_platform_data = {

	.mapbase	= 0xe6c30000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { evt2irq(0xd60), evt2irq(0xd60),

			    evt2irq(0xd60), evt2irq(0xd60) },

arch/arm/mach-shmobile/setup-sh73a0.c

+18 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(72), gic_spi(72),

			    gic_spi(72), gic_spi(72) },
@@ -52,6 +54,8 @@ static struct platform_device scif0_device = { 
static struct plat_sci_port scif1_platform_data = {

	.mapbase	= 0xe6c50000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(73), gic_spi(73),

			    gic_spi(73), gic_spi(73) },
@@ -68,6 +72,8 @@ static struct platform_device scif1_device = { 
static struct plat_sci_port scif2_platform_data = {

	.mapbase	= 0xe6c60000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(74), gic_spi(74),

			    gic_spi(74), gic_spi(74) },
@@ -84,6 +90,8 @@ static struct platform_device scif2_device = { 
static struct plat_sci_port scif3_platform_data = {

	.mapbase	= 0xe6c70000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(75), gic_spi(75),

			    gic_spi(75), gic_spi(75) },
@@ -100,6 +108,8 @@ static struct platform_device scif3_device = { 
static struct plat_sci_port scif4_platform_data = {

	.mapbase	= 0xe6c80000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(78), gic_spi(78),

			    gic_spi(78), gic_spi(78) },
@@ -116,6 +126,8 @@ static struct platform_device scif4_device = { 
static struct plat_sci_port scif5_platform_data = {

	.mapbase	= 0xe6cb0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(79), gic_spi(79),

			    gic_spi(79), gic_spi(79) },
@@ -132,6 +144,8 @@ static struct platform_device scif5_device = { 
static struct plat_sci_port scif6_platform_data = {

	.mapbase	= 0xe6cc0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(156), gic_spi(156),

			    gic_spi(156), gic_spi(156) },
@@ -148,6 +162,8 @@ static struct platform_device scif6_device = { 
static struct plat_sci_port scif7_platform_data = {

	.mapbase	= 0xe6cd0000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFA,

	.irqs		= { gic_spi(143), gic_spi(143),

			    gic_spi(143), gic_spi(143) },
@@ -164,6 +180,8 @@ static struct platform_device scif7_device = { 
static struct plat_sci_port scif8_platform_data = {

	.mapbase	= 0xe6c30000,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIFB,

	.irqs		= { gic_spi(80), gic_spi(80),

			    gic_spi(80), gic_spi(80) },

arch/sh/boards/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ menu "Board support" 
config SOLUTION_ENGINE

	bool



config SH_ALPHA_BOARD

	bool



config SH_SOLUTION_ENGINE

	bool "SolutionEngine"

	select SOLUTION_ENGINE
@@ -320,6 +323,21 @@ config SH_SH2007 
	  Compact Flash socket, two serial ports and PC-104 bus.

	  More information at <http://sh2000.sh-linux.org>.



config SH_APSH4A3A

	bool "AP-SH4A-3A"

	select SH_ALPHA_BOARD

	depends on CPU_SUBTYPE_SH7785

	help

	  Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A.



config SH_APSH4AD0A

	bool "AP-SH4AD-0A"

	select SH_ALPHA_BOARD

	select SYS_SUPPORTS_PCI

	depends on CPU_SUBTYPE_SH7786

	help

	  Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.



endmenu



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