Skip to content

Commit 8adf987

Browse files
committed
arm64: dts: apple: t8103: Sort nodes by address
We decided to keep SoC nodes sorted by address for sanity; fix a couple that slipped into the wrong place. Reviewed-by: Sven Peter <[email protected]> Signed-off-by: Hector Martin <[email protected]>
1 parent 57337b2 commit 8adf987

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

arch/arm64/boot/dts/apple/t8103.dtsi

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -274,34 +274,6 @@
274274
};
275275
};
276276

277-
pmgr_mini: power-management@23d280000 {
278-
compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";
279-
#address-cells = <1>;
280-
#size-cells = <1>;
281-
reg = <0x2 0x3d280000 0 0x4000>;
282-
};
283-
284-
pinctrl_aop: pinctrl@24a820000 {
285-
compatible = "apple,t8103-pinctrl", "apple,pinctrl";
286-
reg = <0x2 0x4a820000 0x0 0x4000>;
287-
288-
gpio-controller;
289-
#gpio-cells = <2>;
290-
gpio-ranges = <&pinctrl_aop 0 0 42>;
291-
apple,npins = <42>;
292-
293-
interrupt-controller;
294-
#interrupt-cells = <2>;
295-
interrupt-parent = <&aic>;
296-
interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>,
297-
<AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>,
298-
<AIC_IRQ 270 IRQ_TYPE_LEVEL_HIGH>,
299-
<AIC_IRQ 271 IRQ_TYPE_LEVEL_HIGH>,
300-
<AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
301-
<AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
302-
<AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
303-
};
304-
305277
pinctrl_nub: pinctrl@23d1f0000 {
306278
compatible = "apple,t8103-pinctrl", "apple,pinctrl";
307279
reg = <0x2 0x3d1f0000 0x0 0x4000>;
@@ -324,6 +296,13 @@
324296
<AIC_IRQ 336 IRQ_TYPE_LEVEL_HIGH>;
325297
};
326298

299+
pmgr_mini: power-management@23d280000 {
300+
compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";
301+
#address-cells = <1>;
302+
#size-cells = <1>;
303+
reg = <0x2 0x3d280000 0 0x4000>;
304+
};
305+
327306
wdt: watchdog@23d2b0000 {
328307
compatible = "apple,t8103-wdt", "apple,wdt";
329308
reg = <0x2 0x3d2b0000 0x0 0x4000>;
@@ -353,6 +332,27 @@
353332
<AIC_IRQ 397 IRQ_TYPE_LEVEL_HIGH>;
354333
};
355334

335+
pinctrl_aop: pinctrl@24a820000 {
336+
compatible = "apple,t8103-pinctrl", "apple,pinctrl";
337+
reg = <0x2 0x4a820000 0x0 0x4000>;
338+
339+
gpio-controller;
340+
#gpio-cells = <2>;
341+
gpio-ranges = <&pinctrl_aop 0 0 42>;
342+
apple,npins = <42>;
343+
344+
interrupt-controller;
345+
#interrupt-cells = <2>;
346+
interrupt-parent = <&aic>;
347+
interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>,
348+
<AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>,
349+
<AIC_IRQ 270 IRQ_TYPE_LEVEL_HIGH>,
350+
<AIC_IRQ 271 IRQ_TYPE_LEVEL_HIGH>,
351+
<AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
352+
<AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
353+
<AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
354+
};
355+
356356
pcie0_dart_0: dart@681008000 {
357357
compatible = "apple,t8103-dart";
358358
reg = <0x6 0x81008000 0x0 0x4000>;

0 commit comments

Comments
 (0)