Merge tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next

Pull part one of ARM SoC updates from Olof Johansson:
 "A quite large set of SoC updates this cycle.  In no particular order:

   - Multi-cluster power management for Samsung Exynos, adding support
     for big.LITTLE CPU switching on EXYNOS5

   - SMP support for Marvell Armada 375 and 38x

   - SMP rework on Allwinner A31

   - Xilinx Zynq support for SOC_BUS, big endian

   - Marvell orion5x platform cleanup, modernizing the implementation
     and moving to DT.

   - _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
     that their platform can be enabled in the same kernel binary as
     most of the other v7 platforms in the tree.  \o/

     The work isn't quite complete, there's some driver fixes still
     needed, but the basics now work.

  New SoC support added:

   - Freescale i.MX6SX

   - LSI Axxia AXM55xx SoCs

   - Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800

   - STi STIH407

  plus a large set of various smaller updates for different platforms.
  I'm probably missing some important one here"

* tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
  ARM: exynos: don't run exynos4 l2x0 setup on other platforms
  ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
  ARM: EXYNOS: mcpm rename the power_down_finish
  ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
  ARM: EXYNOS: Enable multi-platform build support
  ARM: EXYNOS: Consolidate Kconfig entries
  ARM: EXYNOS: Add support for EXYNOS5410 SoC
  ARM: EXYNOS: Support secondary CPU boot of Exynos3250
  ARM: EXYNOS: Add Exynos3250 SoC ID
  ARM: EXYNOS: Add 5800 SoC support
  ARM: EXYNOS: initial board support for exynos5260 SoC
  clk: exynos5410: register clocks using common clock framework
  ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
  ARM: sunxi: allow building without reset controller
  Documentation: devicetree: arm: sort enable-method entries
  ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
  clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
  ARM: dts: axxia: Add reset controller
  power: reset: Add Axxia system reset driver
  ARM: axxia: Adding defconfig for AXM55xx
  ...

14 files changed, 545 insertions, 260 deletions

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index f61f1bf68df4..43969da5d50b 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -628,6 +628,41 @@ void __init omap5xxx_check_revision(void)
         pr_info("%s %s\n", soc_name, soc_rev);
 }
 
+void __init dra7xxx_check_revision(void)
+{
+        u32 idcode;
+        u16 hawkeye;
+        u8 rev;
+
+        idcode = read_tap_reg(OMAP_TAP_IDCODE);
+        hawkeye = (idcode >> 12) & 0xffff;
+        rev = (idcode >> 28) & 0xff;
+        switch (hawkeye) {
+        case 0xb990:
+                switch (rev) {
+                case 0:
+                        omap_revision = DRA752_REV_ES1_0;
+                        break;
+                case 1:
+                default:
+                        omap_revision = DRA752_REV_ES1_1;
+                }
+                break;
+
+        default:
+                /* Unknown default to latest silicon rev as default*/
+                pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%d)\n",
+                        __func__, idcode, hawkeye, rev);
+                omap_revision = DRA752_REV_ES1_1;
+        }
+
+        sprintf(soc_name, "DRA%03x", omap_rev() >> 16);
+        sprintf(soc_rev, "ES%d.%d", (omap_rev() >> 12) & 0xf,
+                (omap_rev() >> 8) & 0xf);
+
+        pr_info("%s %s\n", soc_name, soc_rev);
+}
+
 /*
  * Set up things for map_io and processor detection later on. Gets called
  * pretty much first thing from board init. For multi-omap, this gets
@@ -669,6 +704,8 @@ static const char * __init omap_get_family(void)
                 return kasprintf(GFP_KERNEL, "OMAP5");
         else if (soc_is_am43xx())
                 return kasprintf(GFP_KERNEL, "AM43xx");
+        else if (soc_is_dra7xx())
+                return kasprintf(GFP_KERNEL, "DRA7");
         else
                 return kasprintf(GFP_KERNEL, "Unknown");
 }
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index f14f9ac2dca1..4ec3b4a93843 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -693,6 +693,7 @@ void __init dra7xx_init_early(void)
         omap_prm_base_init();
         omap_cm_base_init();
         omap44xx_prm_init();
+        dra7xxx_check_revision();
         dra7xx_powerdomains_init();
         dra7xx_clockdomains_init();
         dra7xx_hwmod_init();
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 1219280bb976..41e54f759934 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -3635,15 +3635,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_dmic_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> dmic (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_dmic_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* dsp -> iva */
@@ -4209,15 +4201,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_mcbsp1_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> mcbsp1 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp1_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_mcbsp1_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_abe -> mcbsp2 */
@@ -4225,15 +4209,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_mcbsp2_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> mcbsp2 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp2_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_mcbsp2_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_abe -> mcbsp3 */
@@ -4241,15 +4217,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_mcbsp3_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> mcbsp3 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcbsp3_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_mcbsp3_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_per -> mcbsp4 */
@@ -4265,15 +4233,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_mcpdm_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> mcpdm (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_mcpdm_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_per -> mcspi1 */
@@ -4575,15 +4535,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer5 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_timer5_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> timer5 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer5_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_timer5_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_abe -> timer6 */
@@ -4591,15 +4543,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer6 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_timer6_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> timer6 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer6_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_timer6_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_abe -> timer7 */
@@ -4607,15 +4551,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer7 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_timer7_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> timer7 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer7_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_timer7_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_abe -> timer8 */
@@ -4623,15 +4559,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer8 = {
         .master         = &omap44xx_l4_abe_hwmod,
         .slave          = &omap44xx_timer8_hwmod,
         .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_MPU,
-};
-
-/* l4_abe -> timer8 (dma) */
-static struct omap_hwmod_ocp_if omap44xx_l4_abe__timer8_dma = {
-        .master         = &omap44xx_l4_abe_hwmod,
-        .slave          = &omap44xx_timer8_hwmod,
-        .clk            = "ocp_abe_iclk",
-        .user           = OCP_USER_SDMA,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* l4_per -> timer9 */
@@ -4831,7 +4759,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
         &omap44xx_l3_instr__debugss,
         &omap44xx_l4_cfg__dma_system,
         &omap44xx_l4_abe__dmic,
-        &omap44xx_l4_abe__dmic_dma,
         &omap44xx_dsp__iva,
         /* &omap44xx_dsp__sl2if, */
         &omap44xx_l4_cfg__dsp,
@@ -4874,14 +4801,10 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
         &omap44xx_l4_abe__mcasp,
         &omap44xx_l4_abe__mcasp_dma,
         &omap44xx_l4_abe__mcbsp1,
-        &omap44xx_l4_abe__mcbsp1_dma,
         &omap44xx_l4_abe__mcbsp2,
-        &omap44xx_l4_abe__mcbsp2_dma,
         &omap44xx_l4_abe__mcbsp3,
-        &omap44xx_l4_abe__mcbsp3_dma,
         &omap44xx_l4_per__mcbsp4,
         &omap44xx_l4_abe__mcpdm,
-        &omap44xx_l4_abe__mcpdm_dma,
         &omap44xx_l4_per__mcspi1,
         &omap44xx_l4_per__mcspi2,
         &omap44xx_l4_per__mcspi3,
@@ -4913,13 +4836,9 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
         &omap44xx_l4_per__timer3,
         &omap44xx_l4_per__timer4,
         &omap44xx_l4_abe__timer5,
-        &omap44xx_l4_abe__timer5_dma,
         &omap44xx_l4_abe__timer6,
-        &omap44xx_l4_abe__timer6_dma,
         &omap44xx_l4_abe__timer7,
-        &omap44xx_l4_abe__timer7_dma,
         &omap44xx_l4_abe__timer8,
-        &omap44xx_l4_abe__timer8_dma,
         &omap44xx_l4_per__timer9,
         &omap44xx_l4_per__timer10,
         &omap44xx_l4_per__timer11,
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index e829664e6a6c..290213f2cbe3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -334,6 +334,235 @@ static struct omap_hwmod omap54xx_dmic_hwmod = {
 };
 
 /*
+ * 'dss' class
+ * display sub-system
+ */
+static struct omap_hwmod_class_sysconfig omap54xx_dss_sysc = {
+        .rev_offs       = 0x0000,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = SYSS_HAS_RESET_STATUS,
+};
+
+static struct omap_hwmod_class omap54xx_dss_hwmod_class = {
+        .name   = "dss",
+        .sysc   = &omap54xx_dss_sysc,
+        .reset  = omap_dss_reset,
+};
+
+/* dss */
+static struct omap_hwmod_opt_clk dss_opt_clks[] = {
+        { .role = "32khz_clk", .clk = "dss_32khz_clk" },
+        { .role = "sys_clk", .clk = "dss_sys_clk" },
+        { .role = "hdmi_clk", .clk = "dss_48mhz_clk" },
+};
+
+static struct omap_hwmod omap54xx_dss_hwmod = {
+        .name           = "dss_core",
+        .class          = &omap54xx_dss_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "dss_dss_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .context_offs = OMAP54XX_RM_DSS_DSS_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = dss_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_opt_clks),
+};
+
+/*
+ * 'dispc' class
+ * display controller
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_dispc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_MIDLEMODE |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap54xx_dispc_hwmod_class = {
+        .name   = "dispc",
+        .sysc   = &omap54xx_dispc_sysc,
+};
+
+/* dss_dispc */
+static struct omap_hwmod_opt_clk dss_dispc_opt_clks[] = {
+        { .role = "sys_clk", .clk = "dss_sys_clk" },
+};
+
+/* dss_dispc dev_attr */
+static struct omap_dss_dispc_dev_attr dss_dispc_dev_attr = {
+        .has_framedonetv_irq    = 1,
+        .manager_count          = 4,
+};
+
+static struct omap_hwmod omap54xx_dss_dispc_hwmod = {
+        .name           = "dss_dispc",
+        .class          = &omap54xx_dispc_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dss_dss_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .opt_clks       = dss_dispc_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_dispc_opt_clks),
+        .dev_attr       = &dss_dispc_dev_attr,
+};
+
+/*
+ * 'dsi1' class
+ * display serial interface controller
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_dsi1_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap54xx_dsi1_hwmod_class = {
+        .name   = "dsi1",
+        .sysc   = &omap54xx_dsi1_sysc,
+};
+
+/* dss_dsi1_a */
+static struct omap_hwmod_opt_clk dss_dsi1_a_opt_clks[] = {
+        { .role = "sys_clk", .clk = "dss_sys_clk" },
+};
+
+static struct omap_hwmod omap54xx_dss_dsi1_a_hwmod = {
+        .name           = "dss_dsi1",
+        .class          = &omap54xx_dsi1_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dss_dss_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .opt_clks       = dss_dsi1_a_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_dsi1_a_opt_clks),
+};
+
+/* dss_dsi1_c */
+static struct omap_hwmod_opt_clk dss_dsi1_c_opt_clks[] = {
+        { .role = "sys_clk", .clk = "dss_sys_clk" },
+};
+
+static struct omap_hwmod omap54xx_dss_dsi1_c_hwmod = {
+        .name           = "dss_dsi2",
+        .class          = &omap54xx_dsi1_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dss_dss_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .opt_clks       = dss_dsi1_c_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_dsi1_c_opt_clks),
+};
+
+/*
+ * 'hdmi' class
+ * hdmi controller
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_hdmi_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class omap54xx_hdmi_hwmod_class = {
+        .name   = "hdmi",
+        .sysc   = &omap54xx_hdmi_sysc,
+};
+
+static struct omap_hwmod_opt_clk dss_hdmi_opt_clks[] = {
+        { .role = "sys_clk", .clk = "dss_sys_clk" },
+};
+
+static struct omap_hwmod omap54xx_dss_hdmi_hwmod = {
+        .name           = "dss_hdmi",
+        .class          = &omap54xx_hdmi_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dss_48mhz_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .opt_clks       = dss_hdmi_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_hdmi_opt_clks),
+};
+
+/*
+ * 'rfbi' class
+ * remote frame buffer interface
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_rfbi_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap54xx_rfbi_hwmod_class = {
+        .name   = "rfbi",
+        .sysc   = &omap54xx_rfbi_sysc,
+};
+
+/* dss_rfbi */
+static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
+        { .role = "ick", .clk = "l3_iclk_div" },
+};
+
+static struct omap_hwmod omap54xx_dss_rfbi_hwmod = {
+        .name           = "dss_rfbi",
+        .class          = &omap54xx_rfbi_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .opt_clks       = dss_rfbi_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_rfbi_opt_clks),
+};
+
+/*
  * 'emif' class
  * external memory interface no1 (wrapper)
  */
@@ -1974,6 +2203,54 @@ static struct omap_hwmod_ocp_if omap54xx_l4_abe__dmic = {
         .user           = OCP_USER_MPU,
 };
 
+/* l3_main_2 -> dss */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_dss_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_2 -> dss_dispc */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss_dispc = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_dss_dispc_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_2 -> dss_dsi1_a */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss_dsi1_a = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_dss_dsi1_a_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_2 -> dss_dsi1_c */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss_dsi1_c = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_dss_dsi1_c_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_2 -> dss_hdmi */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss_hdmi = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_dss_hdmi_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_2 -> dss_rfbi */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss_rfbi = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_dss_rfbi_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* mpu -> emif1 */
 static struct omap_hwmod_ocp_if omap54xx_mpu__emif1 = {
         .master         = &omap54xx_mpu_hwmod,
@@ -2427,6 +2704,12 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
         &omap54xx_l4_cfg__dma_system,
         &omap54xx_l4_abe__dmic,
         &omap54xx_l4_cfg__mmu_dsp,
+        &omap54xx_l3_main_2__dss,
+        &omap54xx_l3_main_2__dss_dispc,
+        &omap54xx_l3_main_2__dss_dsi1_a,
+        &omap54xx_l3_main_2__dss_dsi1_c,
+        &omap54xx_l3_main_2__dss_hdmi,
+        &omap54xx_l3_main_2__dss_rfbi,
         &omap54xx_mpu__emif1,
         &omap54xx_mpu__emif2,
         &omap54xx_l4_wkup__gpio1,
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
index 615e5b1fb025..6bf626700557 100644
--- a/arch/arm/mach-omap2/omap_twl.c
+++ b/arch/arm/mach-omap2/omap_twl.c
@@ -46,15 +46,8 @@
 
 static bool is_offset_valid;
 static u8 smps_offset;
-/*
- * Flag to ensure Smartreflex bit in TWL
- * being cleared in board file is not overwritten.
- */
-static bool __initdata twl_sr_enable_autoinit;
 
-#define TWL4030_DCDC_GLOBAL_CFG        0x06
 #define REG_SMPS_OFFSET         0xE0
-#define SMARTREFLEX_ENABLE     BIT(3)
 
 static unsigned long twl4030_vsel_to_uv(const u8 vsel)
 {
@@ -251,18 +244,6 @@ int __init omap3_twl_init(void)
         if (!cpu_is_omap34xx())
                 return -ENODEV;
 
-        /*
-         * The smartreflex bit on twl4030 specifies if the setting of voltage
-         * is done over the I2C_SR path. Since this setting is independent of
-         * the actual usage of smartreflex AVS module, we enable TWL SR bit
-         * by default irrespective of whether smartreflex AVS module is enabled
-         * on the OMAP side or not. This is because without this bit enabled,
-         * the voltage scaling through vp forceupdate/bypass mechanism of
-         * voltage scaling will not function on TWL over I2C_SR.
-         */
-        if (!twl_sr_enable_autoinit)
-                omap3_twl_set_sr_bit(true);
-
         voltdm = voltdm_lookup("mpu_iva");
         omap_voltage_register_pmic(voltdm, &omap3_mpu_pmic);
 
@@ -271,44 +252,3 @@ int __init omap3_twl_init(void)
 
         return 0;
 }
-
-/**
- * omap3_twl_set_sr_bit() - Set/Clear SR bit on TWL
- * @enable: enable SR mode in twl or not
- *
- * If 'enable' is true, enables Smartreflex bit on TWL 4030 to make sure
- * voltage scaling through OMAP SR works. Else, the smartreflex bit
- * on twl4030 is cleared as there are platforms which use OMAP3 and T2 but
- * use Synchronized Scaling Hardware Strategy (ENABLE_VMODE=1) and Direct
- * Strategy Software Scaling Mode (ENABLE_VMODE=0), for setting the voltages,
- * in those scenarios this bit is to be cleared (enable = false).
- *
- * Returns 0 on success, error is returned if I2C read/write fails.
- */
-int __init omap3_twl_set_sr_bit(bool enable)
-{
-        u8 temp;
-        int ret;
-        if (twl_sr_enable_autoinit)
-                pr_warning("%s: unexpected multiple calls\n", __func__);
-
-        ret = twl_i2c_read_u8(TWL_MODULE_PM_RECEIVER, &temp,
-                              TWL4030_DCDC_GLOBAL_CFG);
-        if (ret)
-                goto err;
-
-        if (enable)
-                temp |= SMARTREFLEX_ENABLE;
-        else
-                temp &= ~SMARTREFLEX_ENABLE;
-
-        ret = twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, temp,
-                               TWL4030_DCDC_GLOBAL_CFG);
-        if (!ret) {
-                twl_sr_enable_autoinit = true;
-                return 0;
-        }
-err:
-        pr_err("%s: Error access to TWL4030 (%d)\n", __func__, ret);
-        return ret;
-}
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index e1b41416fbf1..828aee9ea6a8 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -32,11 +32,13 @@
 #include "pm.h"
 #include "twl-common.h"
 
+#ifdef CONFIG_SUSPEND
 /*
  * omap_pm_suspend: points to a function that does the SoC-specific
  * suspend work
  */
-int (*omap_pm_suspend)(void);
+static int (*omap_pm_suspend)(void);
+#endif
 
 #ifdef CONFIG_PM
 /**
@@ -243,6 +245,15 @@ static const struct platform_suspend_ops omap_pm_ops = {
         .valid          = suspend_valid_only_mem,
 };
 
+/**
+ * omap_common_suspend_init - Set common suspend routines for OMAP SoCs
+ * @pm_suspend: function pointer to SoC specific suspend function
+ */
+void omap_common_suspend_init(void *pm_suspend)
+{
+        omap_pm_suspend = pm_suspend;
+        suspend_set_ops(&omap_pm_ops);
+}
 #endif /* CONFIG_SUSPEND */
 
 static void __init omap3_init_voltages(void)
@@ -287,32 +298,24 @@ omap_postcore_initcall(omap2_common_pm_init);
 
 int __init omap2_common_pm_late_init(void)
 {
-        /*
-         * In the case of DT, the PMIC and SR initialization will be done using
-         * a completely different mechanism.
-         * Disable this part if a DT blob is available.
-         */
-        if (!of_have_populated_dt()) {
-
-                /* Init the voltage layer */
-                omap_pmic_late_init();
-                omap_voltage_late_init();
+        if (of_have_populated_dt()) {
+                omap3_twl_init();
+                omap4_twl_init();
+        }
 
-                /* Initialize the voltages */
-                omap3_init_voltages();
-                omap4_init_voltages();
+        /* Init the voltage layer */
+        omap_pmic_late_init();
+        omap_voltage_late_init();
 
-                /* Smartreflex device init */
-                omap_devinit_smartreflex();
+        /* Initialize the voltages */
+        omap3_init_voltages();
+        omap4_init_voltages();
 
-        }
+        /* Smartreflex device init */
+        omap_devinit_smartreflex();
 
         /* cpufreq dummy device instantiation */
         omap_init_cpufreq();
 
-#ifdef CONFIG_SUSPEND
-        suspend_set_ops(&omap_pm_ops);
-#endif
-
         return 0;
 }
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index d4d0fce325c7..e150102d6c06 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -34,7 +34,6 @@ extern void *omap3_secure_ram_storage;
 extern void omap3_pm_off_mode_enable(int);
 extern void omap_sram_idle(void);
 extern int omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused);
-extern int (*omap_pm_suspend)(void);
 
 #if defined(CONFIG_PM_OPP)
 extern int omap3_opp_init(void);
@@ -147,4 +146,11 @@ static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { *tstart = *
 static inline void omap_pm_setup_sr_i2c_pcb_length(u32 mm) { }
 #endif
 
+#ifdef CONFIG_SUSPEND
+void omap_common_suspend_init(void *pm_suspend);
+#else
+static inline void omap_common_suspend_init(void *pm_suspend)
+{
+}
+#endif /* CONFIG_SUSPEND */
 #endif
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 8c0759496c8d..a5ea988ff340 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -229,9 +229,7 @@ static void __init prcm_setup_regs(void)
         clkdm_for_each(omap_pm_clkdms_setup, NULL);
         clkdm_add_wkdep(mpu_clkdm, wkup_clkdm);
 
-#ifdef CONFIG_SUSPEND
-        omap_pm_suspend = omap2_enter_full_retention;
-#endif
+        omap_common_suspend_init(omap2_enter_full_retention);
 
         /* REVISIT: Configure number of 32 kHz clock cycles for sys_clk
          * stabilisation */
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 87099bb6de69..507d8eeaab95 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -50,6 +50,7 @@
 #include "sdrc.h"
 #include "sram.h"
 #include "control.h"
+#include "vc.h"
 
 /* pm34xx errata defined in pm.h */
 u16 pm34xx_errata;
@@ -288,6 +289,9 @@ void omap_sram_idle(void)
                 }
         }
 
+        /* Configure PMIC signaling for I2C4 or sys_off_mode */
+        omap3_vc_set_pmic_signaling(core_next_state);
+
         omap3_intc_prepare_idle();
 
         /*
@@ -391,7 +395,8 @@ restore:
 
         return ret;
 }
-
+#else
+#define omap3_pm_suspend NULL
 #endif /* CONFIG_SUSPEND */
 
 
@@ -705,9 +710,7 @@ int __init omap3_pm_init(void)
         per_clkdm = clkdm_lookup("per_clkdm");
         wkup_clkdm = clkdm_lookup("wkup_clkdm");
 
-#ifdef CONFIG_SUSPEND
-        omap_pm_suspend = omap3_pm_suspend;
-#endif
+        omap_common_suspend_init(omap3_pm_suspend);
 
         arm_pm_idle = omap3_pm_idle;
         omap3_idle_init();
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index eefb30cfcabd..0dda6cf8b855 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -96,6 +96,8 @@ static int omap4_pm_suspend(void)
 
         return 0;
 }
+#else
+#define omap4_pm_suspend NULL
 #endif /* CONFIG_SUSPEND */
 
 static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
@@ -251,9 +253,7 @@ int __init omap4_pm_init(void)
 
         (void) clkdm_for_each(omap_pm_clkdms_setup, NULL);
 
-#ifdef CONFIG_SUSPEND
-        omap_pm_suspend = omap4_pm_suspend;
-#endif
+        omap_common_suspend_init(omap4_pm_suspend);
 
         /* Overwrite the default cpu_do_idle() */
         arm_pm_idle = omap_default_idle;
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
index cebad565ed37..106132db532b 100644
--- a/arch/arm/mach-omap2/prm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
@@ -123,8 +123,15 @@
 #define OMAP3430_GLOBAL_SW_RST_SHIFT                    1
 #define OMAP3430_GLOBAL_COLD_RST_SHIFT                  0
 #define OMAP3430_GLOBAL_COLD_RST_MASK                   (1 << 0)
-#define OMAP3430_SEL_OFF_MASK                           (1 << 3)
-#define OMAP3430_AUTO_OFF_MASK                          (1 << 2)
+#define OMAP3430_PRM_VOLTCTRL_SEL_VMODE                 (1 << 4)
+#define OMAP3430_PRM_VOLTCTRL_SEL_OFF                   (1 << 3)
+#define OMAP3430_PRM_VOLTCTRL_AUTO_OFF                  (1 << 2)
+#define OMAP3430_PRM_VOLTCTRL_AUTO_RET                  (1 << 1)
+#define OMAP3430_PRM_VOLTCTRL_AUTO_SLEEP                (1 << 0)
 #define OMAP3430_SETUP_TIME2_MASK                       (0xffff << 16)
 #define OMAP3430_SETUP_TIME1_MASK                       (0xffff << 0)
+#define OMAP3430_PRM_POLCTRL_OFFMODE_POL                (1 << 3)
+#define OMAP3430_PRM_POLCTRL_CLKOUT_POL                 (1 << 2)
+#define OMAP3430_PRM_POLCTRL_CLKREQ_POL                 (1 << 1)
+#define OMAP3430_PRM_POLCTRL_EXTVOL_POL                 (1 << 0)
 #endif
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 30abcc8b20e0..de2a34c423a7 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -459,10 +459,15 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define OMAP5430_REV_ES2_0      (OMAP54XX_CLASS | (0x30 << 16) | (0x20 << 8))
 #define OMAP5432_REV_ES2_0      (OMAP54XX_CLASS | (0x32 << 16) | (0x20 << 8))
 
+#define DRA7XX_CLASS            0x07000000
+#define DRA752_REV_ES1_0        (DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8))
+#define DRA752_REV_ES1_1        (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8))
+
 void omap2xxx_check_revision(void);
 void omap3xxx_check_revision(void);
 void omap4xxx_check_revision(void);
 void omap5xxx_check_revision(void);
+void dra7xxx_check_revision(void);
 void omap3xxx_check_features(void);
 void ti81xx_check_features(void);
 void am33xx_check_features(void);
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 267f204559c3..a4628a9e760c 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -220,10 +220,126 @@ static inline u32 omap_usec_to_32k(u32 usec)
         return DIV_ROUND_UP_ULL(32768ULL * (u64)usec, 1000000ULL);
 }
 
-/* Set oscillator setup time for omap3 */
-static void omap3_set_clksetup(u32 usec, struct voltagedomain *voltdm)
+struct omap3_vc_timings {
+        u32 voltsetup1;
+        u32 voltsetup2;
+};
+
+struct omap3_vc {
+        struct voltagedomain *vd;
+        u32 voltctrl;
+        u32 voltsetup1;
+        u32 voltsetup2;
+        struct omap3_vc_timings timings[2];
+};
+static struct omap3_vc vc;
+
+void omap3_vc_set_pmic_signaling(int core_next_state)
+{
+        struct voltagedomain *vd = vc.vd;
+        struct omap3_vc_timings *c = vc.timings;
+        u32 voltctrl, voltsetup1, voltsetup2;
+
+        voltctrl = vc.voltctrl;
+        voltsetup1 = vc.voltsetup1;
+        voltsetup2 = vc.voltsetup2;
+
+        switch (core_next_state) {
+        case PWRDM_POWER_OFF:
+                voltctrl &= ~(OMAP3430_PRM_VOLTCTRL_AUTO_RET |
+                              OMAP3430_PRM_VOLTCTRL_AUTO_SLEEP);
+                voltctrl |= OMAP3430_PRM_VOLTCTRL_AUTO_OFF;
+                if (voltctrl & OMAP3430_PRM_VOLTCTRL_SEL_OFF)
+                        voltsetup2 = c->voltsetup2;
+                else
+                        voltsetup1 = c->voltsetup1;
+                break;
+        case PWRDM_POWER_RET:
+        default:
+                c++;
+                voltctrl &= ~(OMAP3430_PRM_VOLTCTRL_AUTO_OFF |
+                              OMAP3430_PRM_VOLTCTRL_AUTO_SLEEP);
+                voltctrl |= OMAP3430_PRM_VOLTCTRL_AUTO_RET;
+                voltsetup1 = c->voltsetup1;
+                break;
+        }
+
+        if (voltctrl != vc.voltctrl) {
+                vd->write(voltctrl, OMAP3_PRM_VOLTCTRL_OFFSET);
+                vc.voltctrl = voltctrl;
+        }
+        if (voltsetup1 != vc.voltsetup1) {
+                vd->write(c->voltsetup1,
+                          OMAP3_PRM_VOLTSETUP1_OFFSET);
+                vc.voltsetup1 = voltsetup1;
+        }
+        if (voltsetup2 != vc.voltsetup2) {
+                vd->write(c->voltsetup2,
+                          OMAP3_PRM_VOLTSETUP2_OFFSET);
+                vc.voltsetup2 = voltsetup2;
+        }
+}
+
+#define PRM_POLCTRL_TWL_MASK    (OMAP3430_PRM_POLCTRL_CLKREQ_POL | \
+                                        OMAP3430_PRM_POLCTRL_CLKREQ_POL)
+#define PRM_POLCTRL_TWL_VAL     OMAP3430_PRM_POLCTRL_CLKREQ_POL
+
+/*
+ * Configure signal polarity for sys_clkreq and sys_off_mode pins
+ * as the default values are wrong and can cause the system to hang
+ * if any twl4030 scripts are loaded.
+ */
+static void __init omap3_vc_init_pmic_signaling(struct voltagedomain *voltdm)
+{
+        u32 val;
+
+        if (vc.vd)
+                return;
+
+        vc.vd = voltdm;
+
+        val = voltdm->read(OMAP3_PRM_POLCTRL_OFFSET);
+        if (!(val & OMAP3430_PRM_POLCTRL_CLKREQ_POL) ||
+            (val & OMAP3430_PRM_POLCTRL_CLKREQ_POL)) {
+                val |= OMAP3430_PRM_POLCTRL_CLKREQ_POL;
+                val &= ~OMAP3430_PRM_POLCTRL_OFFMODE_POL;
+                pr_debug("PM: fixing sys_clkreq and sys_off_mode polarity to 0x%x\n",
+                         val);
+                voltdm->write(val, OMAP3_PRM_POLCTRL_OFFSET);
+        }
+
+        /*
+         * By default let's use I2C4 signaling for retention idle
+         * and sys_off_mode pin signaling for off idle. This way we
+         * have sys_clk_req pin go down for retention and both
+         * sys_clk_req and sys_off_mode pins will go down for off
+         * idle. And we can also scale voltages to zero for off-idle.
+         * Note that no actual voltage scaling during off-idle will
+         * happen unless the board specific twl4030 PMIC scripts are
+         * loaded.
+         */
+        val = voltdm->read(OMAP3_PRM_VOLTCTRL_OFFSET);
+        if (!(val & OMAP3430_PRM_VOLTCTRL_SEL_OFF)) {
+                val |= OMAP3430_PRM_VOLTCTRL_SEL_OFF;
+                pr_debug("PM: setting voltctrl sys_off_mode signaling to 0x%x\n",
+                         val);
+                voltdm->write(val, OMAP3_PRM_VOLTCTRL_OFFSET);
+        }
+        vc.voltctrl = val;
+
+        omap3_vc_set_pmic_signaling(PWRDM_POWER_ON);
+}
+
+static void omap3_init_voltsetup1(struct voltagedomain *voltdm,
+                                  struct omap3_vc_timings *c, u32 idle)
 {
-        voltdm->write(omap_usec_to_32k(usec), OMAP3_PRM_CLKSETUP_OFFSET);
+        unsigned long val;
+
+        val = (voltdm->vc_param->on - idle) / voltdm->pmic->slew_rate;
+        val *= voltdm->sys_clk.rate / 8 / 1000000 + 1;
+        val <<= __ffs(voltdm->vfsm->voltsetup_mask);
+        c->voltsetup1 &= ~voltdm->vfsm->voltsetup_mask;
+        c->voltsetup1 |= val;
 }
 
 /**
@@ -236,37 +352,21 @@ static void omap3_set_clksetup(u32 usec, struct voltagedomain *voltdm)
  * or retention. Off mode has additionally an option to use sys_off_mode
  * pad, which uses a global signal to program the whole power IC to
  * off-mode.
+ *
+ * Note that pmic is not controlling the voltage scaling during
+ * retention signaled over I2C4, so we can keep voltsetup2 as 0.
+ * And the oscillator is not shut off over I2C4, so no need to
+ * set clksetup.
  */
-static void omap3_set_i2c_timings(struct voltagedomain *voltdm, bool off_mode)
+static void omap3_set_i2c_timings(struct voltagedomain *voltdm)
 {
-        unsigned long voltsetup1;
-        u32 tgt_volt;
-
-        /*
-         * Oscillator is shut down only if we are using sys_off_mode pad,
-         * thus we set a minimal setup time here
-         */
-        omap3_set_clksetup(1, voltdm);
+        struct omap3_vc_timings *c = vc.timings;
 
-        if (off_mode)
-                tgt_volt = voltdm->vc_param->off;
-        else
-                tgt_volt = voltdm->vc_param->ret;
-
-        voltsetup1 = (voltdm->vc_param->on - tgt_volt) /
-                        voltdm->pmic->slew_rate;
-
-        voltsetup1 = voltsetup1 * voltdm->sys_clk.rate / 8 / 1000000 + 1;
-
-        voltdm->rmw(voltdm->vfsm->voltsetup_mask,
-                voltsetup1 << __ffs(voltdm->vfsm->voltsetup_mask),
-                voltdm->vfsm->voltsetup_reg);
-
-        /*
-         * pmic is not controlling the voltage scaling during retention,
-         * thus set voltsetup2 to 0
-         */
-        voltdm->write(0, OMAP3_PRM_VOLTSETUP2_OFFSET);
+        /* Configure PRWDM_POWER_OFF over I2C4 */
+        omap3_init_voltsetup1(voltdm, c, voltdm->vc_param->off);
+        c++;
+        /* Configure PRWDM_POWER_RET over I2C4 */
+        omap3_init_voltsetup1(voltdm, c, voltdm->vc_param->ret);
 }
 
 /**
@@ -275,69 +375,49 @@ static void omap3_set_i2c_timings(struct voltagedomain *voltdm, bool off_mode)
  *
  * Calculates and sets up off-mode timings for a channel. Off-mode
  * can use either I2C based voltage scaling, or alternatively
- * sys_off_mode pad can be used to send a global command to power IC.
- * This function first checks which mode is being used, and calls
- * omap3_set_i2c_timings() if the system is using I2C control mode.
+ * sys_off_mode pad can be used to send a global command to power IC.n,
  * sys_off_mode has the additional benefit that voltages can be
  * scaled to zero volt level with TWL4030 / TWL5030, I2C can only
  * scale to 600mV.
+ *
+ * Note that omap is not controlling the voltage scaling during
+ * off idle signaled by sys_off_mode, so we can keep voltsetup1
+ * as 0.
  */
 static void omap3_set_off_timings(struct voltagedomain *voltdm)
 {
-        unsigned long clksetup;
-        unsigned long voltsetup2;
-        unsigned long voltsetup2_old;
-        u32 val;
-        u32 tstart, tshut;
+        struct omap3_vc_timings *c = vc.timings;
+        u32 tstart, tshut, clksetup, voltoffset;
 
-        /* check if sys_off_mode is used to control off-mode voltages */
-        val = voltdm->read(OMAP3_PRM_VOLTCTRL_OFFSET);
-        if (!(val & OMAP3430_SEL_OFF_MASK)) {
-                /* No, omap is controlling them over I2C */
-                omap3_set_i2c_timings(voltdm, true);
+        if (c->voltsetup2)
                 return;
-        }
 
         omap_pm_get_oscillator(&tstart, &tshut);
-        omap3_set_clksetup(tstart, voltdm);
-
-        clksetup = voltdm->read(OMAP3_PRM_CLKSETUP_OFFSET);
-
-        /* voltsetup 2 in us */
-        voltsetup2 = voltdm->vc_param->on / voltdm->pmic->slew_rate;
-
-        /* convert to 32k clk cycles */
-        voltsetup2 = DIV_ROUND_UP(voltsetup2 * 32768, 1000000);
-
-        voltsetup2_old = voltdm->read(OMAP3_PRM_VOLTSETUP2_OFFSET);
-
-        /*
-         * Update voltsetup2 if higher than current value (needed because
-         * we have multiple channels with different ramp times), also
-         * update voltoffset always to value recommended by TRM
-         */
-        if (voltsetup2 > voltsetup2_old) {
-                voltdm->write(voltsetup2, OMAP3_PRM_VOLTSETUP2_OFFSET);
-                voltdm->write(clksetup - voltsetup2,
-                        OMAP3_PRM_VOLTOFFSET_OFFSET);
-        } else
-                voltdm->write(clksetup - voltsetup2_old,
-                        OMAP3_PRM_VOLTOFFSET_OFFSET);
+        if (tstart == ULONG_MAX) {
+                pr_debug("PM: oscillator start-up time not initialized, using 10ms\n");
+                clksetup = omap_usec_to_32k(10000);
+        } else {
+                clksetup = omap_usec_to_32k(tstart);
+        }
 
         /*
-         * omap is not controlling voltage scaling during off-mode,
-         * thus set voltsetup1 to 0
+         * For twl4030 errata 27, we need to allow minimum ~488.32 us wait to
+         * switch from HFCLKIN to internal oscillator. That means timings
+         * have voltoffset fixed to 0xa in rounded up 32 KiHz cycles. And
+         * that means we can calculate the value based on the oscillator
+         * start-up time since voltoffset2 = clksetup - voltoffset.
          */
-        voltdm->rmw(voltdm->vfsm->voltsetup_mask, 0,
-                voltdm->vfsm->voltsetup_reg);
-
-        /* voltoffset must be clksetup minus voltsetup2 according to TRM */
-        voltdm->write(clksetup - voltsetup2, OMAP3_PRM_VOLTOFFSET_OFFSET);
+        voltoffset = omap_usec_to_32k(488);
+        c->voltsetup2 = clksetup - voltoffset;
+        voltdm->write(clksetup, OMAP3_PRM_CLKSETUP_OFFSET);
+        voltdm->write(voltoffset, OMAP3_PRM_VOLTOFFSET_OFFSET);
 }
 
 static void __init omap3_vc_init_channel(struct voltagedomain *voltdm)
 {
+        omap3_vc_init_pmic_signaling(voltdm);
         omap3_set_off_timings(voltdm);
+        omap3_set_i2c_timings(voltdm);
 }
 
 /**
diff --git a/arch/arm/mach-omap2/vc.h b/arch/arm/mach-omap2/vc.h
index 91c8d75bf2ea..cdbdd78e755e 100644
--- a/arch/arm/mach-omap2/vc.h
+++ b/arch/arm/mach-omap2/vc.h
@@ -117,6 +117,9 @@ extern struct omap_vc_param omap4_mpu_vc_data;
 extern struct omap_vc_param omap4_iva_vc_data;
 extern struct omap_vc_param omap4_core_vc_data;
 
+void omap3_vc_set_pmic_signaling(int core_next_state);
+
+
 void omap_vc_init_channel(struct voltagedomain *voltdm);
 int omap_vc_pre_scale(struct voltagedomain *voltdm,
                       unsigned long target_volt,