include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / arch / arm / mach-omap2 / mux.c
index f63f3a2..8b3d269 100644 (file)
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/list.h>
+#include <linux/ctype.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include <linux/uaccess.h>
 
 #include <asm/system.h>
 
-#include <mach/control.h>
-#include <mach/mux.h>
+#include <plat/control.h>
+#include <plat/mux.h>
 
-#ifdef CONFIG_OMAP_MUX
+#include "mux.h"
+
+#define OMAP_MUX_BASE_OFFSET           0x30    /* Offset from CTRL_BASE */
+#define OMAP_MUX_BASE_SZ               0x5ca
+
+struct omap_mux_entry {
+       struct omap_mux         mux;
+       struct list_head        node;
+};
+
+static unsigned long mux_phys;
+static void __iomem *mux_base;
+
+u16 omap_mux_read(u16 reg)
+{
+       if (cpu_is_omap24xx())
+               return __raw_readb(mux_base + reg);
+       else
+               return __raw_readw(mux_base + reg);
+}
+
+void omap_mux_write(u16 val, u16 reg)
+{
+       if (cpu_is_omap24xx())
+               __raw_writeb(val, mux_base + reg);
+       else
+               __raw_writew(val, mux_base + reg);
+}
+
+void omap_mux_write_array(struct omap_board_mux *board_mux)
+{
+       while (board_mux->reg_offset !=  OMAP_MUX_TERMINATOR) {
+               omap_mux_write(board_mux->value, board_mux->reg_offset);
+               board_mux++;
+       }
+}
+
+#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_OMAP_MUX)
 
 static struct omap_mux_cfg arch_mux_cfg;
 
 /* NOTE: See mux.h for the enumeration */
 
-#ifdef CONFIG_ARCH_OMAP24XX
 static struct pin_config __initdata_or_module omap24xx_pins[] = {
 /*
  *     description                     mux     mux     pull    pull    debug
@@ -249,318 +291,14 @@ MUX_CFG_24XX("AF19_2430_GPIO_85",        0x0113, 3,      0,      0,      1)
 
 #define OMAP24XX_PINS_SZ       ARRAY_SIZE(omap24xx_pins)
 
-#else
-#define omap24xx_pins          NULL
-#define OMAP24XX_PINS_SZ       0
-#endif /* CONFIG_ARCH_OMAP24XX */
-
-#ifdef CONFIG_ARCH_OMAP34XX
-static struct pin_config __initdata_or_module omap34xx_pins[] = {
-/*
- *             Name, reg-offset,
- *             mux-mode | [active-mode | off-mode]
- */
-
-/* 34xx I2C */
-MUX_CFG_34XX("K21_34XX_I2C1_SCL", 0x1ba,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("J21_34XX_I2C1_SDA", 0x1bc,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AF15_34XX_I2C2_SCL", 0x1be,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AE15_34XX_I2C2_SDA", 0x1c0,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AF14_34XX_I2C3_SCL", 0x1c2,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AG14_34XX_I2C3_SDA", 0x1c4,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AD26_34XX_I2C4_SCL", 0xa00,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AE26_34XX_I2C4_SDA", 0xa02,
-               OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
-
-/* PHY - HSUSB: 12-pin ULPI PHY: Port 1*/
-MUX_CFG_34XX("Y8_3430_USB1HS_PHY_CLK", 0x5da,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("Y9_3430_USB1HS_PHY_STP", 0x5d8,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("AA14_3430_USB1HS_PHY_DIR", 0x5ec,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AA11_3430_USB1HS_PHY_NXT", 0x5ee,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W13_3430_USB1HS_PHY_D0", 0x5dc,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W12_3430_USB1HS_PHY_D1", 0x5de,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W11_3430_USB1HS_PHY_D2", 0x5e0,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y11_3430_USB1HS_PHY_D3", 0x5ea,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W9_3430_USB1HS_PHY_D4", 0x5e4,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y12_3430_USB1HS_PHY_D5", 0x5e6,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W8_3430_USB1HS_PHY_D6", 0x5e8,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y13_3430_USB1HS_PHY_D7", 0x5e2,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-
-/* PHY - HSUSB: 12-pin ULPI PHY: Port 2*/
-MUX_CFG_34XX("AA8_3430_USB2HS_PHY_CLK", 0x5f0,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("AA10_3430_USB2HS_PHY_STP", 0x5f2,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("AA9_3430_USB2HS_PHY_DIR", 0x5f4,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB11_3430_USB2HS_PHY_NXT", 0x5f6,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB10_3430_USB2HS_PHY_D0", 0x5f8,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB9_3430_USB2HS_PHY_D1", 0x5fa,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W3_3430_USB2HS_PHY_D2", 0x1d4,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T4_3430_USB2HS_PHY_D3", 0x1de,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T3_3430_USB2HS_PHY_D4", 0x1d8,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("R3_3430_USB2HS_PHY_D5", 0x1da,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("R4_3430_USB2HS_PHY_D6", 0x1dc,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T2_3430_USB2HS_PHY_D7", 0x1d6,
-               OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
-
-/* TLL - HSUSB: 12-pin TLL Port 1*/
-MUX_CFG_34XX("Y8_3430_USB1HS_TLL_CLK", 0x5da,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y9_3430_USB1HS_TLL_STP", 0x5d8,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AA14_3430_USB1HS_TLL_DIR", 0x5ec,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AA11_3430_USB1HS_TLL_NXT", 0x5ee,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W13_3430_USB1HS_TLL_D0", 0x5dc,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W12_3430_USB1HS_TLL_D1", 0x5de,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W11_3430_USB1HS_TLL_D2", 0x5e0,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y11_3430_USB1HS_TLL_D3", 0x5ea,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W9_3430_USB1HS_TLL_D4", 0x5e4,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y12_3430_USB1HS_TLL_D5", 0x5e6,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W8_3430_USB1HS_TLL_D6", 0x5e8,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y13_3430_USB1HS_TLL_D7", 0x5e2,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-
-/* TLL - HSUSB: 12-pin TLL Port 2*/
-MUX_CFG_34XX("AA8_3430_USB2HS_TLL_CLK", 0x5f0,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AA10_3430_USB2HS_TLL_STP", 0x5f2,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AA9_3430_USB2HS_TLL_DIR", 0x5f4,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB11_3430_USB2HS_TLL_NXT", 0x5f6,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB10_3430_USB2HS_TLL_D0", 0x5f8,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB9_3430_USB2HS_TLL_D1", 0x5fa,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W3_3430_USB2HS_TLL_D2", 0x1d4,
-               OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T4_3430_USB2HS_TLL_D3", 0x1de,
-               OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T3_3430_USB2HS_TLL_D4", 0x1d8,
-               OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("R3_3430_USB2HS_TLL_D5", 0x1da,
-               OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("R4_3430_USB2HS_TLL_D6", 0x1dc,
-               OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T2_3430_USB2HS_TLL_D7", 0x1d6,
-               OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN)
-
-/* TLL - HSUSB: 12-pin TLL Port 3*/
-MUX_CFG_34XX("AA6_3430_USB3HS_TLL_CLK", 0x180,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB3_3430_USB3HS_TLL_STP", 0x166,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AA3_3430_USB3HS_TLL_DIR", 0x168,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y3_3430_USB3HS_TLL_NXT", 0x16a,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AA5_3430_USB3HS_TLL_D0", 0x186,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y4_3430_USB3HS_TLL_D1", 0x184,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y5_3430_USB3HS_TLL_D2", 0x188,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W5_3430_USB3HS_TLL_D3", 0x18a,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB12_3430_USB3HS_TLL_D4", 0x16c,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB13_3430_USB3HS_TLL_D5", 0x16e,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AA13_3430_USB3HS_TLL_D6", 0x170,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AA12_3430_USB3HS_TLL_D7", 0x172,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-
-/* PHY FSUSB: FS Serial for Port 1 (multiple PHY modes supported) */
-MUX_CFG_34XX("AF10_3430_USB1FS_PHY_MM1_RXDP", 0x5d8,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AG9_3430_USB1FS_PHY_MM1_RXDM", 0x5ee,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W13_3430_USB1FS_PHY_MM1_RXRCV", 0x5dc,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W12_3430_USB1FS_PHY_MM1_TXSE0", 0x5de,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W11_3430_USB1FS_PHY_MM1_TXDAT", 0x5e0,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("Y11_3430_USB1FS_PHY_MM1_TXEN_N", 0x5ea,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_OUTPUT)
-
-/* PHY FSUSB: FS Serial for Port 2 (multiple PHY modes supported) */
-MUX_CFG_34XX("AF7_3430_USB2FS_PHY_MM2_RXDP", 0x5f2,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AH7_3430_USB2FS_PHY_MM2_RXDM", 0x5f6,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB10_3430_USB2FS_PHY_MM2_RXRCV", 0x5f8,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AB9_3430_USB2FS_PHY_MM2_TXSE0", 0x5fa,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("W3_3430_USB2FS_PHY_MM2_TXDAT", 0x1d4,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("T4_3430_USB2FS_PHY_MM2_TXEN_N", 0x1de,
-               OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_OUTPUT)
-
-/* PHY FSUSB: FS Serial for Port 3 (multiple PHY modes supported) */
-MUX_CFG_34XX("AH3_3430_USB3FS_PHY_MM3_RXDP", 0x166,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AE3_3430_USB3FS_PHY_MM3_RXDM", 0x16a,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AD1_3430_USB3FS_PHY_MM3_RXRCV", 0x186,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AE1_3430_USB3FS_PHY_MM3_TXSE0", 0x184,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AD2_3430_USB3FS_PHY_MM3_TXDAT", 0x188,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("AC1_3430_USB3FS_PHY_MM3_TXEN_N", 0x18a,
-               OMAP34XX_MUX_MODE6 | OMAP34XX_PIN_OUTPUT)
-
-
-/* 34XX GPIO - bidirectional, unless the name has an "_OUT" suffix.
- * (Always specify PIN_INPUT, except for names suffixed by "_OUT".)
- * No internal pullup/pulldown without "_UP" or "_DOWN" suffix.
- */
-MUX_CFG_34XX("AF26_34XX_GPIO0", 0x1e0,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("AF22_34XX_GPIO9", 0xa18,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("AH8_34XX_GPIO29", 0x5fa,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("U8_34XX_GPIO54_OUT", 0x0b4,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("U8_34XX_GPIO54_DOWN", 0x0b4,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLDOWN)
-MUX_CFG_34XX("L8_34XX_GPIO63", 0x0ce,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("G25_34XX_GPIO86_OUT", 0x0fc,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("AG4_34XX_GPIO134_OUT", 0x160,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("AE4_34XX_GPIO136_OUT", 0x164,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("AF6_34XX_GPIO140_UP", 0x16c,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP)
-MUX_CFG_34XX("AE6_34XX_GPIO141", 0x16e,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("AF5_34XX_GPIO142", 0x170,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("AE5_34XX_GPIO143", 0x172,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-MUX_CFG_34XX("H19_34XX_GPIO164_OUT", 0x19c,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
-MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6,
-               OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
-
-/* OMAP3 SDRC CKE signals to SDR/DDR ram chips */
-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)
-
-#else
-#define omap34xx_pins          NULL
-#define OMAP34XX_PINS_SZ       0
-#endif /* CONFIG_ARCH_OMAP34XX */
-
 #if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
+
 static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 reg)
 {
        u16 orig;
        u8 warn = 0, debug = 0;
 
-       if (cpu_is_omap24xx())
-               orig = omap_ctrl_readb(cfg->mux_reg);
-       else
-               orig = omap_ctrl_readw(cfg->mux_reg);
+       orig = omap_mux_read(cfg->mux_reg - OMAP_MUX_BASE_OFFSET);
 
 #ifdef CONFIG_OMAP_MUX_DEBUG
        debug = cfg->debug;
@@ -576,7 +314,6 @@ static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 r
 #define omap2_cfg_debug(x, y)  do {} while (0)
 #endif
 
-#ifdef CONFIG_ARCH_OMAP24XX
 static int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)
 {
        static DEFINE_SPINLOCK(mux_spin_lock);
@@ -590,47 +327,717 @@ static int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)
        if (cfg->pu_pd_val)
                reg |= OMAP2_PULL_UP;
        omap2_cfg_debug(cfg, reg);
-       omap_ctrl_writeb(reg, cfg->mux_reg);
+       omap_mux_write(reg, cfg->mux_reg - OMAP_MUX_BASE_OFFSET);
        spin_unlock_irqrestore(&mux_spin_lock, flags);
 
        return 0;
 }
+
+int __init omap2_mux_init(void)
+{
+       u32 mux_pbase;
+
+       if (cpu_is_omap2420())
+               mux_pbase = OMAP2420_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
+       else if (cpu_is_omap2430())
+               mux_pbase = OMAP243X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
+       else
+               return -ENODEV;
+
+       mux_base = ioremap(mux_pbase, OMAP_MUX_BASE_SZ);
+       if (!mux_base) {
+               printk(KERN_ERR "mux: Could not ioremap\n");
+               return -ENODEV;
+       }
+
+       if (cpu_is_omap24xx()) {
+               arch_mux_cfg.pins       = omap24xx_pins;
+               arch_mux_cfg.size       = OMAP24XX_PINS_SZ;
+               arch_mux_cfg.cfg_reg    = omap24xx_cfg_reg;
+
+               return omap_mux_register(&arch_mux_cfg);
+       }
+
+       return 0;
+}
+
 #else
-#define omap24xx_cfg_reg       NULL
-#endif
+int __init omap2_mux_init(void)
+{
+       return 0;
+}
+#endif /* CONFIG_OMAP_MUX */
+
+/*----------------------------------------------------------------------------*/
 
-#ifdef CONFIG_ARCH_OMAP34XX
-static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
+#ifdef CONFIG_ARCH_OMAP3
+static LIST_HEAD(muxmodes);
+static DEFINE_MUTEX(muxmode_mutex);
+
+#ifdef CONFIG_OMAP_MUX
+
+static char *omap_mux_options;
+
+int __init omap_mux_init_gpio(int gpio, int val)
 {
-       static DEFINE_SPINLOCK(mux_spin_lock);
-       unsigned long flags;
-       u16 reg = 0;
+       struct omap_mux_entry *e;
+       int found = 0;
+
+       if (!gpio)
+               return -EINVAL;
+
+       list_for_each_entry(e, &muxmodes, node) {
+               struct omap_mux *m = &e->mux;
+               if (gpio == m->gpio) {
+                       u16 old_mode;
+                       u16 mux_mode;
+
+                       old_mode = omap_mux_read(m->reg_offset);
+                       mux_mode = val & ~(OMAP_MUX_NR_MODES - 1);
+                       mux_mode |= OMAP_MUX_MODE4;
+                       printk(KERN_DEBUG "mux: Setting signal "
+                               "%s.gpio%i 0x%04x -> 0x%04x\n",
+                               m->muxnames[0], gpio, old_mode, mux_mode);
+                       omap_mux_write(mux_mode, m->reg_offset);
+                       found++;
+               }
+       }
 
-       spin_lock_irqsave(&mux_spin_lock, flags);
-       reg |= cfg->mux_val;
-       omap2_cfg_debug(cfg, reg);
-       omap_ctrl_writew(reg, cfg->mux_reg);
-       spin_unlock_irqrestore(&mux_spin_lock, flags);
+       if (found == 1)
+               return 0;
+
+       if (found > 1) {
+               printk(KERN_ERR "mux: Multiple gpio paths for gpio%i\n", gpio);
+               return -EINVAL;
+       }
+
+       printk(KERN_ERR "mux: Could not set gpio%i\n", gpio);
+
+       return -ENODEV;
+}
+
+int __init omap_mux_init_signal(char *muxname, int val)
+{
+       struct omap_mux_entry *e;
+       char *m0_name = NULL, *mode_name = NULL;
+       int found = 0;
+
+       mode_name = strchr(muxname, '.');
+       if (mode_name) {
+               *mode_name = '\0';
+               mode_name++;
+               m0_name = muxname;
+       } else {
+               mode_name = muxname;
+       }
+
+       list_for_each_entry(e, &muxmodes, node) {
+               struct omap_mux *m = &e->mux;
+               char *m0_entry = m->muxnames[0];
+               int i;
+
+               if (m0_name && strcmp(m0_name, m0_entry))
+                       continue;
+
+               for (i = 0; i < OMAP_MUX_NR_MODES; i++) {
+                       char *mode_cur = m->muxnames[i];
+
+                       if (!mode_cur)
+                               continue;
+
+                       if (!strcmp(mode_name, mode_cur)) {
+                               u16 old_mode;
+                               u16 mux_mode;
+
+                               old_mode = omap_mux_read(m->reg_offset);
+                               mux_mode = val | i;
+                               printk(KERN_DEBUG "mux: Setting signal "
+                                       "%s.%s 0x%04x -> 0x%04x\n",
+                                       m0_entry, muxname, old_mode, mux_mode);
+                               omap_mux_write(mux_mode, m->reg_offset);
+                               found++;
+                       }
+               }
+       }
+
+       if (found == 1)
+               return 0;
+
+       if (found > 1) {
+               printk(KERN_ERR "mux: Multiple signal paths (%i) for %s\n",
+                               found, muxname);
+               return -EINVAL;
+       }
+
+       printk(KERN_ERR "mux: Could not set signal %s\n", muxname);
+
+       return -ENODEV;
+}
+
+#ifdef CONFIG_DEBUG_FS
+
+#define OMAP_MUX_MAX_NR_FLAGS  10
+#define OMAP_MUX_TEST_FLAG(val, mask)                          \
+       if (((val) & (mask)) == (mask)) {                       \
+               i++;                                            \
+               flags[i] =  #mask;                              \
+       }
+
+/* REVISIT: Add checking for non-optimal mux settings */
+static inline void omap_mux_decode(struct seq_file *s, u16 val)
+{
+       char *flags[OMAP_MUX_MAX_NR_FLAGS];
+       char mode[sizeof("OMAP_MUX_MODE") + 1];
+       int i = -1;
+
+       sprintf(mode, "OMAP_MUX_MODE%d", val & 0x7);
+       i++;
+       flags[i] = mode;
+
+       OMAP_MUX_TEST_FLAG(val, OMAP_PIN_OFF_WAKEUPENABLE);
+       if (val & OMAP_OFF_EN) {
+               if (!(val & OMAP_OFFOUT_EN)) {
+                       if (!(val & OMAP_OFF_PULL_UP)) {
+                               OMAP_MUX_TEST_FLAG(val,
+                                       OMAP_PIN_OFF_INPUT_PULLDOWN);
+                       } else {
+                               OMAP_MUX_TEST_FLAG(val,
+                                       OMAP_PIN_OFF_INPUT_PULLUP);
+                       }
+               } else {
+                       if (!(val & OMAP_OFFOUT_VAL)) {
+                               OMAP_MUX_TEST_FLAG(val,
+                                       OMAP_PIN_OFF_OUTPUT_LOW);
+                       } else {
+                               OMAP_MUX_TEST_FLAG(val,
+                                       OMAP_PIN_OFF_OUTPUT_HIGH);
+                       }
+               }
+       }
+
+       if (val & OMAP_INPUT_EN) {
+               if (val & OMAP_PULL_ENA) {
+                       if (!(val & OMAP_PULL_UP)) {
+                               OMAP_MUX_TEST_FLAG(val,
+                                       OMAP_PIN_INPUT_PULLDOWN);
+                       } else {
+                               OMAP_MUX_TEST_FLAG(val, OMAP_PIN_INPUT_PULLUP);
+                       }
+               } else {
+                       OMAP_MUX_TEST_FLAG(val, OMAP_PIN_INPUT);
+               }
+       } else {
+               i++;
+               flags[i] = "OMAP_PIN_OUTPUT";
+       }
+
+       do {
+               seq_printf(s, "%s", flags[i]);
+               if (i > 0)
+                       seq_printf(s, " | ");
+       } while (i-- > 0);
+}
+
+#define OMAP_MUX_DEFNAME_LEN   16
+
+static int omap_mux_dbg_board_show(struct seq_file *s, void *unused)
+{
+       struct omap_mux_entry *e;
+
+       list_for_each_entry(e, &muxmodes, node) {
+               struct omap_mux *m = &e->mux;
+               char m0_def[OMAP_MUX_DEFNAME_LEN];
+               char *m0_name = m->muxnames[0];
+               u16 val;
+               int i, mode;
+
+               if (!m0_name)
+                       continue;
+
+               /* REVISIT: Needs to be updated if mode0 names get longer */
+               for (i = 0; i < OMAP_MUX_DEFNAME_LEN; i++) {
+                       if (m0_name[i] == '\0') {
+                               m0_def[i] = m0_name[i];
+                               break;
+                       }
+                       m0_def[i] = toupper(m0_name[i]);
+               }
+               val = omap_mux_read(m->reg_offset);
+               mode = val & OMAP_MUX_MODE7;
+
+               seq_printf(s, "OMAP%i_MUX(%s, ",
+                                       cpu_is_omap34xx() ? 3 : 0, m0_def);
+               omap_mux_decode(s, val);
+               seq_printf(s, "),\n");
+       }
+
+       return 0;
+}
+
+static int omap_mux_dbg_board_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, omap_mux_dbg_board_show, &inode->i_private);
+}
+
+static const struct file_operations omap_mux_dbg_board_fops = {
+       .open           = omap_mux_dbg_board_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static int omap_mux_dbg_signal_show(struct seq_file *s, void *unused)
+{
+       struct omap_mux *m = s->private;
+       const char *none = "NA";
+       u16 val;
+       int mode;
+
+       val = omap_mux_read(m->reg_offset);
+       mode = val & OMAP_MUX_MODE7;
+
+       seq_printf(s, "name: %s.%s (0x%08lx/0x%03x = 0x%04x), b %s, t %s\n",
+                       m->muxnames[0], m->muxnames[mode],
+                       mux_phys + m->reg_offset, m->reg_offset, val,
+                       m->balls[0] ? m->balls[0] : none,
+                       m->balls[1] ? m->balls[1] : none);
+       seq_printf(s, "mode: ");
+       omap_mux_decode(s, val);
+       seq_printf(s, "\n");
+       seq_printf(s, "signals: %s | %s | %s | %s | %s | %s | %s | %s\n",
+                       m->muxnames[0] ? m->muxnames[0] : none,
+                       m->muxnames[1] ? m->muxnames[1] : none,
+                       m->muxnames[2] ? m->muxnames[2] : none,
+                       m->muxnames[3] ? m->muxnames[3] : none,
+                       m->muxnames[4] ? m->muxnames[4] : none,
+                       m->muxnames[5] ? m->muxnames[5] : none,
+                       m->muxnames[6] ? m->muxnames[6] : none,
+                       m->muxnames[7] ? m->muxnames[7] : none);
 
        return 0;
 }
+
+#define OMAP_MUX_MAX_ARG_CHAR  7
+
+static ssize_t omap_mux_dbg_signal_write(struct file *file,
+                                               const char __user *user_buf,
+                                               size_t count, loff_t *ppos)
+{
+       char buf[OMAP_MUX_MAX_ARG_CHAR];
+       struct seq_file *seqf;
+       struct omap_mux *m;
+       unsigned long val;
+       int buf_size, ret;
+
+       if (count > OMAP_MUX_MAX_ARG_CHAR)
+               return -EINVAL;
+
+       memset(buf, 0, sizeof(buf));
+       buf_size = min(count, sizeof(buf) - 1);
+
+       if (copy_from_user(buf, user_buf, buf_size))
+               return -EFAULT;
+
+       ret = strict_strtoul(buf, 0x10, &val);
+       if (ret < 0)
+               return ret;
+
+       if (val > 0xffff)
+               return -EINVAL;
+
+       seqf = file->private_data;
+       m = seqf->private;
+
+       omap_mux_write((u16)val, m->reg_offset);
+       *ppos += count;
+
+       return count;
+}
+
+static int omap_mux_dbg_signal_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, omap_mux_dbg_signal_show, inode->i_private);
+}
+
+static const struct file_operations omap_mux_dbg_signal_fops = {
+       .open           = omap_mux_dbg_signal_open,
+       .read           = seq_read,
+       .write          = omap_mux_dbg_signal_write,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static struct dentry *mux_dbg_dir;
+
+static void __init omap_mux_dbg_init(void)
+{
+       struct omap_mux_entry *e;
+
+       mux_dbg_dir = debugfs_create_dir("omap_mux", NULL);
+       if (!mux_dbg_dir)
+               return;
+
+       (void)debugfs_create_file("board", S_IRUGO, mux_dbg_dir,
+                                       NULL, &omap_mux_dbg_board_fops);
+
+       list_for_each_entry(e, &muxmodes, node) {
+               struct omap_mux *m = &e->mux;
+
+               (void)debugfs_create_file(m->muxnames[0], S_IWUGO, mux_dbg_dir,
+                                       m, &omap_mux_dbg_signal_fops);
+       }
+}
+
 #else
-#define omap34xx_cfg_reg       NULL
+static inline void omap_mux_dbg_init(void)
+{
+}
+#endif /* CONFIG_DEBUG_FS */
+
+static void __init omap_mux_free_names(struct omap_mux *m)
+{
+       int i;
+
+       for (i = 0; i < OMAP_MUX_NR_MODES; i++)
+               kfree(m->muxnames[i]);
+
+#ifdef CONFIG_DEBUG_FS
+       for (i = 0; i < OMAP_MUX_NR_SIDES; i++)
+               kfree(m->balls[i]);
 #endif
 
-int __init omap2_mux_init(void)
+}
+
+/* Free all data except for GPIO pins unless CONFIG_DEBUG_FS is set */
+static int __init omap_mux_late_init(void)
 {
-       if (cpu_is_omap24xx()) {
-               arch_mux_cfg.pins       = omap24xx_pins;
-               arch_mux_cfg.size       = OMAP24XX_PINS_SZ;
-               arch_mux_cfg.cfg_reg    = omap24xx_cfg_reg;
-       } else if (cpu_is_omap34xx()) {
-               arch_mux_cfg.pins       = omap34xx_pins;
-               arch_mux_cfg.size       = OMAP34XX_PINS_SZ;
-               arch_mux_cfg.cfg_reg    = omap34xx_cfg_reg;
+       struct omap_mux_entry *e, *tmp;
+
+       list_for_each_entry_safe(e, tmp, &muxmodes, node) {
+               struct omap_mux *m = &e->mux;
+               u16 mode = omap_mux_read(m->reg_offset);
+
+               if (OMAP_MODE_GPIO(mode))
+                       continue;
+
+#ifndef CONFIG_DEBUG_FS
+               mutex_lock(&muxmode_mutex);
+               list_del(&e->node);
+               mutex_unlock(&muxmode_mutex);
+               omap_mux_free_names(m);
+               kfree(m);
+#endif
+
+       }
+
+       omap_mux_dbg_init();
+
+       return 0;
+}
+late_initcall(omap_mux_late_init);
+
+static void __init omap_mux_package_fixup(struct omap_mux *p,
+                                       struct omap_mux *superset)
+{
+       while (p->reg_offset !=  OMAP_MUX_TERMINATOR) {
+               struct omap_mux *s = superset;
+               int found = 0;
+
+               while (s->reg_offset != OMAP_MUX_TERMINATOR) {
+                       if (s->reg_offset == p->reg_offset) {
+                               *s = *p;
+                               found++;
+                               break;
+                       }
+                       s++;
+               }
+               if (!found)
+                       printk(KERN_ERR "mux: Unknown entry offset 0x%x\n",
+                                       p->reg_offset);
+               p++;
+       }
+}
+
+#ifdef CONFIG_DEBUG_FS
+
+static void __init omap_mux_package_init_balls(struct omap_ball *b,
+                               struct omap_mux *superset)
+{
+       while (b->reg_offset != OMAP_MUX_TERMINATOR) {
+               struct omap_mux *s = superset;
+               int found = 0;
+
+               while (s->reg_offset != OMAP_MUX_TERMINATOR) {
+                       if (s->reg_offset == b->reg_offset) {
+                               s->balls[0] = b->balls[0];
+                               s->balls[1] = b->balls[1];
+                               found++;
+                               break;
+                       }
+                       s++;
+               }
+               if (!found)
+                       printk(KERN_ERR "mux: Unknown ball offset 0x%x\n",
+                                       b->reg_offset);
+               b++;
+       }
+}
+
+#else  /* CONFIG_DEBUG_FS */
+
+static inline void omap_mux_package_init_balls(struct omap_ball *b,
+                                       struct omap_mux *superset)
+{
+}
+
+#endif /* CONFIG_DEBUG_FS */
+
+static int __init omap_mux_setup(char *options)
+{
+       if (!options)
+               return 0;
+
+       omap_mux_options = options;
+
+       return 1;
+}
+__setup("omap_mux=", omap_mux_setup);
+
+/*
+ * Note that the omap_mux=some.signal1=0x1234,some.signal2=0x1234
+ * cmdline options only override the bootloader values.
+ * During development, please enable CONFIG_DEBUG_FS, and use the
+ * signal specific entries under debugfs.
+ */
+static void __init omap_mux_set_cmdline_signals(void)
+{
+       char *options, *next_opt, *token;
+
+       if (!omap_mux_options)
+               return;
+
+       options = kmalloc(strlen(omap_mux_options) + 1, GFP_KERNEL);
+       if (!options)
+               return;
+
+       strcpy(options, omap_mux_options);
+       next_opt = options;
+
+       while ((token = strsep(&next_opt, ",")) != NULL) {
+               char *keyval, *name;
+               unsigned long val;
+
+               keyval = token;
+               name = strsep(&keyval, "=");
+               if (name) {
+                       int res;
+
+                       res = strict_strtoul(keyval, 0x10, &val);
+                       if (res < 0)
+                               continue;
+
+                       omap_mux_init_signal(name, (u16)val);
+               }
+       }
+
+       kfree(options);
+}
+
+static int __init omap_mux_copy_names(struct omap_mux *src,
+                                       struct omap_mux *dst)
+{
+       int i;
+
+       for (i = 0; i < OMAP_MUX_NR_MODES; i++) {
+               if (src->muxnames[i]) {
+                       dst->muxnames[i] =
+                               kmalloc(strlen(src->muxnames[i]) + 1,
+                                       GFP_KERNEL);
+                       if (!dst->muxnames[i])
+                               goto free;
+                       strcpy(dst->muxnames[i], src->muxnames[i]);
+               }
+       }
+
+#ifdef CONFIG_DEBUG_FS
+       for (i = 0; i < OMAP_MUX_NR_SIDES; i++) {
+               if (src->balls[i]) {
+                       dst->balls[i] =
+                               kmalloc(strlen(src->balls[i]) + 1,
+                                       GFP_KERNEL);
+                       if (!dst->balls[i])
+                               goto free;
+                       strcpy(dst->balls[i], src->balls[i]);
+               }
+       }
+#endif
+
+       return 0;
+
+free:
+       omap_mux_free_names(dst);
+       return -ENOMEM;
+
+}
+
+#endif /* CONFIG_OMAP_MUX */
+
+static u16 omap_mux_get_by_gpio(int gpio)
+{
+       struct omap_mux_entry *e;
+       u16 offset = OMAP_MUX_TERMINATOR;
+
+       list_for_each_entry(e, &muxmodes, node) {
+               struct omap_mux *m = &e->mux;
+               if (m->gpio == gpio) {
+                       offset = m->reg_offset;
+                       break;
+               }
+       }
+
+       return offset;
+}
+
+/* Needed for dynamic muxing of GPIO pins for off-idle */
+u16 omap_mux_get_gpio(int gpio)
+{
+       u16 offset;
+
+       offset = omap_mux_get_by_gpio(gpio);
+       if (offset == OMAP_MUX_TERMINATOR) {
+               printk(KERN_ERR "mux: Could not get gpio%i\n", gpio);
+               return offset;
+       }
+
+       return omap_mux_read(offset);
+}
+
+/* Needed for dynamic muxing of GPIO pins for off-idle */
+void omap_mux_set_gpio(u16 val, int gpio)
+{
+       u16 offset;
+
+       offset = omap_mux_get_by_gpio(gpio);
+       if (offset == OMAP_MUX_TERMINATOR) {
+               printk(KERN_ERR "mux: Could not set gpio%i\n", gpio);
+               return;
+       }
+
+       omap_mux_write(val, offset);
+}
+
+static struct omap_mux * __init omap_mux_list_add(struct omap_mux *src)
+{
+       struct omap_mux_entry *entry;
+       struct omap_mux *m;
+
+       entry = kzalloc(sizeof(struct omap_mux_entry), GFP_KERNEL);
+       if (!entry)
+               return NULL;
+
+       m = &entry->mux;
+       memcpy(m, src, sizeof(struct omap_mux_entry));
+
+#ifdef CONFIG_OMAP_MUX
+       if (omap_mux_copy_names(src, m)) {
+               kfree(entry);
+               return NULL;
+       }
+#endif
+
+       mutex_lock(&muxmode_mutex);
+       list_add_tail(&entry->node, &muxmodes);
+       mutex_unlock(&muxmode_mutex);
+
+       return m;
+}
+
+/*
+ * Note if CONFIG_OMAP_MUX is not selected, we will only initialize
+ * the GPIO to mux offset mapping that is needed for dynamic muxing
+ * of GPIO pins for off-idle.
+ */
+static void __init omap_mux_init_list(struct omap_mux *superset)
+{
+       while (superset->reg_offset !=  OMAP_MUX_TERMINATOR) {
+               struct omap_mux *entry;
+
+#ifdef CONFIG_OMAP_MUX
+               if (!superset->muxnames || !superset->muxnames[0]) {
+                       superset++;
+                       continue;
+               }
+#else
+               /* Skip pins that are not muxed as GPIO by bootloader */
+               if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
+                       superset++;
+                       continue;
+               }
+#endif
+
+               entry = omap_mux_list_add(superset);
+               if (!entry) {
+                       printk(KERN_ERR "mux: Could not add entry\n");
+                       return;
+               }
+               superset++;
        }
+}
+
+#ifdef CONFIG_OMAP_MUX
+
+static void omap_mux_init_package(struct omap_mux *superset,
+                                 struct omap_mux *package_subset,
+                                 struct omap_ball *package_balls)
+{
+       if (package_subset)
+               omap_mux_package_fixup(package_subset, superset);
+       if (package_balls)
+               omap_mux_package_init_balls(package_balls, superset);
+}
 
-       return omap_mux_register(&arch_mux_cfg);
+static void omap_mux_init_signals(struct omap_board_mux *board_mux)
+{
+       omap_mux_set_cmdline_signals();
+       omap_mux_write_array(board_mux);
+}
+
+#else
+
+static void omap_mux_init_package(struct omap_mux *superset,
+                                 struct omap_mux *package_subset,
+                                 struct omap_ball *package_balls)
+{
+}
+
+static void omap_mux_init_signals(struct omap_board_mux *board_mux)
+{
 }
 
 #endif
+
+int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
+                               struct omap_mux *superset,
+                               struct omap_mux *package_subset,
+                               struct omap_board_mux *board_mux,
+                               struct omap_ball *package_balls)
+{
+       if (mux_base)
+               return -EBUSY;
+
+       mux_phys = mux_pbase;
+       mux_base = ioremap(mux_pbase, mux_size);
+       if (!mux_base) {
+               printk(KERN_ERR "mux: Could not ioremap\n");
+               return -ENODEV;
+       }
+
+       omap_mux_init_package(superset, package_subset, package_balls);
+       omap_mux_init_list(superset);
+       omap_mux_init_signals(board_mux);
+
+       return 0;
+}
+
+#endif /* CONFIG_ARCH_OMAP3 */
+