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 <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
index 87a30d072ae9bfcbe9ce9cdbe7424fe215a33299..bbbe1ed7aba191d456ee8c26fe7be22a415a9436 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
@@ -179,9 +179,18 @@ static struct clk_hw_onecell_data sun50i_a64_de2_hw_clks = {
 static struct ccu_reset_map sun8i_a83t_de2_resets[] = {
        [RST_MIXER0]    = { 0x08, BIT(0) },
        /*
-        * For A83T, H3 and R40, mixer1 reset line is shared with wb, so
-        * only RST_WB is exported here.
-        * For V3s there's just no mixer1, so it also shares this struct.
+        * Mixer1 reset line is shared with wb, so only RST_WB is
+        * exported here.
+        */
+       [RST_WB]        = { 0x08, BIT(2) },
+};
+
+static struct ccu_reset_map sun8i_h3_de2_resets[] = {
+       [RST_MIXER0]    = { 0x08, BIT(0) },
+       /*
+        * Mixer1 reset line is shared with wb, so only RST_WB is
+        * exported here.
+        * V3s doesn't have mixer1, so it also shares this struct.
         */
        [RST_WB]        = { 0x08, BIT(2) },
 };
@@ -215,8 +224,8 @@ static const struct sunxi_ccu_desc sun8i_h3_de2_clk_desc = {
 
        .hw_clks        = &sun8i_h3_de2_hw_clks,
 
-       .resets         = sun8i_a83t_de2_resets,
-       .num_resets     = ARRAY_SIZE(sun8i_a83t_de2_resets),
+       .resets         = sun8i_h3_de2_resets,
+       .num_resets     = ARRAY_SIZE(sun8i_h3_de2_resets),
 };
 
 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 = {
 
        .hw_clks        = &sun8i_v3s_de2_hw_clks,
 
-       .resets         = sun8i_a83t_de2_resets,
-       .num_resets     = ARRAY_SIZE(sun8i_a83t_de2_resets),
+       .resets         = sun8i_h3_de2_resets,
+       .num_resets     = ARRAY_SIZE(sun8i_h3_de2_resets),
 };
 
 static int sunxi_de2_clk_probe(struct platform_device *pdev)