Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
clk: actions: Cache regmap info in private clock descriptor
In order to support the reset controller, regmap info needs to
be cached in the private clock descriptor, owl_clk_desc. Hence,
save that and also make the clock descriptor struct non const.
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
authored by
Manivannan Sadhasivam
and committed by
Stephen Boyd
3a23eb72
5b394b2d
+8
-6
+2
-1
drivers/clk/actions/owl-common.c
+2
-1
drivers/clk/actions/owl-common.c
···
39
39
}
40
40
41
41
int owl_clk_regmap_init(struct platform_device *pdev,
42
-
const struct owl_clk_desc *desc)
42
+
struct owl_clk_desc *desc)
43
43
{
44
44
void __iomem *base;
45
45
struct regmap *regmap;
···
57
57
}
58
58
59
59
owl_clk_set_regmap(desc, regmap);
60
+
desc->regmap = regmap;
60
61
61
62
return 0;
62
63
}
+2
-1
drivers/clk/actions/owl-common.h
+2
-1
drivers/clk/actions/owl-common.h
···
26
26
struct owl_clk_common **clks;
27
27
unsigned long num_clks;
28
28
struct clk_hw_onecell_data *hw_clks;
29
+
struct regmap *regmap;
29
30
};
30
31
31
32
static inline struct owl_clk_common *
···
36
35
}
37
36
38
37
int owl_clk_regmap_init(struct platform_device *pdev,
39
-
const struct owl_clk_desc *desc);
38
+
struct owl_clk_desc *desc);
40
39
int owl_clk_probe(struct device *dev, struct clk_hw_onecell_data *hw_clks);
41
40
42
41
#endif /* _OWL_COMMON_H_ */
+2
-2
drivers/clk/actions/owl-s700.c
+2
-2
drivers/clk/actions/owl-s700.c
···
569
569
.num = CLK_NR_CLKS,
570
570
};
571
571
572
-
static const struct owl_clk_desc s700_clk_desc = {
572
+
static struct owl_clk_desc s700_clk_desc = {
573
573
.clks = s700_clks,
574
574
.num_clks = ARRAY_SIZE(s700_clks),
575
575
···
578
578
579
579
static int s700_clk_probe(struct platform_device *pdev)
580
580
{
581
-
const struct owl_clk_desc *desc;
581
+
struct owl_clk_desc *desc;
582
582
583
583
desc = &s700_clk_desc;
584
584
owl_clk_regmap_init(pdev, desc);
+2
-2
drivers/clk/actions/owl-s900.c
+2
-2
drivers/clk/actions/owl-s900.c
···
684
684
.num = CLK_NR_CLKS,
685
685
};
686
686
687
-
static const struct owl_clk_desc s900_clk_desc = {
687
+
static struct owl_clk_desc s900_clk_desc = {
688
688
.clks = s900_clks,
689
689
.num_clks = ARRAY_SIZE(s900_clks),
690
690
···
693
693
694
694
static int s900_clk_probe(struct platform_device *pdev)
695
695
{
696
-
const struct owl_clk_desc *desc;
696
+
struct owl_clk_desc *desc;
697
697
698
698
desc = &s900_clk_desc;
699
699
owl_clk_regmap_init(pdev, desc);