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

Commit 57b9daa0 authored by Vikram Pandita's avatar Vikram Pandita Committed by Tony Lindgren
Browse files

OMAP3: MMC: Add mux for pins 



For OMAP3 add MMC1 MMC2 pin mux MMC3 mux is not added as there are
multiple configurations possible, so the muxing is left to be done
in board file.

Signed-off-by: default avatarVikram Pandita <vikram.pandita@ti.com>
Signed-off-by: default avatarChikkature Rajashekar <madhu.cr@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ac2a048c

arch/arm/mach-omap2/devices.c

+41 −0
Original line number Diff line number Diff line
@@ -513,6 +513,47 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
			omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);

		}

	}



	if (cpu_is_omap3430()) {

		if (controller_nr == 0) {

			omap_cfg_reg(N28_3430_MMC1_CLK);

			omap_cfg_reg(M27_3430_MMC1_CMD);

			omap_cfg_reg(N27_3430_MMC1_DAT0);

			if (mmc_controller->slots[0].wires == 4 ||

				mmc_controller->slots[0].wires == 8) {

				omap_cfg_reg(N26_3430_MMC1_DAT1);

				omap_cfg_reg(N25_3430_MMC1_DAT2);

				omap_cfg_reg(P28_3430_MMC1_DAT3);

			}

			if (mmc_controller->slots[0].wires == 8) {

				omap_cfg_reg(P27_3430_MMC1_DAT4);

				omap_cfg_reg(P26_3430_MMC1_DAT5);

				omap_cfg_reg(R27_3430_MMC1_DAT6);

				omap_cfg_reg(R25_3430_MMC1_DAT7);

			}

		}

		if (controller_nr == 1) {

			/* MMC2 */

			omap_cfg_reg(AE2_3430_MMC2_CLK);

			omap_cfg_reg(AG5_3430_MMC2_CMD);

			omap_cfg_reg(AH5_3430_MMC2_DAT0);



			/*

			 * For 8 wire configurations, Lines DAT4, 5, 6 and 7 need to be muxed

			 * in the board-*.c files

			 */

			if (mmc_controller->slots[0].wires == 4 ||

				mmc_controller->slots[0].wires == 8) {

				omap_cfg_reg(AH4_3430_MMC2_DAT1);

				omap_cfg_reg(AG4_3430_MMC2_DAT2);

				omap_cfg_reg(AF4_3430_MMC2_DAT3);

			}

		}



		/*

		 * For MMC3 the pins need to be muxed in the board-*.c files

		 */

	}

}



void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,

arch/arm/mach-omap2/mux.c

+50 −0
Original line number Diff line number Diff line
@@ -492,6 +492,56 @@ MUX_CFG_34XX("H16_34XX_SDRC_CKE0", 0x262, 
		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_OUTPUT)

MUX_CFG_34XX("H17_34XX_SDRC_CKE1", 0x264,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_OUTPUT)



/* MMC1 */

MUX_CFG_34XX("N28_3430_MMC1_CLK", 0x144,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("M27_3430_MMC1_CMD", 0x146,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("N27_3430_MMC1_DAT0", 0x148,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("N26_3430_MMC1_DAT1", 0x14a,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("N25_3430_MMC1_DAT2", 0x14c,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("P28_3430_MMC1_DAT3", 0x14e,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("P27_3430_MMC1_DAT4", 0x150,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("P26_3430_MMC1_DAT5", 0x152,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("R27_3430_MMC1_DAT6", 0x154,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("R25_3430_MMC1_DAT7", 0x156,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)



/* MMC2 */

MUX_CFG_34XX("AE2_3430_MMC2_CLK", 0x158,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AG5_3430_MMC2_CMD", 0x15A,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AH5_3430_MMC2_DAT0", 0x15c,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AH4_3430_MMC2_DAT1", 0x15e,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AG4_3430_MMC2_DAT2", 0x160,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AF4_3430_MMC2_DAT3", 0x162,

		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)



/* MMC3 */

MUX_CFG_34XX("AF10_3430_MMC3_CLK", 0x5d8,

		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AC3_3430_MMC3_CMD", 0x1d0,

		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AE11_3430_MMC3_DAT0", 0x5e4,

		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AH9_3430_MMC3_DAT1", 0x5e6,

		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AF13_3430_MMC3_DAT2", 0x5e8,

		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)

MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2,

		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)

};



#define OMAP34XX_PINS_SZ	ARRAY_SIZE(omap34xx_pins)

arch/arm/plat-omap/include/mach/mux.h

+28 −0
Original line number Diff line number Diff line
@@ -857,6 +857,34 @@ enum omap34xx_index { 
	/* OMAP3 SDRC CKE signals to SDR/DDR ram chips */

	H16_34XX_SDRC_CKE0,

	H17_34XX_SDRC_CKE1,



	/* MMC1 */

	N28_3430_MMC1_CLK,

	M27_3430_MMC1_CMD,

	N27_3430_MMC1_DAT0,

	N26_3430_MMC1_DAT1,

	N25_3430_MMC1_DAT2,

	P28_3430_MMC1_DAT3,

	P27_3430_MMC1_DAT4,

	P26_3430_MMC1_DAT5,

	R27_3430_MMC1_DAT6,

	R25_3430_MMC1_DAT7,



	/* MMC2 */

	AE2_3430_MMC2_CLK,

	AG5_3430_MMC2_CMD,

	AH5_3430_MMC2_DAT0,

	AH4_3430_MMC2_DAT1,

	AG4_3430_MMC2_DAT2,

	AF4_3430_MMC2_DAT3,



	/* MMC3 */

	AF10_3430_MMC3_CLK,

	AC3_3430_MMC3_CMD,

	AE11_3430_MMC3_DAT0,

	AH9_3430_MMC3_DAT1,

	AF13_3430_MMC3_DAT2,

	AF13_3430_MMC3_DAT3,

};



struct omap_mux_cfg {