Merge tag 'for_3.8-pm-omap4-core-ret' of...

#include "soc.h"

#include "control.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;

	if (!strncmp(pwrdm->name, "cpu", 3))

		return 0;

	/*

	 * FIXME: Remove this check when core retention is supported

	 * Only MPUSS power domain is added in the list.

	 */

	if (strcmp(pwrdm->name, "mpu_pwrdm"))

		return 0;

	pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC);

	if (!pwrst)

		return -ENOMEM;