ARM: arm-soc: Merge branch 'next/clk' into next/pm

Merge together a couple of the smaller pm/clock branches into one.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 0b1249e,5b9be73..d6700d3
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -21,18 -21,18 +21,19 @@@
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 +#include <linux/platform_data/omap_ocp2scp.h>
+ #include <linux/i2c-omap.h>
+ 
+ #include <plat-omap/dma-omap.h>
  
- #include <plat/omap_hwmod.h>
- #include <plat/i2c.h>
- #include <plat/dma.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
- #include <plat/mmc.h>
  #include <plat/dmtimer.h>
- #include <plat/common.h>
  #include <plat/iommu.h>
  
+ #include "../plat-omap/common.h"
+ 
+ #include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
  #include "cm1_44xx.h"
  #include "cm2_44xx.h"

diff --cc arch/arm/mach-omap2/omap_phy_internal.c
index 9b56e5e,4d76a3c..e237602
--- 1/arch/arm/mach-omap2/omap_phy_internal.c
--- 2/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@@ -32,39 -31,8 +31,40 @@@
  
  #include "soc.h"
  #include "control.h"
+ #include "usb.h"
  
 +#define CONTROL_DEV_CONF              0x300
 +#define PHY_PD                                0x1
 +
 +/**
 + * omap4430_phy_power_down: disable MUSB PHY during early init
 + *
 + * OMAP4 MUSB PHY module is enabled by default on reset, but this will
 + * prevent core retention if not disabled by SW. USB driver will
 + * later on enable this, once and if the driver needs it.
 + */
 +static int __init omap4430_phy_power_down(void)
 +{
 +      void __iomem *ctrl_base;
 +
 +      if (!cpu_is_omap44xx())
 +              return 0;
 +
 +      ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K);
 +      if (!ctrl_base) {
 +              pr_err("control module ioremap failed\n");
 +              return -ENOMEM;
 +      }
 +
 +      /* Power down the phy */
 +      __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
 +
 +      iounmap(ctrl_base);
 +
 +      return 0;
 +}
 +early_initcall(omap4430_phy_power_down);
 +
  void am35x_musb_reset(void)
  {
        u32     regval;

diff --cc arch/arm/mach-omap2/pm.c
Simple merge

diff --cc arch/arm/mach-omap2/pm44xx.c
Simple merge

diff --cc arch/arm/mach-omap2/twl-common.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge