From patchwork Fri Apr 15 11:56:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 561980 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 6BBE8C433FE for ; Fri, 15 Apr 2022 11:58:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352817AbiDOMA4 (ORCPT ); Fri, 15 Apr 2022 08:00:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352921AbiDOL7r (ORCPT ); Fri, 15 Apr 2022 07:59:47 -0400 Received: from relay07.th.seeweb.it (relay07.th.seeweb.it [IPv6:2001:4b7a:2000:18::168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73107A994D; Fri, 15 Apr 2022 04:57:16 -0700 (PDT) Received: from localhost.localdomain (abxj52.neoplus.adsl.tpnet.pl [83.9.3.52]) by m-r2.th.seeweb.it (Postfix) with ESMTPA id 0BA5A3F686; Fri, 15 Apr 2022 13:57:13 +0200 (CEST) From: Konrad Dybcio To: ~postmarketos/upstreaming@lists.sr.ht Cc: martin.botka@somainline.org, angelogioacchino.delregno@somainline.org, marijn.suijten@somainline.org, jamipkettunen@somainline.org, Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 20/23] ARM: dts: qcom-msm8974*: Clean up old GPIO declarations Date: Fri, 15 Apr 2022 13:56:30 +0200 Message-Id: <20220415115633.575010-21-konrad.dybcio@somainline.org> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220415115633.575010-1-konrad.dybcio@somainline.org> References: <20220415115633.575010-1-konrad.dybcio@somainline.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Remove unneeded level of nesting, as it does not match the current DTS style. Signed-off-by: Konrad Dybcio --- .../qcom-msm8974-lge-nexus5-hammerhead.dts | 21 +++----- .../dts/qcom-msm8974-sony-xperia-rhine.dtsi | 13 ++--- .../boot/dts/qcom-msm8974pro-samsung-klte.dts | 53 +++++++------------ 3 files changed, 33 insertions(+), 54 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index 7e4e723f1dc3..52b3f055e834 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -573,12 +573,10 @@ cmd-data { }; mpu6515_pin: mpu6515 { - irq { - pins = "gpio73"; - function = "gpio"; - bias-disable; - input-enable; - }; + pins = "gpio73"; + function = "gpio"; + bias-disable; + input-enable; }; touch_pin: touch { @@ -601,13 +599,10 @@ reset { }; panel_pin: panel { - te { - pins = "gpio12"; - function = "mdp_vsync"; - - drive-strength = <2>; - bias-disable; - }; + pins = "gpio12"; + function = "mdp_vsync"; + drive-strength = <2>; + bias-disable; }; bt_pin: bt { diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi index c2e423d2a21e..1120972ae4d2 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi @@ -375,14 +375,11 @@ &smbb { &tlmm { ts_int_pin: touch-int { - pin { - pins = "gpio61"; - function = "gpio"; - - drive-strength = <2>; - bias-disable; - input-enable; - }; + pins = "gpio61"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + input-enable; }; sdc1_on: sdc1-on { diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts index f230a657d0f3..7c7ad9e7baa6 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts @@ -780,50 +780,37 @@ cmd-data { }; i2c_touchkey_pins: i2c-touchkey { - mux { - pins = "gpio95", "gpio96"; - function = "gpio"; - input-enable; - bias-pull-up; - }; + pins = "gpio95", "gpio96"; + function = "gpio"; + input-enable; + bias-pull-up; }; i2c_led_gpioex_pins: i2c-led-gpioex { - mux { - pins = "gpio120", "gpio121"; - function = "gpio"; - input-enable; - bias-pull-down; - }; + pins = "gpio120", "gpio121"; + function = "gpio"; + input-enable; + bias-pull-down; }; gpioex_pin: gpioex { - res { - pins = "gpio145"; - function = "gpio"; - - bias-pull-up; - drive-strength = <2>; - }; + pins = "gpio145"; + function = "gpio"; + bias-pull-up; + drive-strength = <2>; }; wifi_pin: wifi { - int { - pins = "gpio92"; - function = "gpio"; - - input-enable; - bias-pull-down; - }; + pins = "gpio92"; + function = "gpio"; + input-enable; + bias-pull-down; }; panel_te_pin: panel { - te { - pins = "gpio12"; - function = "mdp_vsync"; - - drive-strength = <2>; - bias-disable; - }; + pins = "gpio12"; + function = "mdp_vsync"; + drive-strength = <2>; + bias-disable; }; };