From patchwork Tue Aug 22 00:13:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13359953 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 80785EE49B1 for ; Tue, 22 Aug 2023 00:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231814AbjHVAOH (ORCPT ); Mon, 21 Aug 2023 20:14:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231809AbjHVAOD (ORCPT ); Mon, 21 Aug 2023 20:14:03 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22EE81AE for ; Mon, 21 Aug 2023 17:13:58 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4fe2d152f62so6007192e87.0 for ; Mon, 21 Aug 2023 17:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692663236; x=1693268036; 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=u1RH0IG0rrFXei9V7mpYpuNzaTfiQ9cfBSSJRkGF8B0=; b=rrH7Lol1mTFkJVOIltRlwt97X5qxIeAV7NVsdtqKeQzZMd+FrTNc9cX3ovrcMCXlpd HupnZH5lop3a5/SQY179h949woyQ3im+MzjUBY24N6baeZn5tdzMba/joLKC3b/P2ABu odsHZD1j0Sz8nLiMP7xCoDikIEZdmS86Th39INRJgk/cTGe0JW7b+Jn/pTsYdHhn2YkP 4AYpd+coc5o4OUV1+E6RO9I6TQw4sns4defb7EJImA4Q5rNc6MJ0dI1aGgrWKYATT3xq 9gQR7vqh5wG/0WQQOyBjkmSLy5DtlubZFamhN/7y+7irC9AhZC7RfH3qi0Z+oteJeTr9 T+yA== 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=u1RH0IG0rrFXei9V7mpYpuNzaTfiQ9cfBSSJRkGF8B0=; b=d+Pg1SaVnsuUfILex0sQ3ZwcPoOfEgXaqkFiLsKnmxqcXx38uDT3n3jMT1lG/IEV9R N4Z9LESDsbovqwGIPJywawJiqZvEnsJI+7I7JSobt/L++isCKS3/leuaMarmTvNtOBD1 KMpdhiNW/BPOsz2p3qUW7MfqQQMtcBDjWLddqMQhL43HdolD32CXSqzzOmhqJ+inbJDH Vf1Wg/q/MljqLG/iv/QyRPpan4cz3lS5/nvUJMlcW7Ww+yjnGevZhDqg0LiT5TuobPLY 9XprGmE9UW+fEccTrv8uDx6JIASB2yjNQqbKRY1MTCmyGubW8asopX0uZ5nOTKqX3dmI UACg== X-Gm-Message-State: AOJu0YzdwNo9jh30kPuFyw98GtOrM6NaO57pVt/mD1TansTCJsXqWgbO DcjC2Xbo6BRWP+dLLMfprW9a6g== X-Google-Smtp-Source: AGHT+IHfal53d5MKB3Q48On9jpc8+EQPQtVwfMXw8CV4DpQtHHb9M1TBxhiHLwkwJvlUQvYpFeE+Fw== X-Received: by 2002:ac2:499e:0:b0:4fb:9a1e:125c with SMTP id f30-20020ac2499e000000b004fb9a1e125cmr4625469lfl.45.1692663236498; Mon, 21 Aug 2023 17:13:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 17:13:56 -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 06/32] ARM: dts: qcom: msm8660-surf: use keypad label directly Date: Tue, 22 Aug 2023 03:13:23 +0300 Message-Id: <20230822001349.899298-7-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 Directly use pm8058_keypad to declare keypad properties instead of referencing pm8058 top-level node. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- 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 */