diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-07 16:33:48 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 10:08:03 +0100 |
| commit | 015d1aa22af1936e5230eee7bcf4ab54fb8740d8 (patch) | |
| tree | a4eeab2b1c1e4ee215a7b22811f159a6fc43e317 | |
| parent | cebedf73c49c29f133a7649aa3825c48606a3b42 (diff) | |
imx7d-colibri.dts: implement mmc card detect
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri.dts | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/imx7d-colibri.dts b/arch/arm/boot/dts/imx7d-colibri.dts index 0ac372c1f82c..217fd1e734cc 100644 --- a/arch/arm/boot/dts/imx7d-colibri.dts +++ b/arch/arm/boot/dts/imx7d-colibri.dts @@ -780,12 +780,11 @@ &iomuxc_lpsr { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog_lpsr_1>, <&pinctrl_gpio1>; + pinctrl-0 = <&pinctrl_gpio1>; imx7d-sdb { pinctrl_gpio1: gpio1grp { fsl,pins = < - MX7D_PAD_GPIO1_IO00__GPIO1_IO0 0x59 MX7D_PAD_GPIO1_IO01__GPIO1_IO1 0x59 MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x59 MX7D_PAD_GPIO1_IO03__GPIO1_IO3 0x59 @@ -794,12 +793,6 @@ >; }; - pinctrl_hog_lpsr_1: hoggrp-lpsr-1 { - fsl,pins = < - MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x59 /* PWR_INT */ - MX7D_PAD_GPIO1_IO00__GPIO1_IO0 0x79 /* CD */ - >; - }; pinctrl_i2c1: i2c1grp { fsl,pins = < MX7D_PAD_GPIO1_IO05__I2C1_SDA 0x4000007f @@ -807,6 +800,12 @@ >; }; + pinctrl_cd_usdhc1: usdhc1-cd-grp { + fsl,pins = < + MX7D_PAD_GPIO1_IO00__GPIO1_IO0 0x59 /* CD */ + >; + }; + pinctrl_uart1_ctrl2: uart1-ctrlgrp2 { /* Additional DSR, RI */ fsl,pins = < MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x14 /* DSR */ @@ -886,17 +885,17 @@ &usdhc1 { #ifdef SD_1_8 pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = <&pinctrl_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz>; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>; vmmc-supply = <®_3p3v>; vqmmc-supply = <®_LDO2>; #else pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1>; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; no-1-8-v; #endif -// cd-gpios = <&gpio1 0 0>; + cd-gpios = <&gpio1 0 0>; enable-sdio-wakeup; keep-power-in-suspend; status = "okay"; |