From patchwork Thu Sep 28 11:02:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 727708 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 09533CE7B1F for ; Thu, 28 Sep 2023 11:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231676AbjI1LDS (ORCPT ); Thu, 28 Sep 2023 07:03:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231770AbjI1LDQ (ORCPT ); Thu, 28 Sep 2023 07:03:16 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E76419D for ; Thu, 28 Sep 2023 04:03:14 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-503397ee920so20297148e87.1 for ; Thu, 28 Sep 2023 04:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695898992; x=1696503792; darn=vger.kernel.org; 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=PLGjVH2QWxag2sLOYzAGk/+jOpB8mgK5Otm+Mn7CeccL8IYQg05iSw7L5GzCa4RXxM nvh6e5NjpZYNMyzJRu9le+sXtNrdmLf0ux2yUl+V9gqEH0/Cc67TKFrpcZL9jHrQNs5q eLlOQP6uMWcbZ+KFv/VLT5irECgnI5cofEDKaR+zFu1VdlyzDdSiLbNgkzocaMjbgcZK N7fZdglDefyawujpQiBLDS6+2HbmZLQWP1z0PgvdwAiAykInwlC6t9CyquJ0RXFCntU6 DI91RRZGDvL4+cloCiLav15f+xhyoQNMQB7fofAWNEJaYyr9xkSXoT+SO8sBy3+8Q40k q/WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695898992; x=1696503792; 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=I/sh8/Ad6zQdghUYDMe8Siru4SLxj1Bz3y6ywUJ+tIapds23vF9JKuZmJ6qJ2mC3o0 KBafngDHwh3cef6c0BaXj33sPoFRCuGIYu5lbfC5tsxr87bOoqcMfjfvzSHGM8Der3kd fZK+lZWgC1af4iSpLRt0spuu0a2IgqFeMFHw1gYzkoPFA6SnjHQUWPPkBCCUg3o3Fd15 P2rBlOT+alZK5A9arDS3pWk5EltgBwfe5ISPwLVy9zd2ZFPr9JP58AJNyXtP2notVRGo nijeR81VGcpPVx/KYlwCCeRDU84VvoGb/slrKei4379FtfOt6cEibUlZuPwoNmA9WMJS hmWQ== X-Gm-Message-State: AOJu0YwdazcjWele8YJaZHRWxndYD1cfw2tdbEARmX4OhNaRTQ4rMWrH ZH1SZOvRsnvdzfg/h+uqOvsWiw== X-Google-Smtp-Source: AGHT+IHNrn2EtnUKBrXbRiybzq8QCMr4nO/YDKdfTDD9zcnzAwHsVUeR/ROIkM9JHMYx9P4tlQ/GCQ== X-Received: by 2002:a19:8c47:0:b0:500:9524:f733 with SMTP id i7-20020a198c47000000b005009524f733mr801481lfj.20.1695898992533; Thu, 28 Sep 2023 04:03:12 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u2-20020a056512040200b005030a35019dsm3052953lfk.178.2023.09.28.04.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:03:11 -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 v6 03/36] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Date: Thu, 28 Sep 2023 14:02:36 +0300 Message-Id: <20230928110309.1212221-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230928110309.1212221-1-dmitry.baryshkov@linaro.org> References: <20230928110309.1212221-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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>;