diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-08-16 10:06:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-08-16 10:06:59 +1000 |
| commit | c6fcc1569a33d7e32814d94b30769d15a22503f8 (patch) | |
| tree | 6f73e0b19a61b05b452fb928ea1177a1cc42c1b6 /arch/arm | |
| parent | 6fdb43da6aaa10678dce16453363a0cb113fb73d (diff) | |
| parent | 8c649da5a7719ff87155d4c9e850f374a39856d4 (diff) | |
Merge remote-tracking branch 'pm/linux-next'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/tango4-smp8758.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra114.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/tango4-smp8758.dtsi b/arch/arm/boot/dts/tango4-smp8758.dtsi index d2e65c46bcc7..eca33d568690 100644 --- a/arch/arm/boot/dts/tango4-smp8758.dtsi +++ b/arch/arm/boot/dts/tango4-smp8758.dtsi @@ -13,7 +13,6 @@ reg = <0>; clocks = <&clkgen CPU_CLK>; clock-latency = <1>; - operating-points = <1215000 0 607500 0 405000 0 243000 0 135000 0>; }; cpu1: cpu@1 { diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c index d3aa9be16621..e3fbcfedf845 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra114.c +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c @@ -60,7 +60,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, return index; } -static void tegra114_idle_enter_freeze(struct cpuidle_device *dev, +static void tegra114_idle_enter_s2idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { @@ -77,7 +77,7 @@ static struct cpuidle_driver tegra_idle_driver = { #ifdef CONFIG_PM_SLEEP [1] = { .enter = tegra114_idle_power_down, - .enter_freeze = tegra114_idle_enter_freeze, + .enter_s2idle = tegra114_idle_enter_s2idle, .exit_latency = 500, .target_residency = 1000, .flags = CPUIDLE_FLAG_TIMER_STOP, |