[PATCH 10/13] arm64: dts: apple: t8122: Fix most property-order dt-style-check issues
Janne Grunau
j at jannau.net
Wed Sep 9 03:27:06 PDT 2026
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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 2a1010000 {
i2c1: i2c at 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 at 2a1014000 {
i2c2: i2c at 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 at 2a1018000 {
i2c3: i2c at 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 at 2a101c000 {
i2c4: i2c at 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 at 2a1020000 {
fpwm1: pwm at 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 at 2a1044000 {
serial0: serial at 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 at 2a1200000 {
pinctrl_ap: pinctrl at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
More information about the linux-arm-kernel
mailing list