| Message ID | 20170921042641.7326-4-joel@jms.id.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 2017-09-21 at 13:56 +0930, Joel Stanley wrote: > This registers a platform driver to set up all of the non-core clocks. > > The clocks that have configurable rates are now registered. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/clk/clk-aspeed.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 129 insertions(+) > > diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c > index e614c61b82d2..19531798e040 100644 > --- a/drivers/clk/clk-aspeed.c > +++ b/drivers/clk/clk-aspeed.c > @@ -14,6 +14,8 @@ > #include <linux/clk-provider.h> > #include <linux/mfd/syscon.h> > #include <linux/of_address.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/slab.h> > #include <linux/spinlock.h> > @@ -115,6 +117,20 @@ static const struct aspeed_gate_data aspeed_gates[] __initconst = { > /* 31: reserved */ > }; > > +static const char * const eclk_parents[] = {"d1pll", "hpll", "mpll"}; > + > +static const struct clk_div_table ast2500_mac_div_table[] = { > + { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ > + { 0x1, 4 }, > + { 0x2, 6 }, > + { 0x3, 8 }, > + { 0x4, 10 }, > + { 0x5, 12 }, > + { 0x6, 14 }, > + { 0x7, 16 }, > + { 0 } > +}; > + > static const struct clk_div_table ast2400_div_table[] = { > { 0x0, 2 }, > { 0x1, 4 }, > @@ -139,6 +155,21 @@ static const struct clk_div_table ast2500_div_table[] = { > { 0 } > }; > > +struct aspeed_clk_soc_data { > + const struct clk_div_table *div_table; > + const struct clk_div_table *mac_div_table; > +}; > + > +static const struct aspeed_clk_soc_data ast2500_data = { > + .div_table = ast2500_div_table, > + .mac_div_table = ast2500_mac_div_table, > +}; > + > +static const struct aspeed_clk_soc_data ast2400_data = { > + .div_table = ast2400_div_table, > + .mac_div_table = ast2400_div_table, > +}; > + > static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) > { > unsigned int mult, div; > @@ -160,6 +191,104 @@ static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) > mult, div); > } > > +static int __init aspeed_clk_probe(struct platform_device *pdev) > +{ > + const struct aspeed_clk_soc_data *soc_data; > + const struct clk_div_table *mac_div_table; > + const struct clk_div_table *div_table; > + struct device *dev = &pdev->dev; > + struct regmap *map; > + struct clk_hw *hw; > + u32 val, rate; > + > + map = syscon_node_to_regmap(dev->of_node); > + if (IS_ERR(map)) { > + dev_err(dev, "no syscon regmap\n"); > + return PTR_ERR(map); > + } > + > + /* SoC generations share common layouts but have different divisors */ > + soc_data = of_device_get_match_data(&pdev->dev); > + div_table = soc_data->div_table; > + mac_div_table = soc_data->mac_div_table; > + > + /* UART clock div13 setting */ > + regmap_read(map, ASPEED_MISC_CTRL, &val); > + if (val & BIT(12)) > + rate = 24000000 / 13; > + else > + rate = 24000000; > + /* TODO: Find the parent data for the uart clock */ > + hw = clk_hw_register_fixed_rate(NULL, "uart", NULL, 0, rate); > + aspeed_clk_data->hws[ASPEED_CLK_UART] = hw; > + > + /* > + * Memory controller (M-PLL) PLL. This clock is configured by the > + * bootloader, and is exposed to Linux as a read-only clock rate. > + */ > + regmap_read(map, ASPEED_MPLL_PARAM, &val); > + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); IIRC the calculation in aspeed_calc_pll() is appropriate for the AST2500, but not the AST2400. > + > + /* SD/SDIO clock divider (TODO: There's a gate too) */ > + hw = clk_hw_register_divider_table(NULL, "sdio", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, > + div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_SDIO] = hw; > + > + /* MAC AHB bus clock divider */ > + hw = clk_hw_register_divider_table(NULL, "mac", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 16, 3, 0, > + mac_div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_MAC] = hw; > + > + /* LPC Host (LHCLK) clock divider */ > + hw = clk_hw_register_divider_table(NULL, "lhclk", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, > + div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_LHCLK] = hw; > + > + /* Video Engine (ECLK) mux and clock divider */ > + hw = clk_hw_register_mux(NULL, "eclk_mux", > + eclk_parents, ARRAY_SIZE(eclk_parents), 0, > + scu_base + ASPEED_CLK_SELECTION, 2, 2, > + 0, &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; > + hw = clk_hw_register_divider_table(NULL, "eclk", "eclk_mux", 0, > + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, On the AST2500 it looks like this should start at bit 28 for 3 bits, not bit 20. Separately, I'm not sure how to interpret the AST2400 datasheet here - maybe it's similar but with different wording ("clock slow down" rather than "divisor"?). > + div_table, This doesn't seem to be correct. There's the problem of 0b000 and 0b001 mapping the same value of 2 for the AST2500, whose table then increments in steps of 1. The AST2400 mapping on the otherhand is multiples of 2 starting at 2, with no inconsistency for 0b000 vs 0b001. > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; > + > + /* P-Bus (BCLK) clock divider */ > + hw = clk_hw_register_divider_table(NULL, "bclk", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 0, 2, 0, Bit 0 in SCU08 is a 1-bit field "CPU/AHB clock dynamic slow down enable". BCLK is actually in SCU*D*8, but (perhaps confusingly) documented immediately below SCU*0*8. Cheers, Andrew > + div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; > + > + return 0; > +}; > + > +static const struct of_device_id aspeed_clk_dt_ids[] = { > + { .compatible = "aspeed,ast2400-scu", .data = &ast2400_data }, > + { .compatible = "aspeed,ast2500-scu", .data = &ast2500_data }, > + { }, > +}; > + > +static struct platform_driver aspeed_clk_driver = { > + .probe = aspeed_clk_probe, > + .driver = { > + .name = "aspeed-clk", > + .of_match_table = aspeed_clk_dt_ids, > + .suppress_bind_attrs = true, > + }, > +}; > +builtin_platform_driver(aspeed_clk_driver); > + > + > static void __init aspeed_ast2400_cc(struct regmap *map) > { > struct clk_hw *hw;
On Mon, Sep 25, 2017 at 10:40 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > On Thu, 2017-09-21 at 13:56 +0930, Joel Stanley wrote: >> + /* >> + * Memory controller (M-PLL) PLL. This clock is configured by the >> + * bootloader, and is exposed to Linux as a read-only clock rate. >> + */ >> + regmap_read(map, ASPEED_MPLL_PARAM, &val); >> + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); > > IIRC the calculation in aspeed_calc_pll() is appropriate for the AST2500, but > not the AST2400. Ah ha. I knew there was a reason why I created an ast2400_calc_pll. I will add it back in in the previous patch so we can use it here. >> + /* Video Engine (ECLK) mux and clock divider */ >> + hw = clk_hw_register_mux(NULL, "eclk_mux", >> + eclk_parents, ARRAY_SIZE(eclk_parents), 0, >> + scu_base + ASPEED_CLK_SELECTION, 2, 2, >> + 0, &aspeed_clk_lock); >> + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; >> + hw = clk_hw_register_divider_table(NULL, "eclk", "eclk_mux", 0, >> + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, > > On the AST2500 it looks like this should start at bit 28 for 3 bits, not bit Good catch. Fixed in v3. > 20. Separately, I'm not sure how to interpret the AST2400 datasheet here - > maybe it's similar but with different wording ("clock slow down" rather than > "divisor"?). > >> + div_table, > > This doesn't seem to be correct. There's the problem of 0b000 and 0b001 mapping > the same value of 2 for the AST2500, whose table then increments in steps of 1. > The AST2400 mapping on the otherhand is multiples of 2 starting at 2, with no > inconsistency for 0b000 vs 0b001. Yep, we do use a different table for ast2400 vs ast2500. See ast2400_div_table vs ast2500_div_table. > >> + &aspeed_clk_lock); >> + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; >> + >> + /* P-Bus (BCLK) clock divider */ >> + hw = clk_hw_register_divider_table(NULL, "bclk", "hpll", 0, >> + scu_base + ASPEED_CLK_SELECTION, 0, 2, 0, > > Bit 0 in SCU08 is a 1-bit field "CPU/AHB clock dynamic slow down enable". BCLK > is actually in SCU*D*8, but (perhaps confusingly) documented immediately below > SCU*0*8. Good catch. Fixed in v3. Cheers, Joel -- 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
On Wed, 2017-09-27 at 16:13 +1000, Joel Stanley wrote: > > > + div_table, > > > > This doesn't seem to be correct. There's the problem of 0b000 and 0b001 mapping > > the same value of 2 for the AST2500, whose table then increments in steps of 1. > > The AST2400 mapping on the otherhand is multiples of 2 starting at 2, with no > > inconsistency for 0b000 vs 0b001. > > Yep, we do use a different table for ast2400 vs ast2500. See > ast2400_div_table vs ast2500_div_table. Yep, but for the AST2500 this is a different table again to what you've already defined (for the AST2500). However, for the AST2400 the table looks the same as the other AST2400 tables. Cheers, Andrew
On Wed, Sep 27, 2017 at 5:34 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > On Wed, 2017-09-27 at 16:13 +1000, Joel Stanley wrote: >> > > + div_table, >> > >> > This doesn't seem to be correct. There's the problem of 0b000 and 0b001 mapping >> > the same value of 2 for the AST2500, whose table then increments in steps of 1. >> > The AST2400 mapping on the otherhand is multiples of 2 starting at 2, with no >> > inconsistency for 0b000 vs 0b001. >> >> Yep, we do use a different table for ast2400 vs ast2500. See >> ast2400_div_table vs ast2500_div_table. > > Yep, but for the AST2500 this is a different table again to what you've > already defined (for the AST2500). However, for the AST2400 the table > looks the same as the other AST2400 tables. You're right. I didn't realise you were pointing out something strange about eclk. I added another table for eclk, and the correct one is selected by the platform data. I'll send out v4 today if no more reviews come in. -- 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
On 09/21, Joel Stanley wrote: > @@ -160,6 +191,104 @@ static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) > mult, div); > } > > +static int __init aspeed_clk_probe(struct platform_device *pdev) Drop __init? Should be a section mismatch with __init here. > +{ > + const struct aspeed_clk_soc_data *soc_data; > + const struct clk_div_table *mac_div_table; > + const struct clk_div_table *div_table; > + struct device *dev = &pdev->dev; > + struct regmap *map; > + struct clk_hw *hw; > + u32 val, rate; > + > + map = syscon_node_to_regmap(dev->of_node); > + if (IS_ERR(map)) { > + dev_err(dev, "no syscon regmap\n"); > + return PTR_ERR(map); > + } > + > + /* SoC generations share common layouts but have different divisors */ > + soc_data = of_device_get_match_data(&pdev->dev); Check for soc_data being NULL. > + div_table = soc_data->div_table; > + mac_div_table = soc_data->mac_div_table; > + > + /* UART clock div13 setting */ > + regmap_read(map, ASPEED_MISC_CTRL, &val); > + if (val & BIT(12)) What does BIT(12) mean? #define or comment please. > + rate = 24000000 / 13; > + else > + rate = 24000000; > + /* TODO: Find the parent data for the uart clock */ > + hw = clk_hw_register_fixed_rate(NULL, "uart", NULL, 0, rate); > + aspeed_clk_data->hws[ASPEED_CLK_UART] = hw; > + > + /* > + * Memory controller (M-PLL) PLL. This clock is configured by the > + * bootloader, and is exposed to Linux as a read-only clock rate. > + */ > + regmap_read(map, ASPEED_MPLL_PARAM, &val); > + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); > + > + /* SD/SDIO clock divider (TODO: There's a gate too) */ > + hw = clk_hw_register_divider_table(NULL, "sdio", "hpll", 0, Please pass your dev pointer here from the platform device. > + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, > + div_table, > + &aspeed_clk_lock); And check for errors? Perhaps use devm_clk_hw_regsiter() APIs and construct the dividers and muxes directly instead of using the basic type registration APIs. > + aspeed_clk_data->hws[ASPEED_CLK_SDIO] = hw; > + > + /* MAC AHB bus clock divider */ > + hw = clk_hw_register_divider_table(NULL, "mac", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 16, 3, 0, > + mac_div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_MAC] = hw; > + > + /* LPC Host (LHCLK) clock divider */ > + hw = clk_hw_register_divider_table(NULL, "lhclk", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, > + div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_LHCLK] = hw; > + > + /* Video Engine (ECLK) mux and clock divider */ > + hw = clk_hw_register_mux(NULL, "eclk_mux", > + eclk_parents, ARRAY_SIZE(eclk_parents), 0, > + scu_base + ASPEED_CLK_SELECTION, 2, 2, > + 0, &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; > + hw = clk_hw_register_divider_table(NULL, "eclk", "eclk_mux", 0, > + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, > + div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; > + > + /* P-Bus (BCLK) clock divider */ > + hw = clk_hw_register_divider_table(NULL, "bclk", "hpll", 0, > + scu_base + ASPEED_CLK_SELECTION, 0, 2, 0, > + div_table, > + &aspeed_clk_lock); > + aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; > + > + return 0; > +}; > + > +static const struct of_device_id aspeed_clk_dt_ids[] = { > + { .compatible = "aspeed,ast2400-scu", .data = &ast2400_data }, > + { .compatible = "aspeed,ast2500-scu", .data = &ast2500_data }, > + { }, ^ Nitpick, drop the comma > +}; > + > +static struct platform_driver aspeed_clk_driver = { > + .probe = aspeed_clk_probe, > + .driver = { > + .name = "aspeed-clk", > + .of_match_table = aspeed_clk_dt_ids, > + .suppress_bind_attrs = true, > + }, > +}; > +builtin_platform_driver(aspeed_clk_driver); > + > + Kill a newline, save the internet. > static void __init aspeed_ast2400_cc(struct regmap *map) > { > struct clk_hw *hw;
On Tue, Oct 3, 2017 at 6:54 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > On 09/21, Joel Stanley wrote: >> @@ -160,6 +191,104 @@ static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) >> + /* >> + * Memory controller (M-PLL) PLL. This clock is configured by the >> + * bootloader, and is exposed to Linux as a read-only clock rate. >> + */ >> + regmap_read(map, ASPEED_MPLL_PARAM, &val); >> + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); >> + >> + /* SD/SDIO clock divider (TODO: There's a gate too) */ >> + hw = clk_hw_register_divider_table(NULL, "sdio", "hpll", 0, > > Please pass your dev pointer here from the platform device. > >> + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, >> + div_table, >> + &aspeed_clk_lock); > > And check for errors? Perhaps use devm_clk_hw_regsiter() APIs and > construct the dividers and muxes directly instead of using the > basic type registration APIs. Do you think that devm_ is overkill, given we will never unload this driver? Can you explain why you suggest to construct the structures directly instead of using the APIs? I had a read of the basic type registration functions, and the relevant failure paths are memory allocation failures. If we're out of memory that early in boot then things have gone pretty bad. I can add checks for null and bail out; I don't think there's value in freeing the allocated memory: if a system can't load it's clock driver then it's super hosed. Thanks for the review. I fixed all of the other things you mentioned. Cheers, Joel -- 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
On 10/03, Joel Stanley wrote: > On Tue, Oct 3, 2017 at 6:54 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > > On 09/21, Joel Stanley wrote: > >> @@ -160,6 +191,104 @@ static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) > >> + /* > >> + * Memory controller (M-PLL) PLL. This clock is configured by the > >> + * bootloader, and is exposed to Linux as a read-only clock rate. > >> + */ > >> + regmap_read(map, ASPEED_MPLL_PARAM, &val); > >> + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); > >> + > >> + /* SD/SDIO clock divider (TODO: There's a gate too) */ > >> + hw = clk_hw_register_divider_table(NULL, "sdio", "hpll", 0, > > > > Please pass your dev pointer here from the platform device. > > > >> + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, > >> + div_table, > >> + &aspeed_clk_lock); > > > > And check for errors? Perhaps use devm_clk_hw_regsiter() APIs and > > construct the dividers and muxes directly instead of using the > > basic type registration APIs. > > Do you think that devm_ is overkill, given we will never unload this driver? Is probe defer going to happen? Even if unload can't happen, probe defer is a concern unless that is also ruled out. > > Can you explain why you suggest to construct the structures directly > instead of using the APIs? There aren't devm APIs for some of these basic clk type registration functions. > > I had a read of the basic type registration functions, and the > relevant failure paths are memory allocation failures. If we're out of > memory that early in boot then things have gone pretty bad. > > I can add checks for null and bail out; I don't think there's value in > freeing the allocated memory: if a system can't load it's clock driver > then it's super hosed. If we can't proceed without this driver because it's super hosed, then perhaps we need to panic the system on errors here. Should be simple enough to add some error checks and goto panic("Things are super hosed").
On Thu, Oct 5, 2017 at 6:48 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > On 10/03, Joel Stanley wrote: >> On Tue, Oct 3, 2017 at 6:54 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: >> > On 09/21, Joel Stanley wrote: >> >> @@ -160,6 +191,104 @@ static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) >> >> + /* >> >> + * Memory controller (M-PLL) PLL. This clock is configured by the >> >> + * bootloader, and is exposed to Linux as a read-only clock rate. >> >> + */ >> >> + regmap_read(map, ASPEED_MPLL_PARAM, &val); >> >> + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); >> >> + >> >> + /* SD/SDIO clock divider (TODO: There's a gate too) */ >> >> + hw = clk_hw_register_divider_table(NULL, "sdio", "hpll", 0, >> > >> > Please pass your dev pointer here from the platform device. >> > >> >> + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, >> >> + div_table, >> >> + &aspeed_clk_lock); >> > >> > And check for errors? Perhaps use devm_clk_hw_regsiter() APIs and >> > construct the dividers and muxes directly instead of using the >> > basic type registration APIs. >> >> Do you think that devm_ is overkill, given we will never unload this driver? > > Is probe defer going to happen? Even if unload can't happen, > probe defer is a concern unless that is also ruled out. As I understand it, I will only get an EPROBE_DEFER if I'm requesting something from another driver? If that's the case then we can rule that out. >> >> Can you explain why you suggest to construct the structures directly >> instead of using the APIs? > > There aren't devm APIs for some of these basic clk type > registration functions. > >> >> I had a read of the basic type registration functions, and the >> relevant failure paths are memory allocation failures. If we're out of >> memory that early in boot then things have gone pretty bad. >> >> I can add checks for null and bail out; I don't think there's value in >> freeing the allocated memory: if a system can't load it's clock driver >> then it's super hosed. > > If we can't proceed without this driver because it's super hosed, > then perhaps we need to panic the system on errors here. Should > be simple enough to add some error checks and goto panic("Things > are super hosed"). Okay. I added checks in v4. Does that look ok you you? Cheers, Joel -- 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/clk-aspeed.c b/drivers/clk/clk-aspeed.c index e614c61b82d2..19531798e040 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -14,6 +14,8 @@ #include <linux/clk-provider.h> #include <linux/mfd/syscon.h> #include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -115,6 +117,20 @@ static const struct aspeed_gate_data aspeed_gates[] __initconst = { /* 31: reserved */ }; +static const char * const eclk_parents[] = {"d1pll", "hpll", "mpll"}; + +static const struct clk_div_table ast2500_mac_div_table[] = { + { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ + { 0x1, 4 }, + { 0x2, 6 }, + { 0x3, 8 }, + { 0x4, 10 }, + { 0x5, 12 }, + { 0x6, 14 }, + { 0x7, 16 }, + { 0 } +}; + static const struct clk_div_table ast2400_div_table[] = { { 0x0, 2 }, { 0x1, 4 }, @@ -139,6 +155,21 @@ static const struct clk_div_table ast2500_div_table[] = { { 0 } }; +struct aspeed_clk_soc_data { + const struct clk_div_table *div_table; + const struct clk_div_table *mac_div_table; +}; + +static const struct aspeed_clk_soc_data ast2500_data = { + .div_table = ast2500_div_table, + .mac_div_table = ast2500_mac_div_table, +}; + +static const struct aspeed_clk_soc_data ast2400_data = { + .div_table = ast2400_div_table, + .mac_div_table = ast2400_div_table, +}; + static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) { unsigned int mult, div; @@ -160,6 +191,104 @@ static struct clk_hw *aspeed_calc_pll(const char *name, u32 val) mult, div); } +static int __init aspeed_clk_probe(struct platform_device *pdev) +{ + const struct aspeed_clk_soc_data *soc_data; + const struct clk_div_table *mac_div_table; + const struct clk_div_table *div_table; + struct device *dev = &pdev->dev; + struct regmap *map; + struct clk_hw *hw; + u32 val, rate; + + map = syscon_node_to_regmap(dev->of_node); + if (IS_ERR(map)) { + dev_err(dev, "no syscon regmap\n"); + return PTR_ERR(map); + } + + /* SoC generations share common layouts but have different divisors */ + soc_data = of_device_get_match_data(&pdev->dev); + div_table = soc_data->div_table; + mac_div_table = soc_data->mac_div_table; + + /* UART clock div13 setting */ + regmap_read(map, ASPEED_MISC_CTRL, &val); + if (val & BIT(12)) + rate = 24000000 / 13; + else + rate = 24000000; + /* TODO: Find the parent data for the uart clock */ + hw = clk_hw_register_fixed_rate(NULL, "uart", NULL, 0, rate); + aspeed_clk_data->hws[ASPEED_CLK_UART] = hw; + + /* + * Memory controller (M-PLL) PLL. This clock is configured by the + * bootloader, and is exposed to Linux as a read-only clock rate. + */ + regmap_read(map, ASPEED_MPLL_PARAM, &val); + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = aspeed_calc_pll("mpll", val); + + /* SD/SDIO clock divider (TODO: There's a gate too) */ + hw = clk_hw_register_divider_table(NULL, "sdio", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, + div_table, + &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_SDIO] = hw; + + /* MAC AHB bus clock divider */ + hw = clk_hw_register_divider_table(NULL, "mac", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 16, 3, 0, + mac_div_table, + &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_MAC] = hw; + + /* LPC Host (LHCLK) clock divider */ + hw = clk_hw_register_divider_table(NULL, "lhclk", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, + div_table, + &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_LHCLK] = hw; + + /* Video Engine (ECLK) mux and clock divider */ + hw = clk_hw_register_mux(NULL, "eclk_mux", + eclk_parents, ARRAY_SIZE(eclk_parents), 0, + scu_base + ASPEED_CLK_SELECTION, 2, 2, + 0, &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; + hw = clk_hw_register_divider_table(NULL, "eclk", "eclk_mux", 0, + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, + div_table, + &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; + + /* P-Bus (BCLK) clock divider */ + hw = clk_hw_register_divider_table(NULL, "bclk", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 0, 2, 0, + div_table, + &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; + + return 0; +}; + +static const struct of_device_id aspeed_clk_dt_ids[] = { + { .compatible = "aspeed,ast2400-scu", .data = &ast2400_data }, + { .compatible = "aspeed,ast2500-scu", .data = &ast2500_data }, + { }, +}; + +static struct platform_driver aspeed_clk_driver = { + .probe = aspeed_clk_probe, + .driver = { + .name = "aspeed-clk", + .of_match_table = aspeed_clk_dt_ids, + .suppress_bind_attrs = true, + }, +}; +builtin_platform_driver(aspeed_clk_driver); + + static void __init aspeed_ast2400_cc(struct regmap *map) { struct clk_hw *hw;
This registers a platform driver to set up all of the non-core clocks. The clocks that have configurable rates are now registered. Signed-off-by: Joel Stanley <joel@jms.id.au> --- drivers/clk/clk-aspeed.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+)