| Message ID | 1381226799-29158-6-git-send-email-rogerq@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Tony, On 10/08/2013 01:06 PM, Roger Quadros wrote: > This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea. > > The proper clock reference is provided in device tree so we > no longer need this. Could you please Ack this one? I think it is best if it goes through Benoit's tree. cheers, -roger > > Signed-off-by: Roger Quadros <rogerq@ti.com> > --- > arch/arm/mach-omap2/board-generic.c | 23 +---------------------- > 1 files changed, 1 insertions(+), 22 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c > index cd85b36..da4e9b2 100644 > --- a/arch/arm/mach-omap2/board-generic.c > +++ b/arch/arm/mach-omap2/board-generic.c > @@ -15,7 +15,6 @@ > #include <linux/of_irq.h> > #include <linux/of_platform.h> > #include <linux/irqdomain.h> > -#include <linux/clk.h> > > #include <asm/mach/arch.h> > > @@ -36,21 +35,6 @@ 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); > @@ -61,15 +45,10 @@ 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> [131009 00:19]: > Hi Tony, > > On 10/08/2013 01:06 PM, Roger Quadros wrote: > > This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea. > > > > The proper clock reference is provided in device tree so we > > no longer need this. > > Could you please Ack this one? I think it is best if it goes through Benoit's tree. I could queue this into my board removal series that will be based on Benoit's branch if that works for you. And this also seems to depend on the omap-for-v3.13/quirk branch that moves all the legacy pdata handling into pdata-quirks.c. The reason for this is that we want to keep the .dts changes completely separate from the code changes to avoid dependencies that cause pointless merge conflicts. And the .dts files will be moved to live in a separate repo soonish, so it's good to be prepared for that. Regards, Tony
On 10/09/2013 06:15 PM, Tony Lindgren wrote: > * Roger Quadros <rogerq@ti.com> [131009 00:19]: >> Hi Tony, >> >> On 10/08/2013 01:06 PM, Roger Quadros wrote: >>> This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea. >>> >>> The proper clock reference is provided in device tree so we >>> no longer need this. >> >> Could you please Ack this one? I think it is best if it goes through Benoit's tree. > > I could queue this into my board removal series that will be > based on Benoit's branch if that works for you. And this > also seems to depend on the omap-for-v3.13/quirk branch > that moves all the legacy pdata handling into pdata-quirks.c. OK Tony. Thanks. cheers, -roger
* Roger Quadros <rogerq@ti.com> [131010 02:23]: > On 10/09/2013 06:15 PM, Tony Lindgren wrote: > > * Roger Quadros <rogerq@ti.com> [131009 00:19]: > >> Hi Tony, > >> > >> On 10/08/2013 01:06 PM, Roger Quadros wrote: > >>> This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea. > >>> > >>> The proper clock reference is provided in device tree so we > >>> no longer need this. > >> > >> Could you please Ack this one? I think it is best if it goes through Benoit's tree. > > > > I could queue this into my board removal series that will be > > based on Benoit's branch if that works for you. And this > > also seems to depend on the omap-for-v3.13/quirk branch > > that moves all the legacy pdata handling into pdata-quirks.c. > > OK Tony. Thanks. Actually, can you please update this patch against branch omap-for-v3.13/board-removal-take2 and check the omap5_uevm_legacy_init() part as well? Tony
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index cd85b36..da4e9b2 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -15,7 +15,6 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/irqdomain.h> -#include <linux/clk.h> #include <asm/mach/arch.h> @@ -36,21 +35,6 @@ 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); @@ -61,15 +45,10 @@ 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
This reverts commit 741532c4a995be11815cb72d4d7a48f442a22fea. The proper clock reference is provided in device tree so we no longer need this. Signed-off-by: Roger Quadros <rogerq@ti.com> --- arch/arm/mach-omap2/board-generic.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-)