From patchwork Tue Aug 22 00:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13359981 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E03EEE49A0 for ; Tue, 22 Aug 2023 00:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231695AbjHVAPR (ORCPT ); Mon, 21 Aug 2023 20:15:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231827AbjHVAOD (ORCPT ); Mon, 21 Aug 2023 20:14:03 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FB011A8 for ; Mon, 21 Aug 2023 17:13:57 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4ff09632194so5396414e87.2 for ; Mon, 21 Aug 2023 17:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692663235; x=1693268035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ii+ERiIP/+rN5/93TQF2YXZBm9/0F6AmtInKGYg6uG8=; b=X4vHwIj3OWCgBneAbXzCeie+I6fy8btM/pKM43CfnX5RCd84+Qpo+l27ESmO+yy361 fkDmCnCEPK48a7338v36s1llDT6lBQBPsVlBCbcWNYJqX7Ug9TWSW13PxD6IXHnxkVxC TeOxvmWIf7jNhzoHkXG756AHEVhKmFPs68fJKl7VqLXA7fKBEY1ZpjmchtJIhzJoF6zc 47bytSNidu6zJWxWKfxVAGIk3Y/VWgZoj1LuZJoXvBR22yzk2FDk5B+ihiqHDy67qAjE E+KJDdyc5ItUFd0qE1kQLGEZ8JU1GS/uCfH51ALIghrb5l6y4+7H9tYsZGoPmta6bLuM 2Riw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692663236; x=1693268036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ii+ERiIP/+rN5/93TQF2YXZBm9/0F6AmtInKGYg6uG8=; b=gxkNd/92I8vE5JSTv8KlGn/tVa1o5Ljv3pfdR5o8OZ6mXmc90sQ5ayr/nB3Kvyifzy n2BteMSWoDd9rtuNL0jsbb+JLnXmhSEEG5LGtuSkl5AYwMixkJO/IgwKLmD2qVKnUId2 xKNV3n9XZmM7dPvS2rLyufrdc9vJ7cHd0lbmLTdQhXivRek3R0W2YACLdqc3FgrFEbK+ My4JD7zl3XIJJz5QJKEu7t3CxXJCsvVboUN+ttGj6kSikBY/FpWJZxJkxmGTBzwdx80B 0Tz1TZUdZ49ZI9wXR6uaW7I2TaWXJmtq+UDCLMH5ftYB6LJuJNIVduBvm5gqrBp2CmqN /4kQ== X-Gm-Message-State: AOJu0Yz7tUBhnDBTikBVopLsYTZ4wV9BV1RYQYME+dyWsTYHqOPdbdXJ 3/v5qLRIXN7Ulhs3PBHGusGU+w== X-Google-Smtp-Source: AGHT+IEQB66ExTcrHYnGsEpRPJGoRv0XObQZt73ANLO9TENxuzX0KDWaLDo4ov/+MRkwY00vEV3Uig== X-Received: by 2002:a05:6512:1587:b0:4fd:d470:203b with SMTP id bp7-20020a056512158700b004fdd470203bmr7025196lfb.69.1692663235798; Mon, 21 Aug 2023 17:13:55 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id er23-20020a05651248d700b004fe36e673b8sm912024lfb.178.2023.08.21.17.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 17:13:55 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH v3 05/32] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Date: Tue, 22 Aug 2023 03:13:22 +0300 Message-Id: <20230822001349.899298-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230822001349.899298-1-dmitry.baryshkov@linaro.org> References: <20230822001349.899298-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org To simplify MSM8960 CDP board file, add label to PMIC keypad node. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- 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 d13080fcbeea..a34fda93d6a4 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>;