Commit 8a8005e3 authored by Thierry Reding's avatar Thierry Reding

drm/tegra: dpaux: Registers are 32-bit

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: default avatarThierry Reding <treding@nvidia.com>
parent fd73caa5
...@@ -56,15 +56,14 @@ static inline struct tegra_dpaux *work_to_dpaux(struct work_struct *work) ...@@ -56,15 +56,14 @@ static inline struct tegra_dpaux *work_to_dpaux(struct work_struct *work)
return container_of(work, struct tegra_dpaux, work); return container_of(work, struct tegra_dpaux, work);
} }
static inline unsigned long tegra_dpaux_readl(struct tegra_dpaux *dpaux, static inline u32 tegra_dpaux_readl(struct tegra_dpaux *dpaux,
unsigned long offset) unsigned long offset)
{ {
return readl(dpaux->regs + (offset << 2)); return readl(dpaux->regs + (offset << 2));
} }
static inline void tegra_dpaux_writel(struct tegra_dpaux *dpaux, static inline void tegra_dpaux_writel(struct tegra_dpaux *dpaux,
unsigned long value, u32 value, unsigned long offset)
unsigned long offset)
{ {
writel(value, dpaux->regs + (offset << 2)); writel(value, dpaux->regs + (offset << 2));
} }
...@@ -76,7 +75,7 @@ static void tegra_dpaux_write_fifo(struct tegra_dpaux *dpaux, const u8 *buffer, ...@@ -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++) { for (i = 0; i < DIV_ROUND_UP(size, 4); i++) {
size_t num = min_t(size_t, size - i * 4, 4); size_t num = min_t(size_t, size - i * 4, 4);
unsigned long value = 0; u32 value = 0;
for (j = 0; j < num; j++) for (j = 0; j < num; j++)
value |= buffer[i * 4 + j] << (j * 8); value |= buffer[i * 4 + j] << (j * 8);
...@@ -92,7 +91,7 @@ static void tegra_dpaux_read_fifo(struct tegra_dpaux *dpaux, u8 *buffer, ...@@ -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++) { for (i = 0; i < DIV_ROUND_UP(size, 4); i++) {
size_t num = min_t(size_t, size - i * 4, 4); 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)); value = tegra_dpaux_readl(dpaux, DPAUX_DP_AUXDATA_READ(i));
...@@ -248,7 +247,7 @@ static irqreturn_t tegra_dpaux_irq(int irq, void *data) ...@@ -248,7 +247,7 @@ static irqreturn_t tegra_dpaux_irq(int irq, void *data)
{ {
struct tegra_dpaux *dpaux = data; struct tegra_dpaux *dpaux = data;
irqreturn_t ret = IRQ_HANDLED; irqreturn_t ret = IRQ_HANDLED;
unsigned long value; u32 value;
/* clear interrupts */ /* clear interrupts */
value = tegra_dpaux_readl(dpaux, DPAUX_INTR_AUX); value = tegra_dpaux_readl(dpaux, DPAUX_INTR_AUX);
...@@ -271,7 +270,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev) ...@@ -271,7 +270,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
{ {
struct tegra_dpaux *dpaux; struct tegra_dpaux *dpaux;
struct resource *regs; struct resource *regs;
unsigned long value; u32 value;
int err; int err;
dpaux = devm_kzalloc(&pdev->dev, sizeof(*dpaux), GFP_KERNEL); dpaux = devm_kzalloc(&pdev->dev, sizeof(*dpaux), GFP_KERNEL);
...@@ -463,7 +462,7 @@ int tegra_dpaux_detach(struct tegra_dpaux *dpaux) ...@@ -463,7 +462,7 @@ int tegra_dpaux_detach(struct tegra_dpaux *dpaux)
enum drm_connector_status tegra_dpaux_detect(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); value = tegra_dpaux_readl(dpaux, DPAUX_DP_AUXSTAT);
...@@ -475,7 +474,7 @@ enum drm_connector_status tegra_dpaux_detect(struct tegra_dpaux *dpaux) ...@@ -475,7 +474,7 @@ enum drm_connector_status tegra_dpaux_detect(struct tegra_dpaux *dpaux)
int tegra_dpaux_enable(struct tegra_dpaux *dpaux) int tegra_dpaux_enable(struct tegra_dpaux *dpaux)
{ {
unsigned long value; u32 value;
value = DPAUX_HYBRID_PADCTL_AUX_CMH(2) | value = DPAUX_HYBRID_PADCTL_AUX_CMH(2) |
DPAUX_HYBRID_PADCTL_AUX_DRVZ(4) | DPAUX_HYBRID_PADCTL_AUX_DRVZ(4) |
...@@ -493,7 +492,7 @@ int tegra_dpaux_enable(struct tegra_dpaux *dpaux) ...@@ -493,7 +492,7 @@ int tegra_dpaux_enable(struct tegra_dpaux *dpaux)
int tegra_dpaux_disable(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 = tegra_dpaux_readl(dpaux, DPAUX_HYBRID_SPARE);
value |= DPAUX_HYBRID_SPARE_PAD_POWER_DOWN; value |= DPAUX_HYBRID_SPARE_PAD_POWER_DOWN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment