On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> Directly use pm8058_keypad to declare keypad properties instead of
> referencing pm8058 top-level node.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
was this board some sort of a laptop?
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 50 ++++++++++----------
> 1 file changed, 24 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> index be18f1be29a1..86fbb6dfdc2a 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> @@ -34,32 +34,30 @@ &gsbi12_serial {
> 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 */
