Skip to content

Commit

Permalink
drm/tegra: sor: Registers are 32-bit
Browse files Browse the repository at this point in the history
Use a sized unsigned 32-bit data type (u32) to store register contents.
The SOR registers are 32 bits wide irrespective of the architecture's
data width.

Signed-off-by: Thierry Reding <treding@nvidia.com>
  • Loading branch information
Thierry Reding committed Apr 2, 2015
1 parent 28c2337 commit 28fe207
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/gpu/drm/tegra/sor.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,12 @@ static inline struct tegra_sor *to_sor(struct tegra_output *output)
return container_of(output, struct tegra_sor, output);
}

static inline unsigned long tegra_sor_readl(struct tegra_sor *sor,
unsigned long offset)
static inline u32 tegra_sor_readl(struct tegra_sor *sor, unsigned long offset)
{
return readl(sor->regs + (offset << 2));
}

static inline void tegra_sor_writel(struct tegra_sor *sor, unsigned long value,
static inline void tegra_sor_writel(struct tegra_sor *sor, u32 value,
unsigned long offset)
{
writel(value, sor->regs + (offset << 2));
Expand All @@ -83,9 +82,9 @@ static inline void tegra_sor_writel(struct tegra_sor *sor, unsigned long value,
static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
struct drm_dp_link *link)
{
unsigned long value;
unsigned int i;
u8 pattern;
u32 value;
int err;

/* setup lane parameters */
Expand Down Expand Up @@ -202,7 +201,7 @@ static void tegra_sor_update(struct tegra_sor *sor)

static int tegra_sor_setup_pwm(struct tegra_sor *sor, unsigned long timeout)
{
unsigned long value;
u32 value;

value = tegra_sor_readl(sor, SOR_PWM_DIV);
value &= ~SOR_PWM_DIV_MASK;
Expand Down Expand Up @@ -281,7 +280,7 @@ static int tegra_sor_wakeup(struct tegra_sor *sor)

static int tegra_sor_power_up(struct tegra_sor *sor, unsigned long timeout)
{
unsigned long value;
u32 value;

value = tegra_sor_readl(sor, SOR_PWR);
value |= SOR_PWR_TRIGGER | SOR_PWR_NORMAL_STATE_PU;
Expand Down Expand Up @@ -791,8 +790,8 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
struct tegra_sor_config config;
struct drm_dp_link link;
struct drm_dp_aux *aux;
unsigned long value;
int err = 0;
u32 value;

mutex_lock(&sor->lock);

Expand Down

0 comments on commit 28fe207

Please sign in to comment.