summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2013-09-20 15:47:31 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2013-10-16 03:06:16 -0700
commit62f6af3a1fab60b77cbea80f3e6b2226a73baf18 (patch)
tree03c4feafe72ab50140fd5a716ca345b72277807b
parentffa9f5edf19cf631f0cda153285d1b0976e50ff3 (diff)
arm: tegra: register save and restore ops
Register syscore ops for modules whose context has to saved/restore during entry/exit to LP0 state from CPU Idle. Bug 1254633 Change-Id: Idf4a67535754db3ccc2fc528469fb17ec198cee0 Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-on: http://git-master/r/299447 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/ahb.c2
-rw-r--r--arch/arm/mach-tegra/irq.c2
-rw-r--r--arch/arm/mach-tegra/pinmux-t11-tables.c2
-rw-r--r--arch/arm/mach-tegra/pinmux-t12-tables.c2
-rw-r--r--arch/arm/mach-tegra/pm-irq.c2
-rw-r--r--arch/arm/mach-tegra/pm.c4
-rw-r--r--arch/arm/mach-tegra/tegra11_clocks.c2
-rw-r--r--arch/arm/mach-tegra/tegra12_clocks.c2
-rw-r--r--arch/arm/mach-tegra/timer.c2
-rw-r--r--drivers/gpio/gpio-tegra.c2
-rw-r--r--kernel/cpu_pm.c2
11 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/ahb.c b/arch/arm/mach-tegra/ahb.c
index dd44729bb4ad..55d0bcadb9d7 100644
--- a/arch/arm/mach-tegra/ahb.c
+++ b/arch/arm/mach-tegra/ahb.c
@@ -199,6 +199,8 @@ void tegra_ahbgizmo_resume(void)
static struct syscore_ops tegra_ahbgizmo_syscore_ops = {
.suspend = tegra_ahbgizmo_suspend,
.resume = tegra_ahbgizmo_resume,
+ .save = tegra_ahbgizmo_suspend,
+ .restore = tegra_ahbgizmo_resume,
};
static int __init tegra_init_ahb_gizmo(void)
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
index e74952ad5f71..2bb7ea6486bf 100644
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
@@ -264,6 +264,8 @@ static void tegra_legacy_irq_resume(void)
static struct syscore_ops tegra_legacy_irq_syscore_ops = {
.suspend = tegra_legacy_irq_suspend,
.resume = tegra_legacy_irq_resume,
+ .save = tegra_legacy_irq_suspend,
+ .restore = tegra_legacy_irq_resume,
};
static int tegra_legacy_irq_syscore_init(void)
diff --git a/arch/arm/mach-tegra/pinmux-t11-tables.c b/arch/arm/mach-tegra/pinmux-t11-tables.c
index b0b41185bbaf..2e7ae48d31c6 100644
--- a/arch/arm/mach-tegra/pinmux-t11-tables.c
+++ b/arch/arm/mach-tegra/pinmux-t11-tables.c
@@ -448,6 +448,8 @@ static void tegra11x_pinmux_resume(void)
static struct syscore_ops tegra_pinmux_syscore_ops = {
.suspend = tegra11x_pinmux_suspend,
.resume = tegra11x_pinmux_resume,
+ .save = tegra11x_pinmux_suspend,
+ .restore = tegra11x_pinmux_resume,
};
#endif
diff --git a/arch/arm/mach-tegra/pinmux-t12-tables.c b/arch/arm/mach-tegra/pinmux-t12-tables.c
index a7eff6c5a9f8..644573c93167 100644
--- a/arch/arm/mach-tegra/pinmux-t12-tables.c
+++ b/arch/arm/mach-tegra/pinmux-t12-tables.c
@@ -635,6 +635,8 @@ static void tegra12x_pinmux_resume(void)
static struct syscore_ops tegra_pinmux_syscore_ops = {
.suspend = tegra12x_pinmux_suspend,
.resume = tegra12x_pinmux_resume,
+ .save = tegra12x_pinmux_suspend,
+ .restore = tegra12x_pinmux_resume,
};
#endif
diff --git a/arch/arm/mach-tegra/pm-irq.c b/arch/arm/mach-tegra/pm-irq.c
index 1e134466f7eb..15b7531598c1 100644
--- a/arch/arm/mach-tegra/pm-irq.c
+++ b/arch/arm/mach-tegra/pm-irq.c
@@ -487,6 +487,8 @@ skip_usb_any_wake:
static struct syscore_ops tegra_pm_irq_syscore_ops = {
.suspend = tegra_pm_irq_syscore_suspend,
.resume = tegra_pm_irq_syscore_resume,
+ .save = tegra_pm_irq_syscore_suspend,
+ .restore = tegra_pm_irq_syscore_resume,
};
static int tegra_pm_irq_syscore_init(void)
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 6d9d77494556..f55b9b3820b4 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -1567,6 +1567,8 @@ static void tegra_pm_enter_shutdown(void)
static struct syscore_ops tegra_pm_enter_syscore_ops = {
.suspend = tegra_pm_enter_suspend,
.resume = tegra_pm_enter_resume,
+ .save = tegra_pm_enter_suspend,
+ .restore = tegra_pm_enter_resume,
.shutdown = tegra_pm_enter_shutdown,
};
@@ -1947,6 +1949,8 @@ static void tegra_debug_uart_resume(void)
static struct syscore_ops tegra_debug_uart_syscore_ops = {
.suspend = tegra_debug_uart_suspend,
.resume = tegra_debug_uart_resume,
+ .save = tegra_debug_uart_suspend,
+ .restore = tegra_debug_uart_resume,
};
struct clk *debug_uart_clk = NULL;
diff --git a/arch/arm/mach-tegra/tegra11_clocks.c b/arch/arm/mach-tegra/tegra11_clocks.c
index a849d506214c..1a85b98b7db7 100644
--- a/arch/arm/mach-tegra/tegra11_clocks.c
+++ b/arch/arm/mach-tegra/tegra11_clocks.c
@@ -7956,6 +7956,8 @@ static void tegra11_clk_resume(void)
static struct syscore_ops tegra_clk_syscore_ops = {
.suspend = tegra11_clk_suspend,
.resume = tegra11_clk_resume,
+ .save = tegra11_clk_suspend,
+ .restore = tegra11_clk_resume,
};
#endif
diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c
index 2ff4347d2c88..98dc99d23db4 100644
--- a/arch/arm/mach-tegra/tegra12_clocks.c
+++ b/arch/arm/mach-tegra/tegra12_clocks.c
@@ -8951,6 +8951,8 @@ static void tegra12_clk_resume(void)
static struct syscore_ops tegra_clk_syscore_ops = {
.suspend = tegra12_clk_suspend,
.resume = tegra12_clk_resume,
+ .save = tegra12_clk_suspend,
+ .restore = tegra12_clk_resume,
};
#endif
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 93e93f530b5d..e41a8752bd9a 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -279,6 +279,8 @@ static void tegra_timer_resume(void)
static struct syscore_ops tegra_timer_syscore_ops = {
.suspend = tegra_timer_suspend,
.resume = tegra_timer_resume,
+ .save = tegra_timer_suspend,
+ .restore = tegra_timer_resume,
};
#if !defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARM_ARCH_TIMER)
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 5a2b7811bc98..124321c9ffb6 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -472,6 +472,8 @@ fail:
static struct syscore_ops tegra_gpio_syscore_ops = {
.suspend = tegra_gpio_suspend,
.resume = tegra_gpio_resume,
+ .save = tegra_gpio_suspend,
+ .restore = tegra_gpio_resume,
};
static struct irq_chip tegra_gpio_irq_chip = {
diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c
index 9656a3c36503..e16cbfd9834a 100644
--- a/kernel/cpu_pm.c
+++ b/kernel/cpu_pm.c
@@ -222,6 +222,8 @@ static void cpu_pm_resume(void)
static struct syscore_ops cpu_pm_syscore_ops = {
.suspend = cpu_pm_suspend,
.resume = cpu_pm_resume,
+ .save = cpu_pm_suspend,
+ .restore = cpu_pm_resume,
};
static int cpu_pm_init(void)