Hi Miquel,
On Mon, Dec 11, 2017 at 04:09:32PM +0100, Miquel RAYNAL wrote:
> On Sun, 3 Dec 2017 13:11:23 +0200
> Baruch Siach <baruch@xxxxxxxxxx> wrote:
>
> > The CP110 component is integrated in the Armada 8k and 7k lines of
> > processors.
> >
> > This patch also adds an option of offset to the MSB of the control
> > register. The existing DT binding for Armada 38x refers to a single
> > 32 bit control register. It turns out that this is actually only the
> > MSB of the control area. Changing the binding to fix that would break
> > existing DT files, so the Armada 38x binding is left as is.
> >
> > The new CP110 binding increases the size of the control area to 64
> > bits, thus moving the MSB to offset 4.
> >
> > Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
> > ---
> > v2: No change
> > ---
> > drivers/thermal/armada_thermal.c | 24 ++++++++++++++++++++++--
> > 1 file changed, 22 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/thermal/armada_thermal.c
> > b/drivers/thermal/armada_thermal.c index 0eb82097571f..59b75f63945d
> > 100644 --- a/drivers/thermal/armada_thermal.c
> > +++ b/drivers/thermal/armada_thermal.c
> > @@ -73,6 +73,7 @@ struct armada_thermal_data {
> > unsigned int temp_shift;
> > unsigned int temp_mask;
> > unsigned int is_valid_shift;
> > + unsigned int control_msb_offset;
> > };
> >
> > static void armadaxp_init_sensor(struct platform_device *pdev,
> > @@ -142,12 +143,14 @@ static void armada375_init_sensor(struct
> > platform_device *pdev, static void armada380_init_sensor(struct
> > platform_device *pdev, struct armada_thermal_priv *priv)
> > {
> > - unsigned long reg = readl_relaxed(priv->control);
> > + void __iomem *control_msb =
> > + priv->control + priv->data->control_msb_offset;
> > + unsigned long reg = readl_relaxed(control_msb);
> >
> > /* Reset hardware once */
> > if (!(reg & A380_HW_RESET)) {
> > reg |= A380_HW_RESET;
> > - writel(reg, priv->control);
> > + writel(reg, control_msb);
> > mdelay(10);
> > }
> > }
> > @@ -266,6 +269,19 @@ static const struct armada_thermal_data
> > armada_ap806_data = { .signed_sample = true,
> > };
> >
> > +static const struct armada_thermal_data armada_cp110_data = {
> > + .is_valid = armada_is_valid,
> > + .init_sensor = armada380_init_sensor,
>
> I see the initialization for CP110 thermal IP is close to
> Armada-380's, but, as you point it in the commit log it is still
> different.
>
> I don't know what is the best way to handle this but until now each
> new compatible had his own ->init_sensor function, shouldn't we do
> the same here as changes are requested? This would naturally avoid the
> situation with Armada-380 bindings.
I'm not sure I understand your suggestion.
There is no difference between the CP110 and the Armada 38x, as far as I can
see. The only quirk is that the existing Armada 38x DT binding is wrong I that
the 'reg' property references the control MSB, while leaving the LSB out. We
can't change the Armada 38x binding without breaking existing DTs. The
'control_msb_offset' field that this patch adds allows correct binding for
CP110, while keeping compatibility with the existing Armada 38x binding.
How would a separate init_sensor routine improve things?
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@xxxxxxxxxx - tel: +972.2.679.5364, http://www.tkos.co.il -
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
