projects / openwrt / staging / ldir.git / blob
? search:


78713d778e1127f422f6ca37c485785406494d39
[openwrt/staging/ldir.git] /
1 From c97c6ebf6fd6a6ff72bd7d58a12de0c07f14953e Mon Sep 17 00:00:00 2001
2 From: Biwen Li <biwen.li@nxp.com>
3 Date: Thu, 27 Jun 2019 15:02:44 +0800
4 Subject: [PATCH] arm64: dts: ls1012a/ls1043a/ls1046a/ls1088a/ls208xa: replace
5 ftm0 with ftm_alarm0
6
7 The patch replaces ftm0 with ftm_alarm0 DT node
8 - replace ftm0 with ftm_alarm0
9 - add new rcpm node
10 - remove old rcpm node
11 - aliases ftm_alarm0 as rtc1
12
13 Signed-off-by: Biwen Li <biwen.li@nxp.com>
14 ---
15 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 23 +++++++++++----------
16 .../boot/dts/freescale/fsl-ls1043a-qds-sdk.dts | 2 +-
17 .../boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts | 2 +-
18 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 24 +++++++++++++---------
19 .../boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts | 2 +-
20 .../boot/dts/freescale/fsl-ls1046a-qds-sdk.dts | 2 +-
21 .../boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts | 2 +-
22 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 24 ++++++++++++++--------
23 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 20 ++++++++++++------
24 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 12 +++++++++--
25 10 files changed, 70 insertions(+), 43 deletions(-)
26
27 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
28 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
29 @@ -23,6 +23,7 @@
30 rtic-c = &rtic_c;
31 rtic-d = &rtic_d;
32 sec-mon = &sec_mon;
33 + rtc1 = &ftm_alarm0;
34 };
35
36 cpus {
37 @@ -290,15 +291,21 @@
38 #thermal-sensor-cells = <1>;
39 };
40
41 - ftm0: ftm0@29d0000 {
42 - compatible = "fsl,ftm-alarm";
43 - reg = <0x0 0x29d0000 0x0 0x10000>,
44 - <0x0 0x1ee2140 0x0 0x4>;
45 - reg-names = "ftm", "FlexTimer1";
46 + rcpm: rcpm@1ee2140 {
47 + compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1+";
48 + reg = <0x0 0x1ee2140 0x0 0x4>;
49 + #fsl,rcpm-wakeup-cells = <1>;
50 + };
51 +
52 + ftm_alarm0: timer@29d0000 {
53 + compatible = "fsl,ls1012a-ftm-alarm";
54 + reg = <0x0 0x29d0000 0x0 0x10000>;
55 + fsl,rcpm-wakeup = <&rcpm 0x20000>;
56 interrupts = <0 86 0x4>;
57 big-endian;
58 };
59
60 +
61 i2c0: i2c@2180000 {
62 compatible = "fsl,vf610-i2c", "fsl,ls1012a-vf610-i2c";
63 #address-cells = <1>;
64 @@ -497,12 +504,6 @@
65 <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
66 status = "disabled";
67 };
68 -
69 - rcpm: rcpm@1ee2000 {
70 - compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1";
71 - reg = <0x0 0x1ee2000 0x0 0x1000>;
72 - fsl,#rcpm-wakeup-cells = <1>;
73 - };
74 };
75
76 reserved-memory {
77 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds-sdk.dts
78 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds-sdk.dts
79 @@ -226,7 +226,7 @@ pcie@3600000 {
80 dma-coherent;
81 };
82
83 -&ftm0 {
84 +&ftm_alarm0 {
85 dma-coherent;
86 };
87
88 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts
89 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts
90 @@ -221,7 +221,7 @@ pcie@3600000 {
91 dma-coherent;
92 };
93
94 -&ftm0 {
95 +&ftm_alarm0 {
96 dma-coherent;
97 };
98
99 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
100 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
101 @@ -27,6 +27,7 @@
102 ethernet4 = &enet4;
103 ethernet5 = &enet5;
104 ethernet6 = &enet6;
105 + rtc1 = &ftm_alarm0;
106 };
107
108 cpus {
109 @@ -661,16 +662,6 @@
110 status = "disabled";
111 };
112
113 - ftm0: ftm0@29d0000 {
114 - compatible = "fsl,ftm-alarm";
115 - reg = <0x0 0x29d0000 0x0 0x10000>,
116 - <0x0 0x1ee2140 0x0 0x4>;
117 - reg-names = "ftm", "FlexTimer1";
118 - interrupts = <0 86 0x4>;
119 - big-endian;
120 - status = "okay";
121 - };
122 -
123 wdog0: wdog@2ad0000 {
124 compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt";
125 reg = <0x0 0x2ad0000 0x0 0x10000>;
126 @@ -875,6 +866,19 @@
127 big-endian;
128 };
129
130 + rcpm: rcpm@1ee2140 {
131 + compatible = "fsl,ls1043a-rcpm", "fsl,qoriq-rcpm-2.1+";
132 + reg = <0x0 0x1ee2140 0x0 0x4>;
133 + #fsl,rcpm-wakeup-cells = <1>;
134 + };
135 +
136 + ftm_alarm0: timer@29d0000 {
137 + compatible = "fsl,ls1043a-ftm-alarm";
138 + reg = <0x0 0x29d0000 0x0 0x10000>;
139 + fsl,rcpm-wakeup = <&rcpm 0x20000>;
140 + interrupts = <0 86 0x4>;
141 + big-endian;
142 + };
143 };
144
145 firmware {
146 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
147 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
148 @@ -196,7 +196,7 @@
149 dma-coherent;
150 };
151
152 -&ftm0 {
153 +&ftm_alarm0 {
154 dma-coherent;
155 };
156
157 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts
158 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts
159 @@ -223,7 +223,7 @@ pcie@3600000 {
160 dma-coherent;
161 };
162
163 -&ftm0 {
164 +&ftm_alarm0 {
165 dma-coherent;
166 };
167
168 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts
169 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts
170 @@ -228,7 +228,7 @@ pcie@3600000 {
171 dma-coherent;
172 };
173
174 -&ftm0 {
175 +&ftm_alarm0 {
176 dma-coherent;
177 };
178
179 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
180 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
181 @@ -28,6 +28,7 @@
182 ethernet5 = &enet5;
183 ethernet6 = &enet6;
184 ethernet7 = &enet7;
185 + rtc1 = &ftm_alarm0;
186 };
187
188 cpus {
189 @@ -561,15 +562,6 @@
190 status = "disabled";
191 };
192
193 - ftm0: ftm0@29d0000 {
194 - compatible = "fsl,ftm-alarm";
195 - reg = <0x0 0x29d0000 0x0 0x10000>,
196 - <0x0 0x1ee2140 0x0 0x4>;
197 - reg-names = "ftm", "FlexTimer1";
198 - interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
199 - big-endian;
200 - };
201 -
202 wdog0: watchdog@2ad0000 {
203 compatible = "fsl,imx21-wdt";
204 reg = <0x0 0x2ad0000 0x0 0x10000>;
205 @@ -811,6 +803,20 @@
206 queue-sizes = <64 64>;
207 big-endian;
208 };
209 +
210 + rcpm: rcpm@1ee208c {
211 + compatible = "fsl,ls1046a-rcpm", "fsl,qoriq-rcpm-2.1+";
212 + reg = <0x0 0x1ee208c 0x0 0x4>;
213 + #fsl,rcpm-wakeup-cells = <1>;
214 + };
215 +
216 + ftm_alarm0: timer@29d0000 {
217 + compatible = "fsl,ls1046a-ftm-alarm";
218 + reg = <0x0 0x29d0000 0x0 0x10000>;
219 + fsl,rcpm-wakeup = <&rcpm 0x20000>;
220 + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
221 + big-endian;
222 + };
223 };
224
225 reserved-memory {
226 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
227 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
228 @@ -18,6 +18,7 @@
229
230 aliases {
231 crypto = &crypto;
232 + rtc1 = &ftm_alarm0;
233 };
234
235 cpus {
236 @@ -339,12 +340,6 @@
237 status = "disabled";
238 };
239
240 - ftm0: ftm0@2800000 {
241 - compatible = "fsl,ftm-alarm";
242 - reg = <0x0 0x2800000 0x0 0x10000>;
243 - interrupts = <0 44 4>;
244 - };
245 -
246 i2c0: i2c@2000000 {
247 compatible = "fsl,vf610-i2c", "fsl,ls1088a-vf610-i2c";
248 #address-cells = <1>;
249 @@ -792,6 +787,19 @@
250 };
251 };
252 };
253 +
254 + rcpm: rcpm@1e34040 {
255 + compatible = "fsl,ls1088a-rcpm", "fsl,qoriq-rcpm-2.1+";
256 + reg = <0x0 0x1e34040 0x0 0x18>;
257 + #fsl,rcpm-wakeup-cells = <6>;
258 + };
259 +
260 + ftm_alarm0: timer@2800000 {
261 + compatible = "fsl,ls1088a-ftm-alarm";
262 + reg = <0x0 0x2800000 0x0 0x10000>;
263 + fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0>;
264 + interrupts = <0 44 4>;
265 + };
266 };
267
268 firmware {
269 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
270 +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
271 @@ -24,6 +24,7 @@
272 serial1 = &serial1;
273 serial2 = &serial2;
274 serial3 = &serial3;
275 + rtc1 = &ftm_alarm0;
276 };
277
278 cpu: cpus {
279 @@ -756,9 +757,16 @@
280 interrupts = <0 12 4>;
281 };
282
283 - ftm0: ftm0@2800000 {
284 - compatible = "fsl,ftm-alarm";
285 + rcpm: rcpm@1e34040 {
286 + compatible = "fsl,ls208xa-rcpm", "fsl,qoriq-rcpm-2.1+";
287 + reg = <0x0 0x1e34040 0x0 0x18>;
288 + #fsl,rcpm-wakeup-cells = <6>;
289 + };
290 +
291 + ftm_alarm0: timer@2800000 {
292 + compatible = "fsl,ls208xa-ftm-alarm";
293 reg = <0x0 0x2800000 0x0 0x10000>;
294 + fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0>;
295 interrupts = <0 44 4>;
296 };
297 };
Kevin D-Bs staging tree