Skip to content

Commit 6aaf36b

Browse files
committed
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: d8bf820 ("arm64: dts: apple: Add PMIC NVMEM") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sven Peter <[email protected]>
1 parent 19272b3 commit 6aaf36b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

arch/arm64/boot/dts/apple/t600x-die0.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
reg = <0x6001 0x1>;
7373
};
7474

75-
boot_error_count: boot-error-count@6002 {
75+
boot_error_count: boot-error-count@6002,0 {
7676
reg = <0x6002 0x1>;
7777
bits = <0 4>;
7878
};
7979

80-
panic_count: panic-count@6002 {
80+
panic_count: panic-count@6002,4 {
8181
reg = <0x6002 0x1>;
8282
bits = <4 4>;
8383
};
@@ -86,7 +86,7 @@
8686
reg = <0x6003 0x1>;
8787
};
8888

89-
shutdown_flag: shutdown-flag@600f {
89+
shutdown_flag: shutdown-flag@600f,3 {
9090
reg = <0x600f 0x1>;
9191
bits = <3 1>;
9292
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -761,12 +761,12 @@
761761
reg = <0x9f01 0x1>;
762762
};
763763

764-
boot_error_count: boot-error-count@9f02 {
764+
boot_error_count: boot-error-count@9f02,0 {
765765
reg = <0x9f02 0x1>;
766766
bits = <0 4>;
767767
};
768768

769-
panic_count: panic-count@9f02 {
769+
panic_count: panic-count@9f02,4 {
770770
reg = <0x9f02 0x1>;
771771
bits = <4 4>;
772772
};
@@ -775,7 +775,7 @@
775775
reg = <0x9f03 0x1>;
776776
};
777777

778-
shutdown_flag: shutdown-flag@9f0f {
778+
shutdown_flag: shutdown-flag@9f0f,3 {
779779
reg = <0x9f0f 0x1>;
780780
bits = <3 1>;
781781
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -809,12 +809,12 @@
809809
reg = <0xf701 0x1>;
810810
};
811811

812-
boot_error_count: boot-error-count@f702 {
812+
boot_error_count: boot-error-count@f702,0 {
813813
reg = <0xf702 0x1>;
814814
bits = <0 4>;
815815
};
816816

817-
panic_count: panic-count@f702 {
817+
panic_count: panic-count@f702,4 {
818818
reg = <0xf702 0x1>;
819819
bits = <4 4>;
820820
};
@@ -823,7 +823,7 @@
823823
reg = <0xf703 0x1>;
824824
};
825825

826-
shutdown_flag: shutdown-flag@f70f {
826+
shutdown_flag: shutdown-flag@f70f,3 {
827827
reg = <0xf70f 0x1>;
828828
bits = <3 1>;
829829
};

0 commit comments

Comments
 (0)