h63xx: mux configs.

diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 062c905c2ba6704eda8e5248b58318e525acc975..b4a6a11c9d965a3878cfad6ac3e9b9aa59ea4bc7 100644 (file)
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -217,6 +217,13 @@ MUX_CFG("N15_1610_SPIF_CS1",        7,    18,   6,   1,  14,   0,    1,     1,  1)
 MUX_CFG("T19_1610_SPIF_CS2",    7,    15,   4,   1,  13,   0,    1,     1,  1)
 MUX_CFG("P15_1610_SPIF_CS3",    8,    12,   3,   1,  22,   0,    1,     1,  1)
 
 MUX_CFG("T19_1610_SPIF_CS2",    7,    15,   4,   1,  13,   0,    1,     1,  1)
 MUX_CFG("P15_1610_SPIF_CS3",    8,    12,   3,   1,  22,   0,    1,     1,  1)
 

+/* OMAP-1510 uWire */
+MUX_CFG("P15_1510_UWIRE_CS3",  8,   12,    1,   NA,   0,   0,  NA,  0,  1)
+MUX_CFG("N14_1510_UWIRE_CS0",  8,    9,    1,   NA,   0,   0,  NA,  0,  1)
+MUX_CFG("V19_1510_UWIRE_SCLK", 8,    6,    0,   NA,   0,   0,  NA,  0,  1)
+MUX_CFG("W21_1510_UWIRE_SDO",  8,    3,    0,   NA,   0,   0,  NA,  0,  1)
+MUX_CFG("U18_1510_UWIRE_SDI",  8,    0,    0,    1,  18,   0,  NA,  0,  1)
+

 /* OMAP-1610 Flash */
 MUX_CFG("L3_1610_FLASH_CS2B_OE",10,    6,    1,         NA,   0,   0,   NA,     0,  1)
 MUX_CFG("M8_1610_FLASH_CS2B_WE",10,    3,    1,         NA,   0,   0,   NA,     0,  1)
 /* OMAP-1610 Flash */
 MUX_CFG("L3_1610_FLASH_CS2B_OE",10,    6,    1,         NA,   0,   0,   NA,     0,  1)
 MUX_CFG("M8_1610_FLASH_CS2B_WE",10,    3,    1,         NA,   0,   0,   NA,     0,  1)


@@ -279,6 +286,7 @@ MUX_CFG("N19_1610_KBR5",     6,  12,     1,   1,   2,   1,    1,     1,  0)
 MUX_CFG("T20_1610_LOW_PWR",     7,   12,    1,   NA,   0,   0,   NA,    0,  0)
 
 /* MCLK Settings */
 MUX_CFG("T20_1610_LOW_PWR",     7,   12,    1,   NA,   0,   0,   NA,    0,  0)
 
 /* MCLK Settings */

+MUX_CFG("R10_1510_MCLK_ON",     B,   18,    0,   2,   22,   1,   NA,    1,  1)

 MUX_CFG("V5_1710_MCLK_ON",      B,   15,    0,   NA,   0,   0,   NA,    0,  0)
 MUX_CFG("V5_1710_MCLK_OFF",     B,   15,    6,   NA,   0,   0,   NA,    0,  0)
 MUX_CFG("R10_1610_MCLK_ON",     B,   18,    0,   NA,  22,   0,   NA,    1,  0)
 MUX_CFG("V5_1710_MCLK_ON",      B,   15,    0,   NA,   0,   0,   NA,    0,  0)
 MUX_CFG("V5_1710_MCLK_OFF",     B,   15,    6,   NA,   0,   0,   NA,    0,  0)
 MUX_CFG("R10_1610_MCLK_ON",     B,   18,    0,   NA,  22,   0,   NA,    1,  0)

diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h
index 67fddec3ec09ef82cc4961937bc16f472c5b6760..e3cd511998d82a6fd6752d1ae529a0a869ef5495 100644 (file)
--- a/arch/arm/plat-omap/include/mach/mux.h
+++ b/arch/arm/plat-omap/include/mach/mux.h
@@ -355,6 +355,13 @@ enum omap1xxx_index {
        R9_16XX_GPIO18,
        L14_16XX_GPIO49,
 
        R9_16XX_GPIO18,
        L14_16XX_GPIO49,
 

+       /* OMAP-1510 uWire */
+       P15_1510_UWIRE_CS3,
+       N14_1510_UWIRE_CS0,
+       V19_1510_UWIRE_SCLK,
+       W21_1510_UWIRE_SDO,
+       U18_1510_UWIRE_SDI,
+

        /* OMAP-1610 uWire */
        V19_1610_UWIRE_SCLK,
        U18_1610_UWIRE_SDI,
        /* OMAP-1610 uWire */
        V19_1610_UWIRE_SCLK,
        U18_1610_UWIRE_SDI,


@@ -438,6 +445,7 @@ enum omap1xxx_index {
        T20_1610_LOW_PWR,
 
        /* MCLK Settings */
        T20_1610_LOW_PWR,
 
        /* MCLK Settings */

+       R10_1510_MCLK_ON,

        V5_1710_MCLK_ON,
        V5_1710_MCLK_OFF,
        R10_1610_MCLK_ON,
        V5_1710_MCLK_ON,
        V5_1710_MCLK_OFF,
        R10_1610_MCLK_ON,