ARM: dts: qcom: msm8960: introduce label for PMIC keypad

To simplify MSM8960 CDP board file, add label to PMIC keypad node.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230928110309.1212221-4-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 6c1bc3818883ca34f014e02e1c13e8c08ae717e8..4641b4f2195dcfd272581625b61b2105960edbe3 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -88,17 +88,15 @@
        };
 };
 
-&pmicintc {
-       keypad@148 {
-               linux,keymap = <
-                       MATRIX_KEY(0, 0, KEY_VOLUMEUP)
-                       MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
-                       MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
-                       MATRIX_KEY(0, 3, KEY_CAMERA)
-                       >;
-               keypad,num-rows = <1>;
-               keypad,num-columns = <5>;
-       };
+&pm8921_keypad {
+       linux,keymap = <
+               MATRIX_KEY(0, 0, KEY_VOLUMEUP)
+               MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
+               MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
+               MATRIX_KEY(0, 3, KEY_CAMERA)
+               >;
+       keypad,num-rows = <1>;
+       keypad,num-columns = <5>;
 };
 
 &rpm {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index d13080fcbeea222c149f6fdafc253a258668593d..a34fda93d6a4bc7a9bb4f783ee911cc44b1e7baf 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -283,7 +283,7 @@
                                        pull-up;
                                };
 
-                               keypad@148 {
+                               pm8921_keypad: keypad@148 {
                                        compatible = "qcom,pm8921-keypad";
                                        reg = <0x148>;
                                        interrupt-parent = <&pmicintc>;