diff options
-rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun8i-a23.dtsi | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index e80288e881ec..3a51151b1dd2 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi | |||
@@ -217,19 +217,11 @@ | |||
217 | "apb1_daudio1"; | 217 | "apb1_daudio1"; |
218 | }; | 218 | }; |
219 | 219 | ||
220 | apb2_mux: apb2_mux@01c20058 { | 220 | apb2: clk@01c20058 { |
221 | #clock-cells = <0>; | 221 | #clock-cells = <0>; |
222 | compatible = "allwinner,sun4i-a10-apb1-mux-clk"; | 222 | compatible = "allwinner,sun4i-a10-apb1-clk"; |
223 | reg = <0x01c20058 0x4>; | 223 | reg = <0x01c20058 0x4>; |
224 | clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; | 224 | clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; |
225 | clock-output-names = "apb2_mux"; | ||
226 | }; | ||
227 | |||
228 | apb2: apb2@01c20058 { | ||
229 | #clock-cells = <0>; | ||
230 | compatible = "allwinner,sun6i-a31-apb2-div-clk"; | ||
231 | reg = <0x01c20058 0x4>; | ||
232 | clocks = <&apb2_mux>; | ||
233 | clock-output-names = "apb2"; | 225 | clock-output-names = "apb2"; |
234 | }; | 226 | }; |
235 | 227 | ||
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi index 6086adbf9d74..0746cd1024d7 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 | ||