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

Commit ccf8f522 authored by Baruch Siach's avatar Baruch Siach Committed by Eduardo Valentin
Browse files

thermal: armada: Add support for Armada CP110 



The CP110 component is integrated in the Armada 8k and 7k lines of
processors.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
[<miquel.raynal@free-electrons.com>: renamed the register pointers as
well as some definitions related to the new register names and
simplified the init sequence for Armada 380]
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@free-electrons.com>
Reviewed-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 2ff12799

drivers/thermal/armada_thermal.c

+26 −7
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define A375_UNIT_CONTROL_MASK		0x7

#define A375_READOUT_INVERT		BIT(15)

#define A375_HW_RESETn			BIT(8)

#define A380_HW_RESET			BIT(8)



/* Legacy bindings */

#define LEGACY_CONTROL_MEM_LEN		0x4
@@ -52,6 +51,10 @@ 
#define CONTROL0_TSEN_RESET		BIT(1)

#define CONTROL0_TSEN_ENABLE		BIT(2)



/* EXT_TSEN refers to the external temperature sensors, out of the AP */

#define CONTROL1_EXT_TSEN_SW_RESET	BIT(7)

#define CONTROL1_EXT_TSEN_HW_RESETn	BIT(8)



struct armada_thermal_data;



/* Marvell EBU Thermal Sensor Dev Structure */
@@ -153,13 +156,12 @@ static void armada380_init_sensor(struct platform_device *pdev, 
{

	u32 reg = readl_relaxed(priv->control1);



	/* Reset hardware once */

	if (!(reg & A380_HW_RESET)) {

		reg |= A380_HW_RESET;

	/* Disable the HW/SW reset */

	reg |= CONTROL1_EXT_TSEN_HW_RESETn;

	reg &= ~CONTROL1_EXT_TSEN_SW_RESET;

	writel(reg, priv->control1);

	msleep(10);

}

}



static void armada_ap806_init_sensor(struct platform_device *pdev,

				     struct armada_thermal_priv *priv)
@@ -277,6 +279,19 @@ static const struct armada_thermal_data armada_ap806_data = { 
	.needs_control0 = true,

};



static const struct armada_thermal_data armada_cp110_data = {

	.is_valid = armada_is_valid,

	.init_sensor = armada380_init_sensor,

	.is_valid_bit = BIT(10),

	.temp_shift = 0,

	.temp_mask = 0x3ff,

	.coef_b = 1172499100ULL,

	.coef_m = 2000096ULL,

	.coef_div = 4201,

	.inverted = true,

	.needs_control0 = true,

};



static const struct of_device_id armada_thermal_id_table[] = {

	{

		.compatible = "marvell,armadaxp-thermal",
@@ -298,6 +313,10 @@ static const struct of_device_id armada_thermal_id_table[] = { 
		.compatible = "marvell,armada-ap806-thermal",

		.data       = &armada_ap806_data,

	},

	{

		.compatible = "marvell,armada-cp110-thermal",

		.data       = &armada_cp110_data,

	},

	{

		/* sentinel */

	},