diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-11-06 15:45:46 -0700 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:43:11 -0700 |
commit | 80b28791ff0416a472e5a555a4b6f5f39df2fc24 (patch) | |
tree | 03722ad8b14021fa9b2901db9b453929cdeefb59 /include/linux/tegra-powergate.h | |
parent | ca48080a039f667c9a1e2d6236ea18dde2d36e7e (diff) | |
download | linux-stable-80b28791ff0416a472e5a555a4b6f5f39df2fc24.tar.gz linux-stable-80b28791ff0416a472e5a555a4b6f5f39df2fc24.tar.bz2 linux-stable-80b28791ff0416a472e5a555a4b6f5f39df2fc24.zip |
ARM: tegra: pass reset to tegra_powergate_sequence_power_up()
Tegra's clock driver now provides an implementation of the common
reset API (include/linux/reset.h). Use this instead of the old Tegra-
specific API; that will soon be removed.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-By: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'include/linux/tegra-powergate.h')
-rw-r--r-- | include/linux/tegra-powergate.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/tegra-powergate.h b/include/linux/tegra-powergate.h index fd4498329c7c..afe442d2629a 100644 --- a/include/linux/tegra-powergate.h +++ b/include/linux/tegra-powergate.h @@ -19,6 +19,7 @@ #define _MACH_TEGRA_POWERGATE_H_ struct clk; +struct reset_control; #define TEGRA_POWERGATE_CPU 0 #define TEGRA_POWERGATE_3D 1 @@ -52,7 +53,8 @@ int tegra_powergate_power_off(int id); int tegra_powergate_remove_clamping(int id); /* Must be called with clk disabled, and returns with clk enabled */ -int tegra_powergate_sequence_power_up(int id, struct clk *clk); +int tegra_powergate_sequence_power_up(int id, struct clk *clk, + struct reset_control *rst); #else static inline int tegra_powergate_is_powered(int id) { @@ -74,7 +76,8 @@ static inline int tegra_powergate_remove_clamping(int id) return -ENOSYS; } -static inline int tegra_powergate_sequence_power_up(int id, struct clk *clk) +static inline int tegra_powergate_sequence_power_up(int id, struct clk *clk, + struct reset_control *rst); { return -ENOSYS; } |