aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-10-29 04:15:25 -0400
committerSimon Horman <horms@verge.net.au>2012-11-08 03:52:03 -0500
commitb5ce635d45fc7da686c9f3071877689d8db1d284 (patch)
treec8c9488082e7a70ab549c0ea1079b583eec45b45
parentab3ff12a78a64b851ab22726ab99dca6ad37bf94 (diff)
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_defconfig3
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c21
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
78CONFIG_THERMAL=y 78CONFIG_THERMAL=y
79CONFIG_RCAR_THERMAL=y 79CONFIG_RCAR_THERMAL=y
80CONFIG_SSB=y 80CONFIG_SSB=y
81# CONFIG_USB_SUPPORT is not set 81CONFIG_USB=y
82CONFIG_USB_RCAR_PHY=y
82CONFIG_MMC=y 83CONFIG_MMC=y
83CONFIG_MMC_SDHI=y 84CONFIG_MMC_SDHI=y
84CONFIG_UIO=y 85CONFIG_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 = {
144 .num_resources = ARRAY_SIZE(hspi_resources), 144 .num_resources = ARRAY_SIZE(hspi_resources),
145}; 145};
146 146
147/* USB PHY */
148static struct resource usb_phy_resources[] = {
149 [0] = {
150 .start = 0xffe70000,
151 .end = 0xffe70900 - 1,
152 .flags = IORESOURCE_MEM,
153 },
154 [1] = {
155 .start = 0xfff70000,
156 .end = 0xfff70900 - 1,
157 .flags = IORESOURCE_MEM,
158 },
159};
160
161static struct platform_device usb_phy_device = {
162 .name = "rcar_usb_phy",
163 .resource = usb_phy_resources,
164 .num_resources = ARRAY_SIZE(usb_phy_resources),
165};
166
147static struct platform_device *marzen_devices[] __initdata = { 167static struct platform_device *marzen_devices[] __initdata = {
148 &eth_device, 168 &eth_device,
149 &sdhi0_device, 169 &sdhi0_device,
150 &thermal_device, 170 &thermal_device,
151 &hspi_device, 171 &hspi_device,
172 &usb_phy_device,
152}; 173};
153 174
154static void __init marzen_init(void) 175static void __init marzen_init(void)