Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: armada: Add support for Armada CP110

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

Signed-off-by: Baruch 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: Miquel Raynal <miquel.raynal@free-electrons.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Baruch Siach 2017-12-22 17:14:09 +01:00 committed by Eduardo Valentin
parent 2ff1279992
commit ccf8f522d1
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/thermal/armada_thermal.c
View File

@ -37,7 +37,6 @@
#define A375_UNIT_CONTROL_MASK 0x7 #define A375_UNIT_CONTROL_MASK 0x7
#define A375_READOUT_INVERT BIT(15) #define A375_READOUT_INVERT BIT(15)
#define A375_HW_RESETn BIT(8) #define A375_HW_RESETn BIT(8)
#define A380_HW_RESET BIT(8)
/* Legacy bindings */ /* Legacy bindings */
#define LEGACY_CONTROL_MEM_LEN 0x4 #define LEGACY_CONTROL_MEM_LEN 0x4
@ -52,6 +51,10 @@
#define CONTROL0_TSEN_RESET BIT(1) #define CONTROL0_TSEN_RESET BIT(1)
#define CONTROL0_TSEN_ENABLE BIT(2) #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; struct armada_thermal_data;
/* Marvell EBU Thermal Sensor Dev Structure */ /* Marvell EBU Thermal Sensor Dev Structure */
@ -153,12 +156,11 @@ static void armada380_init_sensor(struct platform_device *pdev,
{ {
u32 reg = readl_relaxed(priv->control1); u32 reg = readl_relaxed(priv->control1);
/* Reset hardware once */ /* Disable the HW/SW reset */
if (!(reg & A380_HW_RESET)) { reg |= CONTROL1_EXT_TSEN_HW_RESETn;
reg |= A380_HW_RESET; reg &= ~CONTROL1_EXT_TSEN_SW_RESET;
writel(reg, priv->control1); writel(reg, priv->control1);
msleep(10); msleep(10);
}
} }
static void armada_ap806_init_sensor(struct platform_device *pdev, static void armada_ap806_init_sensor(struct platform_device *pdev,
@ -277,6 +279,19 @@ static const struct armada_thermal_data armada_ap806_data = {
.needs_control0 = true, .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[] = { static const struct of_device_id armada_thermal_id_table[] = {
{ {
.compatible = "marvell,armadaxp-thermal", .compatible = "marvell,armadaxp-thermal",
@ -298,6 +313,10 @@ static const struct of_device_id armada_thermal_id_table[] = {
.compatible = "marvell,armada-ap806-thermal", .compatible = "marvell,armada-ap806-thermal",
.data = &armada_ap806_data, .data = &armada_ap806_data,
}, },
{
.compatible = "marvell,armada-cp110-thermal",
.data = &armada_cp110_data,
},
{ {
/* sentinel */ /* sentinel */
}, },