diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-07-17 15:01:19 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-07-17 15:01:19 +0200 |
| commit | b0b64f7b2d35eb8df056e1252ce971ebc624372c (patch) | |
| tree | 3176ddacf7941d95e3743b9af1f5802a3d8ffe0c /arch/arm/mach-tegra/flowctrl.c | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| parent | 2fa937a767bd0933dfe6017cabd038ce52594171 (diff) | |
Merge branch 'for-3.17/fuse-move' into for-3.17/dt
Diffstat (limited to 'arch/arm/mach-tegra/flowctrl.c')
| -rw-r--r-- | arch/arm/mach-tegra/flowctrl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c index ce8ab8abf06..ec55d1de1b5 100644 --- a/arch/arm/mach-tegra/flowctrl.c +++ b/arch/arm/mach-tegra/flowctrl.c @@ -18,14 +18,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/cpumask.h> #include <linux/init.h> -#include <linux/kernel.h> #include <linux/io.h> -#include <linux/cpumask.h> +#include <linux/kernel.h> + +#include <soc/tegra/fuse.h> #include "flowctrl.h" #include "iomap.h" -#include "fuse.h" static u8 flowctrl_offset_halt_cpu[] = { FLOW_CTRL_HALT_CPU0_EVENTS, @@ -76,7 +77,7 @@ void flowctrl_cpu_suspend_enter(unsigned int cpuid) int i; reg = flowctrl_read_cpu_csr(cpuid); - switch (tegra_chip_id) { + switch (tegra_get_chip_id()) { case TEGRA20: /* clear wfe bitmap */ reg &= ~TEGRA20_FLOW_CTRL_CSR_WFE_BITMAP; @@ -117,7 +118,7 @@ void flowctrl_cpu_suspend_exit(unsigned int cpuid) /* Disable powergating via flow controller for CPU0 */ reg = flowctrl_read_cpu_csr(cpuid); - switch (tegra_chip_id) { + switch (tegra_get_chip_id()) { case TEGRA20: /* clear wfe bitmap */ reg &= ~TEGRA20_FLOW_CTRL_CSR_WFE_BITMAP; |