From: Max Krummenacher <max.oss.09@gmail.com>
To: max.krummenacher@toradex.com
Cc: Denys Drozdov <denys.drozdov@toradex.com>,
Fabio Estevam <festevam@gmail.com>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Shawn Guo <shawnguo@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v1 13/17] ARM: dts: imx6q-apalis: Clean-up sd card support
Date: Mon, 16 May 2022 13:58:41 +0200 [thread overview]
Message-ID: <20220516115846.58328-14-max.oss.09@gmail.com> (raw)
In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com>
From: Denys Drozdov <denys.drozdov@toradex.com>
Configure SOM DTSI to 8-bit, card detect in the SoM dtsi as this is
the Apalis family default functionality.
Limit the interface to 4-bit only on the Ixora V1.1 carrier boards.
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
arch/arm/boot/dts/imx6q-apalis-eval.dts | 3 ---
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 1 -
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ++-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 2436f9a1e18c..5c4d9a4ec586 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -172,9 +172,6 @@
/* MMC1 */
&usdhc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>;
- cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index b254e96d194a..2d0324103804 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -175,7 +175,6 @@
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>;
- cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
bus-width = <4>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index f33dfaa907d7..57642aefe349 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -817,7 +817,8 @@
/* MMC1 */
&usdhc1 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
+ pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>;
+ cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
disable-wp;
--
2.20.1
next prev parent reply other threads:[~2022-05-16 12:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 11:58 [PATCH v1 00/17] ARM: dts: imx6q-apalis: Misc improvements and newly added carrier Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 01/17] dt-bindings: arm: fsl: Add carrier for toradex,apalis-imx6q Max Krummenacher
2022-05-18 0:57 ` Rob Herring
2022-05-16 11:58 ` [PATCH v1 02/17] Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name" Max Krummenacher
2022-05-16 12:49 ` Ahmad Fatoum
2022-05-16 14:53 ` Francesco Dolcini
2022-05-16 15:07 ` Ahmad Fatoum
2022-05-18 19:01 ` Rob Herring
2022-05-16 11:58 ` [PATCH v1 03/17] ARM: dts: imx6q-apalis: Add gpio-line-names Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 04/17] ARM: dts: imx6q-apalis: Command pmic to standby for poweroff Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 05/17] ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 06/17] ARM: dts: imx6q-apalis: Move pinmux groups " Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 07/17] ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl " Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 08/17] ARM: dts: imx6q-apalis: Add LVDS panel support Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 09/17] ARM: dts: imx6q-apalis: Disable HDMI Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 10/17] ARM: dts: imx6q-apalis: Disable stmpe touchscreen Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 11/17] ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera Max Krummenacher
2022-05-16 12:08 ` Fabio Estevam
2022-05-18 14:21 ` Max Krummenacher
2022-05-18 14:25 ` Fabio Estevam
2022-05-18 14:54 ` Max Krummenacher
2022-05-17 18:28 ` Fabio Estevam
2022-05-18 14:28 ` Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 12/17] ARM: dts: imx6q-apalis: Add adv7280 video input Max Krummenacher
2022-05-16 12:10 ` Fabio Estevam
2022-05-18 14:07 ` Max Krummenacher
2022-05-18 14:10 ` Fabio Estevam
2022-05-16 11:58 ` Max Krummenacher [this message]
2022-05-16 11:58 ` [PATCH v1 14/17] ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier boards Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 15/17] ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 16/17] ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps Max Krummenacher
2022-05-16 11:58 ` [PATCH v1 17/17] ARM: dts: imx6q-apalis: Cleanup Max Krummenacher
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=20220516115846.58328-14-max.oss.09@gmail.com \
--to=max.oss.09@gmail.com \
--cc=denys.drozdov@toradex.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=max.krummenacher@toradex.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/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).