diff --git a/include/asm-arm/arch-omap3/mux.h b/include/asm-arm/arch-omap3/mux.h
index eba1c307c..3e3c6c242 100644
--- a/include/asm-arm/arch-omap3/mux.h
+++ b/include/asm-arm/arch-omap3/mux.h
@@ -346,43 +346,25 @@
 #define  CONTROL_PADCONF_JTAG_TDI            0x0A22       
 #define  CONTROL_PADCONF_JTAG_EMU0           0x0A24       
 #define  CONTROL_PADCONF_JTAG_EMU1           0x0A26       
-#define  CONTROL_PADCONF_ETK_CLK             0x0A28       
-#define  CONTROL_PADCONF_ETK_CTL             0x0A2A       
-#define  CONTROL_PADCONF_ETK_D0              0x0A2C       
-#define  CONTROL_PADCONF_ETK_D1              0x0A2E
-#define  CONTROL_PADCONF_ETK_D2              0x0A30       
-#define  CONTROL_PADCONF_ETK_D3              0x0A32       
-#define  CONTROL_PADCONF_ETK_D4              0x0A34       
-#define  CONTROL_PADCONF_ETK_D5              0x0A36       
-#define  CONTROL_PADCONF_ETK_D6              0x0A38       
-#define  CONTROL_PADCONF_ETK_D7              0x0A3A       
-#define  CONTROL_PADCONF_ETK_D8              0x0A3C       
-#define  CONTROL_PADCONF_ETK_D9              0x0A3E       
-#define  CONTROL_PADCONF_ETK_D10             0x0A40       
-#define  CONTROL_PADCONF_ETK_D11             0x0A42       
-#define  CONTROL_PADCONF_ETK_D12             0x0A44       
-#define  CONTROL_PADCONF_ETK_D13             0x0A46       
-#define  CONTROL_PADCONF_ETK_D14             0x0A48       
-#define  CONTROL_PADCONF_ETK_D15             0x0A4A       
 
-#define  CONTROL_PADCONF_ETK_CLK_ES2         0x05D8       
-#define  CONTROL_PADCONF_ETK_CTL_ES2         0x05DA       
-#define  CONTROL_PADCONF_ETK_D0_ES2          0x05DC       
-#define  CONTROL_PADCONF_ETK_D1_ES2          0x05DE       
-#define  CONTROL_PADCONF_ETK_D2_ES2          0x05E0       
-#define  CONTROL_PADCONF_ETK_D3_ES2          0x05E2       
-#define  CONTROL_PADCONF_ETK_D4_ES2          0x05E4       
-#define  CONTROL_PADCONF_ETK_D5_ES2          0x05E6       
-#define  CONTROL_PADCONF_ETK_D6_ES2          0x05E8       
-#define  CONTROL_PADCONF_ETK_D7_ES2          0x05EA       
-#define  CONTROL_PADCONF_ETK_D8_ES2          0x05EC       
-#define  CONTROL_PADCONF_ETK_D9_ES2          0x05EE       
-#define  CONTROL_PADCONF_ETK_D10_ES2         0x05F0       
-#define  CONTROL_PADCONF_ETK_D11_ES2         0x05F2       
-#define  CONTROL_PADCONF_ETK_D12_ES2         0x05F4       
-#define  CONTROL_PADCONF_ETK_D13_ES2         0x05F6       
-#define  CONTROL_PADCONF_ETK_D14_ES2         0x05F8       
-#define  CONTROL_PADCONF_ETK_D15_ES2         0x05FA       
+#define  CONTROL_PADCONF_ETK_CLK             0x05D8       
+#define  CONTROL_PADCONF_ETK_CTL             0x05DA       
+#define  CONTROL_PADCONF_ETK_D0              0x05DC       
+#define  CONTROL_PADCONF_ETK_D1              0x05DE
+#define  CONTROL_PADCONF_ETK_D2              0x05E0       
+#define  CONTROL_PADCONF_ETK_D3              0x05E2       
+#define  CONTROL_PADCONF_ETK_D4              0x05E4       
+#define  CONTROL_PADCONF_ETK_D5              0x05E6       
+#define  CONTROL_PADCONF_ETK_D6              0x05E8       
+#define  CONTROL_PADCONF_ETK_D7              0x05EA       
+#define  CONTROL_PADCONF_ETK_D8              0x05EC       
+#define  CONTROL_PADCONF_ETK_D9              0x05EE       
+#define  CONTROL_PADCONF_ETK_D10             0x05F0       
+#define  CONTROL_PADCONF_ETK_D11             0x05F2       
+#define  CONTROL_PADCONF_ETK_D12             0x05F4       
+#define  CONTROL_PADCONF_ETK_D13             0x05F6       
+#define  CONTROL_PADCONF_ETK_D14             0x05F8       
+#define  CONTROL_PADCONF_ETK_D15             0x05FA       
 
 /*Die to Die */                               
 #define  CONTROL_PADCONF_d2d_mcad0           0x01E4       
diff --git a/include/asm-arm/arch-omap3/omap3430.h b/include/asm-arm/arch-omap3/omap3430.h
index 4890e4189..a3960e13f 100644
--- a/include/asm-arm/arch-omap3/omap3430.h
+++ b/include/asm-arm/arch-omap3/omap3430.h
@@ -193,6 +193,9 @@ typedef struct gpio {
 #define SRAM_OFFSET2			0x0000F800
 #define SRAM_VECT_CODE			(SRAM_OFFSET0|SRAM_OFFSET1|SRAM_OFFSET2)
 #define LOW_LEVEL_SRAM_STACK		0x4020FFFC
+
+#define OMAP343X_CONTROL_PROG_IO0	0x48002444
+#define OMAP3630_PRG_SDMMC_PUSTRENGTH	(1 << 1)
 #endif
 
 #if defined(CONFIG_3430SDP) || defined(CONFIG_3630SDP)