From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Mon, 18 Dec 2017 17:07:14 +0100 Subject: [PATCH v4 07/12] thermal: armada: Add support for Armada CP110 In-Reply-To: <20171218143643.7714-8-miquel.raynal@free-electrons.com> (Miquel Raynal's message of "Mon, 18 Dec 2017 15:36:38 +0100") References: <20171218143643.7714-1-miquel.raynal@free-electrons.com> <20171218143643.7714-8-miquel.raynal@free-electrons.com> Message-ID: <87tvwohvf1.fsf@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Miquel, On lun., d?c. 18 2017, Miquel Raynal wrote: > From: Baruch Siach > > The CP110 component is integrated in the Armada 8k and 7k lines of > processors. > > Signed-off-by: Baruch Siach > [: 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 Reviewed-by: Gregory CLEMENT Gregory > --- > drivers/thermal/armada_thermal.c | 33 ++++++++++++++++++++++++++------- > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c > index ec29ea76b818..11a94ad66c35 100644 > --- a/drivers/thermal/armada_thermal.c > +++ b/drivers/thermal/armada_thermal.c > @@ -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,12 +156,11 @@ 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; > - writel(reg, priv->control1); > - msleep(10); > - } > + /* 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, > @@ -278,6 +280,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", > @@ -300,6 +315,10 @@ static const struct of_device_id armada_thermal_id_table[] = { > .data = &armada_ap806_data, > }, > { > + .compatible = "marvell,armada-cp110-thermal", > + .data = &armada_cp110_data, > + }, > + { > /* sentinel */ > }, > }; > -- > 2.11.0 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com