diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 14:45:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 14:45:31 +0100 |
| commit | e264ae280ce178c2da6ddf77c9a7928c6d3b6caa (patch) | |
| tree | e11c0d154382a429b819346e20302116258c8331 /arch/arm/mach-davinci/board-mityomapl138.c | |
| parent | e70a13e7d771289589131890a64762da56990656 (diff) | |
| parent | f7715b299954b1f1644253682e50f38282eee611 (diff) | |
Merge tag 'davinci-for-v4.10/cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull DaVinci cleanup for v4.10 from Sekhar Nori:
mach-davinci cleanup to make it easy to add PM support
for DT-boot.
* tag 'davinci-for-v4.10/cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: PM: fix build when da850 not compiled in
ARM: davinci: PM: cleanup: remove references to pdata
ARM: davinci: PM: rework init, remove platform device
Diffstat (limited to 'arch/arm/mach-davinci/board-mityomapl138.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-mityomapl138.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index 1a6d430742d4..b73ce7bae81f 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -498,18 +498,6 @@ static void __init mityomapl138_config_emac(void) pr_warn("emac registration failed: %d\n", ret); } -static struct davinci_pm_config da850_pm_pdata = { - .sleepcount = 128, -}; - -static struct platform_device da850_pm_device = { - .name = "pm-davinci", - .dev = { - .platform_data = &da850_pm_pdata, - }, - .id = -1, -}; - static void __init mityomapl138_init(void) { int ret; @@ -559,9 +547,7 @@ static void __init mityomapl138_init(void) if (ret) pr_warn("cpuidle registration failed: %d\n", ret); - ret = da850_register_pm(&da850_pm_device); - if (ret) - pr_warn("suspend registration failed: %d\n", ret); + davinci_pm_init(); } #ifdef CONFIG_SERIAL_8250_CONSOLE |