diff options
| author | Kuninori Morimoto | 2012-10-29 09:15:25 +0100 |
|---|---|---|
| committer | Simon Horman | 2012-11-08 09:52:03 +0100 |
| commit | b5ce635d45fc7da686c9f3071877689d8db1d284 (patch) | |
| tree | c8c9488082e7a70ab549c0ea1079b583eec45b45 | |
| parent | Merge branch 'soc' into boards (diff) | |
| download | kernel-qcow2-linux-b5ce635d45fc7da686c9f3071877689d8db1d284.tar.gz kernel-qcow2-linux-b5ce635d45fc7da686c9f3071877689d8db1d284.tar.xz kernel-qcow2-linux-b5ce635d45fc7da686c9f3071877689d8db1d284.zip | |
ARM: shmobile: marzen: add USB phy support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | arch/arm/configs/marzen_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 5b8215f424c5..8a861b75494e 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -78,7 +78,8 @@ CONFIG_GPIO_SYSFS=y CONFIG_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_SSB=y -# CONFIG_USB_SUPPORT is not set +CONFIG_USB=y +CONFIG_USB_RCAR_PHY=y CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_UIO=y diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 69f7f464eff8..74c7f0b64718 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -144,11 +144,32 @@ 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), +}; + static struct platform_device *marzen_devices[] __initdata = { ð_device, &sdhi0_device, &thermal_device, &hspi_device, + &usb_phy_device, }; static void __init marzen_init(void) |