diff options
author | Chen-Yu Tsai <wens@csie.org> | 2014-11-26 02:16:54 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-12-21 17:51:37 -0500 |
commit | de8e8e083def8f0ae5a331fb8ab2db35cdfbd676 (patch) | |
tree | 3e54a384bf7dfdedeba9a31fdd3672da42d68ea4 /arch/arm/boot/dts | |
parent | 42cc71365ebf1ec35a667d76d32be8503c6d84e9 (diff) |
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')
-rw-r--r-- | arch/arm/boot/dts/sun8i-a23.dtsi | 12 |
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 @@ | |||
140 | clock-output-names = "axi"; | 140 | clock-output-names = "axi"; |
141 | }; | 141 | }; |
142 | 142 | ||
143 | ahb1_mux: ahb1_mux_clk@01c20054 { | ||
144 | #clock-cells = <0>; | ||
145 | compatible = "allwinner,sun6i-a31-ahb1-mux-clk"; | ||
146 | reg = <0x01c20054 0x4>; | ||
147 | clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>; | ||
148 | clock-output-names = "ahb1_mux"; | ||
149 | }; | ||
150 | |||
151 | ahb1: ahb1_clk@01c20054 { | 143 | ahb1: ahb1_clk@01c20054 { |
152 | #clock-cells = <0>; | 144 | #clock-cells = <0>; |
153 | compatible = "allwinner,sun4i-a10-ahb-clk"; | 145 | compatible = "allwinner,sun6i-a31-ahb1-clk"; |
154 | reg = <0x01c20054 0x4>; | 146 | reg = <0x01c20054 0x4>; |
155 | clocks = <&ahb1_mux>; | 147 | clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>; |
156 | clock-output-names = "ahb1"; | 148 | clock-output-names = "ahb1"; |
157 | }; | 149 | }; |
158 | 150 | ||