ARM: dts: sun6i: Unify ahb1 clock nodes

The clock driver has unified support for the ahb1 clock.
Unify the clock nodes so it works.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index f47156b6572b..62d932e9b7d1 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -174,19 +174,11 @@
                         clock-output-names = "axi";
                 };
 
-                ahb1_mux: ahb1_mux@01c20054 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
-                        reg = <0x01c20054 0x4>;
-                        clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
-                        clock-output-names = "ahb1_mux";
-                };
-
                 ahb1: ahb1@01c20054 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-ahb-clk";
+                        compatible = "allwinner,sun6i-a31-ahb1-clk";
                         reg = <0x01c20054 0x4>;
-                        clocks = <&ahb1_mux>;
+                        clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
                         clock-output-names = "ahb1";
                 };
 
@@ -367,7 +359,7 @@
                         #dma-cells = <1>;
 
                         /* DMA controller requires AHB1 clocked from PLL6 */
-                        assigned-clocks = <&ahb1_mux>;
+                        assigned-clocks = <&ahb1>;
                         assigned-clock-parents = <&pll6 0>;
                 };