From patchwork Tue Nov 22 00:14:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 9440317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9692760235 for ; Tue, 22 Nov 2016 00:17:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 744B328AE7 for ; Tue, 22 Nov 2016 00:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67BD428AF7; Tue, 22 Nov 2016 00:17:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB6DB28AE7 for ; Tue, 22 Nov 2016 00:17:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c8ykz-0001GC-5c; Tue, 22 Nov 2016 00:16:17 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c8yjt-00086Y-GF for linux-arm-kernel@lists.infradead.org; Tue, 22 Nov 2016 00:15:13 +0000 Received: from marcel-pc.toradex.int.net ([84.227.37.153]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPA (Nemesis) id 0MWzli-1cEasg1VX2-00W0BN; Tue, 22 Nov 2016 01:14:35 +0100 From: Marcel Ziswiler To: devicetree@vger.kernel.org Subject: [PATCH 4/6] apalis-tk1: adjust pin muxing for v1.1 hw Date: Tue, 22 Nov 2016 01:14:05 +0100 Message-Id: <1479773647-14726-5-git-send-email-marcel.ziswiler@toradex.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1479773647-14726-1-git-send-email-marcel.ziswiler@toradex.com> References: <1479773647-14726-1-git-send-email-marcel.ziswiler@toradex.com> X-Provags-ID: V03:K0:qPu1qSairXG1ikOsYvonVUsU0LndL9wV4FQRwejFqwRxmmbgJEw 1Fggh4FeQNpQ8HeTv7lw80DlAPDtyEeiY7hHXbgkJAG4vCyTQH0nxCOUYPHwlvv6JBiesxz QPXYj8ZeeiqwTYu12DWIBwEDeooJIPHh4T064mO7cKS2AF+HrWcKHEU92bnbxWm4F+EChdZ AJHeTiQHccoEonog+MHGQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:uzsx/fBE6wY=:PUnaaBPMLakygXaeZkuAze JlWc1DmHi1gcjHQjuSUQwCEta3+rVxVTphP4uWKwKi244+8UYrRezZEzzSz22TahHcoVIUmpx VqfZsKgEsFqrHBfO82Csvyq0R/hJ2Hqd37nL0btHcg4iuwHRPOjLADhuWFuVnK6FCjjm/A0/I D9TAR9LlzbYoNzEuZekvWjFqmObsU0vlTNA5acvqIEpFXBBSw6pOym+kr5oxhECOM8KLdaNrU WgOEZOUyxrinJdPPCWsN8D/I4Juuh5itiMKWNvKxmXGU+s/R+NChL/4t0LfCEiQ0+A3PiLzPD D7UH1tM01VpTa+LDpwDMCKbKsIRFoBiynvr/EqYdbQ5xLiTIIIyzNwZx8fa/fUJ+LFlp5kIWc e8xCzQAZwuBA628LgAzy6RiFcSOtDxKi07Rb7JFyM8ndUZH/TdmhVJB/NuqW0eE4NWnwA43XA gybBZeklZvE/CJU5xC9/Rp1JrHFrhNpnHwdak6tDuivz1gg7E1PJQhwbvbEniMVwZVF0DcNWD uWfSe7KmxFKMZbdnwRH43XTmFjwCDb67Y1D8z77wUaEdSsvNWn+MLbwRDmnzdXHLmzo4oJ2oR xvCkYUqIQX2IdmQO3/nUcC8zQ5tyU4vR+He/T2PgTcgGg+kQdjWlWgBJGikveiXKiQeSoOTXs Md9xLwV5lkSb3HqyPNn660tfNxvebk1BAW502IrHq4B1OZ4A7ZuMgmKki9dbh7ke7vxI= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161121_161509_815106_9B8EB144 X-CRM114-Status: GOOD ( 10.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Alexandre Courbot , Stephen Warren , Marcel Ziswiler , linux-kernel@vger.kernel.org, Rob Herring , Russell King , Thierry Reding , linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Configure Apalis MMC1 D6 GPIO on SDMMC3_CLK_LB_IN as reserved function without any pull-up/down. Configure GPIO_PV2 as SD1_CD# according to latest V1.1 HW. Leave SDMMC3_CLK_LB_OUT muxed as SDMMC3 with output driver enabled aka not tristated and input driver enabled as well as it features some magic properties even though the external loopback is disabled and the internal loopback used as per SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being set to 0xfffd according to the TRM! This pin is now a not-connect on V1.1 HW in order to avoid any interference. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/tegra124-apalis.dtsi | 53 +++++++++++++++------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi index 747ce81..2bfc579 100644 --- a/arch/arm/boot/dts/tegra124-apalis.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi @@ -414,18 +414,10 @@ nvidia,tristate = ; nvidia,enable-input = ; }; - /* - * Don't use MMC1_D6 aka SDMMC3_CLK_LB_IN for now as it - * features some magic properties even though the - * external loopback is disabled and the internal - * loopback used as per SDMMC_VENDOR_MISC_CNTRL_0 - * register's SDMMC_SPARE1 bits being set to 0xfffd - * according to the TRM! - */ sdmmc3_clk_lb_in_pee5 { /* D6 GPIO */ nvidia,pins = "sdmmc3_clk_lb_in_pee5"; - nvidia,function = "sdmmc3"; - nvidia,pull = ; + nvidia,function = "rsvd2"; + nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; }; @@ -520,20 +512,12 @@ nvidia,tristate = ; nvidia,enable-input = ; }; - /* - * Don't use SD1_CD# aka SDMMC3_CLK_LB_OUT for now as it - * features some magic properties even though the - * external loopback is disabled and the internal - * loopback used as per SDMMC_VENDOR_MISC_CNTRL_0 - * register's SDMMC_SPARE1 bits being set to 0xfffd - * according to the TRM! - */ - sdmmc3_clk_lb_out_pee4 { /* CD# GPIO */ - nvidia,pins = "sdmmc3_clk_lb_out_pee4"; - nvidia,function = "rsvd2"; - nvidia,pull = ; + sdmmc3_cd_n_pv2 { /* CD# GPIO */ + nvidia,pins = "sdmmc3_cd_n_pv2"; + nvidia,function = "rsvd3"; + nvidia,pull = ; nvidia,tristate = ; - nvidia,enable-input = ; + nvidia,enable-input = ; }; /* Apalis SPDIF */ @@ -1512,13 +1496,6 @@ nvidia,tristate = ; nvidia,enable-input = ; }; - sdmmc3_cd_n_pv2 { /* NC */ - nvidia,pins = "sdmmc3_cd_n_pv2"; - nvidia,function = "rsvd3"; - nvidia,pull = ; - nvidia,tristate = ; - nvidia,enable-input = ; - }; gpio_x1_aud_px1 { /* NC */ nvidia,pins = "gpio_x1_aud_px1"; nvidia,function = "rsvd2"; @@ -1568,6 +1545,22 @@ nvidia,tristate = ; nvidia,enable-input = ; }; + /* + * Leave SDMMC3_CLK_LB_OUT muxed as SDMMC3 with output + * driver enabled aka not tristated and input driver + * enabled as well as it features some magic properties + * even though the external loopback is disabled and the + * internal loopback used as per + * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 + * bits being set to 0xfffd according to the TRM! + */ + sdmmc3_clk_lb_out_pee4 { /* NC */ + nvidia,pins = "sdmmc3_clk_lb_out_pee4"; + nvidia,function = "sdmmc3"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + }; }; };