mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
PM changes via Kevin Hilman <khilman@deeprootsystems.com>:
Add support for full-chip retention in suspend for OMAP4 SoCs -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQpEXcAAoJEBvUPslcq6Vz4LkP/3iLA6IUl+Y/wBDUINm8hRjJ 8vBNkWRdkppcDaVv42lrYGMKj7zBZJ8nhtBN6lP8Nyv75tVTzMHKKvVuHFy4gtWe n5+oR+xYKm7PqpKT6xbYNucYbqjywMYKdoZpJ80mL3fpUdRKJAPeciwYGTFwOMI+ hKEgj4gFgWok2fCF6KAgqbbaYXRGZSGErd7q38bsKrYRkPJfH0fHhNf4EYGEfr63 hagNb+ARIRNPeOdfMUCLn91YefOgJtLHJpO2vTvhTMHmhm6FsuHGaZsAd5Uz5+Wo WXII8Ja2kQCWgs+ZUJFFsbAgNWCtuG7IcbWmU3srOtSyNfIFaBB9/EkO42z3qLO+ Q1O+M7TmkN8elxBwx3UYrnWzIBQbXPgMY9l1NaeBXo0BiiLAIsFTYluMnYtPX63x 8niaP+LEoiYwvpchCM6RjycfIlG+dse4SW+rPyik9HnQ/0aKr8fHyiS/oXqvlsds ULqm6i/GxG6KBqLG0VrqvwcPPAZdhpNKzcbL/QJhULpKqxbv4VKCaQBhTslRCAJB uN1hD8+nkrO3rjWEHELHiiJcDR1YL1XmnNiJnrZ4zQZ/SY4o7E098fiOk0kcnSNI KNUhL/i5ZpamqsBdq2LRPLxgtab9D+kw4W2DFc3WuSHfJmq0gq0S0QxQB++Y1Wba NFW4ruEsp0EcAzZgWTUv =yWQr -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
ef7848683f
5 changed files with 37 additions and 8 deletions
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue