| Message ID | 1439514663-23979-1-git-send-email-21cnbao@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Barry Song (2015-08-13 18:11:02) > From: Guo Zeng <Guo.Zeng@csr.com> > > re-order the codes more reasonable by moving variable-definition > together. > > Signed-off-by: Guo Zeng <Guo.Zeng@csr.com> > Signed-off-by: Barry Song <Baohua.Song@csr.com> Hi Barry, I'll apply these after -rc1 drops, towards 4.4. Please be sure to Cc linux-clk@vger.kernel.org for future clk patches. Thanks! Mike > --- > drivers/clk/sirf/clk-atlas7.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/clk/sirf/clk-atlas7.c b/drivers/clk/sirf/clk-atlas7.c > index a98e21f..d34d1b3 100644 > --- a/drivers/clk/sirf/clk-atlas7.c > +++ b/drivers/clk/sirf/clk-atlas7.c > @@ -206,18 +206,6 @@ > #define SIRFSOC_CLKC_LEAF_CLK_EN8_SET 0x0548 > > > -static void __iomem *sirfsoc_clk_vbase; > -static struct clk_onecell_data clk_data; > - > -static const struct clk_div_table pll_div_table[] = { > - { .val = 0, .div = 1 }, > - { .val = 1, .div = 2 }, > - { .val = 2, .div = 4 }, > - { .val = 3, .div = 8 }, > - { .val = 4, .div = 16 }, > - { .val = 5, .div = 32 }, > -}; > - > struct clk_pll { > struct clk_hw hw; > u16 regofs; /* register offset */ > @@ -284,6 +272,18 @@ struct atlas7_reset_desc { > spinlock_t *lock; > }; > > +static void __iomem *sirfsoc_clk_vbase; > +static struct clk_onecell_data clk_data; > + > +static const struct clk_div_table pll_div_table[] = { > + { .val = 0, .div = 1 }, > + { .val = 1, .div = 2 }, > + { .val = 2, .div = 4 }, > + { .val = 3, .div = 8 }, > + { .val = 4, .div = 16 }, > + { .val = 5, .div = 32 }, > +}; > + > static DEFINE_SPINLOCK(cpupll_ctrl1_lock); > static DEFINE_SPINLOCK(mempll_ctrl1_lock); > static DEFINE_SPINLOCK(sys0pll_ctrl1_lock); > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
2015-08-28 7:02 GMT+08:00 Michael Turquette <mturquette@baylibre.com>: > Quoting Barry Song (2015-08-13 18:11:02) >> From: Guo Zeng <Guo.Zeng@csr.com> >> >> re-order the codes more reasonable by moving variable-definition >> together. >> >> Signed-off-by: Guo Zeng <Guo.Zeng@csr.com> >> Signed-off-by: Barry Song <Baohua.Song@csr.com> > > Hi Barry, > > I'll apply these after -rc1 drops, towards 4.4. Please be sure to Cc > linux-clk@vger.kernel.org for future clk patches. ok, mike linux-clk will be CCed. BTW, have you applied these two to clk-next? i have several more patches based on them. > Thanks! > Mike > -barry
diff --git a/drivers/clk/sirf/clk-atlas7.c b/drivers/clk/sirf/clk-atlas7.c index a98e21f..d34d1b3 100644 --- a/drivers/clk/sirf/clk-atlas7.c +++ b/drivers/clk/sirf/clk-atlas7.c @@ -206,18 +206,6 @@ #define SIRFSOC_CLKC_LEAF_CLK_EN8_SET 0x0548 -static void __iomem *sirfsoc_clk_vbase; -static struct clk_onecell_data clk_data; - -static const struct clk_div_table pll_div_table[] = { - { .val = 0, .div = 1 }, - { .val = 1, .div = 2 }, - { .val = 2, .div = 4 }, - { .val = 3, .div = 8 }, - { .val = 4, .div = 16 }, - { .val = 5, .div = 32 }, -}; - struct clk_pll { struct clk_hw hw; u16 regofs; /* register offset */ @@ -284,6 +272,18 @@ struct atlas7_reset_desc { spinlock_t *lock; }; +static void __iomem *sirfsoc_clk_vbase; +static struct clk_onecell_data clk_data; + +static const struct clk_div_table pll_div_table[] = { + { .val = 0, .div = 1 }, + { .val = 1, .div = 2 }, + { .val = 2, .div = 4 }, + { .val = 3, .div = 8 }, + { .val = 4, .div = 16 }, + { .val = 5, .div = 32 }, +}; + static DEFINE_SPINLOCK(cpupll_ctrl1_lock); static DEFINE_SPINLOCK(mempll_ctrl1_lock); static DEFINE_SPINLOCK(sys0pll_ctrl1_lock);