Skip to content

Commit 8f9b11a

Browse files
jernejskmripard
authored andcommitted
clk: sunxi-ng: sun8i-de2: Don't reuse A83T resets
Currently, V3s and H3 reuse A83T reset structure. However, A83T contains additional core for rotation, which is not present in V3s and H3. Make new reset structure for H3 and let V3s reuse it. A83T reset structure will be amended in subsequent commit. Signed-off-by: Jernej Skrabec <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
1 parent 75250eb commit 8f9b11a

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

drivers/clk/sunxi-ng/ccu-sun8i-de2.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,18 @@ static struct clk_hw_onecell_data sun50i_a64_de2_hw_clks = {
179179
static struct ccu_reset_map sun8i_a83t_de2_resets[] = {
180180
[RST_MIXER0] = { 0x08, BIT(0) },
181181
/*
182-
* For A83T, H3 and R40, mixer1 reset line is shared with wb, so
183-
* only RST_WB is exported here.
184-
* For V3s there's just no mixer1, so it also shares this struct.
182+
* Mixer1 reset line is shared with wb, so only RST_WB is
183+
* exported here.
184+
*/
185+
[RST_WB] = { 0x08, BIT(2) },
186+
};
187+
188+
static struct ccu_reset_map sun8i_h3_de2_resets[] = {
189+
[RST_MIXER0] = { 0x08, BIT(0) },
190+
/*
191+
* Mixer1 reset line is shared with wb, so only RST_WB is
192+
* exported here.
193+
* V3s doesn't have mixer1, so it also shares this struct.
185194
*/
186195
[RST_WB] = { 0x08, BIT(2) },
187196
};
@@ -215,8 +224,8 @@ static const struct sunxi_ccu_desc sun8i_h3_de2_clk_desc = {
215224

216225
.hw_clks = &sun8i_h3_de2_hw_clks,
217226

218-
.resets = sun8i_a83t_de2_resets,
219-
.num_resets = ARRAY_SIZE(sun8i_a83t_de2_resets),
227+
.resets = sun8i_h3_de2_resets,
228+
.num_resets = ARRAY_SIZE(sun8i_h3_de2_resets),
220229
};
221230

222231
static const struct sunxi_ccu_desc sun50i_a64_de2_clk_desc = {
@@ -245,8 +254,8 @@ static const struct sunxi_ccu_desc sun8i_v3s_de2_clk_desc = {
245254

246255
.hw_clks = &sun8i_v3s_de2_hw_clks,
247256

248-
.resets = sun8i_a83t_de2_resets,
249-
.num_resets = ARRAY_SIZE(sun8i_a83t_de2_resets),
257+
.resets = sun8i_h3_de2_resets,
258+
.num_resets = ARRAY_SIZE(sun8i_h3_de2_resets),
250259
};
251260

252261
static int sunxi_de2_clk_probe(struct platform_device *pdev)

0 commit comments

Comments
 (0)