hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc/tegra: pmc: Change powergate and rail IDs to be an unsigned type 

The Tegra powergate and rail IDs are always positive values and so change
the type to be unsigned and remove the tests to see if the ID is less
than zero. Update the Tegra DC powergate type to be an unsigned as well.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Jon Hunter 2016-02-11 18:03:22 +00:00 committed by Thierry Reding
parent e8cf6616a3
commit 70293ed09d
3 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/tegra/drm.h
View File

@ -121,7 +121,7 @@ struct tegra_dc {
spinlock_t lock; spinlock_t lock;
struct drm_crtc base; struct drm_crtc base;
int powergate; unsigned int powergate;
int pipe; int pipe;
struct clk *clk; struct clk *clk;

36
drivers/soc/tegra/pmc.c
View File

@ -179,7 +179,7 @@ static void tegra_pmc_writel(u32 value, unsigned long offset)
* @id: partition ID * @id: partition ID
* @new_state: new state of the partition * @new_state: new state of the partition
*/ */
static int tegra_powergate_set(int id, bool new_state) static int tegra_powergate_set(unsigned int id, bool new_state)
{ {
bool status; bool status;
@ -203,9 +203,9 @@ static int tegra_powergate_set(int id, bool new_state)
* tegra_powergate_power_on() - power on partition * tegra_powergate_power_on() - power on partition
* @id: partition ID * @id: partition ID
*/ */
int tegra_powergate_power_on(int id) int tegra_powergate_power_on(unsigned int id)
{ {
if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) if (!pmc->soc || id >= pmc->soc->num_powergates)
return -EINVAL; return -EINVAL;
return tegra_powergate_set(id, true); return tegra_powergate_set(id, true);
@ -215,9 +215,9 @@ int tegra_powergate_power_on(int id)
* tegra_powergate_power_off() - power off partition * tegra_powergate_power_off() - power off partition
* @id: partition ID * @id: partition ID
*/ */
int tegra_powergate_power_off(int id) int tegra_powergate_power_off(unsigned int id)
{ {
if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) if (!pmc->soc || id >= pmc->soc->num_powergates)
return -EINVAL; return -EINVAL;
return tegra_powergate_set(id, false); return tegra_powergate_set(id, false);
@ -228,11 +228,11 @@ EXPORT_SYMBOL(tegra_powergate_power_off);
* tegra_powergate_is_powered() - check if partition is powered * tegra_powergate_is_powered() - check if partition is powered
* @id: partition ID * @id: partition ID
*/ */
int tegra_powergate_is_powered(int id) int tegra_powergate_is_powered(unsigned int id)
{ {
u32 status; u32 status;
if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) if (!pmc->soc || id >= pmc->soc->num_powergates)
return -EINVAL; return -EINVAL;
mutex_lock(&pmc->powergates_lock); mutex_lock(&pmc->powergates_lock);
@ -246,11 +246,11 @@ int tegra_powergate_is_powered(int id)
* tegra_powergate_remove_clamping() - remove power clamps for partition * tegra_powergate_remove_clamping() - remove power clamps for partition
* @id: partition ID * @id: partition ID
*/ */
int tegra_powergate_remove_clamping(int id) int tegra_powergate_remove_clamping(unsigned int id)
{ {
u32 mask; u32 mask;
if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) if (!pmc->soc || id >= pmc->soc->num_powergates)
return -EINVAL; return -EINVAL;
mutex_lock(&pmc->powergates_lock); mutex_lock(&pmc->powergates_lock);
@ -294,7 +294,7 @@ EXPORT_SYMBOL(tegra_powergate_remove_clamping);
* *
* Must be called with clk disabled, and returns with clk enabled. * 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(unsigned int id, struct clk *clk,
struct reset_control *rst) struct reset_control *rst)
{ {
int ret; int ret;
@ -337,9 +337,9 @@ EXPORT_SYMBOL(tegra_powergate_sequence_power_up);
* Returns the partition ID corresponding to the CPU partition ID or a * Returns the partition ID corresponding to the CPU partition ID or a
* negative error code on failure. * negative error code on failure.
*/ */
static int tegra_get_cpu_powergate_id(int cpuid) static int tegra_get_cpu_powergate_id(unsigned int cpuid)
{ {
if (pmc->soc && cpuid > 0 && cpuid < pmc->soc->num_cpu_powergates) if (pmc->soc && cpuid < pmc->soc->num_cpu_powergates)
return pmc->soc->cpu_powergates[cpuid]; return pmc->soc->cpu_powergates[cpuid];
return -EINVAL; return -EINVAL;
@ -349,7 +349,7 @@ static int tegra_get_cpu_powergate_id(int cpuid)
* tegra_pmc_cpu_is_powered() - check if CPU partition is powered * tegra_pmc_cpu_is_powered() - check if CPU partition is powered
* @cpuid: CPU partition ID * @cpuid: CPU partition ID
*/ */
bool tegra_pmc_cpu_is_powered(int cpuid) bool tegra_pmc_cpu_is_powered(unsigned int cpuid)
{ {
int id; int id;
@ -364,7 +364,7 @@ bool tegra_pmc_cpu_is_powered(int cpuid)
* tegra_pmc_cpu_power_on() - power on CPU partition * tegra_pmc_cpu_power_on() - power on CPU partition
* @cpuid: CPU partition ID * @cpuid: CPU partition ID
*/ */
int tegra_pmc_cpu_power_on(int cpuid) int tegra_pmc_cpu_power_on(unsigned int cpuid)
{ {
int id; int id;
@ -379,7 +379,7 @@ int tegra_pmc_cpu_power_on(int cpuid)
* tegra_pmc_cpu_remove_clamping() - remove power clamps for CPU partition * tegra_pmc_cpu_remove_clamping() - remove power clamps for CPU partition
* @cpuid: CPU partition ID * @cpuid: CPU partition ID
*/ */
int tegra_pmc_cpu_remove_clamping(int cpuid) int tegra_pmc_cpu_remove_clamping(unsigned int cpuid)
{ {
int id; int id;
@ -465,7 +465,7 @@ static int tegra_powergate_debugfs_init(void)
return 0; return 0;
} }
static int tegra_io_rail_prepare(int id, unsigned long *request, static int tegra_io_rail_prepare(unsigned int id, unsigned long *request,
unsigned long *status, unsigned int *bit) unsigned long *status, unsigned int *bit)
{ {
unsigned long rate, value; unsigned long rate, value;
@ -522,7 +522,7 @@ static void tegra_io_rail_unprepare(void)
tegra_pmc_writel(DPD_SAMPLE_DISABLE, DPD_SAMPLE); tegra_pmc_writel(DPD_SAMPLE_DISABLE, DPD_SAMPLE);
} }
int tegra_io_rail_power_on(int id) int tegra_io_rail_power_on(unsigned int id)
{ {
unsigned long request, status, value; unsigned long request, status, value;
unsigned int bit, mask; unsigned int bit, mask;
@ -557,7 +557,7 @@ error:
} }
EXPORT_SYMBOL(tegra_io_rail_power_on); EXPORT_SYMBOL(tegra_io_rail_power_on);
int tegra_io_rail_power_off(int id) int tegra_io_rail_power_off(unsigned int id)
{ {
unsigned long request, status, value; unsigned long request, status, value;
unsigned int bit, mask; unsigned int bit, mask;

35
include/soc/tegra/pmc.h
View File

@ -33,9 +33,9 @@ void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode);
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
bool tegra_pmc_cpu_is_powered(int cpuid); bool tegra_pmc_cpu_is_powered(unsigned int cpuid);
int tegra_pmc_cpu_power_on(int cpuid); int tegra_pmc_cpu_power_on(unsigned int cpuid);
int tegra_pmc_cpu_remove_clamping(int cpuid); int tegra_pmc_cpu_remove_clamping(unsigned int cpuid);
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
/* /*
@ -108,50 +108,51 @@ int tegra_pmc_cpu_remove_clamping(int cpuid);
#define TEGRA_IO_RAIL_SYS_DDC 58 #define TEGRA_IO_RAIL_SYS_DDC 58
#ifdef CONFIG_ARCH_TEGRA #ifdef CONFIG_ARCH_TEGRA
int tegra_powergate_is_powered(int id); int tegra_powergate_is_powered(unsigned int id);
int tegra_powergate_power_on(int id); int tegra_powergate_power_on(unsigned int id);
int tegra_powergate_power_off(int id); int tegra_powergate_power_off(unsigned int id);
int tegra_powergate_remove_clamping(int id); int tegra_powergate_remove_clamping(unsigned int id);
/* Must be called with clk disabled, and returns with clk enabled */ /* 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(unsigned int id, struct clk *clk,
struct reset_control *rst); struct reset_control *rst);
int tegra_io_rail_power_on(int id); int tegra_io_rail_power_on(unsigned int id);
int tegra_io_rail_power_off(int id); int tegra_io_rail_power_off(unsigned int id);
#else #else
static inline int tegra_powergate_is_powered(int id) static inline int tegra_powergate_is_powered(unsigned int id)
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int tegra_powergate_power_on(int id) static inline int tegra_powergate_power_on(unsigned int id)
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int tegra_powergate_power_off(int id) static inline int tegra_powergate_power_off(unsigned int id)
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int tegra_powergate_remove_clamping(int id) static inline int tegra_powergate_remove_clamping(unsigned int id)
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int tegra_powergate_sequence_power_up(int id, struct clk *clk, static inline int tegra_powergate_sequence_power_up(unsigned int id,
struct clk *clk,
struct reset_control *rst) struct reset_control *rst)
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int tegra_io_rail_power_on(int id) static inline int tegra_io_rail_power_on(unsigned int id)
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int tegra_io_rail_power_off(int id) static inline int tegra_io_rail_power_off(unsigned int id)
{ {
return -ENOSYS; return -ENOSYS;
} }