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

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
...@@ -217,11 +217,19 @@ apb1_gates: clk@01c20068 { ...@@ -217,11 +217,19 @@ apb1_gates: clk@01c20068 {
"apb1_daudio1"; "apb1_daudio1";
}; };
apb2: clk@01c20058 { apb2_mux: apb2_mux@01c20058 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-apb1-clk"; compatible = "allwinner,sun4i-a10-apb1-mux-clk";
reg = <0x01c20058 0x4>; reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>; 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"; clock-output-names = "apb2";
}; };
......
...@@ -189,11 +189,19 @@ apb1_gates: clk@01c20068 { ...@@ -189,11 +189,19 @@ apb1_gates: clk@01c20068 {
"apb1_daudio0", "apb1_daudio1"; "apb1_daudio0", "apb1_daudio1";
}; };
apb2: clk@01c20058 { apb2_mux: apb2_mux_clk@01c20058 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-apb1-clk"; compatible = "allwinner,sun4i-a10-apb1-mux-clk";
reg = <0x01c20058 0x4>; reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; 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"; clock-output-names = "apb2";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment