diff options
author | Adam Ford | 2017-01-17 13:34:06 -0600 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-01-26 01:24:43 -0600 |
commit | cd9601caa2fa45e768ec6bf1fa1375bbb566466f (patch) | |
tree | e5287ec2b5a9acf5b67499213b8087773fe95e6c | |
parent | a075ac9c0a40f20ad14f052ee34e88922703ed20 (diff) | |
download | kernel-omap-cd9601caa2fa45e768ec6bf1fa1375bbb566466f.tar.gz kernel-omap-cd9601caa2fa45e768ec6bf1fa1375bbb566466f.tar.xz kernel-omap-cd9601caa2fa45e768ec6bf1fa1375bbb566466f.zip |
ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD SOM-LV
commit 1ea6af3216b092ec97129ac81bd95cf254c4b140 upstream.
This fixes commit ab8dd3aed011 ("ARM: DTS: Add minimal Support for
Logic PD DM3730 SOM-LV") where the Card Detect and Write Protect
pins were improperly configured.
Fixes: ab8dd3aed011 ("ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV")
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts index da8598402ab8..38faa90007d7 100644 --- a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | |||
@@ -158,7 +158,7 @@ | |||
158 | &mmc1 { | 158 | &mmc1 { |
159 | interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; | 159 | interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; |
160 | pinctrl-names = "default"; | 160 | pinctrl-names = "default"; |
161 | pinctrl-0 = <&mmc1_pins &mmc1_cd>; | 161 | pinctrl-0 = <&mmc1_pins>; |
162 | wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */ | 162 | wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */ |
163 | cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */ | 163 | cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */ |
164 | vmmc-supply = <&vmmc1>; | 164 | vmmc-supply = <&vmmc1>; |
@@ -193,7 +193,8 @@ | |||
193 | OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */ | 193 | OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */ |
194 | OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */ | 194 | OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */ |
195 | OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */ | 195 | OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */ |
196 | OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 sdmmc1_wp*/ | 196 | OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 */ |
197 | OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */ | ||
197 | >; | 198 | >; |
198 | }; | 199 | }; |
199 | 200 | ||
@@ -242,12 +243,6 @@ | |||
242 | OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* sys_boot6.gpio_8 */ | 243 | OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* sys_boot6.gpio_8 */ |
243 | >; | 244 | >; |
244 | }; | 245 | }; |
245 | |||
246 | mmc1_cd: pinmux_mmc1_cd { | ||
247 | pinctrl-single,pins = < | ||
248 | OMAP3_WKUP_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */ | ||
249 | >; | ||
250 | }; | ||
251 | }; | 246 | }; |
252 | 247 | ||
253 | 248 | ||