From 3fd0c05da46c4dc23b71f2387b611a64f6772283 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 24 Nov 2014 22:01:24 +0100 Subject: Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks." This reverts commit 338302ae32b7be73da97b746f660b283642cfc5c. This is one of two commits that resulted in a boot regression. Conflicts: arch/arm/boot/dts/sun6i-a31.dtsi Signed-off-by: Arnd Bergmann Link: http://lkml.kernel.org/r/7h1toxr0ku.fsf@deeprootsystems.com --- arch/arm/boot/dts/sun8i-a23.dtsi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts/sun8i-a23.dtsi') diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi index 0746cd1024d7..6086adbf9d74 100644 --- a/arch/arm/boot/dts/sun8i-a23.dtsi +++ b/arch/arm/boot/dts/sun8i-a23.dtsi @@ -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"; }; -- cgit