From patchwork Tue Jun 27 01:24:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 697518 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 5B514EB64DD for ; Tue, 27 Jun 2023 01:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230121AbjF0BY3 (ORCPT ); Mon, 26 Jun 2023 21:24:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229789AbjF0BY2 (ORCPT ); Mon, 26 Jun 2023 21:24:28 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6A28199 for ; Mon, 26 Jun 2023 18:24:26 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-4fa48b5dc2eso3566895e87.1 for ; Mon, 26 Jun 2023 18:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687829065; x=1690421065; 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=JYkQHL6lry7VO64+ZtcbjdDVvh4boYbgCY+jGtA/4rk=; b=DoyF63ywVBuhSRpQulWP3wnhTnQD7TDCP2vV4H4tpNbOAJni5OtCqix99JxV2G59ms XBa8vwEFOuLEc82ZCCHAvzhsYiINtKVzTgFUuLvAQ8Dd1STX4eGaI31rV4eNxF2e2SUW TgdbP4dCysYJ/ILE1Vlo+ahNrARTPa8If3tatyWQKc6PLRY1VT2cl5SXSfDBtiq7yTil f85elHkoz2M+6NZJwZ/me6h49LbV3rdZr3Ro0fYxUzn3eCJvGRP82uuylIpmHy9GL4Vc 9wY3z/lzZ06Yy+rpoEkbTMQ6HPYwUGhe4kBMdYiLZ012BnumLt2rn+TmixH6WNNp7Vzt GAWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687829065; x=1690421065; 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=JYkQHL6lry7VO64+ZtcbjdDVvh4boYbgCY+jGtA/4rk=; b=a6GuGH3Ofm/xHn9z/B22ZEUaxPzwtlDB7H4rzMHNJbEOVWXiArTO+F3FU6793vF26T 8xrTHTh3bQWq84ZwlD+JqNvzxiAu3IoUEoxA98cj9z/a1mjMfCCR8e00FqtPk2ugxQrU EfE5VY97yYoqW0TARDkml/igcYpsSp+c6ZnOfXOVoNEgCbsyIDuieHIZBaXMGogoj1ff x/1nQZC5KDeDwBr1vm+DWgdqRtDxh0Is2VfCm4gHLaGrWuZaU7/vEg+5Dosr/ewWKWvU +goGOWSJ43Hfnsa0T7DxKWjgIysEvV0mp9BSd5DkDLf7D0CdXYZbz9QkAvAdYGzA2koi iU2Q== X-Gm-Message-State: AC+VfDwP6r5RyackZPgS+jgx5bOj1VScGlEaBZGPexthn8Hkl/T2Km// pJQ9iipah19qUrQNUyb1Tjo/9w== X-Google-Smtp-Source: ACHHUZ5jETTTNgbtu6aAIf3kgja4GidPVAcx9Or261fhIUwMsDJHi1nnXhEvfMupltAD2jTn3HqGdQ== X-Received: by 2002:a05:6512:3b06:b0:4fb:77d6:89c3 with SMTP id f6-20020a0565123b0600b004fb77d689c3mr2868253lfv.12.1687829065024; Mon, 26 Jun 2023 18:24:25 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id z7-20020ac24187000000b004cc9042c9cfsm1331301lfh.158.2023.06.26.18.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 18:24:24 -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 Subject: [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Date: Tue, 27 Jun 2023 04:24:09 +0300 Message-Id: <20230627012422.206077-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627012422.206077-1-dmitry.baryshkov@linaro.org> References: <20230627012422.206077-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org To simplify MSM8960 CDP board file, add label to PMIC keypad node. 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 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>;