diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 23:38:55 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 23:38:55 -0400 |
commit | 684c8bd61ee8c30e3646a8d01957cfee0d7ed3e6 (patch) | |
tree | 4b433a224405efb47c84cd79fd031b84d7acc831 | |
parent | f48b4918c95ce59f1f92596ddea9014cb846a9f7 (diff) | |
download | longterm-queue-4.8-684c8bd61ee8c30e3646a8d01957cfee0d7ed3e6.tar.gz |
ARM: davinci: refresh for location
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch b/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch index a923cc6..f7d797d 100644 --- a/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch +++ b/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch @@ -1,4 +1,4 @@ -From 7e431af8fa0b9ed9d74378c99514856211cb9db8 Mon Sep 17 00:00:00 2001 +From 82382ed72411311f4d6d524d6d6bd784473aaae8 Mon Sep 17 00:00:00 2001 From: Kevin Hilman <khilman@baylibre.com> Date: Tue, 15 Nov 2016 11:54:21 -0800 Subject: [PATCH] ARM: davinci: PM: support da8xx DT platforms @@ -9,14 +9,15 @@ Add PM support for DA850 device-tree boot. Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c -index 92ae093a2120..e87ff2b66f12 100644 +index 754f478110b4..80f8b99f99dc 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c -@@ -61,6 +61,7 @@ static void __init da850_init_machine(void) - __func__, ret); - +@@ -45,6 +45,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { + static void __init da850_init_machine(void) + { of_platform_default_populate(NULL, da850_auxdata_lookup, NULL); + davinci_pm_init(); } |