Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edd5eb4e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix eMMC on n900 with device tree 



Looks like we need to configure the regulators and use the pdata
quirk to make eMMC work with device tree.

It seems that mostly vaux3 is used, and only some earlier revisions
used vmmc2. This has been tested to work on devices where the
system_rev passed by the bootloader has versions 0x0010, 0x2101
and 0x2204.

Cc: devicetree@vger.kernel.org
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarSebastian Reichel <sre@debian.org>
[tony@atomide.com: updated with pinctrl changes and comments from Sebastian]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 26f67a31

arch/arm/boot/dts/omap3-n900.dts

+22 −1
Original line number Diff line number Diff line
@@ -125,6 +125,21 @@ 
		>;

	};



	mmc2_pins: pinmux_mmc2_pins {

		pinctrl-single,pins = <

			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk */

			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd */

			0x12c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc2_dat0 */

			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1 */

			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2 */

			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3 */

			0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat4 */

			0x136 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat5 */

			0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat6 */

			0x13a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat7 */

		>;

	};



	display_pins: pinmux_display_pins {

		pinctrl-single,pins = <

			0x0d4 (PIN_OUTPUT | MUX_MODE4)		/* RX51_LCD_RESET_GPIO */
@@ -358,8 +373,14 @@ 
	cd-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* 160 */

};



/* most boards use vaux3, only some old versions use vmmc2 instead */

&mmc2 {

	status = "disabled";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&vaux3>;

	vmmc_aux-supply = <&vsim>;

	bus-width = <8>;

	non-removable;

};



&mmc3 {

arch/arm/mach-omap2/pdata-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { 


static struct pdata_init pdata_quirks[] __initdata = {

#ifdef CONFIG_ARCH_OMAP3

	{ "nokia,omap3-n900", hsmmc2_internal_input_clk, },

	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },

	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },

	{ "isee,omap3-igep0020", omap3_igep0020_legacy_init, },