Merge branch 'omap-fixes' into fixes

1 files changed, 30 insertions, 1 deletions

diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index 828cc5c114e1..f1ec2edd4040 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -421,7 +421,9 @@ enum omap24xx_index {
         /* 24xx clock */
         W14_24XX_SYS_CLKOUT,
 
-        /* 24xx GPMC wait pin monitoring */
+        /* 24xx GPMC chipselects, wait pin monitoring */
+        E2_GPMC_NCS2,
+        L2_GPMC_NCS7,
         L3_GPMC_WAIT0,
         N7_GPMC_WAIT1,
         M1_GPMC_WAIT2,
@@ -435,6 +437,7 @@ enum omap24xx_index {
 
         /* 24xx GPIO */
         M21_242X_GPIO11,
+        P21_242X_GPIO12,
         AA10_242X_GPIO13,
         AA6_242X_GPIO14,
         AA4_242X_GPIO15,
@@ -444,7 +447,9 @@ enum omap24xx_index {
         Y20_24XX_GPIO60,
         W4__24XX_GPIO74,
         M15_24XX_GPIO92,
+        J15_24XX_GPIO99,
         V14_24XX_GPIO117,
+        P14_24XX_GPIO125,
 
         /* 242x DBG GPIO */
         V4_242X_GPIO49,
@@ -486,6 +491,30 @@ enum omap24xx_index {
         G18_24XX_MMC_CMD_DIR,
         H15_24XX_MMC_CLKI,
 
+        /* Full speed USB */
+        J20_24XX_USB0_PUEN,
+        J19_24XX_USB0_VP,
+        K20_24XX_USB0_VM,
+        J18_24XX_USB0_RCV,
+        K19_24XX_USB0_TXEN,
+        J14_24XX_USB0_SE0,
+        K18_24XX_USB0_DAT,
+
+        N14_24XX_USB1_SE0,
+        W12_24XX_USB1_SE0,
+        P15_24XX_USB1_DAT,
+        R13_24XX_USB1_DAT,
+        W20_24XX_USB1_TXEN,
+        P13_24XX_USB1_TXEN,
+        V19_24XX_USB1_RCV,
+        V12_24XX_USB1_RCV,
+
+        AA10_24XX_USB2_SE0,
+        Y11_24XX_USB2_DAT,
+        AA12_24XX_USB2_TXEN,
+        AA6_24XX_USB2_RCV,
+        AA4_24XX_USB2_TLLSE0,
+
         /* Keypad GPIO*/
         T19_24XX_KBR0,
         R19_24XX_KBR1,