projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7a83d6
)
clk: at91: usb: introduce num_parents in driver's structure
author
Claudiu Beznea
<claudiu.beznea@microchip.com>
Fri, 17 Jan 2020 11:36:49 +0000
(13:36 +0200)
committer
Stephen Boyd
<sboyd@kernel.org>
Wed, 12 Feb 2020 23:31:47 +0000
(15:31 -0800)
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>
Link:
https://lkml.kernel.org/r/1579261009-4573-5-git-send-email-claudiu.beznea@microchip.com
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/at91/clk-usb.c
patch
|
blob
|
history
diff --git
a/drivers/clk/at91/clk-usb.c
b/drivers/clk/at91/clk-usb.c
index c0895c993cce2fce690a6d22a628780142218a53..31d5c45e30d7a375f1c48e0ff004aac4d6f122ef 100644
(file)
--- 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);