ARM: dts: qcom: msm8660-surf: use keypad label directly

Directly use pm8058_keypad to declare keypad properties instead of
referencing pm8058 top-level 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-5-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
index be18f1be29a17c2b4f90565afd12bbd756011acd..86fbb6dfdc2a1c7ccfb3f8f839bdf6dfb26c537e 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
@@ -34,32 +34,30 @@
        status = "okay";
 };
 
-&pm8058 {
-       keypad@148 {
-               linux,keymap = <
-                       MATRIX_KEY(0, 0, KEY_FN_F1)
-                       MATRIX_KEY(0, 1, KEY_UP)
-                       MATRIX_KEY(0, 2, KEY_LEFT)
-                       MATRIX_KEY(0, 3, KEY_VOLUMEUP)
-                       MATRIX_KEY(1, 0, KEY_FN_F2)
-                       MATRIX_KEY(1, 1, KEY_RIGHT)
-                       MATRIX_KEY(1, 2, KEY_DOWN)
-                       MATRIX_KEY(1, 3, KEY_VOLUMEDOWN)
-                       MATRIX_KEY(2, 3, KEY_ENTER)
-                       MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS)
-                       MATRIX_KEY(4, 1, KEY_UP)
-                       MATRIX_KEY(4, 2, KEY_LEFT)
-                       MATRIX_KEY(4, 3, KEY_HOME)
-                       MATRIX_KEY(4, 4, KEY_FN_F3)
-                       MATRIX_KEY(5, 0, KEY_CAMERA)
-                       MATRIX_KEY(5, 1, KEY_RIGHT)
-                       MATRIX_KEY(5, 2, KEY_DOWN)
-                       MATRIX_KEY(5, 3, KEY_BACK)
-                       MATRIX_KEY(5, 4, KEY_MENU)
-                       >;
-               keypad,num-rows = <6>;
-               keypad,num-columns = <5>;
-       };
+&pm8058_keypad {
+       linux,keymap = <
+               MATRIX_KEY(0, 0, KEY_FN_F1)
+               MATRIX_KEY(0, 1, KEY_UP)
+               MATRIX_KEY(0, 2, KEY_LEFT)
+               MATRIX_KEY(0, 3, KEY_VOLUMEUP)
+               MATRIX_KEY(1, 0, KEY_FN_F2)
+               MATRIX_KEY(1, 1, KEY_RIGHT)
+               MATRIX_KEY(1, 2, KEY_DOWN)
+               MATRIX_KEY(1, 3, KEY_VOLUMEDOWN)
+               MATRIX_KEY(2, 3, KEY_ENTER)
+               MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS)
+               MATRIX_KEY(4, 1, KEY_UP)
+               MATRIX_KEY(4, 2, KEY_LEFT)
+               MATRIX_KEY(4, 3, KEY_HOME)
+               MATRIX_KEY(4, 4, KEY_FN_F3)
+               MATRIX_KEY(5, 0, KEY_CAMERA)
+               MATRIX_KEY(5, 1, KEY_RIGHT)
+               MATRIX_KEY(5, 2, KEY_DOWN)
+               MATRIX_KEY(5, 3, KEY_BACK)
+               MATRIX_KEY(5, 4, KEY_MENU)
+               >;
+       keypad,num-rows = <6>;
+       keypad,num-columns = <5>;
 };
 
 /* eMMC */