summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/sun8i-a23.dtsi
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2014-11-26 10:16:54 +0300
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-12-22 01:51:37 +0300
commitde8e8e083def8f0ae5a331fb8ab2db35cdfbd676 (patch)
tree3e54a384bf7dfdedeba9a31fdd3672da42d68ea4 /arch/arm/boot/dts/sun8i-a23.dtsi
parent42cc71365ebf1ec35a667d76d32be8503c6d84e9 (diff)
downloadlinux-de8e8e083def8f0ae5a331fb8ab2db35cdfbd676.tar.xz
ARM: dts: sun8i: 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>
Diffstat (limited to 'arch/arm/boot/dts/sun8i-a23.dtsi')
-rw-r--r--arch/arm/boot/dts/sun8i-a23.dtsi12
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 0746cd1024d7..726b6139f730 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -140,19 +140,11 @@
clock-output-names = "axi";
};
- ahb1_mux: ahb1_mux_clk@01c20054 {
- #clock-cells = <0>;
- compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
- reg = <0x01c20054 0x4>;
- clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
- clock-output-names = "ahb1_mux";
- };
-
ahb1: ahb1_clk@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>;
clock-output-names = "ahb1";
};