[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250610-nvmem-bit-pattern-v1-2-55ed5c1b369c@kernel.org>
Date: Tue, 10 Jun 2025 17:17:35 +0000
From: Sven Peter <sven@...nel.org>
To: Srinivas Kandagatla <srini@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Janne Grunau <j@...nau.net>,
Alyssa Rosenzweig <alyssa@...enzweig.io>, Neal Gompa <neal@...pa.dev>,
Hector Martin <marcan@...can.st>
Cc: devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Sasha Finkelstein <fnkl.kernel@...il.com>, asahi@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, Sven Peter <sven@...nel.org>
Subject: [PATCH 2/2] 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@...0d9300/pmic@...vmem-layout/boot-error-count@...2: duplicate unit-address (also used in node /soc/spmi@...0d9300/pmic@...vmem-layout/panic-count@...2)
Fixes: 14b7178a76e2 ("arm64: dts: apple: Add PMIC NVMEM")
Signed-off-by: Sven Peter <sven@...nel.org>
---
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(-)
diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 110bc6719512e334e04b496fb157cb4368679957..17ad9328baa14de66ff0f0fdf9e26b3f4a80524a 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -72,12 +72,12 @@ boot_stage: boot-stage@...1 {
reg = <0x6001 0x1>;
};
- boot_error_count: boot-error-count@...2 {
+ boot_error_count: boot-error-count@...2,0 {
reg = <0x6002 0x1>;
bits = <0 4>;
};
- panic_count: panic-count@...2 {
+ panic_count: panic-count@...2,4 {
reg = <0x6002 0x1>;
bits = <4 4>;
};
@@ -86,7 +86,7 @@ boot_error_stage: boot-error-stage@...3 {
reg = <0x6003 0x1>;
};
- shutdown_flag: shutdown-flag@...f {
+ shutdown_flag: shutdown-flag@...f,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
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -761,12 +761,12 @@ boot_stage: boot-stage@...1 {
reg = <0x9f01 0x1>;
};
- boot_error_count: boot-error-count@...2 {
+ boot_error_count: boot-error-count@...2,0 {
reg = <0x9f02 0x1>;
bits = <0 4>;
};
- panic_count: panic-count@...2 {
+ panic_count: panic-count@...2,4 {
reg = <0x9f02 0x1>;
bits = <4 4>;
};
@@ -775,7 +775,7 @@ boot_error_stage: boot-error-stage@...3 {
reg = <0x9f03 0x1>;
};
- shutdown_flag: shutdown-flag@...f {
+ shutdown_flag: shutdown-flag@...f,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
--- a/arch/arm64/boot/dts/apple/t8112.dtsi
+++ b/arch/arm64/boot/dts/apple/t8112.dtsi
@@ -809,12 +809,12 @@ boot_stage: boot-stage@...1 {
reg = <0xf701 0x1>;
};
- boot_error_count: boot-error-count@...2 {
+ boot_error_count: boot-error-count@...2,0 {
reg = <0xf702 0x1>;
bits = <0 4>;
};
- panic_count: panic-count@...2 {
+ panic_count: panic-count@...2,4 {
reg = <0xf702 0x1>;
bits = <4 4>;
};
@@ -823,7 +823,7 @@ boot_error_stage: boot-error-stage@...3 {
reg = <0xf703 0x1>;
};
- shutdown_flag: shutdown-flag@...f {
+ shutdown_flag: shutdown-flag@...f,3 {
reg = <0xf70f 0x1>;
bits = <3 1>;
};
--
2.34.1
Powered by blists - more mailing lists