diff options
author | Chen-Yu Tsai <wens@csie.org> | 2014-11-05 22:40:31 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-23 11:02:55 -0500 |
commit | 74c947ab33c9ada5a180315ed218a1f61b5ede0c (patch) | |
tree | 3bd9414c1355e6d4cfe6440436f1a656bd03307f /arch/arm/boot/dts/sun8i-a23.dtsi | |
parent | acbcc0f03b15585387f9ca69c2a976b02cb69023 (diff) |
ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks.
The apb2 clocks are actually the same as apb1 clocks on the other sunxi
platforms, hence compatible with "allwinner,sun4i-a10-apb1-clk".
Update the dtsi to use the new unified apb1 clk.
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.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 6146ef15efbe..701960e9d033 100644 --- a/arch/arm/boot/dts/sun8i-a23.dtsi +++ b/arch/arm/boot/dts/sun8i-a23.dtsi | |||
@@ -189,19 +189,11 @@ | |||
189 | "apb1_daudio0", "apb1_daudio1"; | 189 | "apb1_daudio0", "apb1_daudio1"; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | apb2_mux: apb2_mux_clk@01c20058 { | 192 | apb2: clk@01c20058 { |
193 | #clock-cells = <0>; | 193 | #clock-cells = <0>; |
194 | compatible = "allwinner,sun4i-a10-apb1-mux-clk"; | 194 | compatible = "allwinner,sun4i-a10-apb1-clk"; |
195 | reg = <0x01c20058 0x4>; | 195 | reg = <0x01c20058 0x4>; |
196 | clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; | 196 | clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; |
197 | clock-output-names = "apb2_mux"; | ||
198 | }; | ||
199 | |||
200 | apb2: apb2_clk@01c20058 { | ||
201 | #clock-cells = <0>; | ||
202 | compatible = "allwinner,sun6i-a31-apb2-div-clk"; | ||
203 | reg = <0x01c20058 0x4>; | ||
204 | clocks = <&apb2_mux>; | ||
205 | clock-output-names = "apb2"; | 197 | clock-output-names = "apb2"; |
206 | }; | 198 | }; |
207 | 199 | ||