Skip to content

Commit a00d077

Browse files
committed
clk: renesas: r8a7740: Remove r8a7740_cpg.reg
The register block base pointer as stored in the reg member of the r8a7740_cpg structure is only used during initialization. Hence move it to a local variable, and pass it as a parameter to r8a7740_cpg_register_clock(). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Link: https://lore.kernel.org/r/7ec676bcc36ef1eda02c2db328c527fc5fd44e99.1654694831.git.geert+renesas@glider.be
1 parent 65d012e commit a00d077

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

drivers/clk/renesas/clk-r8a7740.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
struct r8a7740_cpg {
1919
struct clk_onecell_data data;
2020
spinlock_t lock;
21-
void __iomem *reg;
2221
};
2322

2423
#define CPG_FRQCRA 0x00
@@ -61,7 +60,7 @@ static u32 cpg_mode __initdata;
6160

6261
static struct clk * __init
6362
r8a7740_cpg_register_clock(struct device_node *np, struct r8a7740_cpg *cpg,
64-
const char *name)
63+
void __iomem *base, const char *name)
6564
{
6665
const struct clk_div_table *table = NULL;
6766
const char *parent_name;
@@ -96,20 +95,20 @@ r8a7740_cpg_register_clock(struct device_node *np, struct r8a7740_cpg *cpg,
9695
* clock implementation and we currently have no need to change
9796
* the multiplier value.
9897
*/
99-
u32 value = readl(cpg->reg + CPG_FRQCRC);
98+
u32 value = readl(base + CPG_FRQCRC);
10099
parent_name = "system";
101100
mult = ((value >> 24) & 0x7f) + 1;
102101
} else if (!strcmp(name, "pllc1")) {
103-
u32 value = readl(cpg->reg + CPG_FRQCRA);
102+
u32 value = readl(base + CPG_FRQCRA);
104103
parent_name = "system";
105104
mult = ((value >> 24) & 0x7f) + 1;
106105
div = 2;
107106
} else if (!strcmp(name, "pllc2")) {
108-
u32 value = readl(cpg->reg + CPG_PLLC2CR);
107+
u32 value = readl(base + CPG_PLLC2CR);
109108
parent_name = "system";
110109
mult = ((value >> 24) & 0x3f) + 1;
111110
} else if (!strcmp(name, "usb24s")) {
112-
u32 value = readl(cpg->reg + CPG_USBCKCR);
111+
u32 value = readl(base + CPG_USBCKCR);
113112
if (value & BIT(7))
114113
/* extal2 */
115114
parent_name = of_clk_get_parent_name(np, 1);
@@ -137,14 +136,15 @@ r8a7740_cpg_register_clock(struct device_node *np, struct r8a7740_cpg *cpg,
137136
mult, div);
138137
} else {
139138
return clk_register_divider_table(NULL, name, parent_name, 0,
140-
cpg->reg + reg, shift, 4, 0,
139+
base + reg, shift, 4, 0,
141140
table, &cpg->lock);
142141
}
143142
}
144143

145144
static void __init r8a7740_cpg_clocks_init(struct device_node *np)
146145
{
147146
struct r8a7740_cpg *cpg;
147+
void __iomem *base;
148148
struct clk **clks;
149149
unsigned int i;
150150
int num_clks;
@@ -172,8 +172,8 @@ static void __init r8a7740_cpg_clocks_init(struct device_node *np)
172172
cpg->data.clks = clks;
173173
cpg->data.clk_num = num_clks;
174174

175-
cpg->reg = of_iomap(np, 0);
176-
if (WARN_ON(cpg->reg == NULL))
175+
base = of_iomap(np, 0);
176+
if (WARN_ON(base == NULL))
177177
return;
178178

179179
for (i = 0; i < num_clks; ++i) {
@@ -183,7 +183,7 @@ static void __init r8a7740_cpg_clocks_init(struct device_node *np)
183183
of_property_read_string_index(np, "clock-output-names", i,
184184
&name);
185185

186-
clk = r8a7740_cpg_register_clock(np, cpg, name);
186+
clk = r8a7740_cpg_register_clock(np, cpg, base, name);
187187
if (IS_ERR(clk))
188188
pr_err("%s: failed to register %pOFn %s clock (%ld)\n",
189189
__func__, np, name, PTR_ERR(clk));

0 commit comments

Comments
 (0)