|
@@ -158,7 +158,7 @@
|
|
|
&mmc1 {
|
|
|
interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
|
|
|
pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&mmc1_pins &mmc1_cd>;
|
|
|
+ pinctrl-0 = <&mmc1_pins>;
|
|
|
wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */
|
|
|
cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */
|
|
|
vmmc-supply = <&vmmc1>;
|
|
@@ -193,7 +193,8 @@
|
|
|
OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
|
|
|
OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
|
|
|
OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
|
|
|
- OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 sdmmc1_wp*/
|
|
|
+ OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 */
|
|
|
+ OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */
|
|
|
>;
|
|
|
};
|
|
|
|
|
@@ -242,12 +243,6 @@
|
|
|
OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* sys_boot6.gpio_8 */
|
|
|
>;
|
|
|
};
|
|
|
-
|
|
|
- mmc1_cd: pinmux_mmc1_cd {
|
|
|
- pinctrl-single,pins = <
|
|
|
- OMAP3_WKUP_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */
|
|
|
- >;
|
|
|
- };
|
|
|
};
|
|
|
|
|
|
|