Skip to content

Commit

Permalink
drm/tegra: dpaux: 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 DPAUX 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 Jun 12, 2015
1 parent fd73caa commit 8a8005e
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions drivers/gpu/drm/tegra/dpaux.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,14 @@ static inline struct tegra_dpaux *work_to_dpaux(struct work_struct *work)
return container_of(work, struct tegra_dpaux, work);
}

static inline unsigned long tegra_dpaux_readl(struct tegra_dpaux *dpaux,
unsigned long offset)
static inline u32 tegra_dpaux_readl(struct tegra_dpaux *dpaux,
unsigned long offset)
{
return readl(dpaux->regs + (offset << 2));
}

static inline void tegra_dpaux_writel(struct tegra_dpaux *dpaux,
unsigned long value,
unsigned long offset)
u32 value, unsigned long offset)
{
writel(value, dpaux->regs + (offset << 2));
}
Expand All @@ -76,7 +75,7 @@ static void tegra_dpaux_write_fifo(struct tegra_dpaux *dpaux, const u8 *buffer,

for (i = 0; i < DIV_ROUND_UP(size, 4); i++) {
size_t num = min_t(size_t, size - i * 4, 4);
unsigned long value = 0;
u32 value = 0;

for (j = 0; j < num; j++)
value |= buffer[i * 4 + j] << (j * 8);
Expand All @@ -92,7 +91,7 @@ static void tegra_dpaux_read_fifo(struct tegra_dpaux *dpaux, u8 *buffer,

for (i = 0; i < DIV_ROUND_UP(size, 4); i++) {
size_t num = min_t(size_t, size - i * 4, 4);
unsigned long value;
u32 value;

value = tegra_dpaux_readl(dpaux, DPAUX_DP_AUXDATA_READ(i));

Expand Down Expand Up @@ -248,7 +247,7 @@ static irqreturn_t tegra_dpaux_irq(int irq, void *data)
{
struct tegra_dpaux *dpaux = data;
irqreturn_t ret = IRQ_HANDLED;
unsigned long value;
u32 value;

/* clear interrupts */
value = tegra_dpaux_readl(dpaux, DPAUX_INTR_AUX);
Expand All @@ -271,7 +270,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
{
struct tegra_dpaux *dpaux;
struct resource *regs;
unsigned long value;
u32 value;
int err;

dpaux = devm_kzalloc(&pdev->dev, sizeof(*dpaux), GFP_KERNEL);
Expand Down Expand Up @@ -463,7 +462,7 @@ int tegra_dpaux_detach(struct tegra_dpaux *dpaux)

enum drm_connector_status tegra_dpaux_detect(struct tegra_dpaux *dpaux)
{
unsigned long value;
u32 value;

value = tegra_dpaux_readl(dpaux, DPAUX_DP_AUXSTAT);

Expand All @@ -475,7 +474,7 @@ enum drm_connector_status tegra_dpaux_detect(struct tegra_dpaux *dpaux)

int tegra_dpaux_enable(struct tegra_dpaux *dpaux)
{
unsigned long value;
u32 value;

value = DPAUX_HYBRID_PADCTL_AUX_CMH(2) |
DPAUX_HYBRID_PADCTL_AUX_DRVZ(4) |
Expand All @@ -493,7 +492,7 @@ int tegra_dpaux_enable(struct tegra_dpaux *dpaux)

int tegra_dpaux_disable(struct tegra_dpaux *dpaux)
{
unsigned long value;
u32 value;

value = tegra_dpaux_readl(dpaux, DPAUX_HYBRID_SPARE);
value |= DPAUX_HYBRID_SPARE_PAD_POWER_DOWN;
Expand Down

0 comments on commit 8a8005e

Please sign in to comment.