aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2014-02-27 09:18:29 -0500
committerTony Lindgren <tony@atomide.com>2014-03-04 13:20:22 -0500
commit2ecf8aa1122ba3b2b2affc164af24e164383311d (patch)
treeb6a3dc0ed8c3601e0e919b2a44fc3f1415852fd6
parent5eb9b5e5658effc322bf83c58c0a135b0602ab47 (diff)
ARM: OMAP2+: Remove legacy_init_ehci_clk()
The necessary clock phandle for the EHCI clock is now provided via device tree so we no longer need this legacy method. Update the omap4-panda and omap5-uevm board DTS to provide the necessary EHCI PHY clock information. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/omap4-panda-common.dtsi8
-rw-r--r--arch/arm/boot/dts/omap5-uevm.dts8
-rw-r--r--arch/arm/mach-omap2/pdata-quirks.c16
3 files changed, 4 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index f83dd4c365c7..cbc45cfc44e9 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -83,12 +83,8 @@
83 compatible = "usb-nop-xceiv"; 83 compatible = "usb-nop-xceiv";
84 reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */ 84 reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
85 vcc-supply = <&hsusb1_power>; 85 vcc-supply = <&hsusb1_power>;
86 /** 86 clocks = <&auxclk3_ck>;
87 * FIXME: 87 clock-names = "main_clk";
88 * put the right clock phandle here when available
89 * clocks = <&auxclk3>;
90 * clock-names = "main_clk";
91 */
92 clock-frequency = <19200000>; 88 clock-frequency = <19200000>;
93 }; 89 };
94 90
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 002fa70180a5..3b99ec25b748 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -31,12 +31,8 @@
31 hsusb2_phy: hsusb2_phy { 31 hsusb2_phy: hsusb2_phy {
32 compatible = "usb-nop-xceiv"; 32 compatible = "usb-nop-xceiv";
33 reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */ 33 reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */
34 /** 34 clocks = <&auxclk1_ck>;
35 * FIXME 35 clock-names = "main_clk";
36 * Put the right clock phandle here when available
37 * clocks = <&auxclk1>;
38 * clock-names = "main_clk";
39 */
40 clock-frequency = <19200000>; 36 clock-frequency = <19200000>;
41 }; 37 };
42 38
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 3e1407c909f7..111b8a2923e6 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -31,20 +31,6 @@ struct pdata_init {
31struct of_dev_auxdata omap_auxdata_lookup[]; 31struct of_dev_auxdata omap_auxdata_lookup[];
32static struct twl4030_gpio_platform_data twl_gpio_auxdata; 32static struct twl4030_gpio_platform_data twl_gpio_auxdata;
33 33
34/*
35 * Create alias for USB host PHY clock.
36 * Remove this when clock phandle can be provided via DT
37 */
38static void __init __used legacy_init_ehci_clk(char *clkname)
39{
40 int ret;
41
42 ret = clk_add_alias("main_clk", NULL, clkname, NULL);
43 if (ret)
44 pr_err("%s:Failed to add main_clk alias to %s :%d\n",
45 __func__, clkname, ret);
46}
47
48#if IS_ENABLED(CONFIG_WL12XX) 34#if IS_ENABLED(CONFIG_WL12XX)
49 35
50static struct wl12xx_platform_data wl12xx __initdata; 36static struct wl12xx_platform_data wl12xx __initdata;
@@ -243,7 +229,6 @@ static void __init omap4_sdp_legacy_init(void)
243static void __init omap4_panda_legacy_init(void) 229static void __init omap4_panda_legacy_init(void)
244{ 230{
245 omap4_panda_display_init_of(); 231 omap4_panda_display_init_of();
246 legacy_init_ehci_clk("auxclk3_ck");
247 legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53); 232 legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
248} 233}
249#endif 234#endif
@@ -251,7 +236,6 @@ static void __init omap4_panda_legacy_init(void)
251#ifdef CONFIG_SOC_OMAP5 236#ifdef CONFIG_SOC_OMAP5
252static void __init omap5_uevm_legacy_init(void) 237static void __init omap5_uevm_legacy_init(void)
253{ 238{
254 legacy_init_ehci_clk("auxclk1_ck");
255} 239}
256#endif 240#endif
257 241