| Message ID | 1579261009-4573-5-git-send-email-claudiu.beznea@microchip.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9962fb0d19958215b5bc6b9279f824b55aabdec2 |
| Headers | show |
| Series | clock fixes for at91 | expand |
On 17/01/2020 13:36:49+0200, Claudiu Beznea wrote: > SAM9X60 USB clock may have up to 3 parents. Save the number of parents in > driver's data structure and validate against it when setting parent. > > Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/clk/at91/clk-usb.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c > index c0895c993cce..31d5c45e30d7 100644 > --- a/drivers/clk/at91/clk-usb.c > +++ b/drivers/clk/at91/clk-usb.c > @@ -25,6 +25,7 @@ struct at91sam9x5_clk_usb { > struct clk_hw hw; > struct regmap *regmap; > u32 usbs_mask; > + u8 num_parents; > }; > > #define to_at91sam9x5_clk_usb(hw) \ > @@ -110,7 +111,7 @@ static int at91sam9x5_clk_usb_set_parent(struct clk_hw *hw, u8 index) > { > struct at91sam9x5_clk_usb *usb = to_at91sam9x5_clk_usb(hw); > > - if (index > 1) > + if (index >= usb->num_parents) > return -EINVAL; > > regmap_update_bits(usb->regmap, AT91_PMC_USB, usb->usbs_mask, index); > @@ -215,6 +216,7 @@ _at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, > usb->hw.init = &init; > usb->regmap = regmap; > usb->usbs_mask = usbs_mask; > + usb->num_parents = num_parents; > > hw = &usb->hw; > ret = clk_hw_register(NULL, &usb->hw); > -- > 2.7.4 >
Quoting Claudiu Beznea (2020-01-17 03:36:49) > SAM9X60 USB clock may have up to 3 parents. Save the number of parents in > driver's data structure and validate against it when setting parent. > > Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> > --- Applied to clk-next
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c index c0895c993cce..31d5c45e30d7 100644 --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c @@ -25,6 +25,7 @@ struct at91sam9x5_clk_usb { struct clk_hw hw; struct regmap *regmap; u32 usbs_mask; + u8 num_parents; }; #define to_at91sam9x5_clk_usb(hw) \ @@ -110,7 +111,7 @@ static int at91sam9x5_clk_usb_set_parent(struct clk_hw *hw, u8 index) { struct at91sam9x5_clk_usb *usb = to_at91sam9x5_clk_usb(hw); - if (index > 1) + if (index >= usb->num_parents) return -EINVAL; regmap_update_bits(usb->regmap, AT91_PMC_USB, usb->usbs_mask, index); @@ -215,6 +216,7 @@ _at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, usb->hw.init = &init; usb->regmap = regmap; usb->usbs_mask = usbs_mask; + usb->num_parents = num_parents; hw = &usb->hw; ret = clk_hw_register(NULL, &usb->hw);
SAM9X60 USB clock may have up to 3 parents. Save the number of parents in driver's data structure and validate against it when setting parent. Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> --- drivers/clk/at91/clk-usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)