[PATCH v3 1/2] thermal: armada: fix register offsets for AXP

[PATCH v3 1/2] thermal: armada: fix register offsets for AXP

[Zak Hays]

As shown in its device tree, Armada XP has the control1 register at
0x184d0, not 0x182d0.

Signed-off-by: Zachary Hays <zhays@lexmark.com>
---
v2: update commit title and add "Signed-off-by"
v3: resend for clarification
---
 drivers/thermal/armada_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 709a22f455e9..88363812033c 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -578,7 +578,7 @@ static const struct armada_thermal_data armadaxp_data = {
        .coef_m = 10000000ULL,
        .coef_div = 13825,
        .syscon_status_off = 0xb0,
-       .syscon_control1_off = 0xd0,
+       .syscon_control1_off = 0x2d0,
 };

 static const struct armada_thermal_data armada370_data = {
--
2.7.4

[PATCH v3 2/2] thermal: armada: clear reset in armadaxp_init

[Zak Hays]

The reset bit needs to be cleared in the init sequence otherwise it
holds the block in reset.

Signed-off-by: Zachary Hays <zhays@lexmark.com>
---
v2: update commit title and add "Signed-off-by"
v3: resend for clarification
---
 drivers/thermal/armada_thermal.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 88363812033c..8c4d1244ee7a 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -155,6 +155,9 @@ static void armadaxp_init(struct platform_device *pdev,

        regmap_write(priv->syscon, data->syscon_control1_off, reg);

+       reg &= ~PMU_TDC0_SW_RST_MASK;
+       regmap_write(priv->syscon, data->syscon_control1_off, reg);
+
        /* Enable the sensor */
        regmap_read(priv->syscon, data->syscon_status_off, &reg);
        reg &= ~PMU_TM_DISABLE_MASK;
--
2.7.4

Re: [PATCH v3 1/2] thermal: armada: fix register offsets for AXP

[Miquel Raynal]

Hi Zak,

Zak Hays <zak.hays@lexmark.com> wrote on Mon, 9 Dec 2019 18:55:51 +0000:

> As shown in its device tree, Armada XP has the control1 register at
> 0x184d0, not 0x182d0.
> 
> Signed-off-by: Zachary Hays <zhays@lexmark.com>

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>


Thanks,
Miquèl

Re: [PATCH v3 2/2] thermal: armada: clear reset in armadaxp_init

[Miquel Raynal]

Hi Zak,

Zak Hays <zak.hays@lexmark.com> wrote on Mon, 9 Dec 2019 18:57:23 +0000:

> The reset bit needs to be cleared in the init sequence otherwise it
> holds the block in reset.
> 
> Signed-off-by: Zachary Hays <zhays@lexmark.com>

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>


Thanks,
Miquèl