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>