From patchwork Fri Apr 27 12:08:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 134615 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp644498lji; Fri, 27 Apr 2018 05:13:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpz5QTVcOvGm5+PHgRUj+i46I0hrXnu9jId6dOOcWveOXscR9ZCEJjD2He1dwoaslDGa3Ix X-Received: by 2002:a65:5c4d:: with SMTP id v13-v6mr1957140pgr.428.1524831180273; Fri, 27 Apr 2018 05:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524831180; cv=none; d=google.com; s=arc-20160816; b=R/h11qoQ2R3GVjJNBMOdlBAcA5JFAHBLr7QgE3KVAPJj3btsDRd53datHKj0hbyZKo 1PV7a1ylHzcNc/lhY0PBfgenKTFIFbKOdfHmsyVV6a2mnR7vJL0xKM+prPxED6TTWCgX s4LCVsaUskpzLd17NnBaqi9ihhQ5p1v+QlAnC3dKAtQlbzHK4H3VxRthoHjV11ymQykt p/LRGmcxYsPclwiIJbTSAF/ZZgsJn+r2aXr7KHdZ4FGVUqcJd17zrj5GJTTfKBynr/tR sRsFo1rfybZb4/yTerivVVWqMV0oO/d3oTWtRqdEAICUiIl6dDR0nlROUh/nZd/tLay5 TQmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=2p+EUCiEWGb5qIllvvJ1LxTvBgPP++J76IJabxTWvAY=; b=nZ3bYDMRWX3hTlIcJMb3XjL8sg6mh9+kWbFrG0p7WmJtb6Fda1pnaeKK/o+Sf9ieyC I62Q1kKnMSyAa4ZD6A3mvIRQg4/xW+xQhZaNcIyg19bESAyd/NvvDyp4FUx5g0QdZ6Cm lBLuuIwB2MekHvL7NI/qdg/hhSPJf0VlBhwprcWt+MC7f0rYkOA9SH3n2KA9t8UFXxpZ f8aqucmauA/pcA3178OULejALiXWcHtVgWmEk/HmcBhvLvD/LFyf0tPYcYlj1Dj8d460 zAy3rPUnJUstQsLZUyBRkZbHJPSK57CTPGXEyV3hzG9CTOm6uvS0BJ9sUTuRCgaBIAqT cSsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=vOZcd1Fx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o63-v6si1098474pga.584.2018.04.27.05.12.59; Fri, 27 Apr 2018 05:13:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=vOZcd1Fx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758262AbeD0MM5 (ORCPT + 29 others); Fri, 27 Apr 2018 08:12:57 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:49448 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758026AbeD0MJc (ORCPT ); Fri, 27 Apr 2018 08:09:32 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w3RC9Run029179; Fri, 27 Apr 2018 07:09:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1524830967; bh=+t5ZeoJiY+AWM73P522ngNloIfM90QEQrkDqhn1LXDM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=vOZcd1FxQvnOOcksspzGcZcBUFr7cRPzHpVx8VB4n5BgrGXEEnVijaWx/Cf01jsgw fuLfK7aCXEOI+SR7SuOrPRTAS+s4/WKgOvwk8k3T8hajc5KlDKPQ21AaJ6VeLe3uyS nSHRmQPjNKEH3h4qfc0XhxrQ/3YkDxYheIopc3fw= Received: from DLEE105.ent.ti.com (dlee105.ent.ti.com [157.170.170.35]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3RC9RIR012696; Fri, 27 Apr 2018 07:09:27 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 27 Apr 2018 07:09:27 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Fri, 27 Apr 2018 07:09:27 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3RC9AjM006789; Fri, 27 Apr 2018 07:09:24 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren CC: Jonathan Corbet , =?utf-8?q?Beno=C3=AEt_Cousson?= , Rob Herring , Mark Rutland , , , , , Subject: [PATCH v4 04/14] ARM: dts: am57xx-idk: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown Date: Fri, 27 Apr 2018 17:38:55 +0530 Message-ID: <20180427120905.3665-5-kishon@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427120905.3665-1-kishon@ti.com> References: <20180427120905.3665-1-kishon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit 18aa0f4bca701cb078a6 ("ARM: dts: am57xx-idk: Select pull down for mmc1_clk line in default mode") modified mmc1_pins_default pinctrl group in am57xx-idk-common.dtsi in order to change the CLK line to PIN_INPUT_PULLDOWN. However instead of modifying the pinctrl group, use the new pinctrl group "mmc1_pins_default_no_clk_pu" in dra7-mmc-iodelay.dtsi added specifically to be used for CLK line without external pull up. Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/am571x-idk.dts | 3 ++- arch/arm/boot/dts/am572x-idk.dts | 3 ++- arch/arm/boot/dts/am57xx-idk-common.dtsi | 11 ----------- 3 files changed, 4 insertions(+), 13 deletions(-) -- 2.17.0 diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts index a2555140babc..f7de03eb4377 100644 --- a/arch/arm/boot/dts/am571x-idk.dts +++ b/arch/arm/boot/dts/am571x-idk.dts @@ -10,6 +10,7 @@ #include "dra72x.dtsi" #include #include +#include "dra7-mmc-iodelay.dtsi" #include "dra72x-mmc-iodelay.dtsi" #include "am57xx-idk-common.dtsi" @@ -102,7 +103,7 @@ &mmc1 { pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; - pinctrl-0 = <&mmc1_pins_default>; + pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; pinctrl-2 = <&mmc1_pins_sdr12>; pinctrl-3 = <&mmc1_pins_sdr25>; diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts index 3a02ed720957..98b42ef33c46 100644 --- a/arch/arm/boot/dts/am572x-idk.dts +++ b/arch/arm/boot/dts/am572x-idk.dts @@ -9,6 +9,7 @@ /dts-v1/; #include "dra74x.dtsi" +#include "dra7-mmc-iodelay.dtsi" #include "dra74x-mmc-iodelay.dtsi" #include "am572x-idk-common.dtsi" @@ -20,7 +21,7 @@ &mmc1 { pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; - pinctrl-0 = <&mmc1_pins_default>; + pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; pinctrl-2 = <&mmc1_pins_sdr12>; pinctrl-3 = <&mmc1_pins_sdr25>; diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi index 43cdf523a8a0..43a6d0590f7c 100644 --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi @@ -115,17 +115,6 @@ DRA7XX_CORE_IOPAD(0x37d4, MUX_MODE15 | PULL_UP) /* dcan1_rx.off */ >; }; - - mmc1_pins_default: mmc1_pins_default { - pinctrl-single,pins = < - DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mmc1_clk.clk */ - DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */ - DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */ - DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */ - DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */ - DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */ - >; - }; }; &i2c1 {