| Message ID | 1390417460-3134-5-git-send-email-chf.fritz@googlemail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/22/2014 01:04 PM, Christoph Fritz wrote: > Full device tree support for clock control is not yet accomplished. Until > then, configure the 24Mhz of sys_clkout2 to feed an USB-Hub here. > > Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> > --- > arch/arm/mach-omap2/pdata-quirks.c | 37 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c > index a58590f..9ef7ca8 100644 > --- a/arch/arm/mach-omap2/pdata-quirks.c > +++ b/arch/arm/mach-omap2/pdata-quirks.c > @@ -171,6 +171,43 @@ static void __init am3517_evm_legacy_init(void) > } > static void __init omap3_dbb056_legacy_init(void) > { > + struct clk *clkout2; > + struct clk *cm96fck; > + > + /* Reparent clkout2 to 96M_FCK */ > + pr_info("a83x-quirk: Late Reparent clkout2 to 96M_FCK\n"); what'd be a83x? > + clkout2 = clk_get(NULL, "clkout2_src_ck"); > + if(clkout2 < 0) { > + pr_err("a83x-quirk: couldn't get clkout2_src_ck\n"); > + return; > + } > + cm96fck = clk_get(NULL, "cm_96m_fck"); > + if(cm96fck < 0) { > + pr_err("a83x-quirk: couldn't get cm_96m_fck\n"); > + return; > + } > + if(clk_set_parent(clkout2, cm96fck) < 0) { > + pr_err("a83x-quirk: couldn't reparent clkout2_src_ck\n"); > + return; > + } yep - we have bunch of similar code in drivers/clk/ti -> but we'd need a generic property to handle this. > + > + /* Set clkout2 to 24MHz for internal usb hub*/ > + pr_info("a83x-quirk: Set clkout2 to 24MHz for internal usb hub\n"); > + clkout2 = clk_get(NULL, "sys_clkout2"); > + if(clkout2 < 0) { > + pr_err("a83x-quirk: couldn't get sys_clkout2\n"); > + return; > + } > + if(clk_set_rate(clkout2, 24000000) < 0) { same here. > + printk(KERN_ERR "board-omap3evm: couldn't set sys_clkout2 rate\n"); "board-omap3evm:" copy paste? any reason why not pr_err? > + return; > + } > + if(clk_prepare_enable(clkout2) < 0) { > + pr_err("a83x-quirk: couldn't enable sys_clkout2\n"); > + return; > + } > + > + /* Initialize display */ > omap3_dbb056_display_init_of(); > } > #endif /* CONFIG_ARCH_OMAP3 */ > looking at the coding style, I assume we'd missed running checkpatch.pl --strict? ERROR: space required before the open parenthesis '(' #44: FILE: arch/arm/mach-omap2/pdata-quirks.c:180: + if(clkout2 < 0) { ERROR: space required before the open parenthesis '(' #49: FILE: arch/arm/mach-omap2/pdata-quirks.c:185: + if(cm96fck < 0) { ERROR: space required before the open parenthesis '(' #53: FILE: arch/arm/mach-omap2/pdata-quirks.c:189: + if(clk_set_parent(clkout2, cm96fck) < 0) { ERROR: space required before the open parenthesis '(' #61: FILE: arch/arm/mach-omap2/pdata-quirks.c:197: + if(clkout2 < 0) { ERROR: space required before the open parenthesis '(' #65: FILE: arch/arm/mach-omap2/pdata-quirks.c:201: + if(clk_set_rate(clkout2, 24000000) < 0) { WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... #66: FILE: arch/arm/mach-omap2/pdata-quirks.c:202: + printk(KERN_ERR "board-omap3evm: couldn't set sys_clkout2 rate\n"); ERROR: space required before the open parenthesis '(' #69: FILE: arch/arm/mach-omap2/pdata-quirks.c:205: + if(clk_prepare_enable(clkout2) < 0) { total: 6 errors, 1 warnings, 0 checks, 43 lines checked has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. you might want to run something like aiaiai[1] or kernel_patch_verify[2] or patman... etc.. to help you clean up for minimum needs. [1] https://lwn.net/Articles/488992/ [2] https://github.com/nmenon/kernel_patch_verify
Hi Nishanth, thanks for reviewing this patch. Please see my comments below. On Wed, Jan 22, 2014 at 01:33:21PM -0600, Nishanth Menon wrote: > On 01/22/2014 01:04 PM, Christoph Fritz wrote: > > Full device tree support for clock control is not yet accomplished. Until > > then, configure the 24Mhz of sys_clkout2 to feed an USB-Hub here. > > > > Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> > > --- > > arch/arm/mach-omap2/pdata-quirks.c | 37 ++++++++++++++++++++++++++++++++++++ > > 1 file changed, 37 insertions(+) > > > > diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c > > index a58590f..9ef7ca8 100644 > > --- a/arch/arm/mach-omap2/pdata-quirks.c > > +++ b/arch/arm/mach-omap2/pdata-quirks.c > > @@ -171,6 +171,43 @@ static void __init am3517_evm_legacy_init(void) > > } > > static void __init omap3_dbb056_legacy_init(void) > > { > > + struct clk *clkout2; > > + struct clk *cm96fck; > > + > > + /* Reparent clkout2 to 96M_FCK */ > > + pr_info("a83x-quirk: Late Reparent clkout2 to 96M_FCK\n"); > what'd be a83x? It's the computer-on-module name. Will get changed to __func__. > > + clkout2 = clk_get(NULL, "clkout2_src_ck"); > > + if(clkout2 < 0) { > > + pr_err("a83x-quirk: couldn't get clkout2_src_ck\n"); > > + return; > > + } > > + cm96fck = clk_get(NULL, "cm_96m_fck"); > > + if(cm96fck < 0) { > > + pr_err("a83x-quirk: couldn't get cm_96m_fck\n"); > > + return; > > + } > > + if(clk_set_parent(clkout2, cm96fck) < 0) { > > + pr_err("a83x-quirk: couldn't reparent clkout2_src_ck\n"); > > + return; > > + } > yep - we have bunch of similar code in drivers/clk/ti -> but we'd need > a generic property to handle this. This whole quirk of configuring sys_clkout2 in a platform file will go away. Tero is planning to post some RFC patches to configure this by DT. > > + > > + /* Set clkout2 to 24MHz for internal usb hub*/ > > + pr_info("a83x-quirk: Set clkout2 to 24MHz for internal usb hub\n"); > > + clkout2 = clk_get(NULL, "sys_clkout2"); > > + if(clkout2 < 0) { > > + pr_err("a83x-quirk: couldn't get sys_clkout2\n"); > > + return; > > + } > > + if(clk_set_rate(clkout2, 24000000) < 0) { > same here. > > + printk(KERN_ERR "board-omap3evm: couldn't set sys_clkout2 rate\n"); > "board-omap3evm:" copy paste? > any reason why not pr_err? will get fixed > > + return; > > + } > > + if(clk_prepare_enable(clkout2) < 0) { > > + pr_err("a83x-quirk: couldn't enable sys_clkout2\n"); > > + return; > > + } > > + > > + /* Initialize display */ > > omap3_dbb056_display_init_of(); > > } > > #endif /* CONFIG_ARCH_OMAP3 */ > > > > looking at the coding style, I assume we'd missed running > checkpatch.pl --strict? Let me reroll this patch in a new v3 set. Thanks -- Christoph -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index a58590f..9ef7ca8 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -171,6 +171,43 @@ static void __init am3517_evm_legacy_init(void) } static void __init omap3_dbb056_legacy_init(void) { + struct clk *clkout2; + struct clk *cm96fck; + + /* Reparent clkout2 to 96M_FCK */ + pr_info("a83x-quirk: Late Reparent clkout2 to 96M_FCK\n"); + clkout2 = clk_get(NULL, "clkout2_src_ck"); + if(clkout2 < 0) { + pr_err("a83x-quirk: couldn't get clkout2_src_ck\n"); + return; + } + cm96fck = clk_get(NULL, "cm_96m_fck"); + if(cm96fck < 0) { + pr_err("a83x-quirk: couldn't get cm_96m_fck\n"); + return; + } + if(clk_set_parent(clkout2, cm96fck) < 0) { + pr_err("a83x-quirk: couldn't reparent clkout2_src_ck\n"); + return; + } + + /* Set clkout2 to 24MHz for internal usb hub*/ + pr_info("a83x-quirk: Set clkout2 to 24MHz for internal usb hub\n"); + clkout2 = clk_get(NULL, "sys_clkout2"); + if(clkout2 < 0) { + pr_err("a83x-quirk: couldn't get sys_clkout2\n"); + return; + } + if(clk_set_rate(clkout2, 24000000) < 0) { + printk(KERN_ERR "board-omap3evm: couldn't set sys_clkout2 rate\n"); + return; + } + if(clk_prepare_enable(clkout2) < 0) { + pr_err("a83x-quirk: couldn't enable sys_clkout2\n"); + return; + } + + /* Initialize display */ omap3_dbb056_display_init_of(); } #endif /* CONFIG_ARCH_OMAP3 */
Full device tree support for clock control is not yet accomplished. Until then, configure the 24Mhz of sys_clkout2 to feed an USB-Hub here. Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> --- arch/arm/mach-omap2/pdata-quirks.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)