From f4b02f57225b4dc3050312788048691edf0b2470 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Sun, 13 May 2012 08:24:14 +0900 Subject: [PATCH] --- yaml --- r: 303971 b: refs/heads/master c: 460dcb0220c369921fb55eccc70ea8d8f8bb3ba3 h: refs/heads/master i: 303969: 10bc86976bf7eaf2e453fb82cdd9e085a78d51ac 303967: db07ea6992f84341f0a3d4a6ab3e0e8fc18e7693 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv210/Kconfig | 1 + trunk/arch/arm/mach-s5pv210/mach-goni.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d8d6e17b4280..4f149ac38626 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ea2d9e7de03d147d0bd0ac684fef00e469705e0 +refs/heads/master: 460dcb0220c369921fb55eccc70ea8d8f8bb3ba3 diff --git a/trunk/arch/arm/mach-s5pv210/Kconfig b/trunk/arch/arm/mach-s5pv210/Kconfig index 29594fc4fdf4..88e983b0c82e 100644 --- a/trunk/arch/arm/mach-s5pv210/Kconfig +++ b/trunk/arch/arm/mach-s5pv210/Kconfig @@ -85,6 +85,7 @@ config MACH_AQUILA select S5P_DEV_ONENAND select S5PV210_SETUP_FB_24BPP select S5PV210_SETUP_SDHCI + select S5PV210_SETUP_USB_PHY help Machine support for the Samsung Aquila target based on S5PC110 SoC diff --git a/trunk/arch/arm/mach-s5pv210/mach-goni.c b/trunk/arch/arm/mach-s5pv210/mach-goni.c index 32395664e879..5fac4e4a93f9 100644 --- a/trunk/arch/arm/mach-s5pv210/mach-goni.c +++ b/trunk/arch/arm/mach-s5pv210/mach-goni.c @@ -278,6 +278,9 @@ static void __init goni_tsp_init(void) i2c2_devs[0].irq = gpio_to_irq(gpio); } +/* USB OTG */ +static struct s3c_hsotg_plat goni_hsotg_pdata; + static void goni_camera_init(void) { s5pv210_fimc_setup_gpio(S5P_CAMPORT_A); @@ -941,6 +944,8 @@ static void __init goni_machine_init(void) s3c_set_platdata(&goni_fimc_md_platdata, sizeof(goni_fimc_md_platdata), &s5p_device_fimc_md); + s3c_hsotg_set_platdata(&goni_hsotg_pdata); + goni_camera_init(); /* SPI */