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

Commit 3fd0c05d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks." 



This reverts commit 338302ae.

This is one of two commits that resulted in a boot regression.

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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/7h1toxr0ku.fsf@deeprootsystems.com
parent 2f28e337

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

+10 −2
Original line number Diff line number Diff line
@@ -217,11 +217,19 @@ 
					"apb1_daudio1";

		};



		apb2: clk@01c20058 {

		apb2_mux: apb2_mux@01c20058 {

			#clock-cells = <0>;

			compatible = "allwinner,sun4i-a10-apb1-clk";

			compatible = "allwinner,sun4i-a10-apb1-mux-clk";

			reg = <0x01c20058 0x4>;

			clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;

			clock-output-names = "apb2_mux";

		};



		apb2: apb2@01c20058 {

			#clock-cells = <0>;

			compatible = "allwinner,sun6i-a31-apb2-div-clk";

			reg = <0x01c20058 0x4>;

			clocks = <&apb2_mux>;

			clock-output-names = "apb2";

		};

arch/arm/boot/dts/sun8i-a23.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -189,11 +189,19 @@ 
					"apb1_daudio0",	"apb1_daudio1";

		};



		apb2: clk@01c20058 {

		apb2_mux: apb2_mux_clk@01c20058 {

			#clock-cells = <0>;

			compatible = "allwinner,sun4i-a10-apb1-clk";

			compatible = "allwinner,sun4i-a10-apb1-mux-clk";

			reg = <0x01c20058 0x4>;

			clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;

			clock-output-names = "apb2_mux";

		};



		apb2: apb2_clk@01c20058 {

			#clock-cells = <0>;

			compatible = "allwinner,sun6i-a31-apb2-div-clk";

			reg = <0x01c20058 0x4>;

			clocks = <&apb2_mux>;

			clock-output-names = "apb2";

		};