From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754151AbcGEEEp (ORCPT <rfc822;w@1wt.eu>);
	Tue, 5 Jul 2016 00:04:45 -0400
Received: from mx2.suse.de ([195.135.220.15]:45328 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750751AbcGEEEX (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 5 Jul 2016 00:04:23 -0400
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <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>,
        =?UTF-8?q?Andreas=20F=C3=A4rber?= <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
Message-Id: <1467691450-22975-4-git-send-email-afaerber@suse.de>
X-Mailer: git-send-email 2.6.6
In-Reply-To: <1467691450-22975-1-git-send-email-afaerber@suse.de>
References: <1467691450-22975-1-git-send-email-afaerber@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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