| Message ID | 20170309104154.28295-8-jbrunet@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Quoting Jerome Brunet (2017-03-09 02:41:52) > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Hmm, even for obvious patches like this it is still better to have some sort of changelog :-/ Otherwise patch appears fine to me. Regards, Mike > --- > drivers/clk/meson/meson8b.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ > drivers/clk/meson/meson8b.h | 20 ++++++++- > 2 files changed, 122 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c > index 2937443d4505..e9985503165c 100644 > --- a/drivers/clk/meson/meson8b.c > +++ b/drivers/clk/meson/meson8b.c > @@ -245,6 +245,96 @@ static struct clk_fixed_factor meson8b_fclk_div7 = { > }, > }; > > +static struct meson_clk_mpll meson8b_mpll0 = { > + .sdm = { > + .reg_off = HHI_MPLL_CNTL7, > + .shift = 0, > + .width = 14, > + }, > + .sdm_en = { > + .reg_off = HHI_MPLL_CNTL7, > + .shift = 15, > + .width = 1, > + }, > + .n2 = { > + .reg_off = HHI_MPLL_CNTL7, > + .shift = 16, > + .width = 9, > + }, > + .en = { > + .reg_off = HHI_MPLL_CNTL7, > + .shift = 14, > + .width = 1, > + }, > + .lock = &clk_lock, > + .hw.init = &(struct clk_init_data){ > + .name = "mpll0", > + .ops = &meson_clk_mpll_ops, > + .parent_names = (const char *[]){ "fixed_pll" }, > + .num_parents = 1, > + }, > +}; > + > +static struct meson_clk_mpll meson8b_mpll1 = { > + .sdm = { > + .reg_off = HHI_MPLL_CNTL8, > + .shift = 0, > + .width = 14, > + }, > + .sdm_en = { > + .reg_off = HHI_MPLL_CNTL8, > + .shift = 15, > + .width = 1, > + }, > + .n2 = { > + .reg_off = HHI_MPLL_CNTL8, > + .shift = 16, > + .width = 9, > + }, > + .en = { > + .reg_off = HHI_MPLL_CNTL8, > + .shift = 14, > + .width = 1, > + }, > + .lock = &clk_lock, > + .hw.init = &(struct clk_init_data){ > + .name = "mpll1", > + .ops = &meson_clk_mpll_ops, > + .parent_names = (const char *[]){ "fixed_pll" }, > + .num_parents = 1, > + }, > +}; > + > +static struct meson_clk_mpll meson8b_mpll2 = { > + .sdm = { > + .reg_off = HHI_MPLL_CNTL9, > + .shift = 0, > + .width = 14, > + }, > + .sdm_en = { > + .reg_off = HHI_MPLL_CNTL9, > + .shift = 15, > + .width = 1, > + }, > + .n2 = { > + .reg_off = HHI_MPLL_CNTL9, > + .shift = 16, > + .width = 9, > + }, > + .en = { > + .reg_off = HHI_MPLL_CNTL9, > + .shift = 14, > + .width = 1, > + }, > + .lock = &clk_lock, > + .hw.init = &(struct clk_init_data){ > + .name = "mpll2", > + .ops = &meson_clk_mpll_ops, > + .parent_names = (const char *[]){ "fixed_pll" }, > + .num_parents = 1, > + }, > +}; > + > /* > * FIXME cpu clocks and the legacy composite clocks (e.g. clk81) are both PLL > * post-dividers and should be modeled with their respective PLLs via the > @@ -491,6 +581,9 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { > [CLKID_AO_AHB_SRAM] = &meson8b_ao_ahb_sram.hw, > [CLKID_AO_AHB_BUS] = &meson8b_ao_ahb_bus.hw, > [CLKID_AO_IFACE] = &meson8b_ao_iface.hw, > + [CLKID_MPLL0] = &meson8b_mpll0.hw, > + [CLKID_MPLL1] = &meson8b_mpll1.hw, > + [CLKID_MPLL2] = &meson8b_mpll2.hw, > }, > .num = CLK_NR_CLKS, > }; > @@ -501,6 +594,12 @@ static struct meson_clk_pll *const meson8b_clk_plls[] = { > &meson8b_sys_pll, > }; > > +static struct meson_clk_mpll *const meson8b_clk_mplls[] = { > + &meson8b_mpll0, > + &meson8b_mpll1, > + &meson8b_mpll2, > +}; > + > static struct clk_gate *const meson8b_clk_gates[] = { > &meson8b_clk81, > &meson8b_ddr, > @@ -609,6 +708,10 @@ static int meson8b_clkc_probe(struct platform_device *pdev) > for (i = 0; i < ARRAY_SIZE(meson8b_clk_plls); i++) > meson8b_clk_plls[i]->base = clk_base; > > + /* Populate base address for MPLLs */ > + for (i = 0; i < ARRAY_SIZE(meson8b_clk_mplls); i++) > + meson8b_clk_mplls[i]->base = clk_base; > + > /* Populate the base address for CPU clk */ > meson8b_cpu_clk.base = clk_base; > > diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h > index 010e9582888d..3881defc8644 100644 > --- a/drivers/clk/meson/meson8b.h > +++ b/drivers/clk/meson/meson8b.h > @@ -42,6 +42,21 @@ > #define HHI_VID_PLL_CNTL 0x320 /* 0xc8 offset in data sheet */ > > /* > + * MPLL register offeset taken from the S905 datasheet. Vendor kernel source > + * confirm these are the same for the S805. > + */ > +#define HHI_MPLL_CNTL 0x280 /* 0xa0 offset in data sheet */ > +#define HHI_MPLL_CNTL2 0x284 /* 0xa1 offset in data sheet */ > +#define HHI_MPLL_CNTL3 0x288 /* 0xa2 offset in data sheet */ > +#define HHI_MPLL_CNTL4 0x28C /* 0xa3 offset in data sheet */ > +#define HHI_MPLL_CNTL5 0x290 /* 0xa4 offset in data sheet */ > +#define HHI_MPLL_CNTL6 0x294 /* 0xa5 offset in data sheet */ > +#define HHI_MPLL_CNTL7 0x298 /* 0xa6 offset in data sheet */ > +#define HHI_MPLL_CNTL8 0x29C /* 0xa7 offset in data sheet */ > +#define HHI_MPLL_CNTL9 0x2A0 /* 0xa8 offset in data sheet */ > +#define HHI_MPLL_CNTL10 0x2A4 /* 0xa9 offset in data sheet */ > + > +/* > * CLKID index values > * > * These indices are entirely contrived and do not map onto the hardware. > @@ -142,8 +157,11 @@ > #define CLKID_AO_AHB_SRAM 90 > #define CLKID_AO_AHB_BUS 91 > #define CLKID_AO_IFACE 92 > +#define CLKID_MPLL0 93 > +#define CLKID_MPLL1 94 > +#define CLKID_MPLL2 95 > > -#define CLK_NR_CLKS 93 > +#define CLK_NR_CLKS 96 > > /* include the CLKIDs that have been made part of the stable DT binding */ > #include <dt-bindings/clock/meson8b-clkc.h> > -- > 2.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-clk" 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/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index 2937443d4505..e9985503165c 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -245,6 +245,96 @@ static struct clk_fixed_factor meson8b_fclk_div7 = { }, }; +static struct meson_clk_mpll meson8b_mpll0 = { + .sdm = { + .reg_off = HHI_MPLL_CNTL7, + .shift = 0, + .width = 14, + }, + .sdm_en = { + .reg_off = HHI_MPLL_CNTL7, + .shift = 15, + .width = 1, + }, + .n2 = { + .reg_off = HHI_MPLL_CNTL7, + .shift = 16, + .width = 9, + }, + .en = { + .reg_off = HHI_MPLL_CNTL7, + .shift = 14, + .width = 1, + }, + .lock = &clk_lock, + .hw.init = &(struct clk_init_data){ + .name = "mpll0", + .ops = &meson_clk_mpll_ops, + .parent_names = (const char *[]){ "fixed_pll" }, + .num_parents = 1, + }, +}; + +static struct meson_clk_mpll meson8b_mpll1 = { + .sdm = { + .reg_off = HHI_MPLL_CNTL8, + .shift = 0, + .width = 14, + }, + .sdm_en = { + .reg_off = HHI_MPLL_CNTL8, + .shift = 15, + .width = 1, + }, + .n2 = { + .reg_off = HHI_MPLL_CNTL8, + .shift = 16, + .width = 9, + }, + .en = { + .reg_off = HHI_MPLL_CNTL8, + .shift = 14, + .width = 1, + }, + .lock = &clk_lock, + .hw.init = &(struct clk_init_data){ + .name = "mpll1", + .ops = &meson_clk_mpll_ops, + .parent_names = (const char *[]){ "fixed_pll" }, + .num_parents = 1, + }, +}; + +static struct meson_clk_mpll meson8b_mpll2 = { + .sdm = { + .reg_off = HHI_MPLL_CNTL9, + .shift = 0, + .width = 14, + }, + .sdm_en = { + .reg_off = HHI_MPLL_CNTL9, + .shift = 15, + .width = 1, + }, + .n2 = { + .reg_off = HHI_MPLL_CNTL9, + .shift = 16, + .width = 9, + }, + .en = { + .reg_off = HHI_MPLL_CNTL9, + .shift = 14, + .width = 1, + }, + .lock = &clk_lock, + .hw.init = &(struct clk_init_data){ + .name = "mpll2", + .ops = &meson_clk_mpll_ops, + .parent_names = (const char *[]){ "fixed_pll" }, + .num_parents = 1, + }, +}; + /* * FIXME cpu clocks and the legacy composite clocks (e.g. clk81) are both PLL * post-dividers and should be modeled with their respective PLLs via the @@ -491,6 +581,9 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { [CLKID_AO_AHB_SRAM] = &meson8b_ao_ahb_sram.hw, [CLKID_AO_AHB_BUS] = &meson8b_ao_ahb_bus.hw, [CLKID_AO_IFACE] = &meson8b_ao_iface.hw, + [CLKID_MPLL0] = &meson8b_mpll0.hw, + [CLKID_MPLL1] = &meson8b_mpll1.hw, + [CLKID_MPLL2] = &meson8b_mpll2.hw, }, .num = CLK_NR_CLKS, }; @@ -501,6 +594,12 @@ static struct meson_clk_pll *const meson8b_clk_plls[] = { &meson8b_sys_pll, }; +static struct meson_clk_mpll *const meson8b_clk_mplls[] = { + &meson8b_mpll0, + &meson8b_mpll1, + &meson8b_mpll2, +}; + static struct clk_gate *const meson8b_clk_gates[] = { &meson8b_clk81, &meson8b_ddr, @@ -609,6 +708,10 @@ static int meson8b_clkc_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(meson8b_clk_plls); i++) meson8b_clk_plls[i]->base = clk_base; + /* Populate base address for MPLLs */ + for (i = 0; i < ARRAY_SIZE(meson8b_clk_mplls); i++) + meson8b_clk_mplls[i]->base = clk_base; + /* Populate the base address for CPU clk */ meson8b_cpu_clk.base = clk_base; diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h index 010e9582888d..3881defc8644 100644 --- a/drivers/clk/meson/meson8b.h +++ b/drivers/clk/meson/meson8b.h @@ -42,6 +42,21 @@ #define HHI_VID_PLL_CNTL 0x320 /* 0xc8 offset in data sheet */ /* + * MPLL register offeset taken from the S905 datasheet. Vendor kernel source + * confirm these are the same for the S805. + */ +#define HHI_MPLL_CNTL 0x280 /* 0xa0 offset in data sheet */ +#define HHI_MPLL_CNTL2 0x284 /* 0xa1 offset in data sheet */ +#define HHI_MPLL_CNTL3 0x288 /* 0xa2 offset in data sheet */ +#define HHI_MPLL_CNTL4 0x28C /* 0xa3 offset in data sheet */ +#define HHI_MPLL_CNTL5 0x290 /* 0xa4 offset in data sheet */ +#define HHI_MPLL_CNTL6 0x294 /* 0xa5 offset in data sheet */ +#define HHI_MPLL_CNTL7 0x298 /* 0xa6 offset in data sheet */ +#define HHI_MPLL_CNTL8 0x29C /* 0xa7 offset in data sheet */ +#define HHI_MPLL_CNTL9 0x2A0 /* 0xa8 offset in data sheet */ +#define HHI_MPLL_CNTL10 0x2A4 /* 0xa9 offset in data sheet */ + +/* * CLKID index values * * These indices are entirely contrived and do not map onto the hardware. @@ -142,8 +157,11 @@ #define CLKID_AO_AHB_SRAM 90 #define CLKID_AO_AHB_BUS 91 #define CLKID_AO_IFACE 92 +#define CLKID_MPLL0 93 +#define CLKID_MPLL1 94 +#define CLKID_MPLL2 95 -#define CLK_NR_CLKS 93 +#define CLK_NR_CLKS 96 /* include the CLKIDs that have been made part of the stable DT binding */ #include <dt-bindings/clock/meson8b-clkc.h>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- drivers/clk/meson/meson8b.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/meson/meson8b.h | 20 ++++++++- 2 files changed, 122 insertions(+), 1 deletion(-)