From patchwork Thu Sep 28 11:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 727215 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 A07FACE7B19 for ; Thu, 28 Sep 2023 11:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231770AbjI1LDS (ORCPT ); Thu, 28 Sep 2023 07:03:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231246AbjI1LDR (ORCPT ); Thu, 28 Sep 2023 07:03:17 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F1A9191 for ; Thu, 28 Sep 2023 04:03:15 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-50433d8385cso20015568e87.0 for ; Thu, 28 Sep 2023 04:03:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695898994; x=1696503794; 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=u1RH0IG0rrFXei9V7mpYpuNzaTfiQ9cfBSSJRkGF8B0=; b=hhvuaPH0t3P3kiBp0VgfoDBShes+t/Qmg9nO3txzmYdnUaYV7DzEL9UFbIhc/b6+l8 cMPi7qxbGFZL5VIZ3cWT22IgS76E7wHIn//Pr5SHVGMD9cyLD6aOufg01rT/i4vczSwT 8izhRGw2jUbExUPFPuuYXGX2CcWK4cgbldG5LcnhRSAEhjj+55SgDNABn2T4G7Wb4KDi AHf047rMipq5mxDpcbC0+ldGdkpKaU3/NyESwft9SOrnf0g1Q4ocohVrz5YMBMjww2lS U7g4MfwKZVJlEty6iVbuaM28BNQU1NCDdoNQaQ50YzoNt/pp8cTpYeUiG3b0BzOBvF63 xpOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695898994; x=1696503794; 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=kaZE4dNDkR9kcXpY9W6cW8opRfpJL7VNmcMy6V5KO+WldLM1GWGi5gaB6LIn1ZSf84 GYxBbmZxT8gvHHlUZqQ7Vs3QnaaWzf+2C7tWXnyoJnO8A9B9W3+rZ8EFzoXmFaoJGLjM mclrm8lp8UvjknHeKK1CDYztljbKGOOe3ys3jDwBqqABC/oOWi9+zsaodm0HZDfzuR0S rI/i32k7UdilFg25LXHVgbTZemAzsNX/3oE4M7Bdjpm4KHbPHWMLQUGvK7IgDMrOy49e 6hV5LCxsX0F8NjKV6dJA2GfQagG2FGD8n/uudv37k54k2n8h2fLcty3trjIZBsb1LBeT zf7Q== X-Gm-Message-State: AOJu0Yz/F1k7z4HYPYJi503+dlaB2m9cCUZI22E3iOpvwVcZiwqbt7UB aoV4CntL5DkieNsAPCVapWmU9g== X-Google-Smtp-Source: AGHT+IGrRoRGtPuCtJBOskAPI9wCavV58Yv/t35IclZOVuVpmFubBREmxbPeoszsSVM9edkvn/pK5g== X-Received: by 2002:a19:8c46:0:b0:4fe:551:3d3c with SMTP id i6-20020a198c46000000b004fe05513d3cmr842972lfj.36.1695898993540; Thu, 28 Sep 2023 04:03:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:03:12 -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 04/36] ARM: dts: qcom: msm8660-surf: use keypad label directly Date: Thu, 28 Sep 2023 14:02:37 +0300 Message-Id: <20230928110309.1212221-5-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 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 */