Devicetree
 help / color / mirror / Atom feed
* [PATCH v2] arm64: dts: qcom: glymur-crd: merge duplicate &pmh0101_gpios node extensions
@ 2026-06-02  9:48 Gopikrishna Garmidi
  2026-06-08  9:03 ` Konrad Dybcio
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Gopikrishna Garmidi @ 2026-06-02  9:48 UTC (permalink / raw)
  To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley, Dmitry Baryshkov, Pankaj Patil
  Cc: Sibi Sankar, Rajendra Nayak, linux-arm-msm, devicetree,
	linux-kernel, Gopikrishna Garmidi

The &pmh0101_gpios node is extended twice in glymur-crd.dtsi. The first
extension defines the nvme_reg_en pinctrl state for the NVMe regulator
enable GPIO (gpio14), and the second adds key_vol_up_default for the
volume-up key (gpio6).

Merge both pinctrl states into a single &pmh0101_gpios block to avoid
the duplicate node extension.

No functional change intended.

Fixes: a5ad8a8e473c ("arm64: dts: qcom: Commonize Glymur CRD DTSI")
Signed-off-by: Gopikrishna Garmidi <gopikrishna.garmidi@oss.qualcomm.com>
---
Changes in v2:
- Reorder nodes in alphabetical order
- Link to v1: https://lore.kernel.org/r/20260526-merge-duplicate-pmh0101-gpios-node-v1-1-c4ab4983f8be@oss.qualcomm.com
---
 arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
index e784b538f42e..782578a2c5ff 100644
--- a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
+++ b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
@@ -538,6 +538,13 @@ &pcie6_port0 {
 };
 
 &pmh0101_gpios {
+	key_vol_up_default: key-vol-up-default-state {
+		pins = "gpio6";
+		function = "normal";
+		output-disable;
+		bias-pull-up;
+	};
+
 	nvme_reg_en: nvme-reg-en-state {
 		pins = "gpio14";
 		function = "normal";
@@ -553,15 +560,6 @@ nvme_sec_reg_en: nvme-reg-en-state {
 	};
 };
 
-&pmh0101_gpios {
-	key_vol_up_default: key-vol-up-default-state {
-		pins = "gpio6";
-		function = "normal";
-		output-disable;
-		bias-pull-up;
-	};
-};
-
 &pmk8850_rtc {
 	qcom,no-alarm;
 };

---
base-commit: 08484c504b55a98bd100527fbe10a3caf55ff3ff
change-id: 20260526-merge-duplicate-pmh0101-gpios-node-52eaf99f8485

Best regards,
-- 
Gopikrishna Garmidi <gopikrishna.garmidi@oss.qualcomm.com>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-07-11 16:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-02  9:48 [PATCH v2] arm64: dts: qcom: glymur-crd: merge duplicate &pmh0101_gpios node extensions Gopikrishna Garmidi
2026-06-08  9:03 ` Konrad Dybcio
2026-06-23 11:22 ` Pankaj Patil
2026-07-11 16:40 ` Bjorn Andersson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox