Skip to contentSkip to conversation

ARM: dts: omap3-ldp: fix mmc configuration

PATCH New Nishanth Menon 2 participants 3 messages Jan 20, 2014 – Feb 4, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: omap3-ldp: fix mmc configuration

MMC1 is the only MMC interface available on the platform. Further, since the platform is based on older revision of SoC which is not capable of doing multi-block writes, mark it so and add pinmux to ensure that all relevant pins are configured for non-MMC boot mode.

---
ti,erratum-2.1.1.128 introduced in https://patchwork.kernel.org/patch/3514851/
hence depends on the same.

 arch/arm/boot/dts/omap3-ldp.dts |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/omap3-ldp.dts +22 -0
index ddce0d8..bc0cc66 100644
@@ -176,6 +176,17 @@
 &mmc1 {
 	vmmc-supply = <&vmmc1>;
 	bus-width = <4>;
+	ti,erratum-2.1.1.128;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+};
+
+&mmc2 {
+	status="disabled";
+};
+
+&mmc3 {
+	status="disabled";
 };
 
 &omap3_pmx_core {
@@ -209,6 +220,17 @@
 			0x174 (PIN_OUTPUT | MUX_MODE0)	/* hsusb0_stp.hsusb0_stp */
 		>;
 	};
+
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_clk.mmc1_clk */
+			OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_cmd.mmc1_cmd */
+			OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat0.mmc1_dat0 */
+			OMAP3_CORE1_IOPAD(0x214A, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat1.mmc1_dat1 */
+			OMAP3_CORE1_IOPAD(0x214C, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat2.mmc1_dat2 */
+			OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat3.mmc1_dat3 */
+		>;
+	};
 };
 
 &usb_otg_hs {
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: dts: omap3-ldp: fix mmc configuration

Quoted 3 lines · Nishanth Menon

MMC1 is the only MMC interface available on the platform. Further, since the platform is based on older revision of SoC which is not capable of doing multi-block writes, mark it so and add pinmux

s/writes/read

Thanks and Regards,
Balaji T K

Quoted 51 lines

to ensure that all relevant pins are configured for non-MMC boot mode.

---
ti,erratum-2.1.1.128 introduced in https://patchwork.kernel.org/patch/3514851/
hence depends on the same.

  arch/arm/boot/dts/omap3-ldp.dts |   22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
arch/arm/boot/dts/omap3-ldp.dts +22 -0
index ddce0d8..bc0cc66 100644
@@ -176,6 +176,17 @@
  &mmc1 {
  	vmmc-supply = <&vmmc1>;
  	bus-width = <4>;
+	ti,erratum-2.1.1.128;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+};
+
+&mmc2 {
+	status="disabled";
+};
+
+&mmc3 {
+	status="disabled";
  };
 
  &omap3_pmx_core {
@@ -209,6 +220,17 @@
  			0x174 (PIN_OUTPUT | MUX_MODE0)	/* hsusb0_stp.hsusb0_stp */
  		>;
  	};
+
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_clk.mmc1_clk */
+			OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_cmd.mmc1_cmd */
+			OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat0.mmc1_dat0 */
+			OMAP3_CORE1_IOPAD(0x214A, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat1.mmc1_dat1 */
+			OMAP3_CORE1_IOPAD(0x214C, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat2.mmc1_dat2 */
+			OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat3.mmc1_dat3 */
+		>;
+	};
  };
 
  &usb_otg_hs {
#2 lore raw

PATCH 1/1 ARM: dts: omap3-ldp: fix mmc configuration

Quoted 6 lines · Balaji T K
Quoted 3 lines · Nishanth Menon

MMC1 is the only MMC interface available on the platform. Further, since the platform is based on older revision of SoC which is not capable of doing multi-block writes, mark it so and add pinmux

s/writes/read

arrgh.. yes.

Quoted 56 lines

Thanks and Regards,
Balaji T K

Quoted 51 lines

to ensure that all relevant pins are configured for non-MMC boot mode.

---
ti,erratum-2.1.1.128 introduced in https://patchwork.kernel.org/patch/3514851/
hence depends on the same.

  arch/arm/boot/dts/omap3-ldp.dts |   22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
arch/arm/boot/dts/omap3-ldp.dts +22 -0
index ddce0d8..bc0cc66 100644
@@ -176,6 +176,17 @@
  &mmc1 {
  	vmmc-supply = <&vmmc1>;
  	bus-width = <4>;
+	ti,erratum-2.1.1.128;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+};
+
+&mmc2 {
+	status="disabled";
+};
+
+&mmc3 {
+	status="disabled";
  };
 
  &omap3_pmx_core {
@@ -209,6 +220,17 @@
  			0x174 (PIN_OUTPUT | MUX_MODE0)	/* hsusb0_stp.hsusb0_stp */
  		>;
  	};
+
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_clk.mmc1_clk */
+			OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_cmd.mmc1_cmd */
+			OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat0.mmc1_dat0 */
+			OMAP3_CORE1_IOPAD(0x214A, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat1.mmc1_dat1 */
+			OMAP3_CORE1_IOPAD(0x214C, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat2.mmc1_dat2 */
+			OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_dat3.mmc1_dat3 */
+		>;
+	};
  };
 
  &usb_otg_hs {
Signature · 2 lines
Regards,
Nishanth Menon