2 files changed, 12 insertions, 9 deletions

diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
index c88420de1151..1e2d3322f33e 100644
--- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
+++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
@@ -941,10 +941,10 @@
 #define OMAP4_DSI2_LANEENABLE_MASK                              (0x7 << 29)
 #define OMAP4_DSI1_LANEENABLE_SHIFT                             24
 #define OMAP4_DSI1_LANEENABLE_MASK                              (0x1f << 24)
-#define OMAP4_DSI1_PIPD_SHIFT                                   19
-#define OMAP4_DSI1_PIPD_MASK                                    (0x1f << 19)
-#define OMAP4_DSI2_PIPD_SHIFT                                   14
-#define OMAP4_DSI2_PIPD_MASK                                    (0x1f << 14)
+#define OMAP4_DSI2_PIPD_SHIFT                                   19
+#define OMAP4_DSI2_PIPD_MASK                                    (0x1f << 19)
+#define OMAP4_DSI1_PIPD_SHIFT                                   14
+#define OMAP4_DSI1_PIPD_MASK                                    (0x1f << 14)
 
 /* CONTROL_MCBSPLP */
 #define OMAP4_ALBCTRLRX_FSX_SHIFT                               31
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 3008e1672c7a..87a3b01d254c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3159,7 +3159,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_mmc2_hwmod,
         &omap3xxx_mmc3_hwmod,
         &omap3xxx_mpu_hwmod,
-        &omap3xxx_iva_hwmod,
 
         &omap3xxx_timer1_hwmod,
         &omap3xxx_timer2_hwmod,
@@ -3188,8 +3187,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_i2c1_hwmod,
         &omap3xxx_i2c2_hwmod,
         &omap3xxx_i2c3_hwmod,
-        &omap34xx_sr1_hwmod,
-        &omap34xx_sr2_hwmod,
 
         /* gpio class */
         &omap3xxx_gpio1_hwmod,
@@ -3211,8 +3208,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_mcbsp2_sidetone_hwmod,
         &omap3xxx_mcbsp3_sidetone_hwmod,
 
-        /* mailbox class */
-        &omap3xxx_mailbox_hwmod,
 
         /* mcspi class */
         &omap34xx_mcspi1,
@@ -3225,31 +3220,39 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
 
 /* 3430ES1-only hwmods */
 static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
+        &omap3xxx_iva_hwmod,
         &omap3430es1_dss_core_hwmod,
+        &omap3xxx_mailbox_hwmod,
         NULL
 };
 
 /* 3430ES2+-only hwmods */
 static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
+        &omap3xxx_iva_hwmod,
         &omap3xxx_dss_core_hwmod,
         &omap3xxx_usbhsotg_hwmod,
+        &omap3xxx_mailbox_hwmod,
         NULL
 };
 
 /* 34xx-only hwmods (all ES revisions) */
 static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
+        &omap3xxx_iva_hwmod,
         &omap34xx_sr1_hwmod,
         &omap34xx_sr2_hwmod,
+        &omap3xxx_mailbox_hwmod,
         NULL
 };
 
 /* 36xx-only hwmods (all ES revisions) */
 static __initdata struct omap_hwmod *omap36xx_hwmods[] = {
+        &omap3xxx_iva_hwmod,
         &omap3xxx_uart4_hwmod,
         &omap3xxx_dss_core_hwmod,
         &omap36xx_sr1_hwmod,
         &omap36xx_sr2_hwmod,
         &omap3xxx_usbhsotg_hwmod,
+        &omap3xxx_mailbox_hwmod,
         NULL
 };