ARM: OMAP: Mux additions and clean-up for omap2

Mux additions and clean-up for omap2

arch/arm/mach-omap2/mux.c

@@ -33,18 +33,27 @@
 
 #ifdef CONFIG_OMAP_MUX
 
+/* NOTE: See mux.h for the enumeration */
+
 struct pin_config __initdata_or_module omap24xx_pins[] = {
 /*
- *            description             mux       mux   pull  pull  debug
- *                                    offset    mode  ena   type
+ *	description			mux	mux	pull	pull	debug
+ *					offset	mode	ena	type
  */
 
 /* 24xx I2C */
-MUX_CFG_24XX("M19_24XX_I2C1_SCL",    0x111,    0,    0,    0,    1)
-MUX_CFG_24XX("L15_24XX_I2C1_SDA",    0x112,    0,    0,    0,    1)
-MUX_CFG_24XX("J15_24XX_I2C2_SCL",    0x113,    0,    0,    0,    1)
-MUX_CFG_24XX("H19_24XX_I2C2_SDA",    0x114,    0,    0,    0,    1)
-MUX_CFG_24XX("W19_24XX_SYS_NIRQ",    0x12c,    0,    1,    1,    1)
+MUX_CFG_24XX("M19_24XX_I2C1_SCL",	0x111,	0,	0,	0,	1)
+MUX_CFG_24XX("L15_24XX_I2C1_SDA",	0x112,	0,	0,	0,	1)
+MUX_CFG_24XX("J15_24XX_I2C2_SCL",	0x113,	0,	0,	0,	1)
+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 GPIO */
+MUX_CFG_24XX("Y20_24XX_GPIO60",		0x12c,	3,	0,	0,	1)
+MUX_CFG_24XX("M15_24XX_GPIO92",		0x10a,	3,	0,	0,	1)
+
 };
 
 int __init omap2_mux_init(void)

arch/arm/plat-omap/mux.c

@@ -83,7 +83,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
 		if(cfg->pu_pd_val)
 			reg |= OMAP24XX_PULL_UP;
 #ifdef CONFIG_OMAP_MUX_DEBUG
-		printk("Muxing %s: (0x%08x) 0x%02x -> 0x%02x\n",
+		printk("Muxing %s (0x%08x): 0x%02x -> 0x%02x\n",
 		       cfg->name, OMAP24XX_L4_BASE + cfg->mux_reg,
 		       omap_readb(OMAP24XX_L4_BASE + cfg->mux_reg), reg);
 #endif

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

@@ -399,7 +399,13 @@ enum omap24xx_index {
 	L15_24XX_I2C1_SDA,
 	J15_24XX_I2C2_SCL,
 	H19_24XX_I2C2_SDA,
+
+	/* 24xx Menelaus interrupt */
 	W19_24XX_SYS_NIRQ,
+
+	/* 24xx GPIO */
+	Y20_24XX_GPIO60,
+	M15_24XX_GPIO92,
 };
 
 #ifdef	CONFIG_OMAP_MUX