Commit a1149269 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-phy-rcar-usb-for-v3.11' of... 

Merge tag 'renesas-phy-rcar-usb-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas USB updates for v3.11

These updates are by Sergei Shtylyov to clean-up USB support
present for R8A7779/Marzen and then extend USB support coverage to
R8A7778/BOCK-W.

* tag 'renesas-phy-rcar-usb-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: BOCK-W: add USB support
  ARM: shmobile: r8a7778: add USB support
  phy-rcar-usb: add R8A7778 support
  phy-rcar-usb: handle platform data
  ARM: shmobile: Marzen: pass platform data to USB PHY device
  phy-rcar-usb: add platform data
  phy-rcar-usb: correct base address
  ARM: shmobile: r8a7779: remove USB PHY 2nd memory resource
  phy-rcar-usb: remove EHCI internal buffer setup
  ARM: shmobile: r8a7779: setup EHCI internal buffer
  ehci-platform: add pre_setup() method to platform data
  ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code

Conflicts:
	arch/arm/mach-shmobile/board-marzen.c
	arch/arm/mach-shmobile/setup-r8a7778.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5ae13ef4 1a87b01d

arch/arm/mach-shmobile/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ config ARCH_R8A7778 
	select CPU_V7

	select SH_CLK_CPG

	select ARM_GIC

	select USB_ARCH_HAS_EHCI

	select USB_ARCH_HAS_OHCI



config ARCH_R8A7779

	bool "R-Car H1 (R8A77790)"

arch/arm/mach-shmobile/board-bockw.c

+8 −0
Original line number Diff line number Diff line
@@ -38,12 +38,18 @@ static struct resource smsc911x_resources[] = { 
	DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */

};



static struct rcar_phy_platform_data usb_phy_platform_data __initdata;



static const struct pinctrl_map bockw_pinctrl_map[] = {

	/* SCIF0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",

				  "scif0_data_a", "scif0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",

				  "scif0_ctrl", "scif0"),

	PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",

				  "usb0", "usb0"),

	PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",

				  "usb1", "usb1"),

};



#define IRQ0MR	0x30
@@ -54,6 +60,7 @@ static void __init bockw_init(void) 
	r8a7778_clock_init();

	r8a7778_init_irq_extpin(1);

	r8a7778_add_standard_devices();

	r8a7778_add_usb_phy_device(&usb_phy_platform_data);



	pinctrl_register_mappings(bockw_pinctrl_map,

				  ARRAY_SIZE(bockw_pinctrl_map));
@@ -91,4 +98,5 @@ DT_MACHINE_START(BOCKW_DT, "bockw") 
	.init_machine	= bockw_init,

	.init_time	= shmobile_timer_init,

	.dt_compat	= bockw_boards_compat_dt,

	.init_late      = r8a7778_init_late,

MACHINE_END

arch/arm/mach-shmobile/board-marzen.c

+4 −177
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ 
#include <linux/mmc/host.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/usb/otg.h>

#include <linux/usb/ehci_pdriver.h>

#include <linux/usb/ohci_pdriver.h>

#include <linux/pm_runtime.h>

#include <mach/hardware.h>

#include <mach/r8a7779.h>

#include <mach/common.h>
@@ -61,6 +57,8 @@ static struct regulator_consumer_supply dummy_supplies[] = { 
	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



static struct rcar_phy_platform_data usb_phy_platform_data __initdata;



/* SMSC LAN89218 */

static struct resource smsc911x_resources[] = {

	[0] = {
@@ -150,26 +148,6 @@ static struct platform_device hspi_device = { 
	.num_resources	= ARRAY_SIZE(hspi_resources),

};



/* USB PHY */

static struct resource usb_phy_resources[] = {

	[0] = {

		.start		= 0xffe70000,

		.end		= 0xffe70900 - 1,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= 0xfff70000,

		.end		= 0xfff70900 - 1,

		.flags		= IORESOURCE_MEM,

	},

};



static struct platform_device usb_phy_device = {

	.name		= "rcar_usb_phy",

	.resource	= usb_phy_resources,

	.num_resources	= ARRAY_SIZE(usb_phy_resources),

};



/* LEDS */

static struct gpio_led marzen_leds[] = {

	{
@@ -205,161 +183,9 @@ static struct platform_device *marzen_devices[] __initdata = { 
	&sdhi0_device,

	&thermal_device,

	&hspi_device,

	&usb_phy_device,

	&leds_device,

};



/* USB */

static struct usb_phy *phy;

static int usb_power_on(struct platform_device *pdev)

{

	if (IS_ERR(phy))

		return PTR_ERR(phy);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);



	usb_phy_init(phy);



	return 0;

}



static void usb_power_off(struct platform_device *pdev)

{

	if (IS_ERR(phy))

		return;



	usb_phy_shutdown(phy);



	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

}



static struct usb_ehci_pdata ehcix_pdata = {

	.power_on	= usb_power_on,

	.power_off	= usb_power_off,

	.power_suspend	= usb_power_off,

};



static struct resource ehci0_resources[] = {

	[0] = {

		.start	= 0xffe70000,

		.end	= 0xffe70400 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_iid(0x4c),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device ehci0_device = {

	.name	= "ehci-platform",

	.id	= 0,

	.dev	= {

		.dma_mask		= &ehci0_device.dev.coherent_dma_mask,

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &ehcix_pdata,

	},

	.num_resources	= ARRAY_SIZE(ehci0_resources),

	.resource	= ehci0_resources,

};



static struct resource ehci1_resources[] = {

	[0] = {

		.start	= 0xfff70000,

		.end	= 0xfff70400 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_iid(0x4d),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device ehci1_device = {

	.name	= "ehci-platform",

	.id	= 1,

	.dev	= {

		.dma_mask		= &ehci1_device.dev.coherent_dma_mask,

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &ehcix_pdata,

	},

	.num_resources	= ARRAY_SIZE(ehci1_resources),

	.resource	= ehci1_resources,

};



static struct usb_ohci_pdata ohcix_pdata = {

	.power_on	= usb_power_on,

	.power_off	= usb_power_off,

	.power_suspend	= usb_power_off,

};



static struct resource ohci0_resources[] = {

	[0] = {

		.start	= 0xffe70400,

		.end	= 0xffe70800 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_iid(0x4c),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device ohci0_device = {

	.name	= "ohci-platform",

	.id	= 0,

	.dev	= {

		.dma_mask		= &ohci0_device.dev.coherent_dma_mask,

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &ohcix_pdata,

	},

	.num_resources	= ARRAY_SIZE(ohci0_resources),

	.resource	= ohci0_resources,

};



static struct resource ohci1_resources[] = {

	[0] = {

		.start	= 0xfff70400,

		.end	= 0xfff70800 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_iid(0x4d),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device ohci1_device = {

	.name	= "ohci-platform",

	.id	= 1,

	.dev	= {

		.dma_mask		= &ohci1_device.dev.coherent_dma_mask,

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &ohcix_pdata,

	},

	.num_resources	= ARRAY_SIZE(ohci1_resources),

	.resource	= ohci1_resources,

};



static struct platform_device *marzen_late_devices[] __initdata = {

	&ehci0_device,

	&ehci1_device,

	&ohci0_device,

	&ohci1_device,

};



void __init marzen_init_late(void)

{

	/* get usb phy */

	phy = usb_get_phy(USB_PHY_TYPE_USB2);



	shmobile_init_late();

	platform_add_devices(marzen_late_devices,

			     ARRAY_SIZE(marzen_late_devices));

}



static const struct pinctrl_map marzen_pinctrl_map[] = {

	/* HSPI0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
@@ -407,6 +233,7 @@ static void __init marzen_init(void) 
	r8a7779_pinmux_init();



	r8a7779_add_standard_devices();

	r8a7779_add_usb_phy_device(&usb_phy_platform_data);

	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));

}
@@ -417,6 +244,6 @@ MACHINE_START(MARZEN, "marzen") 
	.nr_irqs	= NR_IRQS_LEGACY,

	.init_irq	= r8a7779_init_irq,

	.init_machine	= marzen_init,

	.init_late	= marzen_init_late,

	.init_late	= r8a7779_init_late,

	.init_time	= r8a7779_earlytimer_init,

MACHINE_END

arch/arm/mach-shmobile/clock-r8a7778.c

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static struct clk *main_clks[] = { 
enum {

	MSTP323, MSTP322, MSTP321,

	MSTP114,

	MSTP100,

	MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,

	MSTP016, MSTP015,

	MSTP_NR };
@@ -114,6 +115,7 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP322] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 22, 0), /* SDHI1 */

	[MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */

	[MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */

	[MSTP100] = SH_CLK_MSTP32(&p_clk, MSTPCR1,  0, 0), /* USB0/1 */

	[MSTP026] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 26, 0), /* SCIF0 */

	[MSTP025] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 25, 0), /* SCIF1 */

	[MSTP024] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 24, 0), /* SCIF2 */
@@ -130,6 +132,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */

	CLKDEV_DEV_ID("sh-eth",	&mstp_clks[MSTP114]), /* Ether */

	CLKDEV_DEV_ID("ehci-platform", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */

	CLKDEV_DEV_ID("ohci-platform", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */

	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */

	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */

	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */

arch/arm/mach-shmobile/include/mach/r8a7778.h

+3 −0
Original line number Diff line number Diff line
@@ -20,10 +20,13 @@ 


#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/sh_eth.h>

#include <linux/platform_data/usb-rcar-phy.h>



extern void r8a7778_add_standard_devices(void);

extern void r8a7778_add_standard_devices_dt(void);

extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);

extern void r8a7778_add_usb_phy_device(struct rcar_phy_platform_data *pdata);

extern void r8a7778_init_late(void);

extern void r8a7778_init_delay(void);

extern void r8a7778_init_irq(void);

extern void r8a7778_init_irq_dt(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE