| Message ID | 1371571487-14389-5-git-send-email-rogerq@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Tony, On 06/18/2013 07:04 PM, Roger Quadros wrote: > 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. Looks like this one got missed out. USB host no longer works on Panda with DT boot. Could you please queue this for next 3.11-rc? Thanks. cheers, -roger > > 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..7428733 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 = { > { } > }; > > +/* > + * 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 >
* Roger Quadros <rogerq@ti.com> [130715 07:11]: > Hi Tony, > > On 06/18/2013 07:04 PM, Roger Quadros wrote: > > 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. > > Looks like this one got missed out. > > USB host no longer works on Panda with DT boot. > Could you please queue this for next 3.11-rc? Thanks. OK thanks for checking, applying into omap-for-v3.11/fixes. Looks like I also have some pending the .dts changes in omap-for-v3.11/dt branch: 4cf2198b1e3cee47a1cccbb500b67782c36615d5 ARM: dts: omap3-beagle-xm: Add USB host supprot for Rev. Ax/Bx 9bc44515819a00c0ffaf751ad497ddf275089ede ARM: dts: omap3-beagle-xm: Add USB Host support fd65d7df4598c1d2ad27d664c719611a1a070edc ARM: dts: omap3-beagle: Make USB host pin naming consistent 39ea891d9da6ae1824bc9f689db3f306f5ce0724 ARM: dts: omap4-panda: Add USB Host support Those should get merged as fixes, right? Can you please check and see if they're still OK or if we also need something else? Regards, Tony
On 07/15/2013 04:05 PM, Roger Quadros wrote: > Hi Tony, > > On 06/18/2013 07:04 PM, Roger Quadros wrote: >> 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. > > Looks like this one got missed out. Could it be because you promised to resend it (see [1]). I was upgrading our test stuff to 3.11-rc1 and made a DT appended image. Boot went fine, but no USB/ethernet. Should I pickup all four patches? Regards, Arend [1] http://mid.gmane.org/51C2EC5F.8050703@ti.com > USB host no longer works on Panda with DT boot. > Could you please queue this for next 3.11-rc? Thanks. > > cheers, > -roger >
On 07/16/2013 03:12 PM, Arend van Spriel wrote: > On 07/15/2013 04:05 PM, Roger Quadros wrote: >> Hi Tony, >> >> On 06/18/2013 07:04 PM, Roger Quadros wrote: >>> 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. >> >> Looks like this one got missed out. > > Could it be because you promised to resend it (see [1]). I was upgrading > our test stuff to 3.11-rc1 and made a DT appended image. Boot went fine, > but no USB/ethernet. Should I pickup all four patches? Nevermind. The first three seem to be in already. > Regards, > Arend > > [1] http://mid.gmane.org/51C2EC5F.8050703@ti.com > >> USB host no longer works on Panda with DT boot. >> Could you please queue this for next 3.11-rc? Thanks. >> >> cheers, >> -roger >> >
On 07/16/2013 03:32 PM, Tony Lindgren wrote: > * Roger Quadros <rogerq@ti.com> [130715 07:11]: >> Hi Tony, >> >> On 06/18/2013 07:04 PM, Roger Quadros wrote: >>> 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. >> >> Looks like this one got missed out. >> >> USB host no longer works on Panda with DT boot. >> Could you please queue this for next 3.11-rc? Thanks. > > OK thanks for checking, applying into omap-for-v3.11/fixes. Thanks. > > Looks like I also have some pending the .dts changes in > omap-for-v3.11/dt branch: > > 4cf2198b1e3cee47a1cccbb500b67782c36615d5 ARM: dts: omap3-beagle-xm: Add USB host supprot for Rev. Ax/Bx > 9bc44515819a00c0ffaf751ad497ddf275089ede ARM: dts: omap3-beagle-xm: Add USB Host support > fd65d7df4598c1d2ad27d664c719611a1a070edc ARM: dts: omap3-beagle: Make USB host pin naming consistent Please disregard those. They are old versions. Benoit had agreed to take the newer version of those for 3.12. Please pick this one to get usb host working on 3.11 with DT. http://www.spinics.net/lists/arm-kernel/msg253612.html > 39ea891d9da6ae1824bc9f689db3f306f5ce0724 ARM: dts: omap4-panda: Add USB Host support This one is already in through Benoit. cheers, -roger
* Roger Quadros <rogerq@ti.com> [130716 06:45]: > On 07/16/2013 03:32 PM, Tony Lindgren wrote: > > * Roger Quadros <rogerq@ti.com> [130715 07:11]: > >> Hi Tony, > >> > >> On 06/18/2013 07:04 PM, Roger Quadros wrote: > >>> 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. > >> > >> Looks like this one got missed out. > >> > >> USB host no longer works on Panda with DT boot. > >> Could you please queue this for next 3.11-rc? Thanks. > > > > OK thanks for checking, applying into omap-for-v3.11/fixes. > > Thanks. > > > > > Looks like I also have some pending the .dts changes in > > omap-for-v3.11/dt branch: > > > > 4cf2198b1e3cee47a1cccbb500b67782c36615d5 ARM: dts: omap3-beagle-xm: Add USB host supprot for Rev. Ax/Bx > > 9bc44515819a00c0ffaf751ad497ddf275089ede ARM: dts: omap3-beagle-xm: Add USB Host support > > fd65d7df4598c1d2ad27d664c719611a1a070edc ARM: dts: omap3-beagle: Make USB host pin naming consistent > > Please disregard those. They are old versions. OK, poof that branch is now gone. > Benoit had agreed to take the newer version of those for 3.12. > > Please pick this one to get usb host working on 3.11 with DT. > > http://www.spinics.net/lists/arm-kernel/msg253612.html > > > 39ea891d9da6ae1824bc9f689db3f306f5ce0724 ARM: dts: omap4-panda: Add USB Host support > > This one is already in through Benoit. It's best that Benoit queue all those to avoid more confusion :) Regards, Tony
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 88aa6b1..7428733 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 = { { } }; +/* + * 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(-)