From: "Andreas Färber" <afaerber@suse.de>
To: linux-arm-kernel@lists.infradead.org
Cc: "Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <kernel@pengutronix.de>,
"Fabio Estevam" <fabio.estevam@nxp.com>,
"Ettore Chimenti" <ettore.chimenti@udoo.org>,
"Andreas Färber" <afaerber@suse.de>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Russell King" <linux@armlinux.org.uk>,
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND
FLATTENED DEVICE TREE BINDINGS),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: Add SD
Date: Tue, 5 Jul 2016 06:04:10 +0200 [thread overview]
Message-ID: <1467691450-22975-4-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1467691450-22975-1-git-send-email-afaerber@suse.de>
Enable the SDHC node and model the SDIO_PWR GPIO as a regulator.
Use the SD card as default trigger for the red LED.
Cc: Ettore Chimenti <ettore.chimenti@udoo.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index e074409644d8..85f5e8606dab 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@ -56,6 +56,7 @@
label = "udoo-neo:red:mmc";
gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
default-state = "off";
+ linux,default-trigger = "mmc0";
};
orange {
@@ -64,6 +65,17 @@
default-state = "keep";
};
};
+
+ sdio_pwr_reg: sd-gpio-regulator {
+ compatible = "regulator-fixed";
+ gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ regulator-name = "SDIO_PWR";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
};
&cpu0 {
@@ -230,6 +242,17 @@
<MX6SX_PAD_CSI_DATA06__UART6_RTS_B 0x1b0b1>,
<MX6SX_PAD_CSI_DATA07__UART6_CTS_B 0x1b0b1>;
};
+
+ pinctrl_usdhc2: usdhc2grp {
+ fsl,pins =
+ <MX6SX_PAD_SD2_CMD__USDHC2_CMD 0x17059>,
+ <MX6SX_PAD_SD2_CLK__USDHC2_CLK 0x10059>,
+ <MX6SX_PAD_SD2_DATA0__USDHC2_DATA0 0x17059>,
+ <MX6SX_PAD_SD2_DATA1__USDHC2_DATA1 0x17059>,
+ <MX6SX_PAD_SD2_DATA2__USDHC2_DATA2 0x17059>,
+ <MX6SX_PAD_SD2_DATA3__USDHC2_DATA3 0x17059>,
+ <MX6SX_PAD_SD1_DATA0__GPIO6_IO_2 0x17059>; /* CD */
+ };
};
};
@@ -259,3 +282,14 @@
uart-has-rtscts;
status = "disabled";
};
+
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2>;
+ bus-width = <4>;
+ cd-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
+ no-1-8-v;
+ keep-power-in-suspend;
+ wakeup-source;
+ status = "okay";
+};
--
2.6.6
next prev parent reply other threads:[~2016-07-05 4:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1467691450-22975-1-git-send-email-afaerber@suse.de>
2016-07-05 4:04 ` [PATCH 1/3] ARM: dts: imx6sx-sabreauto: Fix misspelled property Andreas Färber
2016-07-05 8:54 ` Sudeep Holla
2016-08-08 13:58 ` Shawn Guo
2016-07-05 4:04 ` [PATCH 2/3] ARM: dts: imx6sx: Add UDOO Neo support Andreas Färber
2016-07-05 6:27 ` Uwe Kleine-König
2016-07-05 14:46 ` Andreas Färber
2016-07-05 12:04 ` Fabio Estevam
2016-07-05 13:55 ` Andreas Färber
2016-07-05 18:33 ` Uwe Kleine-König
2016-08-08 14:04 ` Shawn Guo
2016-07-05 4:04 ` Andreas Färber [this message]
2016-08-08 14:12 ` [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: Add SD Shawn Guo
2016-08-08 15:00 ` Andreas Färber
2016-08-15 12:38 ` Shawn Guo
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=1467691450-22975-4-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=devicetree@vger.kernel.org \
--cc=ettore.chimenti@udoo.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--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
all inboxes | Powered by JetHome®