diff options
-rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index f47156b6572b..62d932e9b7d1 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi | |||
@@ -174,19 +174,11 @@ | |||
174 | clock-output-names = "axi"; | 174 | clock-output-names = "axi"; |
175 | }; | 175 | }; |
176 | 176 | ||
177 | ahb1_mux: ahb1_mux@01c20054 { | ||
178 | #clock-cells = <0>; | ||
179 | compatible = "allwinner,sun6i-a31-ahb1-mux-clk"; | ||
180 | reg = <0x01c20054 0x4>; | ||
181 | clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>; | ||
182 | clock-output-names = "ahb1_mux"; | ||
183 | }; | ||
184 | |||
185 | ahb1: ahb1@01c20054 { | 177 | ahb1: ahb1@01c20054 { |
186 | #clock-cells = <0>; | 178 | #clock-cells = <0>; |
187 | compatible = "allwinner,sun4i-a10-ahb-clk"; | 179 | compatible = "allwinner,sun6i-a31-ahb1-clk"; |
188 | reg = <0x01c20054 0x4>; | 180 | reg = <0x01c20054 0x4>; |
189 | clocks = <&ahb1_mux>; | 181 | clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>; |
190 | clock-output-names = "ahb1"; | 182 | clock-output-names = "ahb1"; |
191 | }; | 183 | }; |
192 | 184 | ||
@@ -367,7 +359,7 @@ | |||
367 | #dma-cells = <1>; | 359 | #dma-cells = <1>; |
368 | 360 | ||
369 | /* DMA controller requires AHB1 clocked from PLL6 */ | 361 | /* DMA controller requires AHB1 clocked from PLL6 */ |
370 | assigned-clocks = <&ahb1_mux>; | 362 | assigned-clocks = <&ahb1>; |
371 | assigned-clock-parents = <&pll6 0>; | 363 | assigned-clock-parents = <&pll6 0>; |
372 | }; | 364 | }; |
373 | 365 | ||