linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Schenker <dev@pschenker.ch>
To: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com,
	stefan@agner.ch, devicetree@vger.kernel.org,
	Rob Herring <robh+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: Stefan Agner <stefan.agner@toradex.com>,
	Philippe Schenker <philippe.schenker@toradex.com>,
	Fabio Estevam <festevam@gmail.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	NXP Linux Team <linux-imx@nxp.com>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 07/22] ARM: dts: imx7-colibri: fix 1.8V/UHS support
Date: Tue, 30 Jul 2019 16:46:34 +0200	[thread overview]
Message-ID: <20190730144649.19022-8-dev@pschenker.ch> (raw)
In-Reply-To: <20190730144649.19022-1-dev@pschenker.ch>

From: Stefan Agner <stefan.agner@toradex.com>

Add pinmuxing and do not specify voltage restrictions in the
module level device tree.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

 arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 16d1a1ed1aff..67f5e0c87fdc 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -326,7 +326,6 @@
 &usdhc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
-	no-1-8-v;
 	cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 	disable-wp;
 	vqmmc-supply = <&reg_LDO2>;
@@ -671,6 +670,28 @@
 		>;
 	};
 
+	pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
+		fsl,pins = <
+			MX7D_PAD_SD1_CMD__SD1_CMD	0x5a
+			MX7D_PAD_SD1_CLK__SD1_CLK	0x1a
+			MX7D_PAD_SD1_DATA0__SD1_DATA0	0x5a
+			MX7D_PAD_SD1_DATA1__SD1_DATA1	0x5a
+			MX7D_PAD_SD1_DATA2__SD1_DATA2	0x5a
+			MX7D_PAD_SD1_DATA3__SD1_DATA3	0x5a
+		>;
+	};
+
+	pinctrl_usdhc1_200mhz: usdhc1grp_200mhz {
+		fsl,pins = <
+			MX7D_PAD_SD1_CMD__SD1_CMD	0x5b
+			MX7D_PAD_SD1_CLK__SD1_CLK	0x1b
+			MX7D_PAD_SD1_DATA0__SD1_DATA0	0x5b
+			MX7D_PAD_SD1_DATA1__SD1_DATA1	0x5b
+			MX7D_PAD_SD1_DATA2__SD1_DATA2	0x5b
+			MX7D_PAD_SD1_DATA3__SD1_DATA3	0x5b
+		>;
+	};
+
 	pinctrl_usdhc3: usdhc3grp {
 		fsl,pins = <
 			MX7D_PAD_SD3_CMD__SD3_CMD		0x59
-- 
2.22.0


  parent reply	other threads:[~2019-07-30 15:10 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-30 14:46 [PATCH 00/22] This patchset holds some common changes that were never upstreamed Philippe Schenker
2019-07-30 14:46 ` [PATCH 01/22] ARM: dts: imx7-colibri: make sure module supplies are always on Philippe Schenker
2019-07-30 14:46 ` [PATCH 02/22] ARM: dts: imx7-colibri: disable HS400 Philippe Schenker
2019-07-30 14:46 ` [PATCH 03/22] ARM: dts: imx7-colibri: prepare module device tree for FlexCAN Philippe Schenker
2019-07-30 14:46 ` [PATCH 04/22] ARM: dts: imx7-colibri: Add sleep mode to ethernet Philippe Schenker
2019-07-30 14:46 ` [PATCH 05/22] ARM: dts: add recovery for I2C for iMX7 Philippe Schenker
2019-07-30 14:46 ` [PATCH 06/22] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker
2019-07-30 14:46 ` Philippe Schenker [this message]
2019-07-30 14:46 ` [PATCH 08/22] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker
2019-07-30 14:46 ` [PATCH 09/22] ARM: dts: imx6qdl-colibri: add phy to fec Philippe Schenker
2019-07-30 14:46 ` [PATCH 10/22] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker
2019-07-30 14:46 ` [PATCH 11/22] ARM: dts: imx6: Add sleep state to can interfaces Philippe Schenker
2019-07-31  7:14   ` Michal Vokáč
2019-07-31 11:13     ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 12/22] ARM: dts: imx6: Add touchscreens used on Toradex eval boards Philippe Schenker
2019-07-30 20:46   ` Fabio Estevam
2019-07-31  6:43     ` Philippe Schenker
2019-07-31  6:54       ` Michal Vokáč
2019-07-30 14:46 ` [PATCH 13/22] ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval board Philippe Schenker
2019-07-31  7:09   ` Michal Vokáč
2019-07-30 14:46 ` [PATCH 14/22] ARM: dts: apalis-imx6: Add some example I2C devices Philippe Schenker
2019-07-30 20:53   ` Fabio Estevam
2019-07-31 11:36     ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 15/22] ARM: dts: apalis-imx6: Add some optional " Philippe Schenker
2019-07-30 20:43   ` Fabio Estevam
2019-07-31 11:37     ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 16/22] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker
2019-07-30 14:46 ` [PATCH 17/22] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker
2019-07-30 14:46 ` [PATCH 18/22] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker
2019-07-30 14:46 ` [PATCH 19/22] ARM: dts: imx6ull: improve can templates Philippe Schenker
2019-07-30 14:46 ` [PATCH 20/22] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker
2019-07-30 14:46 ` [PATCH 21/22] ARM: dts: imx6/7-colibri: switch dr_mode to otg Philippe Schenker
2019-07-30 14:46 ` [PATCH 22/22] ARM: dts: imx6ull-colibri: Add touchscreens used with Eval Board Philippe Schenker

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=20190730144649.19022-8-dev@pschenker.ch \
    --to=dev@pschenker.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcel.ziswiler@toradex.com \
    --cc=mark.rutland@arm.com \
    --cc=max.krummenacher@toradex.com \
    --cc=philippe.schenker@toradex.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=stefan.agner@toradex.com \
    --cc=stefan@agner.ch \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).