Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e920f9b6 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Eduardo Valentin
Browse files

thermal: armada: Remove support for A375-Z1 SoC 



The Armada 375 Z1 SoC revision is no longer supported. This commit
removes the quirk needed for the thermal sensor.

Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent cbac8f63

Documentation/devicetree/bindings/thermal/armada-thermal.txt

+0 −8
Original line number Diff line number Diff line
@@ -5,17 +5,9 @@ Required properties: 
- compatible:	Should be set to one of the following:

		marvell,armada370-thermal

		marvell,armada375-thermal

		marvell,armada375-z1-thermal

		marvell,armada380-thermal

		marvell,armadaxp-thermal



		Note: As the name suggests, "marvell,armada375-z1-thermal"

		applies for the SoC Z1 stepping only. On such stepping

		some quirks need to be done and the register offset differs

		from the one in the A0 stepping.

		The operating system may auto-detect the SoC stepping and

		update the compatible and register offsets at runtime.



- reg:		Device's register space.

		Two entries are expected, see the examples below.

		The first one is required for the sensor register;

drivers/thermal/armada_thermal.c

+0 −20
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ 
#define PMU_TDC0_OTF_CAL_MASK		(0x1 << 30)

#define PMU_TDC0_START_CAL_MASK		(0x1 << 25)



#define A375_Z1_CAL_RESET_LSB		0x8011e214

#define A375_Z1_CAL_RESET_MSB		0x30a88019

#define A375_Z1_WORKAROUND_BIT		BIT(9)



#define A375_UNIT_CONTROL_SHIFT		27

#define A375_UNIT_CONTROL_MASK		0x7

#define A375_READOUT_INVERT		BIT(15)
@@ -124,24 +120,12 @@ static void armada375_init_sensor(struct platform_device *pdev, 
				  struct armada_thermal_priv *priv)

{

	unsigned long reg;

	bool quirk_needed =

		!!of_device_is_compatible(pdev->dev.of_node,

					  "marvell,armada375-z1-thermal");



	if (quirk_needed) {

		/* Ensure these registers have the default (reset) values */

		writel(A375_Z1_CAL_RESET_LSB, priv->control);

		writel(A375_Z1_CAL_RESET_MSB, priv->control + 0x4);

	}



	reg = readl(priv->control + 4);

	reg &= ~(A375_UNIT_CONTROL_MASK << A375_UNIT_CONTROL_SHIFT);

	reg &= ~A375_READOUT_INVERT;

	reg &= ~A375_HW_RESETn;



	if (quirk_needed)

		reg |= A375_Z1_WORKAROUND_BIT;



	writel(reg, priv->control + 4);

	mdelay(20);
@@ -259,10 +243,6 @@ static const struct of_device_id armada_thermal_id_table[] = { 
		.compatible = "marvell,armada375-thermal",

		.data       = &armada375_data,

	},

	{

		.compatible = "marvell,armada375-z1-thermal",

		.data       = &armada375_data,

	},

	{

		.compatible = "marvell,armada380-thermal",

		.data       = &armada380_data,