Merge branch 'misc_devel_3.4' of git://git.pwsan.com/linux-2.6 into fixes

diff --combined arch/arm/mach-omap2/prm44xx.c
index eac623c7c3d86c58869c4804f63ad576631c129a,fbc597f65b3fe4ceb85b948740264e60e862a685..f106d21ff581a3af4894fd45f58fe53aaebc6dd2
--- 1/arch/arm/mach-omap2/prm44xx.c
--- 2/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@@ -17,12 -17,11 +17,12 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
 -#include "common.h"
  #include <plat/cpu.h>
  #include <plat/irqs.h>
  #include <plat/prcm.h>
  
 +#include "iomap.h"
 +#include "common.h"
  #include "vp.h"
  #include "prm44xx.h"
  #include "prm-regbits-44xx.h"
@@@ -147,8 -146,9 +147,9 @@@ static inline u32 _read_pending_irq_reg
        u32 mask, st;
  
        /* XXX read mask from RAM? */
-       mask = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, irqen_offs);
-       st = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, irqst_offs);
+       mask = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
+                                      irqen_offs);
+       st = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST, irqst_offs);
  
        return mask & st;
  }
@@@ -180,7 -180,7 +181,7 @@@ void omap44xx_prm_read_pending_irqs(uns
   */
  void omap44xx_prm_ocp_barrier(void)
  {
-       omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+       omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
                                OMAP4_REVISION_PRM_OFFSET);
  }
  
@@@ -198,19 -198,19 +199,19 @@@
  void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask)
  {
        saved_mask[0] =
-               omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+               omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
                                        OMAP4_PRM_IRQSTATUS_MPU_OFFSET);
        saved_mask[1] =
-               omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+               omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
                                        OMAP4_PRM_IRQSTATUS_MPU_2_OFFSET);
  
-       omap4_prm_write_inst_reg(0, OMAP4430_PRM_DEVICE_INST,
+       omap4_prm_write_inst_reg(0, OMAP4430_PRM_OCP_SOCKET_INST,
                                 OMAP4_PRM_IRQENABLE_MPU_OFFSET);
-       omap4_prm_write_inst_reg(0, OMAP4430_PRM_DEVICE_INST,
+       omap4_prm_write_inst_reg(0, OMAP4430_PRM_OCP_SOCKET_INST,
                                 OMAP4_PRM_IRQENABLE_MPU_2_OFFSET);
  
        /* OCP barrier */
-       omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+       omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
                                OMAP4_REVISION_PRM_OFFSET);
  }
  
@@@ -226,9 -226,9 +227,9 @@@
   */
  void omap44xx_prm_restore_irqen(u32 *saved_mask)
  {
-       omap4_prm_write_inst_reg(saved_mask[0], OMAP4430_PRM_DEVICE_INST,
+       omap4_prm_write_inst_reg(saved_mask[0], OMAP4430_PRM_OCP_SOCKET_INST,
                                 OMAP4_PRM_IRQENABLE_MPU_OFFSET);
-       omap4_prm_write_inst_reg(saved_mask[1], OMAP4430_PRM_DEVICE_INST,
+       omap4_prm_write_inst_reg(saved_mask[1], OMAP4430_PRM_OCP_SOCKET_INST,
                                 OMAP4_PRM_IRQENABLE_MPU_2_OFFSET);
  }