Commit 1428ed1a authored by Kevin Hilman's avatar Kevin Hilman Committed by Sekhar Nori

ARM: davinci: PM: cleanup: remove references to pdata

Since the PM core code is no longer using a fake platform_device or
platform_data, remove references to 'pdata'.

No functional changes.
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent aa9aa1ec
...@@ -38,8 +38,6 @@ static struct davinci_pm_config pm_config = { ...@@ -38,8 +38,6 @@ static struct davinci_pm_config pm_config = {
.ddrpsc_num = DA8XX_LPSC1_EMIF3C, .ddrpsc_num = DA8XX_LPSC1_EMIF3C,
}; };
static struct davinci_pm_config *pdata = &pm_config;
static void davinci_sram_push(void *dest, void *src, unsigned int size) static void davinci_sram_push(void *dest, void *src, unsigned int size)
{ {
memcpy(dest, src, size); memcpy(dest, src, size);
...@@ -50,58 +48,58 @@ static void davinci_pm_suspend(void) ...@@ -50,58 +48,58 @@ static void davinci_pm_suspend(void)
{ {
unsigned val; unsigned val;
if (pdata->cpupll_reg_base != pdata->ddrpll_reg_base) { if (pm_config.cpupll_reg_base != pm_config.ddrpll_reg_base) {
/* Switch CPU PLL to bypass mode */ /* Switch CPU PLL to bypass mode */
val = __raw_readl(pdata->cpupll_reg_base + PLLCTL); val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~(PLLCTL_PLLENSRC | PLLCTL_PLLEN); val &= ~(PLLCTL_PLLENSRC | PLLCTL_PLLEN);
__raw_writel(val, pdata->cpupll_reg_base + PLLCTL); __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
udelay(PLL_BYPASS_TIME); udelay(PLL_BYPASS_TIME);
/* Powerdown CPU PLL */ /* Powerdown CPU PLL */
val = __raw_readl(pdata->cpupll_reg_base + PLLCTL); val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val |= PLLCTL_PLLPWRDN; val |= PLLCTL_PLLPWRDN;
__raw_writel(val, pdata->cpupll_reg_base + PLLCTL); __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
} }
/* Configure sleep count in deep sleep register */ /* Configure sleep count in deep sleep register */
val = __raw_readl(pdata->deepsleep_reg); val = __raw_readl(pm_config.deepsleep_reg);
val &= ~DEEPSLEEP_SLEEPCOUNT_MASK, val &= ~DEEPSLEEP_SLEEPCOUNT_MASK,
val |= pdata->sleepcount; val |= pm_config.sleepcount;
__raw_writel(val, pdata->deepsleep_reg); __raw_writel(val, pm_config.deepsleep_reg);
/* System goes to sleep in this call */ /* System goes to sleep in this call */
davinci_sram_suspend(pdata); davinci_sram_suspend(&pm_config);
if (pdata->cpupll_reg_base != pdata->ddrpll_reg_base) { if (pm_config.cpupll_reg_base != pm_config.ddrpll_reg_base) {
/* put CPU PLL in reset */ /* put CPU PLL in reset */
val = __raw_readl(pdata->cpupll_reg_base + PLLCTL); val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~PLLCTL_PLLRST; val &= ~PLLCTL_PLLRST;
__raw_writel(val, pdata->cpupll_reg_base + PLLCTL); __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
/* put CPU PLL in power down */ /* put CPU PLL in power down */
val = __raw_readl(pdata->cpupll_reg_base + PLLCTL); val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~PLLCTL_PLLPWRDN; val &= ~PLLCTL_PLLPWRDN;
__raw_writel(val, pdata->cpupll_reg_base + PLLCTL); __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
/* wait for CPU PLL reset */ /* wait for CPU PLL reset */
udelay(PLL_RESET_TIME); udelay(PLL_RESET_TIME);
/* bring CPU PLL out of reset */ /* bring CPU PLL out of reset */
val = __raw_readl(pdata->cpupll_reg_base + PLLCTL); val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val |= PLLCTL_PLLRST; val |= PLLCTL_PLLRST;
__raw_writel(val, pdata->cpupll_reg_base + PLLCTL); __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
/* Wait for CPU PLL to lock */ /* Wait for CPU PLL to lock */
udelay(PLL_LOCK_TIME); udelay(PLL_LOCK_TIME);
/* Remove CPU PLL from bypass mode */ /* Remove CPU PLL from bypass mode */
val = __raw_readl(pdata->cpupll_reg_base + PLLCTL); val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~PLLCTL_PLLENSRC; val &= ~PLLCTL_PLLENSRC;
val |= PLLCTL_PLLEN; val |= PLLCTL_PLLEN;
__raw_writel(val, pdata->cpupll_reg_base + PLLCTL); __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
} }
} }
...@@ -134,21 +132,21 @@ int __init davinci_pm_init(void) ...@@ -134,21 +132,21 @@ int __init davinci_pm_init(void)
if (ret) if (ret)
return ret; return ret;
pdata->ddr2_ctlr_base = da8xx_get_mem_ctlr(); pm_config.ddr2_ctlr_base = da8xx_get_mem_ctlr();
pdata->deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG); pm_config.deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);
pdata->cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K); pm_config.cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);
if (!pdata->cpupll_reg_base) if (!pm_config.cpupll_reg_base)
return -ENOMEM; return -ENOMEM;
pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K); pm_config.ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);
if (!pdata->ddrpll_reg_base) { if (!pm_config.ddrpll_reg_base) {
ret = -ENOMEM; ret = -ENOMEM;
goto no_ddrpll_mem; goto no_ddrpll_mem;
} }
pdata->ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K); pm_config.ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);
if (!pdata->ddrpsc_reg_base) { if (!pm_config.ddrpsc_reg_base) {
ret = -ENOMEM; ret = -ENOMEM;
goto no_ddrpsc_mem; goto no_ddrpsc_mem;
} }
...@@ -165,8 +163,8 @@ int __init davinci_pm_init(void) ...@@ -165,8 +163,8 @@ int __init davinci_pm_init(void)
suspend_set_ops(&davinci_pm_ops); suspend_set_ops(&davinci_pm_ops);
no_ddrpsc_mem: no_ddrpsc_mem:
iounmap(pdata->ddrpll_reg_base); iounmap(pm_config.ddrpll_reg_base);
no_ddrpll_mem: no_ddrpll_mem:
iounmap(pdata->cpupll_reg_base); iounmap(pm_config.cpupll_reg_base);
return ret; return ret;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment