* [PATCH 01/13] arm64: dts: apple: t603x: Fix all blank line dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
@ 2026-09-09 10:26 ` Janne Grunau
2026-09-09 10:26 ` [PATCH 02/13] arm64: dts: apple: t8122: Fix blank line related " Janne Grunau
` (11 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:26 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Fixes dt-style-check 'blank-lines' and 'required-blank-lines' issues
reported in strict mode.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6030-pmgr.dtsi | 1 -
arch/arm64/boot/dts/apple/t6030.dtsi | 18 ++++++++++++++++++
arch/arm64/boot/dts/apple/t6031-base.dtsi | 13 +++++++++++++
arch/arm64/boot/dts/apple/t6031-die0.dtsi | 10 ++++++++++
arch/arm64/boot/dts/apple/t6031-pmgr.dtsi | 6 ++++++
arch/arm64/boot/dts/apple/t6032-j575d.dts | 3 ++-
arch/arm64/boot/dts/apple/t6032.dtsi | 13 +++++++++++++
arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi | 4 +++-
8 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6030-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6030-pmgr.dtsi
index 932388ea13c9..b890d622566e 100644
--- a/arch/arm64/boot/dts/apple/t6030-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t6030-pmgr.dtsi
@@ -1434,4 +1434,3 @@ ps_atc3_usb: power-controller@f0 {
power-domains = <&ps_atc3_usb_aon>, <&ps_atc3_common>;
};
};
-
diff --git a/arch/arm64/boot/dts/apple/t6030.dtsi b/arch/arm64/boot/dts/apple/t6030.dtsi
index 5ff12edfc553..0bfa8db59db4 100644
--- a/arch/arm64/boot/dts/apple/t6030.dtsi
+++ b/arch/arm64/boot/dts/apple/t6030.dtsi
@@ -24,18 +24,23 @@ cluster0 {
core0 {
cpu = <&cpu_e00>;
};
+
core1 {
cpu = <&cpu_e01>;
};
+
core2 {
cpu = <&cpu_e02>;
};
+
core3 {
cpu = <&cpu_e03>;
};
+
core4 {
cpu = <&cpu_e04>;
};
+
core5 {
cpu = <&cpu_e05>;
};
@@ -45,18 +50,23 @@ cluster1 {
core0 {
cpu = <&cpu_p00>;
};
+
core1 {
cpu = <&cpu_p01>;
};
+
core2 {
cpu = <&cpu_p02>;
};
+
core3 {
cpu = <&cpu_p03>;
};
+
core4 {
cpu = <&cpu_p04>;
};
+
core5 {
cpu = <&cpu_p05>;
};
@@ -254,6 +264,7 @@ i2c1: i2c@289014000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c1>;
+
status = "disabled";
};
@@ -268,6 +279,7 @@ i2c2: i2c@289018000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c2>;
+
status = "disabled";
};
@@ -282,6 +294,7 @@ i2c3: i2c@28901c000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c3>;
+
status = "disabled";
};
@@ -296,6 +309,7 @@ i2c4: i2c@289020000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c4>;
+
status = "disabled";
};
@@ -310,6 +324,7 @@ i2c6: i2c@289028000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c6>;
+
status = "disabled";
};
@@ -324,6 +339,7 @@ i2c8: i2c@289030000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c8>;
+
status = "disabled";
};
@@ -333,6 +349,7 @@ fpwm0: pwm@289040000 {
power-domains = <&ps_fpwm0>;
clocks = <&clkref>;
#pwm-cells = <2>;
+
status = "disabled";
};
@@ -349,6 +366,7 @@ serial0: serial@289200000 {
clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
power-domains = <&ps_uart0>;
+
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/apple/t6031-base.dtsi b/arch/arm64/boot/dts/apple/t6031-base.dtsi
index 74e1fa51242d..6df3be68d740 100644
--- a/arch/arm64/boot/dts/apple/t6031-base.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-base.dtsi
@@ -20,12 +20,15 @@ cluster0 {
core0 {
cpu = <&cpu_e00>;
};
+
core1 {
cpu = <&cpu_e01>;
};
+
core2 {
cpu = <&cpu_e02>;
};
+
core3 {
cpu = <&cpu_e03>;
};
@@ -35,18 +38,23 @@ cluster1 {
core0 {
cpu = <&cpu_p00>;
};
+
core1 {
cpu = <&cpu_p01>;
};
+
core2 {
cpu = <&cpu_p02>;
};
+
core3 {
cpu = <&cpu_p03>;
};
+
core4 {
cpu = <&cpu_p04>;
};
+
core5 {
cpu = <&cpu_p05>;
};
@@ -56,18 +64,23 @@ cluster2 {
core0 {
cpu = <&cpu_p10>;
};
+
core1 {
cpu = <&cpu_p11>;
};
+
core2 {
cpu = <&cpu_p12>;
};
+
core3 {
cpu = <&cpu_p13>;
};
+
core4 {
cpu = <&cpu_p14>;
};
+
core5 {
cpu = <&cpu_p15>;
};
diff --git a/arch/arm64/boot/dts/apple/t6031-die0.dtsi b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
index cffab6b51d12..932c97579f99 100644
--- a/arch/arm64/boot/dts/apple/t6031-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
@@ -71,6 +71,7 @@ i2c1: i2c@391014000 {
power-domains = <&ps_i2c1>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -85,6 +86,7 @@ i2c2: i2c@391018000 {
power-domains = <&ps_i2c2>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -99,6 +101,7 @@ i2c3: i2c@39101c000 {
power-domains = <&ps_i2c3>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -113,6 +116,7 @@ i2c4: i2c@391020000 {
power-domains = <&ps_i2c4>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -127,6 +131,7 @@ i2c5: i2c@391024000 {
power-domains = <&ps_i2c5>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -141,6 +146,7 @@ i2c6: i2c@391028000 {
power-domains = <&ps_i2c6>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -155,6 +161,7 @@ i2c7: i2c@39102c000 {
power-domains = <&ps_i2c7>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -169,6 +176,7 @@ i2c8: i2c@391030000 {
power-domains = <&ps_i2c8>;
#address-cells = <0x1>;
#size-cells = <0x0>;
+
status = "disabled";
};
@@ -178,6 +186,7 @@ fpwm0: pwm@391040000 {
power-domains = <&ps_fpwm0>;
clocks = <&clkref>;
#pwm-cells = <2>;
+
status = "disabled";
};
@@ -194,6 +203,7 @@ serial0: serial@391200000 {
clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
power-domains = <&ps_uart0>;
+
status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/apple/t6031-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6031-pmgr.dtsi
index f80ee5f7ebcf..721ab2e9fd4b 100644
--- a/arch/arm64/boot/dts/apple/t6031-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-pmgr.dtsi
@@ -1383,6 +1383,7 @@ DIE_NODE(ps_afi_d2d_0): power-controller@2d0 {
#reset-cells = <0>;
label = DIE_LABEL(afi_d2d_0);
apple,always-on;
+
status = "disabled";
};
@@ -1393,6 +1394,7 @@ DIE_NODE(ps_afi_d2d_1): power-controller@2e0 {
#reset-cells = <0>;
label = DIE_LABEL(afi_d2d_1);
apple,always-on;
+
status = "disabled";
};
@@ -1403,6 +1405,7 @@ DIE_NODE(ps_afc_d2d_0): power-controller@2f0 {
#reset-cells = <0>;
label = DIE_LABEL(afc_d2d_0);
apple,always-on;
+
status = "disabled";
};
@@ -1413,6 +1416,7 @@ DIE_NODE(ps_afc_d2d_1): power-controller@300 {
#reset-cells = <0>;
label = DIE_LABEL(afc_d2d_1);
apple,always-on;
+
status = "disabled";
};
@@ -1423,6 +1427,7 @@ DIE_NODE(ps_afr_d2d_0): power-controller@310 {
#reset-cells = <0>;
label = DIE_LABEL(afr_d2d_0);
apple,always-on;
+
status = "disabled";
};
@@ -1433,6 +1438,7 @@ DIE_NODE(ps_afr_d2d_1): power-controller@320 {
#reset-cells = <0>;
label = DIE_LABEL(afr_d2d_1);
apple,always-on;
+
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/apple/t6032-j575d.dts b/arch/arm64/boot/dts/apple/t6032-j575d.dts
index 56edfb1139fb..71f4a00e1b1c 100644
--- a/arch/arm64/boot/dts/apple/t6032-j575d.dts
+++ b/arch/arm64/boot/dts/apple/t6032-j575d.dts
@@ -30,8 +30,9 @@ framebuffer0: framebuffer@0 {
compatible = "apple,simple-framebuffer", "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
/* Format properties will be added by loader */
- status = "disabled";
power-domains = <&ps_dispext0_cpu>;
+
+ status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/apple/t6032.dtsi b/arch/arm64/boot/dts/apple/t6032.dtsi
index 0a966370cc82..aa48f2483fbb 100644
--- a/arch/arm64/boot/dts/apple/t6032.dtsi
+++ b/arch/arm64/boot/dts/apple/t6032.dtsi
@@ -33,12 +33,15 @@ cluster3 {
core0 {
cpu = <&cpu_e10>;
};
+
core1 {
cpu = <&cpu_e11>;
};
+
core2 {
cpu = <&cpu_e12>;
};
+
core3 {
cpu = <&cpu_e13>;
};
@@ -48,18 +51,23 @@ cluster4 {
core0 {
cpu = <&cpu_p20>;
};
+
core1 {
cpu = <&cpu_p21>;
};
+
core2 {
cpu = <&cpu_p22>;
};
+
core3 {
cpu = <&cpu_p23>;
};
+
core4 {
cpu = <&cpu_p24>;
};
+
core5 {
cpu = <&cpu_p25>;
};
@@ -69,18 +77,23 @@ cluster5 {
core0 {
cpu = <&cpu_p30>;
};
+
core1 {
cpu = <&cpu_p31>;
};
+
core2 {
cpu = <&cpu_p32>;
};
+
core3 {
cpu = <&cpu_p33>;
};
+
core4 {
cpu = <&cpu_p34>;
};
+
core5 {
cpu = <&cpu_p35>;
};
diff --git a/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi b/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
index 517b84c183ca..3ac8a2f0723b 100644
--- a/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
+++ b/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
@@ -35,8 +35,9 @@ framebuffer0: framebuffer@0 {
compatible = "apple,simple-framebuffer", "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
/* Format properties will be added by loader */
- status = "disabled";
power-domains = <&ps_disp_fe>;
+
+ status = "disabled";
};
};
@@ -47,6 +48,7 @@ memory@10000000000 {
led-controller {
compatible = "pwm-leds";
+
led-0 {
pwms = <&fpwm0 0 40000>;
function = LED_FUNCTION_KBD_BACKLIGHT;
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 02/13] arm64: dts: apple: t8122: Fix blank line related dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
2026-09-09 10:26 ` [PATCH 01/13] arm64: dts: apple: t603x: Fix all blank line dt-style-check issues Janne Grunau
@ 2026-09-09 10:26 ` Janne Grunau
2026-09-09 10:26 ` [PATCH 03/13] arm64: dts: apple: t603x: Fix child-name-order " Janne Grunau
` (10 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:26 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Fixes dt-style-check 'blank-lines' and 'required-blank-lines' issues
reported in strict mode.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8122-j504.dts | 2 +-
arch/arm64/boot/dts/apple/t8122-j613.dts | 1 +
arch/arm64/boot/dts/apple/t8122-j615.dts | 1 +
arch/arm64/boot/dts/apple/t8122-jxxx.dtsi | 1 +
arch/arm64/boot/dts/apple/t8122-pmgr.dtsi | 1 -
arch/arm64/boot/dts/apple/t8122.dtsi | 14 +++++++++++++-
6 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8122-j504.dts b/arch/arm64/boot/dts/apple/t8122-j504.dts
index 464491b55b01..d9e8016e84a2 100644
--- a/arch/arm64/boot/dts/apple/t8122-j504.dts
+++ b/arch/arm64/boot/dts/apple/t8122-j504.dts
@@ -20,6 +20,7 @@ / {
led-controller {
compatible = "pwm-leds";
+
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
@@ -34,4 +35,3 @@ led-0 {
&fpwm1 {
status = "okay";
};
-
diff --git a/arch/arm64/boot/dts/apple/t8122-j613.dts b/arch/arm64/boot/dts/apple/t8122-j613.dts
index 51894ea705e7..127a4c2d8577 100644
--- a/arch/arm64/boot/dts/apple/t8122-j613.dts
+++ b/arch/arm64/boot/dts/apple/t8122-j613.dts
@@ -19,6 +19,7 @@ / {
led-controller {
compatible = "pwm-leds";
+
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
diff --git a/arch/arm64/boot/dts/apple/t8122-j615.dts b/arch/arm64/boot/dts/apple/t8122-j615.dts
index 2a1970c1bc90..9ef7791e2f32 100644
--- a/arch/arm64/boot/dts/apple/t8122-j615.dts
+++ b/arch/arm64/boot/dts/apple/t8122-j615.dts
@@ -19,6 +19,7 @@ / {
led-controller {
compatible = "pwm-leds";
+
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
diff --git a/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
index dd85f0c9fb1e..b9576e4164a3 100644
--- a/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
@@ -26,6 +26,7 @@ framebuffer0: framebuffer@0 {
reg = <0 0 0 0>; /* To be filled by loader */
power-domains = <&ps_disp_cpu>, <&ps_dptx_ext_phy>;
/* Format properties will be added by loader */
+
status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/apple/t8122-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8122-pmgr.dtsi
index 64093792e0ad..3f8be74b5ea8 100644
--- a/arch/arm64/boot/dts/apple/t8122-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122-pmgr.dtsi
@@ -1004,7 +1004,6 @@ ps_disp_cpu: power-controller@10000 {
};
&pmgr_mini {
-
ps_debug_gated: power-controller@0 {
compatible = "apple,t8122-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
reg = <0x0 4>;
diff --git a/arch/arm64/boot/dts/apple/t8122.dtsi b/arch/arm64/boot/dts/apple/t8122.dtsi
index 1ee61c5b3409..de09989c5663 100644
--- a/arch/arm64/boot/dts/apple/t8122.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122.dtsi
@@ -29,12 +29,15 @@ cluster0 {
core0 {
cpu = <&cpu_e0>;
};
+
core1 {
cpu = <&cpu_e1>;
};
+
core2 {
cpu = <&cpu_e2>;
};
+
core3 {
cpu = <&cpu_e3>;
};
@@ -44,12 +47,15 @@ cluster1 {
core0 {
cpu = <&cpu_p0>;
};
+
core1 {
cpu = <&cpu_p1>;
};
+
core2 {
cpu = <&cpu_p2>;
};
+
core3 {
cpu = <&cpu_p3>;
};
@@ -197,6 +203,7 @@ i2c0: i2c@2a1010000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c0>;
+
status = "disabled";
};
@@ -211,6 +218,7 @@ i2c1: i2c@2a1014000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c1>;
+
status = "disabled";
};
@@ -225,6 +233,7 @@ i2c2: i2c@2a1018000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c2>;
+
status = "disabled";
};
@@ -239,6 +248,7 @@ i2c3: i2c@2a101c000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c3>;
+
status = "disabled";
};
@@ -253,6 +263,7 @@ i2c4: i2c@2a1020000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
power-domains = <&ps_i2c4>;
+
status = "disabled";
};
@@ -262,6 +273,7 @@ fpwm1: pwm@2a1044000 {
power-domains = <&ps_fpwm1>;
clocks = <&clkref>;
#pwm-cells = <2>;
+
status = "disabled";
};
@@ -278,6 +290,7 @@ serial0: serial@2a1200000 {
clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
power-domains = <&ps_uart0>;
+
status = "disabled";
};
@@ -356,7 +369,6 @@ i2c4_pins: i2c4-pins {
pinmux = <APPLE_PINMUX(149, 1)>,
<APPLE_PINMUX(148, 1)>;
};
-
};
pinctrl_nub: pinctrl@2e41f0000 {
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 03/13] arm64: dts: apple: t603x: Fix child-name-order dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
2026-09-09 10:26 ` [PATCH 01/13] arm64: dts: apple: t603x: Fix all blank line dt-style-check issues Janne Grunau
2026-09-09 10:26 ` [PATCH 02/13] arm64: dts: apple: t8122: Fix blank line related " Janne Grunau
@ 2026-09-09 10:26 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 04/13] arm64: dts: apple: t8122: " Janne Grunau
` (9 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:26 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Reorder child nodes by name to fix dt-style-check warnings.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6030.dtsi | 34 +++++++++++++++----------------
arch/arm64/boot/dts/apple/t6031-base.dtsi | 26 +++++++++++------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6030.dtsi b/arch/arm64/boot/dts/apple/t6030.dtsi
index 0bfa8db59db4..0b5824c9f1bf 100644
--- a/arch/arm64/boot/dts/apple/t6030.dtsi
+++ b/arch/arm64/boot/dts/apple/t6030.dtsi
@@ -15,6 +15,13 @@ / {
#address-cells = <2>;
#size-cells = <2>;
+ clkref: clock-ref {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <24000000>;
+ clock-output-names = "clkref";
+ };
+
cpus {
#address-cells = <2>;
#size-cells = <0>;
@@ -220,23 +227,6 @@ l2_cache_1: l2-cache-1 {
};
};
- timer {
- compatible = "arm,armv8-timer";
- interrupt-parent = <&aic>;
- interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
- interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
- <AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
- <AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
- <AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
- };
-
- clkref: clock-ref {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <24000000>;
- clock-output-names = "clkref";
- };
-
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
@@ -537,6 +527,16 @@ pinctrl_aop: pinctrl@374824000 {
#interrupt-cells = <2>;
};
};
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupt-parent = <&aic>;
+ interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
+ interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
+ };
};
#include "t6030-pmgr.dtsi"
diff --git a/arch/arm64/boot/dts/apple/t6031-base.dtsi b/arch/arm64/boot/dts/apple/t6031-base.dtsi
index 6df3be68d740..667f32e9e606 100644
--- a/arch/arm64/boot/dts/apple/t6031-base.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-base.dtsi
@@ -11,6 +11,13 @@ / {
#address-cells = <2>;
#size-cells = <2>;
+ clkref: clock-ref {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <24000000>;
+ clock-output-names = "clkref";
+ };
+
cpus {
#address-cells = <2>;
#size-cells = <0>;
@@ -285,6 +292,12 @@ l2_cache_2: l2-cache-2 {
};
};
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ };
+
timer {
compatible = "arm,armv8-timer";
interrupt-parent = <&aic>;
@@ -294,17 +307,4 @@ timer {
<AIC_FIQ 0 AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ 0 AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
};
-
- clkref: clock-ref {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <24000000>;
- clock-output-names = "clkref";
- };
-
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
- };
};
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 04/13] arm64: dts: apple: t8122: Fix child-name-order dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (2 preceding siblings ...)
2026-09-09 10:26 ` [PATCH 03/13] arm64: dts: apple: t603x: Fix child-name-order " Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 05/13] arm64: dts: apple: t8122: Fix child-address-order " Janne Grunau
` (8 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Reorder child nodes by name to fix dt-style-check warnings.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8122.dtsi | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8122.dtsi b/arch/arm64/boot/dts/apple/t8122.dtsi
index de09989c5663..481f68a570ec 100644
--- a/arch/arm64/boot/dts/apple/t8122.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122.dtsi
@@ -20,6 +20,13 @@ / {
#address-cells = <2>;
#size-cells = <2>;
+ clkref: clock-ref {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <24000000>;
+ clock-output-names = "clkref";
+ };
+
cpus {
#address-cells = <2>;
#size-cells = <0>;
@@ -165,23 +172,6 @@ l2_cache_1: l2-cache-1 {
};
};
- timer {
- compatible = "arm,armv8-timer";
- interrupt-parent = <&aic>;
- interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
- interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
- <AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
- <AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
- <AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
- };
-
- clkref: clock-ref {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <24000000>;
- clock-output-names = "clkref";
- };
-
soc {
compatible = "simple-bus";
#address-cells = <2>;
@@ -451,6 +441,16 @@ pinctrl_aop: pinctrl@2f4824000 {
<AIC_IRQ 352 IRQ_TYPE_LEVEL_HIGH>;
};
};
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupt-parent = <&aic>;
+ interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
+ interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
+ };
};
#include "t8122-pmgr.dtsi"
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 05/13] arm64: dts: apple: t8122: Fix child-address-order dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (3 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 04/13] arm64: dts: apple: t8122: " Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 06/13] arm64: dts: apple: t6031: Fix continuation alignment Janne Grunau
` (7 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Reorder device nodes in the soc node by their unit address.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8122.dtsi | 60 ++++++++++++++++++------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8122.dtsi b/arch/arm64/boot/dts/apple/t8122.dtsi
index 481f68a570ec..3c7677079a29 100644
--- a/arch/arm64/boot/dts/apple/t8122.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122.dtsi
@@ -284,36 +284,6 @@ serial0: serial@2a1200000 {
status = "disabled";
};
- aic: interrupt-controller@2d1000000 {
- compatible = "apple,t8122-aic3";
- #interrupt-cells = <3>;
- interrupt-controller;
- reg = <0x2 0xd1000000 0x0 0x184000>,
- <0x2 0xd1040000 0x0 0x4>;
- reg-names = "core", "event";
- power-domains = <&ps_aic>;
-
- affinities {
- e-core-pmu-affinity {
- apple,fiq-index = <AIC_CPU_PMU_E>;
- cpus = <&cpu_e0 &cpu_e1 &cpu_e2 &cpu_e3>;
- };
-
- p-core-pmu-affinity {
- apple,fiq-index = <AIC_CPU_PMU_P>;
- cpus = <&cpu_p0 &cpu_p1 &cpu_p2 &cpu_p3>;
- };
- };
- };
-
- pmgr: power-management@2d0700000 {
- compatible = "apple,t8122-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
- #address-cells = <1>;
- #size-cells = <1>;
- reg = <0x2 0xd0700000 0 0x14000>;
- /* child nodes are added in t8122-pmgr.dtsi */
- };
-
pinctrl_ap: pinctrl@2c7100000 {
compatible = "apple,t8122-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xc7100000 0x0 0x100000>;
@@ -361,6 +331,36 @@ i2c4_pins: i2c4-pins {
};
};
+ pmgr: power-management@2d0700000 {
+ compatible = "apple,t8122-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x2 0xd0700000 0 0x14000>;
+ /* child nodes are added in t8122-pmgr.dtsi */
+ };
+
+ aic: interrupt-controller@2d1000000 {
+ compatible = "apple,t8122-aic3";
+ #interrupt-cells = <3>;
+ interrupt-controller;
+ reg = <0x2 0xd1000000 0x0 0x184000>,
+ <0x2 0xd1040000 0x0 0x4>;
+ reg-names = "core", "event";
+ power-domains = <&ps_aic>;
+
+ affinities {
+ e-core-pmu-affinity {
+ apple,fiq-index = <AIC_CPU_PMU_E>;
+ cpus = <&cpu_e0 &cpu_e1 &cpu_e2 &cpu_e3>;
+ };
+
+ p-core-pmu-affinity {
+ apple,fiq-index = <AIC_CPU_PMU_P>;
+ cpus = <&cpu_p0 &cpu_p1 &cpu_p2 &cpu_p3>;
+ };
+ };
+ };
+
pinctrl_nub: pinctrl@2e41f0000 {
compatible = "apple,t8122-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xe41f0000 0x0 0x4000>;
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 06/13] arm64: dts: apple: t6031: Fix continuation alignment
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (4 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 05/13] arm64: dts: apple: t8122: Fix child-address-order " Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 07/13] arm64: dts: apple: t8122: " Janne Grunau
` (6 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Align multi-line properties exactly to "<" of the previous value.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6031-die0.dtsi | 12 ++++-----
arch/arm64/boot/dts/apple/t6031-dieX.dtsi | 36 +++++++++++++-------------
arch/arm64/boot/dts/apple/t6031-gpio-pins.dtsi | 18 ++++++-------
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6031-die0.dtsi b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
index 932c97579f99..57f44f1fbe6e 100644
--- a/arch/arm64/boot/dts/apple/t6031-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
@@ -39,12 +39,12 @@ pinctrl_smc: pinctrl@2a4820000 {
#interrupt-cells = <2>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 904 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 905 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 906 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 907 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 908 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 909 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 910 IRQ_TYPE_LEVEL_HIGH>;
+ <AIC_IRQ 0 905 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 0 906 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 0 907 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 0 908 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 0 909 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 0 910 IRQ_TYPE_LEVEL_HIGH>;
};
i2c0: i2c@391010000 {
diff --git a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
index 524a72f5483e..01fe459259a4 100644
--- a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
@@ -37,12 +37,12 @@ DIE_NODE(pinctrl_nub): pinctrl@2a01f0000 {
#interrupt-cells = <2>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 710 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 711 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 712 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 713 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 714 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 715 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 716 IRQ_TYPE_LEVEL_HIGH>;
+ <AIC_IRQ DIE_NO 711 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 712 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 713 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 714 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 715 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 716 IRQ_TYPE_LEVEL_HIGH>;
};
DIE_NODE(pmgr_mini): power-management@2a0280000 {
@@ -66,12 +66,12 @@ DIE_NODE(pinctrl_aop): pinctrl@2a8824000 {
#interrupt-cells = <2>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 595 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 596 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 597 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 598 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 599 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 600 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 601 IRQ_TYPE_LEVEL_HIGH>;
+ <AIC_IRQ DIE_NO 596 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 597 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 598 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 599 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 600 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 601 IRQ_TYPE_LEVEL_HIGH>;
};
DIE_NODE(pinctrl_ap): pinctrl@2b3000000 {
@@ -80,12 +80,12 @@ DIE_NODE(pinctrl_ap): pinctrl@2b3000000 {
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 458 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 459 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 460 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 461 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 462 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 463 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ DIE_NO 464 IRQ_TYPE_LEVEL_HIGH>;
+ <AIC_IRQ DIE_NO 459 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 460 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 461 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 462 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 463 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ DIE_NO 464 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkref>;
power-domains = <&DIE_NODE(ps_gpio)>;
diff --git a/arch/arm64/boot/dts/apple/t6031-gpio-pins.dtsi b/arch/arm64/boot/dts/apple/t6031-gpio-pins.dtsi
index 5e4727e357d2..0c0d09964e69 100644
--- a/arch/arm64/boot/dts/apple/t6031-gpio-pins.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-gpio-pins.dtsi
@@ -8,46 +8,46 @@
&pinctrl_ap {
i2c0_pins: i2c0-pins {
pinmux = <APPLE_PINMUX(56, 1)>,
- <APPLE_PINMUX(57, 1)>;
+ <APPLE_PINMUX(57, 1)>;
};
i2c1_pins: i2c1-pins {
pinmux = <APPLE_PINMUX(58, 1)>,
- <APPLE_PINMUX(59, 1)>;
+ <APPLE_PINMUX(59, 1)>;
};
i2c2_pins: i2c2-pins {
pinmux = <APPLE_PINMUX(60, 1)>,
- <APPLE_PINMUX(61, 1)>;
+ <APPLE_PINMUX(61, 1)>;
};
i2c3_pins: i2c3-pins {
pinmux = <APPLE_PINMUX(62, 1)>,
- <APPLE_PINMUX(63, 1)>;
+ <APPLE_PINMUX(63, 1)>;
};
i2c4_pins: i2c4-pins {
pinmux = <APPLE_PINMUX(64, 1)>,
- <APPLE_PINMUX(65, 1)>;
+ <APPLE_PINMUX(65, 1)>;
};
i2c5_pins: i2c5-pins {
pinmux = <APPLE_PINMUX(66, 1)>,
- <APPLE_PINMUX(67, 1)>;
+ <APPLE_PINMUX(67, 1)>;
};
i2c6_pins: i2c6-pins {
pinmux = <APPLE_PINMUX(68, 1)>,
- <APPLE_PINMUX(69, 1)>;
+ <APPLE_PINMUX(69, 1)>;
};
i2c7_pins: i2c7-pins {
pinmux = <APPLE_PINMUX(70, 1)>,
- <APPLE_PINMUX(71, 1)>;
+ <APPLE_PINMUX(71, 1)>;
};
i2c8_pins: i2c8-pins {
pinmux = <APPLE_PINMUX(72, 1)>,
- <APPLE_PINMUX(73, 1)>;
+ <APPLE_PINMUX(73, 1)>;
};
};
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 07/13] arm64: dts: apple: t8122: Fix continuation alignment
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (5 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 06/13] arm64: dts: apple: t6031: Fix continuation alignment Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 08/13] arm64: dts: apple: t6030: Fix most property-order dt-style-check issues Janne Grunau
` (5 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Align multi-line properties exactly to "<" of the previous value.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8122.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/apple/t8122.dtsi b/arch/arm64/boot/dts/apple/t8122.dtsi
index 3c7677079a29..cf9cd0781fde 100644
--- a/arch/arm64/boot/dts/apple/t8122.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122.dtsi
@@ -344,7 +344,7 @@ aic: interrupt-controller@2d1000000 {
#interrupt-cells = <3>;
interrupt-controller;
reg = <0x2 0xd1000000 0x0 0x184000>,
- <0x2 0xd1040000 0x0 0x4>;
+ <0x2 0xd1040000 0x0 0x4>;
reg-names = "core", "event";
power-domains = <&ps_aic>;
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 08/13] arm64: dts: apple: t6030: Fix most property-order dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (6 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 07/13] arm64: dts: apple: t8122: " Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 09/13] arm64: dts: apple: t603[12]: " Janne Grunau
` (4 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
t6030-pmgr.dtsi is left unchanged because future additions or
modifications will be sparse.
Not fixed are
| [property-order] property 'd-cache-size' out of canonical order (should sort before 'enable-method')
for all CPU nodes to keep cache related properties together. A blank
line is added before 'd-cache-size' to attenuate this grouping for human
consumption.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6030.dtsi | 218 ++++++++++++++++++-----------------
1 file changed, 113 insertions(+), 105 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6030.dtsi b/arch/arm64/boot/dts/apple/t6030.dtsi
index 0b5824c9f1bf..71b75a59f695 100644
--- a/arch/arm64/boot/dts/apple/t6030.dtsi
+++ b/arch/arm64/boot/dts/apple/t6030.dtsi
@@ -81,179 +81,190 @@ core5 {
};
cpu_e00: cpu@0 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x0>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e01: cpu@1 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x1>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e02: cpu@2 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x2>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e03: cpu@3 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x3>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e04: cpu@4 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x4>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e05: cpu@5 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x5>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_p00: cpu@10100 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10100>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p01: cpu@10101 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10101>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p02: cpu@10102 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10102>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p03: cpu@10103 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10103>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p04: cpu@10104 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10104>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p05: cpu@10105 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10105>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
l2_cache_0: l2-cache-0 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x400000>;
+ cache-unified;
};
l2_cache_1: l2-cache-1 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x1000000>;
+ cache-unified;
};
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
};
soc: soc {
compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
-
ranges;
- nonposted-mmio;
+ #address-cells = <2>;
/* Required to get >32-bit DMA via DARTs */
dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;
+ nonposted-mmio;
+ #size-cells = <2>;
i2c1: i2c@289014000 {
compatible = "apple,t6030-i2c", "apple,t8103-i2c";
reg = <0x2 0x89014000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 890 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c1_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c1>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -261,14 +272,14 @@ i2c1: i2c@289014000 {
i2c2: i2c@289018000 {
compatible = "apple,t6030-i2c", "apple,t8103-i2c";
reg = <0x2 0x89018000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 891 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c2_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c2>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -276,14 +287,14 @@ i2c2: i2c@289018000 {
i2c3: i2c@28901c000 {
compatible = "apple,t6030-i2c", "apple,t8103-i2c";
reg = <0x2 0x8901c000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 892 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c3_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c3>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -291,14 +302,14 @@ i2c3: i2c@28901c000 {
i2c4: i2c@289020000 {
compatible = "apple,t6030-i2c", "apple,t8103-i2c";
reg = <0x2 0x89020000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 893 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c4_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c4>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -306,14 +317,14 @@ i2c4: i2c@289020000 {
i2c6: i2c@289028000 {
compatible = "apple,t6030-i2c", "apple,t8103-i2c";
reg = <0x2 0x89028000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 895 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c6_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c6>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -321,14 +332,14 @@ i2c6: i2c@289028000 {
i2c8: i2c@289030000 {
compatible = "apple,t6030-i2c", "apple,t8103-i2c";
reg = <0x2 0x89030000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 897 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c8_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c8>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -336,8 +347,8 @@ i2c8: i2c@289030000 {
fpwm0: pwm@289040000 {
compatible = "apple,t6030-fpwm", "apple,s5l-fpwm";
reg = <0x2 0x89040000 0x0 0x4000>;
- power-domains = <&ps_fpwm0>;
clocks = <&clkref>;
+ power-domains = <&ps_fpwm0>;
#pwm-cells = <2>;
status = "disabled";
@@ -346,26 +357,25 @@ fpwm0: pwm@289040000 {
serial0: serial@289200000 {
compatible = "apple,s5l-uart";
reg = <0x2 0x89200000 0x0 0x1000>;
- reg-io-width = <4>;
- interrupt-parent = <&aic>;
- interrupts = <AIC_IRQ 866 IRQ_TYPE_LEVEL_HIGH>;
/*
* TODO: figure out the clocking properly, there may
* be a third selectable clock.
*/
clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 866 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_uart0>;
+ reg-io-width = <4>;
status = "disabled";
};
pmgr_gfx: power-management@290e80000 {
compatible = "apple,t6030-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x2 0x90e80000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x2 0x90e80000 0 0x4000>;
/* child nodes are added in t6030-pmgr.dtsi */
};
@@ -373,6 +383,12 @@ pinctrl_ap: pinctrl@347100000 {
compatible = "apple,t6030-pinctrl", "apple,t8103-pinctrl";
reg = <0x3 0x47100000 0x0 0x4000>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pinctrl_ap 0 0 224>;
+
+ #interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>,
@@ -383,15 +399,8 @@ pinctrl_ap: pinctrl@347100000 {
<AIC_IRQ 279 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_gpio>;
-
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pinctrl_ap 0 0 224>;
apple,npins = <224>;
- interrupt-controller;
- #interrupt-cells = <2>;
-
i2c1_pins: i2c1-pins {
pinmux = <APPLE_PINMUX(37, 1)>,
<APPLE_PINMUX(36, 1)>;
@@ -425,21 +434,20 @@ i2c8_pins: i2c8-pins {
pmgr: power-management@350700000 {
compatible = "apple,t6030-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x3 0x50700000 0 0x14000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x3 0x50700000 0 0x14000>;
/* child nodes are added in t6030-pmgr.dtsi */
};
aic: interrupt-controller@351000000 {
compatible = "apple,t6030-aic3", "apple,t8122-aic3";
- #interrupt-cells = <3>;
- interrupt-controller;
-
reg = <0x3 0x51000000 0x0 0x184000>,
<0x3 0x51040000 0x0 0x4000>;
reg-names = "core", "event";
+
+ #interrupt-cells = <3>;
+ interrupt-controller;
power-domains = <&ps_aic>;
};
@@ -447,6 +455,12 @@ pinctrl_nub: pinctrl@3641f0000 {
compatible = "apple,t6030-pinctrl", "apple,t8103-pinctrl";
reg = <0x3 0x641f0000 0x0 0x4000>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pinctrl_nub 0 0 37>;
+
+ #interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 472 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 473 IRQ_TYPE_LEVEL_HIGH>,
@@ -456,21 +470,14 @@ pinctrl_nub: pinctrl@3641f0000 {
<AIC_IRQ 477 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 478 IRQ_TYPE_LEVEL_HIGH>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pinctrl_nub 0 0 37>;
apple,npins = <37>;
-
- interrupt-controller;
- #interrupt-cells = <2>;
};
pmgr_mini: power-management@364280000 {
compatible = "apple,t6030-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x3 0x64280000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x3 0x64280000 0 0x4000>;
/* child nodes are added in t6030-pmgr.dtsi */
};
@@ -486,13 +493,12 @@ pinctrl_smc: pinctrl@36c820000 {
compatible = "apple,t6030-pinctrl", "apple,t8103-pinctrl";
reg = <0x3 0x6c820000 0x0 0x4000>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&pinctrl_smc 0 0 18>;
- apple,npins = <18>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 545 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 546 IRQ_TYPE_LEVEL_HIGH>,
@@ -501,12 +507,22 @@ pinctrl_smc: pinctrl@36c820000 {
<AIC_IRQ 549 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 550 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 551 IRQ_TYPE_LEVEL_HIGH>;
+
+ apple,npins = <18>;
};
pinctrl_aop: pinctrl@374824000 {
compatible = "apple,t6030-pinctrl", "apple,t8103-pinctrl";
reg = <0x3 0x74824000 0x0 0x4000>;
+ clocks = <&clkref>;
+
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pinctrl_aop 0 0 54>;
+
+ #interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 394 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 395 IRQ_TYPE_LEVEL_HIGH>,
@@ -516,26 +532,18 @@ pinctrl_aop: pinctrl@374824000 {
<AIC_IRQ 399 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 400 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clkref>;
-
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pinctrl_aop 0 0 54>;
apple,npins = <54>;
-
- interrupt-controller;
- #interrupt-cells = <2>;
};
};
timer {
compatible = "arm,armv8-timer";
interrupt-parent = <&aic>;
- interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
};
};
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 09/13] arm64: dts: apple: t603[12]: Fix most property-order dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (7 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 08/13] arm64: dts: apple: t6030: Fix most property-order dt-style-check issues Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 10/13] arm64: dts: apple: t8122: " Janne Grunau
` (3 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
t6031-pmgr.dtsi is left unchanged because future additions or
modifications will be sparse.
Not fixed are
| [property-order] property 'd-cache-size' out of canonical order (should sort before 'enable-method')
for all CPU nodes to keep cache related properties together. A blank
line is added before 'd-cache-size' to attenuate this grouping for human
consumption.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6031-base.dtsi | 154 ++++++++++++-----------
arch/arm64/boot/dts/apple/t6031-die0.dtsi | 39 +++---
arch/arm64/boot/dts/apple/t6031-dieX.dtsi | 44 ++++---
arch/arm64/boot/dts/apple/t6031.dtsi | 7 +-
arch/arm64/boot/dts/apple/t6032-j575d.dts | 2 +-
arch/arm64/boot/dts/apple/t6032.dtsi | 162 ++++++++++++++-----------
arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi | 8 +-
7 files changed, 223 insertions(+), 193 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6031-base.dtsi b/arch/arm64/boot/dts/apple/t6031-base.dtsi
index 667f32e9e606..f62ce0690182 100644
--- a/arch/arm64/boot/dts/apple/t6031-base.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-base.dtsi
@@ -95,216 +95,232 @@ core5 {
};
cpu_e00: cpu@0 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x0>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e01: cpu@1 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x1>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e02: cpu@2 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x2>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e03: cpu@3 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x3>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_p00: cpu@10100 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10100>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p01: cpu@10101 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10101>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p02: cpu@10102 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10102>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p03: cpu@10103 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10103>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p04: cpu@10104 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10104>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p05: cpu@10105 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10105>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p10: cpu@10200 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10200>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_2>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_2>;
};
cpu_p11: cpu@10201 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10201>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_2>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_2>;
};
cpu_p12: cpu@10202 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10202>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_2>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_2>;
};
cpu_p13: cpu@10203 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10203>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_2>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_2>;
};
cpu_p14: cpu@10204 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10204>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_2>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_2>;
};
cpu_p15: cpu@10205 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10205>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_2>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_2>;
};
l2_cache_0: l2-cache-0 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x400000>;
+ cache-unified;
};
l2_cache_1: l2-cache-1 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x1000000>;
+ cache-unified;
};
l2_cache_2: l2-cache-2 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x1000000>;
+ cache-unified;
};
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
};
timer {
compatible = "arm,armv8-timer";
interrupt-parent = <&aic>;
- interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
interrupts = <AIC_FIQ 0 AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ 0 AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ 0 AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ 0 AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
};
};
diff --git a/arch/arm64/boot/dts/apple/t6031-die0.dtsi b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
index 57f44f1fbe6e..b14443436e26 100644
--- a/arch/arm64/boot/dts/apple/t6031-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
@@ -9,12 +9,12 @@
&SOC_NODE {
aic: interrupt-controller@292400000 {
compatible = "apple,t6031-aic3", "apple,t8122-aic3";
- #interrupt-cells = <4>;
- interrupt-controller;
-
reg = <0x00000002 0x92400000 0x00000000 0x1cc000>,
<0x00000002 0x92440000 0x00000000 0x4000>;
reg-names = "core", "event";
+
+ #interrupt-cells = <4>;
+ interrupt-controller;
power-domains = <&ps_aic>;
};
@@ -30,13 +30,12 @@ pinctrl_smc: pinctrl@2a4820000 {
compatible = "apple,t6031-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xa4820000 0x0 0x4000>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&pinctrl_smc 0 0 30>;
- apple,npins = <30>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 904 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 905 IRQ_TYPE_LEVEL_HIGH>,
@@ -45,31 +44,33 @@ pinctrl_smc: pinctrl@2a4820000 {
<AIC_IRQ 0 908 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 909 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 910 IRQ_TYPE_LEVEL_HIGH>;
+
+ apple,npins = <30>;
};
i2c0: i2c@391010000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91010000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1326 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c0_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c0>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
};
i2c1: i2c@391014000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91014000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1327 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c1_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c1>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -78,13 +79,13 @@ i2c1: i2c@391014000 {
i2c2: i2c@391018000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91018000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1328 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c2_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c2>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -93,13 +94,13 @@ i2c2: i2c@391018000 {
i2c3: i2c@39101c000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x9101c000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1329 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c3_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c3>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -108,13 +109,13 @@ i2c3: i2c@39101c000 {
i2c4: i2c@391020000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91020000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1330 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c4_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c4>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -123,13 +124,13 @@ i2c4: i2c@391020000 {
i2c5: i2c@391024000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91024000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1331 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c5_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c5>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -138,13 +139,13 @@ i2c5: i2c@391024000 {
i2c6: i2c@391028000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91028000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1332 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c6_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c6>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -153,13 +154,13 @@ i2c6: i2c@391028000 {
i2c7: i2c@39102c000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x9102c000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1333 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c7_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c7>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -168,13 +169,13 @@ i2c7: i2c@39102c000 {
i2c8: i2c@391030000 {
compatible = "apple,t6031-i2c", "apple,t8103-i2c";
reg = <0x3 0x91030000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1334 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c8_pins>;
pinctrl-names = "default";
power-domains = <&ps_i2c8>;
- #address-cells = <0x1>;
#size-cells = <0x0>;
status = "disabled";
@@ -183,8 +184,8 @@ i2c8: i2c@391030000 {
fpwm0: pwm@391040000 {
compatible = "apple,t6031-fpwm", "apple,s5l-fpwm";
reg = <0x3 0x91040000 0x0 0x4000>;
- power-domains = <&ps_fpwm0>;
clocks = <&clkref>;
+ power-domains = <&ps_fpwm0>;
#pwm-cells = <2>;
status = "disabled";
@@ -193,16 +194,16 @@ fpwm0: pwm@391040000 {
serial0: serial@391200000 {
compatible = "apple,s5l-uart";
reg = <0x3 0x91200000 0x0 0x4000>;
- reg-io-width = <4>;
- interrupt-parent = <&aic>;
- interrupts = <AIC_IRQ 0 1303 IRQ_TYPE_LEVEL_HIGH>;
/*
* TODO: figure out the clocking properly, there may
* be a third selectable clock.
*/
clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 0 1303 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_uart0>;
+ reg-io-width = <4>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
index 01fe459259a4..bd73d691f0d8 100644
--- a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
@@ -9,32 +9,28 @@
&SOC_NODE {
DIE_NODE(pmgr): power-management@292280000 {
compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x2 0x92280000 0 0xc000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x2 0x92280000 0 0xc000>;
};
DIE_NODE(pmgr1): power-management@292800000 {
compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x2 0x92800000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x2 0x92800000 0 0x4000>;
};
DIE_NODE(pinctrl_nub): pinctrl@2a01f0000 {
compatible = "apple,t6031-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xa01f0000 0x0 0x4000>;
- power-domains = <&DIE_NODE(ps_nub_gpio)>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&DIE_NODE(pinctrl_nub) 0 0 59>;
- apple,npins = <59>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 710 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 711 IRQ_TYPE_LEVEL_HIGH>,
@@ -43,27 +39,28 @@ DIE_NODE(pinctrl_nub): pinctrl@2a01f0000 {
<AIC_IRQ DIE_NO 714 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 715 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 716 IRQ_TYPE_LEVEL_HIGH>;
+
+ power-domains = <&DIE_NODE(ps_nub_gpio)>;
+ apple,npins = <59>;
};
DIE_NODE(pmgr_mini): power-management@2a0280000 {
compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x2 0xa0280000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x2 0xa0280000 0 0x4000>;
};
DIE_NODE(pinctrl_aop): pinctrl@2a8824000 {
compatible = "apple,t6031-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xa8824000 0x0 0x4000>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&DIE_NODE(pinctrl_aop) 0 0 102>;
- apple,npins = <102>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 595 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 596 IRQ_TYPE_LEVEL_HIGH>,
@@ -72,12 +69,22 @@ DIE_NODE(pinctrl_aop): pinctrl@2a8824000 {
<AIC_IRQ DIE_NO 599 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 600 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 601 IRQ_TYPE_LEVEL_HIGH>;
+
+ apple,npins = <102>;
};
DIE_NODE(pinctrl_ap): pinctrl@2b3000000 {
compatible = "apple,t6031-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xb3000000 0x0 0x4000>;
+ clocks = <&clkref>;
+
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&DIE_NODE(pinctrl_ap) 0 0 200>;
+
+ #interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 458 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 459 IRQ_TYPE_LEVEL_HIGH>,
@@ -87,23 +94,14 @@ DIE_NODE(pinctrl_ap): pinctrl@2b3000000 {
<AIC_IRQ DIE_NO 463 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 464 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clkref>;
power-domains = <&DIE_NODE(ps_gpio)>;
-
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&DIE_NODE(pinctrl_ap) 0 0 200>;
apple,npins = <200>;
-
- interrupt-controller;
- #interrupt-cells = <2>;
};
DIE_NODE(pmgr_gfx): power-management@408e80000 {
compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x4 0x8e80000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
-
- reg = <0x4 0x8e80000 0 0x4000>;
};
};
diff --git a/arch/arm64/boot/dts/apple/t6031.dtsi b/arch/arm64/boot/dts/apple/t6031.dtsi
index 2ba0768c33bc..a2aa64ea9db9 100644
--- a/arch/arm64/boot/dts/apple/t6031.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031.dtsi
@@ -21,13 +21,12 @@ / {
soc: soc {
compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
-
ranges;
- nonposted-mmio;
+ #address-cells = <2>;
/* Required to get >32-bit DMA via DARTs */
dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;
+ nonposted-mmio;
+ #size-cells = <2>;
// filled via templated includes at the end of the file
};
diff --git a/arch/arm64/boot/dts/apple/t6032-j575d.dts b/arch/arm64/boot/dts/apple/t6032-j575d.dts
index 71f4a00e1b1c..1c4a0fc9bd6f 100644
--- a/arch/arm64/boot/dts/apple/t6032-j575d.dts
+++ b/arch/arm64/boot/dts/apple/t6032-j575d.dts
@@ -20,9 +20,9 @@ aliases {
};
chosen {
+ ranges;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
stdout-path = "serial0";
diff --git a/arch/arm64/boot/dts/apple/t6032.dtsi b/arch/arm64/boot/dts/apple/t6032.dtsi
index aa48f2483fbb..efe56d2a9a79 100644
--- a/arch/arm64/boot/dts/apple/t6032.dtsi
+++ b/arch/arm64/boot/dts/apple/t6032.dtsi
@@ -101,228 +101,244 @@ core5 {
};
cpu_e10: cpu@800 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x800>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_3>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_3>;
};
cpu_e11: cpu@801 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x801>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_3>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_3>;
};
cpu_e12: cpu@802 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x802>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_3>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_3>;
};
cpu_e13: cpu@803 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x803>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* to be filled by loader */
- next-level-cache = <&l2_cache_3>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_3>;
};
cpu_p20: cpu@10900 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10900>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_4>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_4>;
};
cpu_p21: cpu@10901 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10901>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_4>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_4>;
};
cpu_p22: cpu@10902 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10902>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_4>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_4>;
};
cpu_p23: cpu@10903 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10903>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_4>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_4>;
};
cpu_p24: cpu@10904 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10904>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_4>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_4>;
};
cpu_p25: cpu@10905 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10905>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_4>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_4>;
};
cpu_p30: cpu@10a00 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10a00>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_5>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_5>;
};
cpu_p31: cpu@10a01 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10a01>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_5>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_5>;
};
cpu_p32: cpu@10a02 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10a02>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_5>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_5>;
};
cpu_p33: cpu@10a03 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10a03>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_5>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_5>;
};
cpu_p34: cpu@10a04 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10a04>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_5>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_5>;
};
cpu_p35: cpu@10a05 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10a05>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_5>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_5>;
};
l2_cache_3: l2-cache-3 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x400000>;
+ cache-unified;
};
l2_cache_4: l2-cache-4 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x1000000>;
+ cache-unified;
};
l2_cache_5: l2-cache-5 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x1000000>;
+ cache-unified;
};
};
die0: soc@200000000 {
compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
ranges = <0x02 0x00000000 0x02 0x00000000 0x4 0x00000000>,
<0x05 0x80000000 0x05 0x80000000 0x1 0x80000000>,
<0x07 0x00000000 0x07 0x00000000 0xf 0x80000000>,
<0x16 0x80000000 0x16 0x80000000 0x5 0x80000000>;
- nonposted-mmio;
+ #address-cells = <2>;
/* Required to get >32-bit DMA via DARTs */
dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;
+ nonposted-mmio;
+ #size-cells = <2>;
// filled via templated includes at the end of the file
};
die1: soc@2200000000 {
compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
ranges = <0x02 0x00000000 0x22 0x00000000 0x4 0x00000000>,
<0x07 0x00000000 0x27 0x00000000 0xf 0x80000000>,
<0x16 0x80000000 0x36 0x80000000 0x5 0x80000000>;
- nonposted-mmio;
+ #address-cells = <2>;
/* Required to get >32-bit DMA via DARTs */
dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;
+ nonposted-mmio;
+ #size-cells = <2>;
// filled via templated includes at the end of the file
};
diff --git a/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi b/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
index 3ac8a2f0723b..c9af6103487a 100644
--- a/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
+++ b/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
@@ -25,9 +25,9 @@ aliases {
};
chosen {
+ ranges;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
stdout-path = "serial0";
@@ -50,11 +50,11 @@ led-controller {
compatible = "pwm-leds";
led-0 {
- pwms = <&fpwm0 0 40000>;
- function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
- max-brightness = <255>;
default-state = "keep";
+ function = LED_FUNCTION_KBD_BACKLIGHT;
+ max-brightness = <255>;
+ pwms = <&fpwm0 0 40000>;
};
};
};
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 10/13] arm64: dts: apple: t8122: Fix most property-order dt-style-check issues
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (8 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 09/13] arm64: dts: apple: t603[12]: " Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-13 8:57 ` Sven Peter
2026-09-09 10:27 ` [PATCH 11/13] arm64: dts: apple: t6032-j575d: Remove unused "framebuffer0" label Janne Grunau
` (2 subsequent siblings)
12 siblings, 1 reply; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
t8122-pmgr.dtsi is left unchanged because future additions or
modifications will be sparse.
Not fixed are
| [property-order] property 'd-cache-size' out of canonical order (should sort before 'enable-method')
for all CPU nodes to keep cache related properties together. A blank
line is added before 'd-cache-size' to attenuate this grouping for human
consumption.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8122-j504.dts | 8 +-
arch/arm64/boot/dts/apple/t8122-j613.dts | 8 +-
arch/arm64/boot/dts/apple/t8122-j615.dts | 8 +-
arch/arm64/boot/dts/apple/t8122-jxxx.dtsi | 4 +-
arch/arm64/boot/dts/apple/t8122.dtsi | 158 ++++++++++++++++--------------
5 files changed, 99 insertions(+), 87 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8122-j504.dts b/arch/arm64/boot/dts/apple/t8122-j504.dts
index d9e8016e84a2..e60ec3039196 100644
--- a/arch/arm64/boot/dts/apple/t8122-j504.dts
+++ b/arch/arm64/boot/dts/apple/t8122-j504.dts
@@ -22,12 +22,12 @@ led-controller {
compatible = "pwm-leds";
led-0 {
- pwms = <&fpwm1 0 40000>;
- label = "kbd_backlight";
- function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
- max-brightness = <255>;
default-state = "keep";
+ function = LED_FUNCTION_KBD_BACKLIGHT;
+ label = "kbd_backlight";
+ max-brightness = <255>;
+ pwms = <&fpwm1 0 40000>;
};
};
};
diff --git a/arch/arm64/boot/dts/apple/t8122-j613.dts b/arch/arm64/boot/dts/apple/t8122-j613.dts
index 127a4c2d8577..40274a983849 100644
--- a/arch/arm64/boot/dts/apple/t8122-j613.dts
+++ b/arch/arm64/boot/dts/apple/t8122-j613.dts
@@ -21,12 +21,12 @@ led-controller {
compatible = "pwm-leds";
led-0 {
- pwms = <&fpwm1 0 40000>;
- label = "kbd_backlight";
- function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
- max-brightness = <255>;
default-state = "keep";
+ function = LED_FUNCTION_KBD_BACKLIGHT;
+ label = "kbd_backlight";
+ max-brightness = <255>;
+ pwms = <&fpwm1 0 40000>;
};
};
};
diff --git a/arch/arm64/boot/dts/apple/t8122-j615.dts b/arch/arm64/boot/dts/apple/t8122-j615.dts
index 9ef7791e2f32..61833f6d019b 100644
--- a/arch/arm64/boot/dts/apple/t8122-j615.dts
+++ b/arch/arm64/boot/dts/apple/t8122-j615.dts
@@ -21,12 +21,12 @@ led-controller {
compatible = "pwm-leds";
led-0 {
- pwms = <&fpwm1 0 40000>;
- label = "kbd_backlight";
- function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
- max-brightness = <255>;
default-state = "keep";
+ function = LED_FUNCTION_KBD_BACKLIGHT;
+ label = "kbd_backlight";
+ max-brightness = <255>;
+ pwms = <&fpwm1 0 40000>;
};
};
};
diff --git a/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
index b9576e4164a3..2dbdb77d5413 100644
--- a/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
@@ -15,9 +15,9 @@ aliases {
};
chosen {
+ ranges;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
stdout-path = "serial0";
@@ -32,9 +32,9 @@ framebuffer0: framebuffer@0 {
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
/* To be filled by loader */
};
diff --git a/arch/arm64/boot/dts/apple/t8122.dtsi b/arch/arm64/boot/dts/apple/t8122.dtsi
index cf9cd0781fde..5e79de6fece8 100644
--- a/arch/arm64/boot/dts/apple/t8122.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122.dtsi
@@ -70,129 +70,137 @@ core3 {
};
cpu_e0: cpu@0 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x0>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e1: cpu@1 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x1>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e2: cpu@2 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x2>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_e3: cpu@3 {
- compatible = "apple,sawtooth";
device_type = "cpu";
+ compatible = "apple,sawtooth";
reg = <0x0 0x3>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_0>;
- i-cache-size = <0x20000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x10000>;
+ i-cache-size = <0x20000>;
+ next-level-cache = <&l2_cache_0>;
};
cpu_p0: cpu@10100 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10100>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p1: cpu@10101 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10101>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p2: cpu@10102 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10102>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
cpu_p3: cpu@10103 {
- compatible = "apple,everest";
device_type = "cpu";
+ compatible = "apple,everest";
reg = <0x0 0x10103>;
- enable-method = "spin-table";
cpu-release-addr = <0 0>; /* To be filled by loader */
- next-level-cache = <&l2_cache_1>;
- i-cache-size = <0x30000>;
+ enable-method = "spin-table";
+
d-cache-size = <0x20000>;
+ i-cache-size = <0x30000>;
+ next-level-cache = <&l2_cache_1>;
};
l2_cache_0: l2-cache-0 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x400000>;
+ cache-unified;
};
l2_cache_1: l2-cache-1 {
compatible = "cache";
cache-level = <2>;
- cache-unified;
cache-size = <0x1000000>;
+ cache-unified;
};
};
soc {
compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
-
ranges;
- nonposted-mmio;
+ #address-cells = <2>;
+
/* Required to get >32-bit DMA via DARTs */
dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;
+ nonposted-mmio;
+ #size-cells = <2>;
i2c0: i2c@2a1010000 {
compatible = "apple,t8122-i2c", "apple,t8103-i2c";
reg = <0x2 0xa1010000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 780 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c0_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c0>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -200,14 +208,14 @@ i2c0: i2c@2a1010000 {
i2c1: i2c@2a1014000 {
compatible = "apple,t8122-i2c", "apple,t8103-i2c";
reg = <0x2 0xa1014000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 781 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c1_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c1>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -215,14 +223,14 @@ i2c1: i2c@2a1014000 {
i2c2: i2c@2a1018000 {
compatible = "apple,t8122-i2c", "apple,t8103-i2c";
reg = <0x2 0xa1018000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 782 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c2_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c2>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -230,14 +238,14 @@ i2c2: i2c@2a1018000 {
i2c3: i2c@2a101c000 {
compatible = "apple,t8122-i2c", "apple,t8103-i2c";
reg = <0x2 0xa101c000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 783 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c3_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c3>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -245,14 +253,14 @@ i2c3: i2c@2a101c000 {
i2c4: i2c@2a1020000 {
compatible = "apple,t8122-i2c", "apple,t8103-i2c";
reg = <0x2 0xa1020000 0x0 0x4000>;
+ #address-cells = <0x1>;
clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 784 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c4_pins>;
pinctrl-names = "default";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
power-domains = <&ps_i2c4>;
+ #size-cells = <0x0>;
status = "disabled";
};
@@ -260,8 +268,8 @@ i2c4: i2c@2a1020000 {
fpwm1: pwm@2a1044000 {
compatible = "apple,t8122-fpwm", "apple,s5l-fpwm";
reg = <0x2 0xa1044000 0x0 0x4000>;
- power-domains = <&ps_fpwm1>;
clocks = <&clkref>;
+ power-domains = <&ps_fpwm1>;
#pwm-cells = <2>;
status = "disabled";
@@ -270,16 +278,16 @@ fpwm1: pwm@2a1044000 {
serial0: serial@2a1200000 {
compatible = "apple,s5l-uart";
reg = <0x2 0xa1200000 0x0 0x1000>;
- reg-io-width = <4>;
+ clocks = <&clkref>, <&clkref>;
+ clock-names = "uart", "clk_uart_baud0";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 757 IRQ_TYPE_LEVEL_HIGH>;
/*
* TODO: figure out the clocking properly, there may
* be a third selectable clock.
*/
- clocks = <&clkref>, <&clkref>;
- clock-names = "uart", "clk_uart_baud0";
power-domains = <&ps_uart0>;
+ reg-io-width = <4>;
status = "disabled";
};
@@ -287,15 +295,13 @@ serial0: serial@2a1200000 {
pinctrl_ap: pinctrl@2c7100000 {
compatible = "apple,t8122-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xc7100000 0x0 0x100000>;
- power-domains = <&ps_gpio>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&pinctrl_ap 0 0 224>;
- apple,npins = <224>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 241 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 242 IRQ_TYPE_LEVEL_HIGH>,
@@ -305,6 +311,9 @@ pinctrl_ap: pinctrl@2c7100000 {
<AIC_IRQ 246 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 247 IRQ_TYPE_LEVEL_HIGH>;
+ power-domains = <&ps_gpio>;
+ apple,npins = <224>;
+
i2c0_pins: i2c0-pins {
pinmux = <APPLE_PINMUX(145, 1)>,
<APPLE_PINMUX(144, 1)>;
@@ -333,30 +342,30 @@ i2c4_pins: i2c4-pins {
pmgr: power-management@2d0700000 {
compatible = "apple,t8122-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x2 0xd0700000 0 0x14000>;
#address-cells = <1>;
#size-cells = <1>;
- reg = <0x2 0xd0700000 0 0x14000>;
/* child nodes are added in t8122-pmgr.dtsi */
};
aic: interrupt-controller@2d1000000 {
compatible = "apple,t8122-aic3";
- #interrupt-cells = <3>;
- interrupt-controller;
reg = <0x2 0xd1000000 0x0 0x184000>,
<0x2 0xd1040000 0x0 0x4>;
reg-names = "core", "event";
+ #interrupt-cells = <3>;
+ interrupt-controller;
power-domains = <&ps_aic>;
affinities {
e-core-pmu-affinity {
- apple,fiq-index = <AIC_CPU_PMU_E>;
cpus = <&cpu_e0 &cpu_e1 &cpu_e2 &cpu_e3>;
+ apple,fiq-index = <AIC_CPU_PMU_E>;
};
p-core-pmu-affinity {
- apple,fiq-index = <AIC_CPU_PMU_P>;
cpus = <&cpu_p0 &cpu_p1 &cpu_p2 &cpu_p3>;
+ apple,fiq-index = <AIC_CPU_PMU_P>;
};
};
};
@@ -364,15 +373,13 @@ p-core-pmu-affinity {
pinctrl_nub: pinctrl@2e41f0000 {
compatible = "apple,t8122-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xe41f0000 0x0 0x4000>;
- power-domains = <&ps_nub_gpio>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&pinctrl_nub 0 0 32>;
- apple,npins = <32>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 424 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 425 IRQ_TYPE_LEVEL_HIGH>,
@@ -381,13 +388,16 @@ pinctrl_nub: pinctrl@2e41f0000 {
<AIC_IRQ 428 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 429 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 430 IRQ_TYPE_LEVEL_HIGH>;
+
+ power-domains = <&ps_nub_gpio>;
+ apple,npins = <32>;
};
pmgr_mini: power-management@2e4280000 {
compatible = "apple,t8122-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ reg = <0x2 0xe4280000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
- reg = <0x2 0xe4280000 0 0x4000>;
/* child nodes are added in t8122-pmgr.dtsi */
};
@@ -403,13 +413,12 @@ pinctrl_smc: pinctrl@2ec820000 {
compatible = "apple,t8122-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xec820000 0x0 0x4000>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&pinctrl_smc 0 0 18>;
- apple,npins = <18>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 493 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 494 IRQ_TYPE_LEVEL_HIGH>,
@@ -418,19 +427,20 @@ pinctrl_smc: pinctrl@2ec820000 {
<AIC_IRQ 497 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 498 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 499 IRQ_TYPE_LEVEL_HIGH>;
+
+ apple,npins = <18>;
};
pinctrl_aop: pinctrl@2f4824000 {
compatible = "apple,t8122-pinctrl", "apple,t8103-pinctrl";
reg = <0x2 0xf4824000 0x0 0x4000>;
- gpio-controller;
#gpio-cells = <2>;
+ gpio-controller;
gpio-ranges = <&pinctrl_aop 0 0 54>;
- apple,npins = <54>;
- interrupt-controller;
#interrupt-cells = <2>;
+ interrupt-controller;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 346 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 347 IRQ_TYPE_LEVEL_HIGH>,
@@ -439,17 +449,19 @@ pinctrl_aop: pinctrl@2f4824000 {
<AIC_IRQ 350 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 351 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 352 IRQ_TYPE_LEVEL_HIGH>;
+
+ apple,npins = <54>;
};
};
timer {
compatible = "arm,armv8-timer";
interrupt-parent = <&aic>;
- interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
<AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
};
};
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 10/13] arm64: dts: apple: t8122: Fix most property-order dt-style-check issues
2026-09-09 10:27 ` [PATCH 10/13] arm64: dts: apple: t8122: " Janne Grunau
@ 2026-09-13 8:57 ` Sven Peter
0 siblings, 0 replies; 15+ messages in thread
From: Sven Peter @ 2026-09-13 8:57 UTC (permalink / raw)
To: Janne Grunau
Cc: asahi, Conor Dooley, linux-arm-kernel, devicetree, linux-kernel,
Krzysztof Kozlowski, Neal Gompa, Rob Herring
Hi,
On 9/9/26 12:27, Janne Grunau wrote:
> t8122-pmgr.dtsi is left unchanged because future additions or
> modifications will be sparse.
>
> Not fixed are
>
> | [property-order] property 'd-cache-size' out of canonical order (should sort before 'enable-method')
>
> for all CPU nodes to keep cache related properties together. A blank
> line is added before 'd-cache-size' to attenuate this grouping for human
> consumption.
>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
[...]
>
> status = "disabled";
> @@ -270,16 +278,16 @@ fpwm1: pwm@2a1044000 {
> serial0: serial@2a1200000 {
> compatible = "apple,s5l-uart";
> reg = <0x2 0xa1200000 0x0 0x1000>;
> - reg-io-width = <4>;
> + clocks = <&clkref>, <&clkref>;
> + clock-names = "uart", "clk_uart_baud0";
> interrupt-parent = <&aic>;
> interrupts = <AIC_IRQ 757 IRQ_TYPE_LEVEL_HIGH>;
> /*
> * TODO: figure out the clocking properly, there may
> * be a third selectable clock.
> */
> - clocks = <&clkref>, <&clkref>;
> - clock-names = "uart", "clk_uart_baud0";
Please also move the comment so that it stays together with clocks = ...;
Sven
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 11/13] arm64: dts: apple: t6032-j575d: Remove unused "framebuffer0" label
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (9 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 10/13] arm64: dts: apple: t8122: " Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 12/13] arm64: dts: apple: t603x: Break overly long lines Janne Grunau
2026-09-09 10:27 ` [PATCH 13/13] arm64: dts: apple: t8122: " Janne Grunau
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Fixes "[unused-labels] label 'framebuffer0' defined but never
&-referenced" dt-style-check strict mode warning.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6032-j575d.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/apple/t6032-j575d.dts b/arch/arm64/boot/dts/apple/t6032-j575d.dts
index 1c4a0fc9bd6f..e83fdb5d8c86 100644
--- a/arch/arm64/boot/dts/apple/t6032-j575d.dts
+++ b/arch/arm64/boot/dts/apple/t6032-j575d.dts
@@ -26,7 +26,7 @@ chosen {
stdout-path = "serial0";
- framebuffer0: framebuffer@0 {
+ framebuffer@0 {
compatible = "apple,simple-framebuffer", "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
/* Format properties will be added by loader */
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 12/13] arm64: dts: apple: t603x: Break overly long lines
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (10 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 11/13] arm64: dts: apple: t6032-j575d: Remove unused "framebuffer0" label Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
2026-09-09 10:27 ` [PATCH 13/13] arm64: dts: apple: t8122: " Janne Grunau
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Fixes "[line-length] line exceeds 80 columns (N)" dt-style-check issue
with N > 84.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6030.dtsi | 9 ++++++---
arch/arm64/boot/dts/apple/t6031-dieX.dtsi | 12 ++++++++----
arch/arm64/boot/dts/apple/t6032-j575d.dts | 3 ++-
arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi | 3 ++-
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6030.dtsi b/arch/arm64/boot/dts/apple/t6030.dtsi
index 71b75a59f695..524e532830e2 100644
--- a/arch/arm64/boot/dts/apple/t6030.dtsi
+++ b/arch/arm64/boot/dts/apple/t6030.dtsi
@@ -372,7 +372,8 @@ serial0: serial@289200000 {
};
pmgr_gfx: power-management@290e80000 {
- compatible = "apple,t6030-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6030-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x2 0x90e80000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -433,7 +434,8 @@ i2c8_pins: i2c8-pins {
};
pmgr: power-management@350700000 {
- compatible = "apple,t6030-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6030-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x3 0x50700000 0 0x14000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -474,7 +476,8 @@ pinctrl_nub: pinctrl@3641f0000 {
};
pmgr_mini: power-management@364280000 {
- compatible = "apple,t6030-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6030-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x3 0x64280000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
index bd73d691f0d8..1624651c1d92 100644
--- a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
@@ -8,14 +8,16 @@
&SOC_NODE {
DIE_NODE(pmgr): power-management@292280000 {
- compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6031-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x2 0x92280000 0 0xc000>;
#address-cells = <1>;
#size-cells = <1>;
};
DIE_NODE(pmgr1): power-management@292800000 {
- compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6031-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x2 0x92800000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -45,7 +47,8 @@ DIE_NODE(pinctrl_nub): pinctrl@2a01f0000 {
};
DIE_NODE(pmgr_mini): power-management@2a0280000 {
- compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6031-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x2 0xa0280000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -99,7 +102,8 @@ DIE_NODE(pinctrl_ap): pinctrl@2b3000000 {
};
DIE_NODE(pmgr_gfx): power-management@408e80000 {
- compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t6031-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x4 0x8e80000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/apple/t6032-j575d.dts b/arch/arm64/boot/dts/apple/t6032-j575d.dts
index e83fdb5d8c86..12991546d4bb 100644
--- a/arch/arm64/boot/dts/apple/t6032-j575d.dts
+++ b/arch/arm64/boot/dts/apple/t6032-j575d.dts
@@ -27,7 +27,8 @@ chosen {
stdout-path = "serial0";
framebuffer@0 {
- compatible = "apple,simple-framebuffer", "simple-framebuffer";
+ compatible = "apple,simple-framebuffer",
+ "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
/* Format properties will be added by loader */
power-domains = <&ps_dispext0_cpu>;
diff --git a/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi b/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
index c9af6103487a..bbee373044f9 100644
--- a/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
+++ b/arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
@@ -32,7 +32,8 @@ chosen {
stdout-path = "serial0";
framebuffer0: framebuffer@0 {
- compatible = "apple,simple-framebuffer", "simple-framebuffer";
+ compatible = "apple,simple-framebuffer",
+ "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
/* Format properties will be added by loader */
power-domains = <&ps_disp_fe>;
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 13/13] arm64: dts: apple: t8122: Break overly long lines
2026-09-09 10:26 [PATCH 00/13] dt-style-check strict fixes for Apple M3, M3 Pro/Max/Ultra Janne Grunau
` (11 preceding siblings ...)
2026-09-09 10:27 ` [PATCH 12/13] arm64: dts: apple: t603x: Break overly long lines Janne Grunau
@ 2026-09-09 10:27 ` Janne Grunau
12 siblings, 0 replies; 15+ messages in thread
From: Janne Grunau @ 2026-09-09 10:27 UTC (permalink / raw)
To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
Fixes "[line-length] line exceeds 80 columns (N)" dt-style-check issue
with N > 84.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8122.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8122.dtsi b/arch/arm64/boot/dts/apple/t8122.dtsi
index 5e79de6fece8..1b4a67172332 100644
--- a/arch/arm64/boot/dts/apple/t8122.dtsi
+++ b/arch/arm64/boot/dts/apple/t8122.dtsi
@@ -341,7 +341,8 @@ i2c4_pins: i2c4-pins {
};
pmgr: power-management@2d0700000 {
- compatible = "apple,t8122-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t8122-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x2 0xd0700000 0 0x14000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -394,7 +395,8 @@ pinctrl_nub: pinctrl@2e41f0000 {
};
pmgr_mini: power-management@2e4280000 {
- compatible = "apple,t8122-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
+ compatible = "apple,t8122-pmgr", "apple,t8103-pmgr",
+ "syscon", "simple-mfd";
reg = <0x2 0xe4280000 0 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
--
2.55.0
^ permalink raw reply [flat|nested] 15+ messages in thread