LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: "Jonathan Corbet" <corbet@lwn.net>,
	"Benoît Cousson" <bcousson@baylibre.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Mark Rutland" <mark.rutland@arm.com>,
	linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	kishon@ti.com
Subject: [PATCH v4 05/14] ARM: dts: dra71-evm: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown
Date: Fri, 27 Apr 2018 17:38:56 +0530	[thread overview]
Message-ID: <20180427120905.3665-6-kishon@ti.com> (raw)
In-Reply-To: <20180427120905.3665-1-kishon@ti.com>

commit 0e43884cca77218d2eccc331396e8 ("ARM: dts: dra71-evm: Select pull
down for mmc1_clk line in default mode") modified mmc1_pins_default
pinctrl group in dra71-evm.dts to change the CLK line to
PIN_INPUT_PULLDOWN. However instead of changing 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 <kishon@ti.com>
---
 arch/arm/boot/dts/dra71-evm.dts | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index 64c57d87ca2f..b7aeaeeead3b 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -7,6 +7,7 @@
  */
 
 #include "dra72-evm-common.dtsi"
+#include "dra7-mmc-iodelay.dtsi"
 #include "dra72x-mmc-iodelay.dtsi"
 #include <dt-bindings/net/ti-dp83867.h>
 
@@ -50,19 +51,6 @@
 	};
 };
 
-&dra7_pmx_core {
-	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 {
 	status = "okay";
 	clock-frequency = <400000>;
@@ -187,7 +175,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>;
-- 
2.17.0

  parent reply	other threads:[~2018-04-27 12:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27 12:08 [PATCH v4 00/14] dra7: mmc: Update mmc dt node to use sdhci-omap Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 01/14] ARM: dts: dra72-evm-common: Remove mmc specific pinmux Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 02/14] ARM: dts: dra71-evm: Add "vqmmc-supply" property for mmc2 Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 03/14] ARM: dts: dra7-mmc-iodelay: Add a new pinctrl group for clk line without pullup Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 04/14] ARM: dts: am57xx-idk: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown Kishon Vijay Abraham I
2018-04-27 12:08 ` Kishon Vijay Abraham I [this message]
2018-04-27 12:08 ` [PATCH v4 06/14] ARM: dts: am574x-idk: Add pinmux configuration for MMC Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 07/14] ARM: dts: am57xx-beagle-x15/am57xx-idk: Fix pinctrl-names Kishon Vijay Abraham I
2018-04-27 12:08 ` [PATCH v4 08/14] ARM: dts: dra72-evm-common: Add wilink8 wlan support Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 09/14] ARM: dts: dra7-evm: Model EVM_3V6 regulator Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 10/14] ARM: dts: dra7-evm: Add wilink8 wlan support Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 11/14] ARM: dts: dra76-evm: " Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 12/14] ARM: dts: dra7: Use sdhci-omap programming model Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 13/14] ARM: dts: dra7: Add high speed modes capability to MMC1/MMC2 dt node Kishon Vijay Abraham I
2018-04-27 12:09 ` [PATCH v4 14/14] Documentation: ARM: Add new MMC requirements for DRA7/K2G Kishon Vijay Abraham I
2018-05-03 17:40 ` [PATCH v4 00/14] dra7: mmc: Update mmc dt node to use sdhci-omap Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180427120905.3665-6-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=bcousson@baylibre.com \
    --cc=corbet@lwn.net \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=tony@atomide.com \
    --subject='Re: [PATCH v4 05/14] ARM: dts: dra71-evm: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).