Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef784868 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.8/pm-part2-v3-signed' of... 

Merge tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm

From Tony Lindgren <tony@atomide.com>:
PM changes via Kevin Hilman <khilman@deeprootsystems.com>:

Add support for full-chip retention in suspend for OMAP4 SoCs

* tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
  ARM: OMAP4: USB: power down MUSB PHY during boot
  ARM: OMAP4: suspend: Program all domains to retention

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6b2aa055 74d29168

arch/arm/mach-omap2/omap_phy_internal.c

+32 −0
Original line number Diff line number Diff line
@@ -33,6 +33,38 @@ 
#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;

arch/arm/mach-omap2/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static struct omap_device_pm_latency *pm_lats; 
 */

int (*omap_pm_suspend)(void);



#ifdef CONFIG_PM

/**

 * struct omap2_oscillator - Describe the board main oscillator latencies

 * @startup_time: oscillator startup latency
@@ -68,6 +69,7 @@ void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) 
	*tstart = oscillator.startup_time;

	*tshut = oscillator.shutdown_time;

}

#endif



static int __init _init_omap_device(char *name)

{

arch/arm/mach-omap2/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ extern void omap_pm_get_oscillator(u32 *tstart, u32 *tshut); 
extern void omap_pm_setup_sr_i2c_pcb_length(u32 mm);

#else

static inline void omap_pm_setup_oscillator(u32 tstart, u32 tshut) { }

static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { }

static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { *tstart = *tshut = 0; }

static inline void omap_pm_setup_sr_i2c_pcb_length(u32 mm) { }

#endif

arch/arm/mach-omap2/pm44xx.c

+0 −7
Original line number Diff line number Diff line
@@ -100,13 +100,6 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) 
	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;

arch/arm/mach-omap2/vc.c

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ static u8 omap_vc_calc_vsel(struct voltagedomain *voltdm, u32 uvolt) 
	return voltdm->pmic->uv_to_vsel(uvolt);

}



#ifdef CONFIG_PM

/**

 * omap_pm_setup_sr_i2c_pcb_length - set length of SR I2C traces on PCB

 * @mm: length of the PCB trace in millimetres
@@ -678,6 +679,7 @@ void __init omap_pm_setup_sr_i2c_pcb_length(u32 mm) 
{

	sr_i2c_pcb_length = mm;

}

#endif



void __init omap_vc_init_channel(struct voltagedomain *voltdm)

{