Extend nvmem patternProperties and then fix W=1 warnings in Apple dts
Subsystems (3)
Sven Peter
maintainercover Extend nvmem patternProperties and then fix W=1 warnings in Apple dts
Hi,
This brief series fixes a W=1 warning recently introduced with the Apple Silicon PMIC NVMEM nodes. We have cells that are the same bytes but a different bit offset and these currently result in the same node name. The legcy layout already allows to specify the bit offset in the name as a suffix but this isn't possible in the new fixed-layout.
Thus first adjust the fixed-layout cell patternProperties to the same pattern as the legacy one and then fix the node names in our device tree files.
Best,
Sven
---
Sven Peter (2):
dt-bindings: nvmem: fixed-layout: Allow optional bit positions
arm64: dts: apple: Add bit offset to PMIC NVMEM node names
Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml | 2 +- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 6 +++--- arch/arm64/boot/dts/apple/t8103.dtsi | 6 +++--- arch/arm64/boot/dts/apple/t8112.dtsi | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-)
---
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
change-id: 20250523-nvmem-bit-pattern-1dbc39fe4681
Best regards,
Signature · 1 line
Sven Peter <[email protected]>
Sven Peter
maintainerPATCH 1/2 dt-bindings: nvmem: fixed-layout: Allow optional bit positions
NVMEM nodes can optionally include the bits property to specify the bit position of the cell within a byte.
Extend patternProperties to allow adding the bit offset to the node address to be able to distinguish nodes with the same address but different bit positions, e.g.
trim@54,4 {
reg = <0x54 1>;
bits = <4 2>;
};
trim@54,0 {
reg = <0x54 1>;
bits = <0 4>;
};Before the conversion to NVMEM layouts in commit bd912c991d2e ("dt-bindings: nvmem: layouts: add fixed-layout") this extension was originally added with commit 4b2545dd19ed ("dt-bindings: nvmem: Extend patternProperties to optionally indicate bit position") to the now deprecated layout.
--- Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml +1 -1
@@ -27,7 +27,7 @@ properties: const: 1 patternProperties: - "@[a-f0-9]+$": + "@[a-f0-9]+(,[0-7])?$": type: object $ref: fixed-cell.yaml unevaluatedProperties: false
Signature · 1 line
2.34.1
Re: [PATCH 1/2] dt-bindings: nvmem: fixed-layout: Allow optional bit positions
Quoted 21 lines · Sven Peter
NVMEM nodes can optionally include the bits property to specify the bit position of the cell within a byte.
Extend patternProperties to allow adding the bit offset to the node address to be able to distinguish nodes with the same address but different bit positions, e.g.trim@54,4 { reg = <0x54 1>; bits = <4 2>; }; trim@54,0 { reg = <0x54 1>; bits = <0 4>; };Before the conversion to NVMEM layouts in commit
bd912c991d2e("dt-bindings: nvmem: layouts: add fixed-layout") this extension was originally added with commit4b2545dd19ed("dt-bindings: nvmem: Extend patternProperties to optionally indicate bit position") to the now deprecated layout.
Quoted 5 lines
Signed-off-by Sven Peter <[email protected]>--- Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Sven Peter
maintainerPATCH 2/2 arm64: dts: apple: Add bit offset to PMIC NVMEM node names
In reply to Sven PeterNow 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)
--- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 6 +++--- arch/arm64/boot/dts/apple/t8103.dtsi | 6 +++--- arch/arm64/boot/dts/apple/t8112.dtsi | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/apple/t600x-die0.dtsi +3 -3
@@ -72,12 +72,12 @@ boot_stage: boot-stage@6001 { 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 @@ boot_error_stage: boot-error-stage@6003 { reg = <0x6003 0x1>; }; - shutdown_flag: shutdown-flag@600f { + shutdown_flag: shutdown-flag@600f,3 { reg = <0x600f 0x1>; bits = <3 1>; };
arch/arm64/boot/dts/apple/t8103.dtsi +3 -3
@@ -761,12 +761,12 @@ boot_stage: boot-stage@9f01 { 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 @@ boot_error_stage: boot-error-stage@9f03 { reg = <0x9f03 0x1>; }; - shutdown_flag: shutdown-flag@9f0f { + shutdown_flag: shutdown-flag@9f0f,3 { reg = <0x9f0f 0x1>; bits = <3 1>; };
arch/arm64/boot/dts/apple/t8112.dtsi +3 -3
@@ -809,12 +809,12 @@ boot_stage: boot-stage@f701 { 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 @@ boot_error_stage: boot-error-stage@f703 { reg = <0xf703 0x1>; }; - shutdown_flag: shutdown-flag@f70f { + shutdown_flag: shutdown-flag@f70f,3 { reg = <0xf70f 0x1>; bits = <3 1>; };
Signature · 1 line
2.34.1
Re: (subset) [PATCH 0/2] Extend nvmem patternProperties and then fix W=1 warnings in Apple dts
In reply to Sven PeterQuoted 9 lines · Sven Peter
This brief series fixes a W=1 warning recently introduced with the Apple Silicon PMIC NVMEM nodes. We have cells that are the same bytes but a different bit offset and these currently result in the same node name. The legcy layout already allows to specify the bit offset in the name as a suffix but this isn't possible in the new fixed-layout.
Thus first adjust the fixed-layout cell patternProperties to the same pattern as the legacy one and then fix the node names in our device tree files.[...]
Applied, thanks!
[1/2] dt-bindings: nvmem: fixed-layout: Allow optional bit positions
commit: 6aa656ce94693c8712c004045375e2221b157659
Best regards,
Signature · 1 line
Srinivas Kandagatla <[email protected]>
Re: (subset) [PATCH 0/2] Extend nvmem patternProperties and then fix W=1 warnings in Apple dts
In reply to Sven PeterQuoted 9 lines · Sven Peter
This brief series fixes a W=1 warning recently introduced with the Apple Silicon PMIC NVMEM nodes. We have cells that are the same bytes but a different bit offset and these currently result in the same node name. The legcy layout already allows to specify the bit offset in the name as a suffix but this isn't possible in the new fixed-layout.
Thus first adjust the fixed-layout cell patternProperties to the same pattern as the legacy one and then fix the node names in our device tree files.[...]
Applied to [email protected]:AsahiLinux/linux.git (asahi-soc/for-next), thanks!
[2/2] arm64: dts: apple: Add bit offset to PMIC NVMEM node names
https://github.com/AsahiLinux/linux/commit/a622259af9eb
Best regards,
Signature · 1 line
Sven Peter <[email protected]>