i.MX SoC updates for 4.16:
- Drop power saving status checking from MMDC driver probe function, since there is nothing really depending on power saving being enabled. - Clean up unused imx3 pm definitions. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJaTCoAAAoJEFBXWFqHsHzOhO8H/2dA59AXGNc0HQGChD46R0sY mogHzAPhmziEE3/t/CL1PLeGtp8Z5enVQa/ckd0AByIdMbN4gTXiGrOLMwXF3fpP jpkhWw6ZPb/jz53zDLWcEPhwnFu2ANUF7dAYgA4rI7742idqy21zbD9tXpJFU+ZM f7ieXqjVAoQ4vKG8pPCrTyEn6urEAZP2cOmW6WvYcLpyMIFRFoLHCthA3DtHAobG 910VtDyMOg4Bc4uvn26SWZCwC5+hXxda75Uc9lgdSGG3nO7LIFi4shcwh87mTFtI eOJ23UTtB6C4lTIPZwUDeA2YIsWdQRfWIdtGwGrPztB+R+HYblwCmNk4zAZOIXM= =l5gq -----END PGP SIGNATURE----- Merge tag 'imx-soc-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc Pull "i.MX SoC updates for 4.16" from Shawn Guo: - Drop power saving status checking from MMDC driver probe function, since there is nothing really depending on power saving being enabled. - Clean up unused imx3 pm definitions. * tag 'imx-soc-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: remove unused imx3 pm definitions ARM: imx: don't abort MMDC probe if power saving status doesn't match
This commit is contained in:
commit
95f7f383b6
|
@ -71,15 +71,6 @@ enum mxc_cpu_pwr_mode {
|
|||
STOP_POWER_OFF, /* STOP + SRPG */
|
||||
};
|
||||
|
||||
enum mx3_cpu_pwr_mode {
|
||||
MX3_RUN,
|
||||
MX3_WAIT,
|
||||
MX3_DOZE,
|
||||
MX3_SLEEP,
|
||||
};
|
||||
|
||||
void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode);
|
||||
|
||||
void imx_enable_cpu(int cpu, bool enable);
|
||||
void imx_set_cpu_jump(int cpu, void *jump_addr);
|
||||
u32 imx_get_cpu_arg(int cpu);
|
||||
|
|
|
@ -547,7 +547,6 @@ static int imx_mmdc_probe(struct platform_device *pdev)
|
|||
struct device_node *np = pdev->dev.of_node;
|
||||
void __iomem *mmdc_base, *reg;
|
||||
u32 val;
|
||||
int timeout = 0x400;
|
||||
|
||||
mmdc_base = of_iomap(np, 0);
|
||||
WARN_ON(!mmdc_base);
|
||||
|
@ -565,16 +564,6 @@ static int imx_mmdc_probe(struct platform_device *pdev)
|
|||
val &= ~(1 << BP_MMDC_MAPSR_PSD);
|
||||
writel_relaxed(val, reg);
|
||||
|
||||
/* Ensure it's successfully enabled */
|
||||
while (!(readl_relaxed(reg) & 1 << BP_MMDC_MAPSR_PSS) && --timeout)
|
||||
cpu_relax();
|
||||
|
||||
if (unlikely(!timeout)) {
|
||||
pr_warn("%s: failed to enable automatic power saving\n",
|
||||
__func__);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
return imx_mmdc_perf_init(pdev, mmdc_base);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue