On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> To simplify MSM8960 CDP board file, add label to PMIC keypad node.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 20 +++++++++-----------
> arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 2 +-
> 2 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
> index 6c1bc3818883..4641b4f2195d 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
> @@ -88,17 +88,15 @@ clk-pins {
> };
> };
>
> -&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 fa2013388d99..913bc6afd0a1 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> @@ -283,7 +283,7 @@ pwrkey@1c {
> pull-up;
> };
>
> - keypad@148 {
> + pm8921_keypad: keypad@148 {
> compatible = "qcom,pm8921-keypad";
> reg = <0x148>;
> interrupt-parent = <&pmicintc>;
