From patchwork Sun Jul 2 13:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699814 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 3294CC001DD for ; Sun, 2 Jul 2023 13:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229941AbjGBNn2 (ORCPT ); Sun, 2 Jul 2023 09:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjGBNn0 (ORCPT ); Sun, 2 Jul 2023 09:43:26 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD616E6A for ; Sun, 2 Jul 2023 06:43:25 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b6a084a34cso52501781fa.1 for ; Sun, 02 Jul 2023 06:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305404; x=1690897404; 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=BoNDvRdu9IY8E9pNnBP/tGPN90GSNWelhBq9rt0cJXiZVl/pl++UChepPZ5BqpF4RU FIGeot41krKEnW8Q6xqp925kgAplBooFBQ7R78piZPmVBRyKOT5ZRO/PDgLXK3PEDjnV Wwnvi9rPBeEUcP7Ddia2KOekD7zHPF4P7PCHDJwX4FvkQVeUfLJ2nVY9Xo+fFWAE2o8Q Hgg7pb5AP5w70Qj5OoVaPmWkkG9R8mzPqFS2qUm9ggyYAAts9ArFYQVg1L9w2mULpEYW cglbVUOaWsw6h3sEZIp9WCvL/e2QTSHtEyZDRclKuw7EiWX+/xo4tXUANCcek1BcWdIi T8cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305404; x=1690897404; 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=XadA28+upAfbADwBbOQ7fzSZiE6Osn9Ew1Glt8F1vrnr5HUo2hQPLN7nOk1yrKNmih 0fWOXoRfi59B+K8FDBTRaOvH7fDHx8rNOjNefyM3H7mJp9Tu+EFoMuFSTVxjsm8G0HAw Iq5kDaZ1UWyRtLKA41boT/FLI7mvtD9f4QosM41WCWa/AbrzD2NKNMLqqkwyMG2NKjCj eNF+rwZnCP+e+TeGmarqKUA26xRJVCICzGnsAoZdQZ6jQYBmw0p+CKBg7zMg6OMmFucp AR7jnmJFF+sjCn24jjrPOGzpjC3pR9tvm8TUCwWNHd0l7LzwD21eEXZvfu8MBirTueUA A3Pw== X-Gm-Message-State: ABy/qLaVhiNCgFdLP535LPfKsRpxYRs4TEcHULz37+/UP+EAoBORs19s k0VnX9ZHfmZYdSkd96tJdaTYbg== X-Google-Smtp-Source: APBJJlGISzdsd/pdopGpISupSIjd+YTTrGRW8QE9GUCda++zvs6IL/HN1bLc8xL1s4yEqgwO6BnULA== X-Received: by 2002:a2e:9c87:0:b0:2b6:bc30:7254 with SMTP id x7-20020a2e9c87000000b002b6bc307254mr4750546lji.13.1688305404020; Sun, 02 Jul 2023 06:43:24 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:23 -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 v2 03/27] ARM: dts: qcom: msm8660-surf: use keypad label directly Date: Sun, 2 Jul 2023 16:42:56 +0300 Message-Id: <20230702134320.98831-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-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 */