From patchwork Sun Jun 13 20:17:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 459563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C150CC49361 for ; Sun, 13 Jun 2021 20:18:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2E4F61040 for ; Sun, 13 Jun 2021 20:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232099AbhFMUUK (ORCPT ); Sun, 13 Jun 2021 16:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232094AbhFMUUH (ORCPT ); Sun, 13 Jun 2021 16:20:07 -0400 Received: from relay03.th.seeweb.it (relay03.th.seeweb.it [IPv6:2001:4b7a:2000:18::164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07AFAC061767; Sun, 13 Jun 2021 13:18:04 -0700 (PDT) Received: from localhost.localdomain (83.6.168.161.neoplus.adsl.tpnet.pl [83.6.168.161]) by m-r1.th.seeweb.it (Postfix) with ESMTPA id D49761F87F; Sun, 13 Jun 2021 22:18:01 +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 , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: qcom: qrb5165-rb5: Fix up pins Date: Sun, 13 Jun 2021 22:17:54 +0200 Message-Id: <20210613201754.346440-1-konrad.dybcio@somainline.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210612192358.62602-2-konrad.dybcio@somainline.org> References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In the SDHCI pin commonization commit I overlooked the fact that this board had the pins defined in its own DT. Revert their settings to the original values. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 38 ++++++++---------------- arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 +-- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index a5b742325261..bf05328f3901 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -858,6 +858,18 @@ dai@2 { }; }; +&sdc2_card_det_n { + /delete-property/ drive-strength; +}; + +&sdc2_cmd_default { + drive-strength = <10>; +}; + +&sdc2_data_default { + drive-strength = <10>; +}; + &sdhc_2 { status = "okay"; pinctrl-names = "default"; @@ -1253,32 +1265,6 @@ wake-n { bias-pull-up; }; }; - - sdc2_default_state: sdc2-default { - clk { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <16>; - }; - - cmd { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - - data { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <10>; - }; - }; - - sdc2_card_det_n: sd-card-det-n { - pins = "gpio77"; - function = "gpio"; - bias-pull-up; - }; }; &uart12 { diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index fe858abbff5d..fab5d83f4496 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -3414,13 +3414,13 @@ clk { bias-disable; }; - cmd { + sdc2_cmd_default: cmd { pins = "sdc2_cmd"; drive-strength = <16>; bias-pull-up; }; - data { + sdc2_data_default: data { pins = "sdc2_data"; drive-strength = <16>; bias-pull-up;