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

Pull ARM SoC-specific updates from Arnd Bergmann:
 "This is a larger set of new functionality for the existing SoC
  families, including:

   - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
     wm8850

   - prima2 gains support for the "marco" SoC family, its SMP based
     cousin

   - tegra gains support for the new Tegra4 (Tegra114) family

   - socfpga now supports a newer version of the hardware including SMP

   - i.mx31 and bcm2835 are now using DT probing for their clocks

   - lots of updates for sh-mobile

   - OMAP updates for clocks, power management and USB

   - i.mx6q and tegra now support cpuidle

   - kirkwood now supports PCIe hot plugging

   - tegra clock support is updated

   - tegra USB PHY probing gets implemented diffently"

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
  ARM: prima2: remove duplicate v7_invalidate_l1
  ARM: shmobile: r8a7779: Correct TMU clock support again
  ARM: prima2: fix __init section for cpu hotplug
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
  arm: socfpga: Add SMP support for actual socfpga harware
  arm: Add v7_invalidate_l1 to cache-v7.S
  arm: socfpga: Add entries to enable make dtbs socfpga
  arm: socfpga: Add new device tree source for actual socfpga HW
  ARM: tegra: sort Kconfig selects for Tegra114
  ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
  ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
  ARM: tegra: Fix build error for gic update
  ARM: tegra: remove empty tegra_smp_init_cpus()
  ARM: shmobile: Register ARM architected timer
  ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
  ARM: shmobile: r8a7779: Correct TMU clock support
  ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
  ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
  ARM: mxs: use apbx bus clock to drive the timers on timrotv2
  ...

1 files changed, 49 insertions, 50 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 624a7e84a685..7ec1083ff604 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -616,7 +616,7 @@ static struct omap_hwmod omap44xx_dmic_hwmod = {
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_dmic_irqs,
         .sdma_reqs      = omap44xx_dmic_sdma_reqs,
-        .main_clk       = "dmic_fck",
+        .main_clk       = "func_dmic_abe_gfclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_DMIC_CLKCTRL_OFFSET,
@@ -1161,7 +1161,7 @@ static struct omap_hwmod omap44xx_gpio1_hwmod = {
         .class          = &omap44xx_gpio_hwmod_class,
         .clkdm_name     = "l4_wkup_clkdm",
         .mpu_irqs       = omap44xx_gpio1_irqs,
-        .main_clk       = "gpio1_ick",
+        .main_clk       = "l4_wkup_clk_mux_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_WKUP_GPIO1_CLKCTRL_OFFSET,
@@ -1190,7 +1190,7 @@ static struct omap_hwmod omap44xx_gpio2_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
         .mpu_irqs       = omap44xx_gpio2_irqs,
-        .main_clk       = "gpio2_ick",
+        .main_clk       = "l4_div_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_GPIO2_CLKCTRL_OFFSET,
@@ -1219,7 +1219,7 @@ static struct omap_hwmod omap44xx_gpio3_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
         .mpu_irqs       = omap44xx_gpio3_irqs,
-        .main_clk       = "gpio3_ick",
+        .main_clk       = "l4_div_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_GPIO3_CLKCTRL_OFFSET,
@@ -1248,7 +1248,7 @@ static struct omap_hwmod omap44xx_gpio4_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
         .mpu_irqs       = omap44xx_gpio4_irqs,
-        .main_clk       = "gpio4_ick",
+        .main_clk       = "l4_div_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_GPIO4_CLKCTRL_OFFSET,
@@ -1277,7 +1277,7 @@ static struct omap_hwmod omap44xx_gpio5_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
         .mpu_irqs       = omap44xx_gpio5_irqs,
-        .main_clk       = "gpio5_ick",
+        .main_clk       = "l4_div_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_GPIO5_CLKCTRL_OFFSET,
@@ -1306,7 +1306,7 @@ static struct omap_hwmod omap44xx_gpio6_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
         .mpu_irqs       = omap44xx_gpio6_irqs,
-        .main_clk       = "gpio6_ick",
+        .main_clk       = "l4_div_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_GPIO6_CLKCTRL_OFFSET,
@@ -1405,7 +1405,7 @@ static struct omap_hwmod omap44xx_gpu_hwmod = {
         .class          = &omap44xx_gpu_hwmod_class,
         .clkdm_name     = "l3_gfx_clkdm",
         .mpu_irqs       = omap44xx_gpu_irqs,
-        .main_clk       = "gpu_fck",
+        .main_clk       = "sgx_clk_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_GFX_GFX_CLKCTRL_OFFSET,
@@ -1446,7 +1446,7 @@ static struct omap_hwmod omap44xx_hdq1w_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_INIT_NO_RESET, /* XXX temporary */
         .mpu_irqs       = omap44xx_hdq1w_irqs,
-        .main_clk       = "hdq1w_fck",
+        .main_clk       = "func_12m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_HDQ1W_CLKCTRL_OFFSET,
@@ -1550,7 +1550,7 @@ static struct omap_hwmod omap44xx_i2c1_hwmod = {
         .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c1_irqs,
         .sdma_reqs      = omap44xx_i2c1_sdma_reqs,
-        .main_clk       = "i2c1_fck",
+        .main_clk       = "func_96m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_I2C1_CLKCTRL_OFFSET,
@@ -1580,7 +1580,7 @@ static struct omap_hwmod omap44xx_i2c2_hwmod = {
         .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c2_irqs,
         .sdma_reqs      = omap44xx_i2c2_sdma_reqs,
-        .main_clk       = "i2c2_fck",
+        .main_clk       = "func_96m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_I2C2_CLKCTRL_OFFSET,
@@ -1610,7 +1610,7 @@ static struct omap_hwmod omap44xx_i2c3_hwmod = {
         .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c3_irqs,
         .sdma_reqs      = omap44xx_i2c3_sdma_reqs,
-        .main_clk       = "i2c3_fck",
+        .main_clk       = "func_96m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_I2C3_CLKCTRL_OFFSET,
@@ -1640,7 +1640,7 @@ static struct omap_hwmod omap44xx_i2c4_hwmod = {
         .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c4_irqs,
         .sdma_reqs      = omap44xx_i2c4_sdma_reqs,
-        .main_clk       = "i2c4_fck",
+        .main_clk       = "func_96m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_I2C4_CLKCTRL_OFFSET,
@@ -1743,7 +1743,7 @@ static struct omap_hwmod omap44xx_iss_hwmod = {
         .clkdm_name     = "iss_clkdm",
         .mpu_irqs       = omap44xx_iss_irqs,
         .sdma_reqs      = omap44xx_iss_sdma_reqs,
-        .main_clk       = "iss_fck",
+        .main_clk       = "ducati_clk_mux_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_CAM_ISS_CLKCTRL_OFFSET,
@@ -1785,7 +1785,7 @@ static struct omap_hwmod omap44xx_iva_hwmod = {
         .mpu_irqs       = omap44xx_iva_irqs,
         .rst_lines      = omap44xx_iva_resets,
         .rst_lines_cnt  = ARRAY_SIZE(omap44xx_iva_resets),
-        .main_clk       = "iva_fck",
+        .main_clk       = "dpll_iva_m5x2_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_IVAHD_IVAHD_CLKCTRL_OFFSET,
@@ -1829,7 +1829,7 @@ static struct omap_hwmod omap44xx_kbd_hwmod = {
         .class          = &omap44xx_kbd_hwmod_class,
         .clkdm_name     = "l4_wkup_clkdm",
         .mpu_irqs       = omap44xx_kbd_irqs,
-        .main_clk       = "kbd_fck",
+        .main_clk       = "sys_32k_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_WKUP_KEYBOARD_CLKCTRL_OFFSET,
@@ -1920,7 +1920,7 @@ static struct omap_hwmod omap44xx_mcasp_hwmod = {
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_mcasp_irqs,
         .sdma_reqs      = omap44xx_mcasp_sdma_reqs,
-        .main_clk       = "mcasp_fck",
+        .main_clk       = "func_mcasp_abe_gfclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_MCASP_CLKCTRL_OFFSET,
@@ -1972,7 +1972,7 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_mcbsp1_irqs,
         .sdma_reqs      = omap44xx_mcbsp1_sdma_reqs,
-        .main_clk       = "mcbsp1_fck",
+        .main_clk       = "func_mcbsp1_gfclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_MCBSP1_CLKCTRL_OFFSET,
@@ -2007,7 +2007,7 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_mcbsp2_irqs,
         .sdma_reqs      = omap44xx_mcbsp2_sdma_reqs,
-        .main_clk       = "mcbsp2_fck",
+        .main_clk       = "func_mcbsp2_gfclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_MCBSP2_CLKCTRL_OFFSET,
@@ -2042,7 +2042,7 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_mcbsp3_irqs,
         .sdma_reqs      = omap44xx_mcbsp3_sdma_reqs,
-        .main_clk       = "mcbsp3_fck",
+        .main_clk       = "func_mcbsp3_gfclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_MCBSP3_CLKCTRL_OFFSET,
@@ -2077,7 +2077,7 @@ static struct omap_hwmod omap44xx_mcbsp4_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mcbsp4_irqs,
         .sdma_reqs      = omap44xx_mcbsp4_sdma_reqs,
-        .main_clk       = "mcbsp4_fck",
+        .main_clk       = "per_mcbsp4_gfclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MCBSP4_CLKCTRL_OFFSET,
@@ -2140,7 +2140,7 @@ static struct omap_hwmod omap44xx_mcpdm_hwmod = {
         .flags          = HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE,
         .mpu_irqs       = omap44xx_mcpdm_irqs,
         .sdma_reqs      = omap44xx_mcpdm_sdma_reqs,
-        .main_clk       = "mcpdm_fck",
+        .main_clk       = "pad_clks_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_PDM_CLKCTRL_OFFSET,
@@ -2201,7 +2201,7 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mcspi1_irqs,
         .sdma_reqs      = omap44xx_mcspi1_sdma_reqs,
-        .main_clk       = "mcspi1_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MCSPI1_CLKCTRL_OFFSET,
@@ -2237,7 +2237,7 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mcspi2_irqs,
         .sdma_reqs      = omap44xx_mcspi2_sdma_reqs,
-        .main_clk       = "mcspi2_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MCSPI2_CLKCTRL_OFFSET,
@@ -2273,7 +2273,7 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mcspi3_irqs,
         .sdma_reqs      = omap44xx_mcspi3_sdma_reqs,
-        .main_clk       = "mcspi3_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MCSPI3_CLKCTRL_OFFSET,
@@ -2307,7 +2307,7 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mcspi4_irqs,
         .sdma_reqs      = omap44xx_mcspi4_sdma_reqs,
-        .main_clk       = "mcspi4_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MCSPI4_CLKCTRL_OFFSET,
@@ -2363,7 +2363,7 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = {
         .clkdm_name     = "l3_init_clkdm",
         .mpu_irqs       = omap44xx_mmc1_irqs,
         .sdma_reqs      = omap44xx_mmc1_sdma_reqs,
-        .main_clk       = "mmc1_fck",
+        .main_clk       = "hsmmc1_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L3INIT_MMC1_CLKCTRL_OFFSET,
@@ -2392,7 +2392,7 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = {
         .clkdm_name     = "l3_init_clkdm",
         .mpu_irqs       = omap44xx_mmc2_irqs,
         .sdma_reqs      = omap44xx_mmc2_sdma_reqs,
-        .main_clk       = "mmc2_fck",
+        .main_clk       = "hsmmc2_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L3INIT_MMC2_CLKCTRL_OFFSET,
@@ -2420,7 +2420,7 @@ static struct omap_hwmod omap44xx_mmc3_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mmc3_irqs,
         .sdma_reqs      = omap44xx_mmc3_sdma_reqs,
-        .main_clk       = "mmc3_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MMCSD3_CLKCTRL_OFFSET,
@@ -2448,7 +2448,7 @@ static struct omap_hwmod omap44xx_mmc4_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mmc4_irqs,
         .sdma_reqs      = omap44xx_mmc4_sdma_reqs,
-        .main_clk       = "mmc4_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MMCSD4_CLKCTRL_OFFSET,
@@ -2476,7 +2476,7 @@ static struct omap_hwmod omap44xx_mmc5_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_mmc5_irqs,
         .sdma_reqs      = omap44xx_mmc5_sdma_reqs,
-        .main_clk       = "mmc5_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_MMCSD5_CLKCTRL_OFFSET,
@@ -2718,7 +2718,7 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {
         .name           = "ocp2scp_usb_phy",
         .class          = &omap44xx_ocp2scp_hwmod_class,
         .clkdm_name     = "l3_init_clkdm",
-        .main_clk       = "ocp2scp_usb_phy_phy_48m",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L3INIT_USBPHYOCP2SCP_CLKCTRL_OFFSET,
@@ -3155,7 +3155,7 @@ static struct omap_hwmod omap44xx_timer1_hwmod = {
         .clkdm_name     = "l4_wkup_clkdm",
         .flags          = HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_timer1_irqs,
-        .main_clk       = "timer1_fck",
+        .main_clk       = "dmt1_clk_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_WKUP_TIMER1_CLKCTRL_OFFSET,
@@ -3178,7 +3178,7 @@ static struct omap_hwmod omap44xx_timer2_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_timer2_irqs,
-        .main_clk       = "timer2_fck",
+        .main_clk       = "cm2_dm2_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_DMTIMER2_CLKCTRL_OFFSET,
@@ -3199,7 +3199,7 @@ static struct omap_hwmod omap44xx_timer3_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_timer3_irqs,
-        .main_clk       = "timer3_fck",
+        .main_clk       = "cm2_dm3_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_DMTIMER3_CLKCTRL_OFFSET,
@@ -3220,7 +3220,7 @@ static struct omap_hwmod omap44xx_timer4_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_timer4_irqs,
-        .main_clk       = "timer4_fck",
+        .main_clk       = "cm2_dm4_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_DMTIMER4_CLKCTRL_OFFSET,
@@ -3241,7 +3241,7 @@ static struct omap_hwmod omap44xx_timer5_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_timer5_irqs,
-        .main_clk       = "timer5_fck",
+        .main_clk       = "timer5_sync_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_TIMER5_CLKCTRL_OFFSET,
@@ -3263,8 +3263,7 @@ static struct omap_hwmod omap44xx_timer6_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_timer6_irqs,
-
-        .main_clk       = "timer6_fck",
+        .main_clk       = "timer6_sync_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_TIMER6_CLKCTRL_OFFSET,
@@ -3286,7 +3285,7 @@ static struct omap_hwmod omap44xx_timer7_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_timer7_irqs,
-        .main_clk       = "timer7_fck",
+        .main_clk       = "timer7_sync_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_TIMER7_CLKCTRL_OFFSET,
@@ -3308,7 +3307,7 @@ static struct omap_hwmod omap44xx_timer8_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_timer8_irqs,
-        .main_clk       = "timer8_fck",
+        .main_clk       = "timer8_sync_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_TIMER8_CLKCTRL_OFFSET,
@@ -3330,7 +3329,7 @@ static struct omap_hwmod omap44xx_timer9_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_timer9_irqs,
-        .main_clk       = "timer9_fck",
+        .main_clk       = "cm2_dm9_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_DMTIMER9_CLKCTRL_OFFSET,
@@ -3353,7 +3352,7 @@ static struct omap_hwmod omap44xx_timer10_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .flags          = HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_timer10_irqs,
-        .main_clk       = "timer10_fck",
+        .main_clk       = "cm2_dm10_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_DMTIMER10_CLKCTRL_OFFSET,
@@ -3375,7 +3374,7 @@ static struct omap_hwmod omap44xx_timer11_hwmod = {
         .class          = &omap44xx_timer_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_timer11_irqs,
-        .main_clk       = "timer11_fck",
+        .main_clk       = "cm2_dm11_mux",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_DMTIMER11_CLKCTRL_OFFSET,
@@ -3426,7 +3425,7 @@ static struct omap_hwmod omap44xx_uart1_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_uart1_irqs,
         .sdma_reqs      = omap44xx_uart1_sdma_reqs,
-        .main_clk       = "uart1_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_UART1_CLKCTRL_OFFSET,
@@ -3454,7 +3453,7 @@ static struct omap_hwmod omap44xx_uart2_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_uart2_irqs,
         .sdma_reqs      = omap44xx_uart2_sdma_reqs,
-        .main_clk       = "uart2_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_UART2_CLKCTRL_OFFSET,
@@ -3483,7 +3482,7 @@ static struct omap_hwmod omap44xx_uart3_hwmod = {
         .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
         .mpu_irqs       = omap44xx_uart3_irqs,
         .sdma_reqs      = omap44xx_uart3_sdma_reqs,
-        .main_clk       = "uart3_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_UART3_CLKCTRL_OFFSET,
@@ -3511,7 +3510,7 @@ static struct omap_hwmod omap44xx_uart4_hwmod = {
         .clkdm_name     = "l4_per_clkdm",
         .mpu_irqs       = omap44xx_uart4_irqs,
         .sdma_reqs      = omap44xx_uart4_sdma_reqs,
-        .main_clk       = "uart4_fck",
+        .main_clk       = "func_48m_fclk",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_L4PER_UART4_CLKCTRL_OFFSET,
@@ -3790,7 +3789,7 @@ static struct omap_hwmod omap44xx_wd_timer2_hwmod = {
         .class          = &omap44xx_wd_timer_hwmod_class,
         .clkdm_name     = "l4_wkup_clkdm",
         .mpu_irqs       = omap44xx_wd_timer2_irqs,
-        .main_clk       = "wd_timer2_fck",
+        .main_clk       = "sys_32k_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM_WKUP_WDT2_CLKCTRL_OFFSET,
@@ -3811,7 +3810,7 @@ static struct omap_hwmod omap44xx_wd_timer3_hwmod = {
         .class          = &omap44xx_wd_timer_hwmod_class,
         .clkdm_name     = "abe_clkdm",
         .mpu_irqs       = omap44xx_wd_timer3_irqs,
-        .main_clk       = "wd_timer3_fck",
+        .main_clk       = "sys_32k_ck",
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = OMAP4_CM1_ABE_WDT3_CLKCTRL_OFFSET,