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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
  sh: Add -mno-fdpic to default flags.
  sh: add resource of USB host for SH7723
  usb: r8a66597-hcd: Add support for SH7723 USB host
  sh: Fix compile error SH7763 setup code
  sh: Add SH7723 SCIF support
parents dfa7e20c e5090133

arch/sh/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,) 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -mb

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -ml



cflags-y	+= $(call cc-option,-mno-fdpic)



#

# -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that

# support it, while -Wa,-dsp by itself limits the range of usable opcodes

arch/sh/kernel/cpu/sh4a/setup-sh7723.c

+41 −0
Original line number Diff line number Diff line
@@ -16,6 +16,21 @@ 


static struct plat_sci_port sci_platform_data[] = {

	{

		.mapbase        = 0xffe00000,

		.flags          = UPF_BOOT_AUTOCONF,

		.type           = PORT_SCIF,

		.irqs           = { 80, 80, 80, 80 },

	},{

		.mapbase        = 0xffe10000,

		.flags          = UPF_BOOT_AUTOCONF,

		.type           = PORT_SCIF,

		.irqs           = { 81, 81, 81, 81 },

	},{

		.mapbase        = 0xffe20000,

		.flags          = UPF_BOOT_AUTOCONF,

		.type           = PORT_SCIF,

		.irqs           = { 82, 82, 82, 82 },

	},{

		.mapbase	= 0xa4e30000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCI,
@@ -73,9 +88,35 @@ static struct platform_device rtc_device = { 
	.resource	= rtc_resources,

};



static struct resource sh7723_usb_host_resources[] = {

	[0] = {

		.name	= "r8a66597_hcd",

		.start	= 0xa4d80000,

		.end	= 0xa4d800ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 65,

		.end	= 65,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device sh7723_usb_host_device = {

	.name		= "r8a66597_hcd",

	.id		= 0,

	.dev = {

		.dma_mask		= NULL,         /*  not use dma */

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(sh7723_usb_host_resources),

	.resource	= sh7723_usb_host_resources,

};



static struct platform_device *sh7723_devices[] __initdata = {

	&sci_device,

	&rtc_device,

	&sh7723_usb_host_device,

};



static int __init sh7723_devices_setup(void)

arch/sh/kernel/cpu/sh4a/setup-sh7763.c

+5 −4
Original line number Diff line number Diff line
@@ -291,9 +291,10 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = { 
};



static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors,

			 NULL, NULL, irq_mask_registers, irq_prio_registers,

			NULL, irq_mask_registers, irq_prio_registers,

			irq_sense_registers);





/* External interrupt pins in IRL mode */

static struct intc_vect irl_vectors[] __initdata = {

	INTC_VECT(IRL_LLLL, 0x200), INTC_VECT(IRL_LLLH, 0x220),
@@ -324,10 +325,10 @@ static struct intc_mask_reg irl7654_mask_registers[] __initdata = { 
};



static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors,

			 NULL, NULL, irl7654_mask_registers, NULL, NULL);

			NULL, irl7654_mask_registers, NULL, NULL);



static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors,

			 NULL, NULL, irl3210_mask_registers, NULL, NULL);

			NULL, irl3210_mask_registers, NULL, NULL);



#define INTC_ICR0	0xffd00000

#define INTC_INTMSK0	0xffd00044

drivers/usb/host/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ config USB_R8A66597_HCD 
	  module will be called r8a66597-hcd.



config SUPERH_ON_CHIP_R8A66597

	boolean "Enable SuperH on-chip USB like the R8A66597"

	depends on USB_R8A66597_HCD && CPU_SUBTYPE_SH7366

	boolean "Enable SuperH on-chip R8A66597 USB"

	depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723)

	help

	   Renesas SuperH processor has USB like the R8A66597.

	   This driver supported processor is SH7366.
 
	   This driver enables support for the on-chip R8A66597 in the

	   SH7366 and SH7723 processors.