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

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

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)
  sh: intc - add support for SH7750 and its variants
  sh: Move entry point code to .text.head.
  sh: heartbeat: Shut up resource size warning.
  sh: update r2d defconfig and fix SH7751R pci compliation
  sh: Many symbol exports for nommu allmodconfig.
  sh: zero terminate 8250 platform data for r2d board
  sh: cpufreq: Fix up the build for SH-2.
  sh: Make on-chip DMA channel selection explicit.
  sh: Fix up CPU dependencies for on-chip DMAC.
  sh: cpufreq: clock framework support.
  sh: Support rate rounding for SH7722 FRQCR clocks.
  sh: Implement clk_round_rate() in the clock framework.
  sh: Fix up PCI section mismatch warnings.
  sh: Wire up fallocate() syscall.
  sh: intc - add support for 7780
  sh: intc - improve group support
  sh: Fix up SH-3 and SH-4 driver dependencies.
  sh: push-switch: Correct license string.
  sh: cpufreq: Fix driver dependencies and flag as broken.
  sh: IPR/INTC2 IRQ setup consolidation.
  ...
parents 7f46e6ca 56386f64

arch/sh/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ config CPU_HAS_PINT_IRQ 
config CPU_HAS_MASKREG_IRQ

	bool



config CPU_HAS_INTC_IRQ

	bool



config CPU_HAS_INTC2_IRQ

	bool
@@ -209,6 +212,7 @@ config SOLUTION_ENGINE 
config SH_SOLUTION_ENGINE

	bool "SolutionEngine"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7750

	help

	  Select SolutionEngine if configuring for a Hitachi SH7709
@@ -241,6 +245,7 @@ config SH_7722_SOLUTION_ENGINE 
config SH_7751_SOLUTION_ENGINE

	bool "SolutionEngine7751"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7751

	help

	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751
@@ -250,6 +255,7 @@ config SH_7780_SOLUTION_ENGINE 
	bool "SolutionEngine7780"

	select SOLUTION_ENGINE

	select SYS_SUPPORTS_PCI

	select CPU_HAS_INTC2_IRQ

	depends on CPU_SUBTYPE_SH7780

	help

	  Select 7780 SolutionEngine if configuring for a Renesas SH7780
@@ -317,6 +323,7 @@ config SH_MPC1211 
config SH_SH03

	bool "Interface CTP/PCI-SH03"

	depends on CPU_SUBTYPE_SH7751 && BROKEN

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  CTP/PCI-SH03 is a CPU module computer that is produced
@@ -326,6 +333,7 @@ config SH_SH03 
config SH_SECUREEDGE5410

	bool "SecureEdge5410"

	depends on CPU_SUBTYPE_SH7751R

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  Select SecureEdge5410 if configuring for a SnapGear SH board.
@@ -380,6 +388,7 @@ config SH_LANDISK 
config SH_TITAN

	bool "TITAN"

	depends on CPU_SUBTYPE_SH7751R

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  Select Titan if you are configuring for a Nimble Microsystems
@@ -388,6 +397,7 @@ config SH_TITAN 
config SH_SHMIN

	bool "SHMIN"

	depends on CPU_SUBTYPE_SH7706

	select CPU_HAS_IPR_IRQ

	help

	  Select SHMIN if configuring for the SHMIN board.

arch/sh/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ core-y += $(addprefix arch/sh/boards/, \ 
endif



# Companion chips

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

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

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

core-$(CONFIG_VOYAGERGX)	+= arch/sh/cchips/voyagergx/



cpuincdir-$(CONFIG_CPU_SH2)	:= cpu-sh2

arch/sh/boards/mpc1211/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ char * __devinit pcibios_setup(char *str) 
 *  are examined.

 */



void __init pcibios_fixup_bus(struct pci_bus *b)

void __devinit pcibios_fixup_bus(struct pci_bus *b)

{

	pci_read_bridge_bases(b);

}

arch/sh/boards/renesas/r7780rp/setup.c

+54 −0
Original line number Diff line number Diff line
@@ -21,6 +21,58 @@ 
#include <asm/clock.h>

#include <asm/io.h>



static struct resource r8a66597_usb_host_resources[] = {

	[0] = {

		.name	= "r8a66597_hcd",

		.start	= 0xA4200000,

		.end	= 0xA42000FF,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.name	= "r8a66597_hcd",

		.start	= 11,		/* irq number */

		.end	= 11,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device r8a66597_usb_host_device = {

	.name		= "r8a66597_hcd",

	.id		= -1,

	.dev = {

		.dma_mask		= NULL,		/* don't use dma */

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(r8a66597_usb_host_resources),

	.resource	= r8a66597_usb_host_resources,

};



static struct resource m66592_usb_peripheral_resources[] = {

	[0] = {

		.name	= "m66592_udc",

		.start	= 0xb0000000,

		.end	= 0xb00000FF,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.name	= "m66592_udc",

		.start	= 9,		/* irq number */

		.end	= 9,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device m66592_usb_peripheral_device = {

	.name		= "m66592_udc",

	.id		= -1,

	.dev = {

		.dma_mask		= NULL,		/* don't use dma */

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(m66592_usb_peripheral_resources),

	.resource	= m66592_usb_peripheral_resources,

};



static struct resource cf_ide_resources[] = {

	[0] = {

		.start	= PA_AREA5_IO + 0x1000,
@@ -81,6 +133,8 @@ static struct platform_device heartbeat_device = { 
};



static struct platform_device *r7780rp_devices[] __initdata = {

	&r8a66597_usb_host_device,

	&m66592_usb_peripheral_device,

	&cf_ide_device,

	&heartbeat_device,

};

arch/sh/boards/renesas/rts7751r2d/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ static struct plat_serial8250_port uart_platform_data[] = { 
		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.regshift	= 2,

		.uartclk	= (9600 * 16),

	}

	},

	{ 0 },

};



static struct platform_device uart_device = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE