arm64: dts: apple: Add bit offset to PMIC NVMEM node names

Now that the dt-binding has been extended to allow indicating the bit
position the following warning about a duplicate unit address with W=1
can be fixed:

arch/arm64/boot/dts/apple/t8103.dtsi:764.46-767.8: Warning (unique_unit_address_if_enabled): /soc/spmi@23d0d9300/pmic@f/nvmem-layout/boot-error-count@9f02: duplicate unit-address (also used in node /soc/spmi@23d0d9300/pmic@f/nvmem-layout/panic-count@9f02)

Fixes: d8bf82081c9e ("arm64: dts: apple: Add PMIC NVMEM")
Link: https://lore.kernel.org/r/20250610-nvmem-bit-pattern-v1-2-55ed5c1b369c@kernel.org
Signed-off-by: Sven Peter <sven@kernel.org>

diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 110bc6719512e334e04b496fb157cb4368679957..17ad9328baa14de66ff0f0fdf9e26b3f4a80524a 100644 (file)
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -72,12 +72,12 @@
                                        reg = <0x6001 0x1>;
                                };
 
-                               boot_error_count: boot-error-count@6002 {
+                               boot_error_count: boot-error-count@6002,0 {
                                        reg = <0x6002 0x1>;
                                        bits = <0 4>;
                                };
 
-                               panic_count: panic-count@6002 {
+                               panic_count: panic-count@6002,4 {
                                        reg = <0x6002 0x1>;
                                        bits = <4 4>;
                                };
@@ -86,7 +86,7 @@
                                        reg = <0x6003 0x1>;
                                };
 
-                               shutdown_flag: shutdown-flag@600f {
+                               shutdown_flag: shutdown-flag@600f,3 {
                                        reg = <0x600f 0x1>;
                                        bits = <3 1>;
                                };

diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 20faf0c0d80927b2e18dd966a61b5507b322c72f..76bab19f99c89d5c0a025fb313b53bac1f703bc9 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -761,12 +761,12 @@
                                                reg = <0x9f01 0x1>;
                                        };
 
-                                       boot_error_count: boot-error-count@9f02 {
+                                       boot_error_count: boot-error-count@9f02,0 {
                                                reg = <0x9f02 0x1>;
                                                bits = <0 4>;
                                        };
 
-                                       panic_count: panic-count@9f02 {
+                                       panic_count: panic-count@9f02,4 {
                                                reg = <0x9f02 0x1>;
                                                bits = <4 4>;
                                        };
@@ -775,7 +775,7 @@
                                                reg = <0x9f03 0x1>;
                                        };
 
-                                       shutdown_flag: shutdown-flag@9f0f {
+                                       shutdown_flag: shutdown-flag@9f0f,3 {
                                                reg = <0x9f0f 0x1>;
                                                bits = <3 1>;
                                        };

diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi
index e95711d8337f6cea898e88a3d564caf2c4f94404..a27e2312b0c73d5352a80dd050c7b314786add4a 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8112.dtsi
+++ b/arch/arm64/boot/dts/apple/t8112.dtsi
@@ -809,12 +809,12 @@
                                                reg = <0xf701 0x1>;
                                        };
 
-                                       boot_error_count: boot-error-count@f702 {
+                                       boot_error_count: boot-error-count@f702,0 {
                                                reg = <0xf702 0x1>;
                                                bits = <0 4>;
                                        };
 
-                                       panic_count: panic-count@f702 {
+                                       panic_count: panic-count@f702,4 {
                                                reg = <0xf702 0x1>;
                                                bits = <4 4>;
                                        };
@@ -823,7 +823,7 @@
                                                reg = <0xf703 0x1>;
                                        };
 
-                                       shutdown_flag: shutdown-flag@f70f {
+                                       shutdown_flag: shutdown-flag@f70f,3 {
                                                reg = <0xf70f 0x1>;
                                                bits = <3 1>;
                                        };