Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42cc7136 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

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: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 7954dfae

arch/arm/boot/dts/sun6i-a31.dtsi

+3 −11
Original line number Diff line number Diff line
@@ -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>;

		};