diff options
| author | Jon Hunter <jonathanh@nvidia.com> | 2018-12-13 09:46:14 +0000 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-12-14 13:32:55 -0800 |
| commit | f9c380efa792f313d3366a935fe38091d4c98ccb (patch) | |
| tree | 11ad0b30bfbcff9045cfa3b1964e4797bd0e709b | |
| parent | 845d782d91448e0fbca686bca2cc9f9c2a9ba3e7 (diff) | |
| download | linux-stable-f9c380efa792f313d3366a935fe38091d4c98ccb.tar.gz linux-stable-f9c380efa792f313d3366a935fe38091d4c98ccb.tar.bz2 linux-stable-f9c380efa792f313d3366a935fe38091d4c98ccb.zip | |
soc/tegra: pmc: Drop SMP dependency from CPU APIs
When CONFIG_SMP is disabled, the tegra clk driver now fails to build:
drivers/clk/tegra/clk-tegra30.c: In function ‘tegra30_cpu_rail_off_ready’:
drivers/clk/tegra/clk-tegra30.c:1151:2: error: implicit declaration of function ‘tegra_pmc_cpu_is_powered’ [-Werror=implicit-function-declaration]
cpu_pwr_status = tegra_pmc_cpu_is_powered(1) ||
^
Fix the above error by removing the CONFIG_SMP ifdef around the
declaration around the PMC CPU APIs because although these are not
needed for non-SMP configurations, there is no harm in including these
for non-SMP builds either.
Fixes: 61866523ed6e ("clk: tegra30: Use Tegra CPU powergate helper function")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
| -rw-r--r-- | drivers/soc/tegra/pmc.c | 2 | ||||
| -rw-r--r-- | include/soc/tegra/pmc.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 1fa840e3d930..b30af18516d6 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -600,7 +600,6 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, } EXPORT_SYMBOL(tegra_powergate_sequence_power_up); -#ifdef CONFIG_SMP /** * tegra_get_cpu_powergate_id() - convert from CPU ID to partition ID * @cpuid: CPU partition ID @@ -660,7 +659,6 @@ int tegra_pmc_cpu_remove_clamping(unsigned int cpuid) return tegra_powergate_remove_clamping(id); } -#endif /* CONFIG_SMP */ static int tegra_pmc_restart_notify(struct notifier_block *this, unsigned long action, void *data) diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 562426812ab2..bf761e68a7c7 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -26,11 +26,9 @@ struct clk; struct reset_control; -#ifdef CONFIG_SMP bool tegra_pmc_cpu_is_powered(unsigned int cpuid); int tegra_pmc_cpu_power_on(unsigned int cpuid); int tegra_pmc_cpu_remove_clamping(unsigned int cpuid); -#endif /* CONFIG_SMP */ /* * powergate and I/O rail APIs |