| Message ID | 1371553891-29364-5-git-send-email-rogerq@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Roger Quadros <rogerq@ti.com> [130618 04:17]: > Till the OMAP clocks are correctly defined in device tree, use > this temporary hack to provide clock alias to the USB PHY clocks. > > Without this, USB Host & Ethernet will not be functional with > device tree boots on Panda and uEVM. Thanks, this looks OK to me to have USB working until we have the DT defined clock patches ready. The $Subject needs updating though, just make it ARM: OMAP2+: and leave out the dts and hack from there. Regards, Tony > Signed-off-by: Roger Quadros <rogerq@ti.com> > --- > arch/arm/mach-omap2/board-generic.c | 23 ++++++++++++++++++++++- > 1 files changed, 22 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c > index 88aa6b1..2b2d0de 100644 > --- a/arch/arm/mach-omap2/board-generic.c > +++ b/arch/arm/mach-omap2/board-generic.c > @@ -15,6 +15,7 @@ > #include <linux/of_irq.h> > #include <linux/of_platform.h> > #include <linux/irqdomain.h> > +#include <linux/clk.h> > > #include <asm/mach/arch.h> > > @@ -35,6 +36,21 @@ static struct of_device_id omap_dt_match_table[] __initdata = { > { } > }; > > +/* > + * HACK: create alias for USB host PHY clock. > + * Remove this when clock phandle can be provided via DT > + */ > +static void __init 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); > + } > +} > + > static void __init omap_generic_init(void) > { > omap_sdrc_init(NULL, NULL); > @@ -45,10 +61,15 @@ static void __init omap_generic_init(void) > * HACK: call display setup code for selected boards to enable omapdss. > * This will be removed when omapdss supports DT. > */ > - if (of_machine_is_compatible("ti,omap4-panda")) > + if (of_machine_is_compatible("ti,omap4-panda")) { > omap4_panda_display_init_of(); > + legacy_init_ehci_clk("auxclk3_ck"); > + > + } > else if (of_machine_is_compatible("ti,omap4-sdp")) > omap_4430sdp_display_init_of(); > + else if (of_machine_is_compatible("ti,omap5-uevm")) > + legacy_init_ehci_clk("auxclk1_ck"); > } > > #ifdef CONFIG_SOC_OMAP2420 > -- > 1.7.4.1 >
On 06/18/2013 02:23 PM, Tony Lindgren wrote: > * Roger Quadros <rogerq@ti.com> [130618 04:17]: >> Till the OMAP clocks are correctly defined in device tree, use >> this temporary hack to provide clock alias to the USB PHY clocks. >> >> Without this, USB Host & Ethernet will not be functional with >> device tree boots on Panda and uEVM. > > Thanks, this looks OK to me to have USB working until we have the > DT defined clock patches ready. > > The $Subject needs updating though, just make it ARM: OMAP2+: and > leave out the dts and hack from there. > OK. will send v2 as i need to make another minor change in the panda dts file. cheers, -roger
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 88aa6b1..2b2d0de 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -15,6 +15,7 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/irqdomain.h> +#include <linux/clk.h> #include <asm/mach/arch.h> @@ -35,6 +36,21 @@ static struct of_device_id omap_dt_match_table[] __initdata = { { } }; +/* + * HACK: create alias for USB host PHY clock. + * Remove this when clock phandle can be provided via DT + */ +static void __init 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); + } +} + static void __init omap_generic_init(void) { omap_sdrc_init(NULL, NULL); @@ -45,10 +61,15 @@ static void __init omap_generic_init(void) * HACK: call display setup code for selected boards to enable omapdss. * This will be removed when omapdss supports DT. */ - if (of_machine_is_compatible("ti,omap4-panda")) + if (of_machine_is_compatible("ti,omap4-panda")) { omap4_panda_display_init_of(); + legacy_init_ehci_clk("auxclk3_ck"); + + } else if (of_machine_is_compatible("ti,omap4-sdp")) omap_4430sdp_display_init_of(); + else if (of_machine_is_compatible("ti,omap5-uevm")) + legacy_init_ehci_clk("auxclk1_ck"); } #ifdef CONFIG_SOC_OMAP2420
Till the OMAP clocks are correctly defined in device tree, use this temporary hack to provide clock alias to the USB PHY clocks. Without this, USB Host & Ethernet will not be functional with device tree boots on Panda and uEVM. Signed-off-by: Roger Quadros <rogerq@ti.com> --- arch/arm/mach-omap2/board-generic.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-)