xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: OMAP2+: Remove legacy_init_ehci_clk()

Browse Source 
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>
This commit is contained in:
Roger Quadros
2014-02-27 16:18:29 +02:00
committed by Tony Lindgren
parent 5eb9b5e565
commit 2ecf8aa112
3 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/omap4-panda-common.dtsi
View File

@@ -83,12 +83,8 @@
compatible = "usb-nop-xceiv"; compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */ reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
vcc-supply = <&hsusb1_power>; vcc-supply = <&hsusb1_power>;
/** clocks = <&auxclk3_ck>;
* FIXME: clock-names = "main_clk";
* put the right clock phandle here when available
* clocks = <&auxclk3>;
* clock-names = "main_clk";
*/
clock-frequency = <19200000>; clock-frequency = <19200000>;
}; };

8
arch/arm/boot/dts/omap5-uevm.dts
View File

@@ -31,12 +31,8 @@
hsusb2_phy: hsusb2_phy { hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv"; compatible = "usb-nop-xceiv";
reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */ reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */
/** clocks = <&auxclk1_ck>;
* FIXME clock-names = "main_clk";
* Put the right clock phandle here when available
* clocks = <&auxclk1>;
* clock-names = "main_clk";
*/
clock-frequency = <19200000>; clock-frequency = <19200000>;
}; };

16
arch/arm/mach-omap2/pdata-quirks.c
View File

@@ -31,20 +31,6 @@ struct pdata_init {
struct of_dev_auxdata omap_auxdata_lookup[]; struct of_dev_auxdata omap_auxdata_lookup[];
static struct twl4030_gpio_platform_data twl_gpio_auxdata; static struct twl4030_gpio_platform_data twl_gpio_auxdata;
/*
* Create alias for USB host PHY clock.
* Remove this when clock phandle can be provided via DT
*/
static void __init __used legacy_init_ehci_clk(char *clkname)
{
int ret;
ret = clk_add_alias("main_clk", NULL, clkname, NULL);
if (ret)
pr_err("%s:Failed to add main_clk alias to %s :%d\n",
__func__, clkname, ret);
}
#if IS_ENABLED(CONFIG_WL12XX) #if IS_ENABLED(CONFIG_WL12XX)
static struct wl12xx_platform_data wl12xx __initdata; static struct wl12xx_platform_data wl12xx __initdata;
@@ -243,7 +229,6 @@ static void __init omap4_sdp_legacy_init(void)
static void __init omap4_panda_legacy_init(void) static void __init omap4_panda_legacy_init(void)
{ {
omap4_panda_display_init_of(); omap4_panda_display_init_of();
legacy_init_ehci_clk("auxclk3_ck");
legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53); legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
} }
#endif #endif
@@ -251,7 +236,6 @@ static void __init omap4_panda_legacy_init(void)
#ifdef CONFIG_SOC_OMAP5 #ifdef CONFIG_SOC_OMAP5
static void __init omap5_uevm_legacy_init(void) static void __init omap5_uevm_legacy_init(void)
{ {
legacy_init_ehci_clk("auxclk1_ck");
} }
#endif #endif