diff options
author | Chen-Yu Tsai <wens@csie.org> | 2014-11-24 02:58:58 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-12-21 17:51:37 -0500 |
commit | ff8bbf78e45ee3a07d28642ee6fa1f3424f1bab8 (patch) | |
tree | 4cd36cb1893b84854f6f70bbfa035710c8192ed6 /arch/arm/boot/dts/sun8i-a23.dtsi | |
parent | de8e8e083def8f0ae5a331fb8ab2db35cdfbd676 (diff) |
ARM: dts: sun8i: Add PLL6 and MBUS clock nodes
Now that the clock driver supports PLL6 and MBUS on sun8i correctly,
add the corresponding clock nodes to the dtsi.
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 | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi index 726b6139f730..2fcccf0cbcee 100644 --- a/arch/arm/boot/dts/sun8i-a23.dtsi +++ b/arch/arm/boot/dts/sun8i-a23.dtsi | |||
@@ -110,11 +110,19 @@ | |||
110 | }; | 110 | }; |
111 | 111 | ||
112 | /* dummy clock until actually implemented */ | 112 | /* dummy clock until actually implemented */ |
113 | pll6: pll6_clk { | 113 | pll5: pll5_clk { |
114 | #clock-cells = <0>; | 114 | #clock-cells = <0>; |
115 | compatible = "fixed-clock"; | 115 | compatible = "fixed-clock"; |
116 | clock-frequency = <600000000>; | 116 | clock-frequency = <0>; |
117 | clock-output-names = "pll6"; | 117 | clock-output-names = "pll5"; |
118 | }; | ||
119 | |||
120 | pll6: clk@01c20028 { | ||
121 | #clock-cells = <1>; | ||
122 | compatible = "allwinner,sun6i-a31-pll6-clk"; | ||
123 | reg = <0x01c20028 0x4>; | ||
124 | clocks = <&osc24M>; | ||
125 | clock-output-names = "pll6", "pll6x2"; | ||
118 | }; | 126 | }; |
119 | 127 | ||
120 | cpu: cpu_clk@01c20050 { | 128 | cpu: cpu_clk@01c20050 { |
@@ -144,7 +152,7 @@ | |||
144 | #clock-cells = <0>; | 152 | #clock-cells = <0>; |
145 | compatible = "allwinner,sun6i-a31-ahb1-clk"; | 153 | compatible = "allwinner,sun6i-a31-ahb1-clk"; |
146 | reg = <0x01c20054 0x4>; | 154 | reg = <0x01c20054 0x4>; |
147 | clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>; | 155 | clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>; |
148 | clock-output-names = "ahb1"; | 156 | clock-output-names = "ahb1"; |
149 | }; | 157 | }; |
150 | 158 | ||
@@ -185,7 +193,7 @@ | |||
185 | #clock-cells = <0>; | 193 | #clock-cells = <0>; |
186 | compatible = "allwinner,sun4i-a10-apb1-clk"; | 194 | compatible = "allwinner,sun4i-a10-apb1-clk"; |
187 | reg = <0x01c20058 0x4>; | 195 | reg = <0x01c20058 0x4>; |
188 | clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; | 196 | clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>; |
189 | clock-output-names = "apb2"; | 197 | clock-output-names = "apb2"; |
190 | }; | 198 | }; |
191 | 199 | ||
@@ -204,7 +212,7 @@ | |||
204 | #clock-cells = <0>; | 212 | #clock-cells = <0>; |
205 | compatible = "allwinner,sun4i-a10-mod0-clk"; | 213 | compatible = "allwinner,sun4i-a10-mod0-clk"; |
206 | reg = <0x01c20088 0x4>; | 214 | reg = <0x01c20088 0x4>; |
207 | clocks = <&osc24M>, <&pll6>; | 215 | clocks = <&osc24M>, <&pll6 0>; |
208 | clock-output-names = "mmc0"; | 216 | clock-output-names = "mmc0"; |
209 | }; | 217 | }; |
210 | 218 | ||
@@ -212,7 +220,7 @@ | |||
212 | #clock-cells = <0>; | 220 | #clock-cells = <0>; |
213 | compatible = "allwinner,sun4i-a10-mod0-clk"; | 221 | compatible = "allwinner,sun4i-a10-mod0-clk"; |
214 | reg = <0x01c2008c 0x4>; | 222 | reg = <0x01c2008c 0x4>; |
215 | clocks = <&osc24M>, <&pll6>; | 223 | clocks = <&osc24M>, <&pll6 0>; |
216 | clock-output-names = "mmc1"; | 224 | clock-output-names = "mmc1"; |
217 | }; | 225 | }; |
218 | 226 | ||
@@ -220,9 +228,17 @@ | |||
220 | #clock-cells = <0>; | 228 | #clock-cells = <0>; |
221 | compatible = "allwinner,sun4i-a10-mod0-clk"; | 229 | compatible = "allwinner,sun4i-a10-mod0-clk"; |
222 | reg = <0x01c20090 0x4>; | 230 | reg = <0x01c20090 0x4>; |
223 | clocks = <&osc24M>, <&pll6>; | 231 | clocks = <&osc24M>, <&pll6 0>; |
224 | clock-output-names = "mmc2"; | 232 | clock-output-names = "mmc2"; |
225 | }; | 233 | }; |
234 | |||
235 | mbus_clk: clk@01c2015c { | ||
236 | #clock-cells = <0>; | ||
237 | compatible = "allwinner,sun8i-a23-mbus-clk"; | ||
238 | reg = <0x01c2015c 0x4>; | ||
239 | clocks = <&osc24M>, <&pll6 1>, <&pll5>; | ||
240 | clock-output-names = "mbus"; | ||
241 | }; | ||
226 | }; | 242 | }; |
227 | 243 | ||
228 | soc@01c00000 { | 244 | soc@01c00000 { |