Skip to content

Commit

Permalink
thermal: armada: Use real status register name
Browse files Browse the repository at this point in the history
Three 32-bit registers are used to drive the thermal IP: control0,
control1 and status. The two control registers share the same name both
in the documentation and in the code, while the latter is referred as
"sensor" in the code. Rename this pointer to be called "status" in order
to be aligned with the documentation.

Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
  • Loading branch information
Miquel Raynal authored and Eduardo Valentin committed Jan 1, 2018
1 parent 2f28e4c commit 8371b8a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/thermal/armada_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct armada_thermal_data;

/* Marvell EBU Thermal Sensor Dev Structure */
struct armada_thermal_priv {
void __iomem *sensor;
void __iomem *status;
void __iomem *control0;
void __iomem *control1;
struct armada_thermal_data *data;
Expand Down Expand Up @@ -99,9 +99,9 @@ static void armadaxp_init_sensor(struct platform_device *pdev,
writel(reg, priv->control1);

/* Enable the sensor */
reg = readl_relaxed(priv->sensor);
reg = readl_relaxed(priv->status);
reg &= ~PMU_TM_DISABLE_MASK;
writel(reg, priv->sensor);
writel(reg, priv->status);
}

static void armada370_init_sensor(struct platform_device *pdev,
Expand Down Expand Up @@ -157,7 +157,7 @@ static void armada380_init_sensor(struct platform_device *pdev,

static bool armada_is_valid(struct armada_thermal_priv *priv)
{
u32 reg = readl_relaxed(priv->sensor);
u32 reg = readl_relaxed(priv->status);

return reg & priv->data->is_valid_bit;
}
Expand All @@ -176,7 +176,7 @@ static int armada_get_temp(struct thermal_zone_device *thermal,
return -EIO;
}

reg = readl_relaxed(priv->sensor);
reg = readl_relaxed(priv->status);
reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask;

/* Get formula coeficients */
Expand Down Expand Up @@ -279,9 +279,9 @@ static int armada_thermal_probe(struct platform_device *pdev)
return -ENOMEM;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(priv->sensor))
return PTR_ERR(priv->sensor);
priv->status = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(priv->status))
return PTR_ERR(priv->status);

res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
control = devm_ioremap_resource(&pdev->dev, res);
Expand Down

0 comments on commit 8371b8a

Please sign in to comment.