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

Commit 8d7f9f50 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[ARM] 3428/1: ARM: OMAP: 3/8 Update pin multiplexing 



Patch from Tony Lindgren

Update OMAP pin multiplexing code from linux-omap tree.
This patch adds new pin configurations by various OMAP
developers, and suport for omap730 by Brian Swetland.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a569c6ec

arch/arm/mach-omap1/mux.c

+17 −13
Original line number Diff line number Diff line
@@ -35,16 +35,20 @@ 


#ifdef CONFIG_ARCH_OMAP730

struct pin_config __initdata_or_module omap730_pins[] = {

MUX_CFG_730("E2_730_KBR0",	12,   21,    0,	  0,   20,   1,	  NA,	 0,  0)

MUX_CFG_730("J7_730_KBR1",	12,   25,    0,	  0,   24,   1,	  NA,	 0,  0)

MUX_CFG_730("E1_730_KBR2",	12,   29,    0,	  0,   28,   1,	  NA,	 0,  0)

MUX_CFG_730("F3_730_KBR3",	13,    1,    0,	  0,   0,    1,	  NA,	 0,  0)

MUX_CFG_730("D2_730_KBR4",	13,    5,    0,	  0,   4,    1,	  NA,	 0,  0)

MUX_CFG_730("C2_730_KBC0",	13,    9,    0,	  0,	8,   1,	  NA,	 0,  0)

MUX_CFG_730("D3_730_KBC1",	13,   13,    0,	  0,   12,   1,	  NA,	 0,  0)

MUX_CFG_730("E4_730_KBC2",	13,   17,    0,	  0,   16,   1,	  NA,	 0,  0)

MUX_CFG_730("F4_730_KBC3",	13,   21,    0,	  0,   20,   1,	  NA,	 0,  0)

MUX_CFG_730("E3_730_KBC4",	13,   25,    0,	  0,   24,   1,	  NA,	 0,  0)

MUX_CFG_730("E2_730_KBR0",        12,   21,    0,   20,   1, 0)

MUX_CFG_730("J7_730_KBR1",        12,   25,    0,   24,   1, 0)

MUX_CFG_730("E1_730_KBR2",        12,   29,    0,   28,   1, 0)

MUX_CFG_730("F3_730_KBR3",        13,    1,    0,    0,   1, 0)

MUX_CFG_730("D2_730_KBR4",        13,    5,    0,    4,   1, 0)

MUX_CFG_730("C2_730_KBC0",        13,    9,    0,    8,   1, 0)

MUX_CFG_730("D3_730_KBC1",        13,   13,    0,   12,   1, 0)

MUX_CFG_730("E4_730_KBC2",        13,   17,    0,   16,   1, 0)

MUX_CFG_730("F4_730_KBC3",        13,   21,    0,   20,   1, 0)

MUX_CFG_730("E3_730_KBC4",        13,   25,    0,   24,   1, 0)



MUX_CFG_730("AA17_730_USB_DM",     2,   21,    0,   20,   0, 0)

MUX_CFG_730("W16_730_USB_PU_EN",   2,   25,    0,   24,   0, 0)

MUX_CFG_730("W17_730_USB_VBUSI",   2,   29,    0,   28,   0, 0)

};

#endif

arch/arm/mach-omap2/mux.c

+45 −0
Original line number Diff line number Diff line
@@ -50,9 +50,54 @@ MUX_CFG_24XX("H19_24XX_I2C2_SDA", 0x114, 0, 0, 0, 1) 
/* Menelaus interrupt */

MUX_CFG_24XX("W19_24XX_SYS_NIRQ",	0x12c,	0,	1,	1,	1)



/* 24xx clocks */

MUX_CFG_24XX("W14_24XX_SYS_CLKOUT",	0x137,	0,	1,	1,	1)



/* 24xx McBSP */

MUX_CFG_24XX("Y15_24XX_MCBSP2_CLKX",	0x124,	1,	1,	0,	1)

MUX_CFG_24XX("R14_24XX_MCBSP2_FSX",	0x125,	1,	1,	0,	1)

MUX_CFG_24XX("W15_24XX_MCBSP2_DR",	0x126,	1,	1,	0,	1)

MUX_CFG_24XX("V15_24XX_MCBSP2_DX",	0x127,	1,	1,	0,	1)



/* 24xx GPIO */

MUX_CFG_24XX("M21_242X_GPIO11",	 0x0c9,  3,      1,      1,      1)

MUX_CFG_24XX("AA10_242X_GPIO13",	0x0e5,  3,      0,      0,      1)

MUX_CFG_24XX("AA6_242X_GPIO14",	 0x0e6,  3,      0,      0,      1)

MUX_CFG_24XX("AA4_242X_GPIO15",	 0x0e7,  3,      0,      0,      1)

MUX_CFG_24XX("Y11_242X_GPIO16",	 0x0e8,  3,      0,      0,      1)

MUX_CFG_24XX("AA12_242X_GPIO17",	0x0e9,  3,      0,      0,      1)

MUX_CFG_24XX("AA8_242X_GPIO58",	 0x0ea,  3,      0,      0,      1)

MUX_CFG_24XX("Y20_24XX_GPIO60",		0x12c,	3,	0,	0,	1)

MUX_CFG_24XX("W4__24XX_GPIO74",	 0x0f2,  3,      0,      0,      1)

MUX_CFG_24XX("M15_24XX_GPIO92",		0x10a,	3,	0,	0,	1)

MUX_CFG_24XX("V14_24XX_GPIO117",	0x128,	3,	1,	0,	1)



/* TSC IRQ */

MUX_CFG_24XX("P20_24XX_TSC_IRQ",	0x108,	0,	0,	0,	1)



/* UART3  */

MUX_CFG_24XX("K15_24XX_UART3_TX",	0x118,	0,	0,	0,	1)

MUX_CFG_24XX("K14_24XX_UART3_RX",	0x119,	0,	0,	0,	1)



/* Keypad GPIO*/

MUX_CFG_24XX("T19_24XX_KBR0",		0x106,	3,	1,	1,	1)

MUX_CFG_24XX("R19_24XX_KBR1",		0x107,	3,	1,	1,	1)

MUX_CFG_24XX("V18_24XX_KBR2",		0x139,	3,	1,	1,	1)

MUX_CFG_24XX("M21_24XX_KBR3",		0xc9,	3,	1,	1,	1)

MUX_CFG_24XX("E5__24XX_KBR4",		0x138,	3,	1,	1,	1)

MUX_CFG_24XX("M18_24XX_KBR5",		0x10e,	3,	1,	1,	1)

MUX_CFG_24XX("R20_24XX_KBC0",		0x108,	3,	0,	0,	1)

MUX_CFG_24XX("M14_24XX_KBC1",		0x109,	3,	0,	0,	1)

MUX_CFG_24XX("H19_24XX_KBC2",		0x114,	3,	0,	0,	1)

MUX_CFG_24XX("V17_24XX_KBC3",		0x135,	3,	0,	0,	1)

MUX_CFG_24XX("P21_24XX_KBC4",		0xca,	3,	0,	0,	1)

MUX_CFG_24XX("L14_24XX_KBC5",		0x10f,	3,	0,	0,	1)

MUX_CFG_24XX("N19_24XX_KBC6",		0x110,	3,	0,	0,	1)



/* 24xx Menelaus Keypad GPIO */

MUX_CFG_24XX("B3__24XX_KBR5",		0x30,	3,	1,	1,	1)

MUX_CFG_24XX("AA4_24XX_KBC2",		0xe7,	3,	0,	0,	1)

MUX_CFG_24XX("B13_24XX_KBC6",		0x110,	3,	0,	0,	1)



};

include/asm-arm/arch-omap/mux.h

+51 −3
Original line number Diff line number Diff line
@@ -112,14 +112,13 @@ 
 *   as mux config

 */

#define MUX_CFG_730(desc, mux_reg, mode_offset, mode,	\

		   pull_reg, pull_bit, pull_status,	\

		   pu_pd_reg, pu_pd_status, debug_status)\

		   pull_bit, pull_status, debug_status)\

{							\

	.name =	 desc,					\

	.debug = debug_status,				\

	MUX_REG_730(mux_reg, mode_offset, mode)		\

	PULL_REG_730(mux_reg, pull_bit, pull_status)	\

	PU_PD_REG(pu_pd_reg, pu_pd_status)		\

	PU_PD_REG(NA, 0)		\

},



#define MUX_CFG_24XX(desc, reg_offset, mode,			\
@@ -172,6 +171,11 @@ enum omap730_index { 
	E4_730_KBC2,

	F4_730_KBC3,

	E3_730_KBC4,



	/* USB */

	AA17_730_USB_DM,

	W16_730_USB_PU_EN,

	W17_730_USB_VBUSI,

};



enum omap1xxx_index {
@@ -403,9 +407,53 @@ enum omap24xx_index { 
	/* 24xx Menelaus interrupt */

	W19_24XX_SYS_NIRQ,



	/* 24xx clock */

	W14_24XX_SYS_CLKOUT,



	/* 242X McBSP */

	Y15_24XX_MCBSP2_CLKX,

	R14_24XX_MCBSP2_FSX,

	W15_24XX_MCBSP2_DR,

	V15_24XX_MCBSP2_DX,



	/* 24xx GPIO */

	M21_242X_GPIO11,

	AA10_242X_GPIO13,

	AA6_242X_GPIO14,

	AA4_242X_GPIO15,

	Y11_242X_GPIO16,

	AA12_242X_GPIO17,

	AA8_242X_GPIO58,

	Y20_24XX_GPIO60,

	W4__24XX_GPIO74,

	M15_24XX_GPIO92,

	V14_24XX_GPIO117,



	P20_24XX_TSC_IRQ,



	/* UART3 */

	K15_24XX_UART3_TX,

	K14_24XX_UART3_RX,



	/* Keypad GPIO*/

	T19_24XX_KBR0,

	R19_24XX_KBR1,

	V18_24XX_KBR2,

	M21_24XX_KBR3,

	E5__24XX_KBR4,

	M18_24XX_KBR5,

	R20_24XX_KBC0,

	M14_24XX_KBC1,

	H19_24XX_KBC2,

	V17_24XX_KBC3,

	P21_24XX_KBC4,

	L14_24XX_KBC5,

	N19_24XX_KBC6,



	/* 24xx Menelaus Keypad GPIO */

	B3__24XX_KBR5,

	AA4_24XX_KBC2,

	B13_24XX_KBC6,

};



#ifdef	CONFIG_OMAP_MUX