Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / arm / mach-omap2 / mux.c

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index ea46548..60ef084 100644 (file)
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <asm/system.h>
@@ -50,9 +49,80 @@ 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 GPMC wait pin monitoring */
+MUX_CFG_24XX("L3_GPMC_WAIT0",          0x09a,  0,      1,      1,      1)
+MUX_CFG_24XX("N7_GPMC_WAIT1",          0x09b,  0,      1,      1,      1)
+MUX_CFG_24XX("M1_GPMC_WAIT2",          0x09c,  0,      1,      1,      1)
+MUX_CFG_24XX("P1_GPMC_WAIT3",          0x09d,  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)
+
+/* 242x DBG GPIO */
+MUX_CFG_24XX("V4_242X_GPIO49",         0xd3,   3,      0,      0,      1)
+MUX_CFG_24XX("W2_242X_GPIO50",         0xd4,   3,      0,      0,      1)
+MUX_CFG_24XX("U4_242X_GPIO51",         0xd5,   3,      0,      0,      1)
+MUX_CFG_24XX("V3_242X_GPIO52",         0xd6,   3,      0,      0,      1)
+MUX_CFG_24XX("V2_242X_GPIO53",         0xd7,   3,      0,      0,      1)
+MUX_CFG_24XX("V6_242X_GPIO53",         0xcf,   3,      0,      0,      1)
+MUX_CFG_24XX("T4_242X_GPIO54",         0xd8,   3,      0,      0,      1)
+MUX_CFG_24XX("Y4_242X_GPIO54",         0xd0,   3,      0,      0,      1)
+MUX_CFG_24XX("T3_242X_GPIO55",         0xd9,   3,      0,      0,      1)
+MUX_CFG_24XX("U2_242X_GPIO56",         0xda,   3,      0,      0,      1)
+
+/* 24xx external DMA requests */
+MUX_CFG_24XX("AA10_242X_DMAREQ0",      0x0e5,  2,      0,      0,      1)
+MUX_CFG_24XX("AA6_242X_DMAREQ1",       0x0e6,  2,      0,      0,      1)
+MUX_CFG_24XX("E4_242X_DMAREQ2",                0x074,  2,      0,      0,      1)
+MUX_CFG_24XX("G4_242X_DMAREQ3",                0x073,  2,      0,      0,      1)
+MUX_CFG_24XX("D3_242X_DMAREQ4",                0x072,  2,      0,      0,      1)
+MUX_CFG_24XX("E3_242X_DMAREQ5",                0x071,  2,      0,      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)
 
 };