* [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
@ 2022-09-30 12:39 Pali Rohár
2022-09-30 12:40 ` Marek Behún
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Pali Rohár @ 2022-09-30 12:39 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: Marek Behún, Josef Schlehofer, linuxppc-dev, linux-kernel
Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
itself is located on the board) and channel 1 of SA56004ED chip refers to
external sensor which is connected to temperature diode of the P2020 CPU.
Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
Signed-off-by: Pali Rohár <pali@kernel.org>
---
With this change userspace 'sensors' applications prints labels:
$ sensors
sa56004-i2c-0-4c
Adapter: MPC adapter (i2c@3000)
board: +34.2°C (low = +0.0°C, high = +70.0°C)
(crit = +85.0°C, hyst = +75.0°C)
cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
(crit = +85.0°C, hyst = +75.0°C)
And without this change it prints just generic tempX names:
$ sensors
sa56004-i2c-0-4c
Adapter: MPC adapter (i2c@3000)
temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
(crit = +85.0°C, hyst = +75.0°C)
temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
(crit = +85.0°C, hyst = +75.0°C)
---
arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
index 4033c554b06a..5b5278c32e43 100644
--- a/arch/powerpc/boot/dts/turris1x.dts
+++ b/arch/powerpc/boot/dts/turris1x.dts
@@ -69,6 +69,20 @@
interrupt-parent = <&gpio>;
interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
<13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ /* Local temperature sensor (SA56004ED internal) */
+ channel@0 {
+ reg = <0>;
+ label = "board";
+ };
+
+ /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
+ channel@1 {
+ reg = <1>;
+ label = "cpu";
+ };
};
/* DDR3 SPD/EEPROM */
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-09-30 12:39 [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor Pali Rohár
@ 2022-09-30 12:40 ` Marek Behún
2022-09-30 12:46 ` Pali Rohár
2022-12-08 12:39 ` Michael Ellerman
2 siblings, 0 replies; 9+ messages in thread
From: Marek Behún @ 2022-09-30 12:40 UTC (permalink / raw)
To: Pali Rohár
Cc: linux-kernel, Nicholas Piggin, Josef Schlehofer, linuxppc-dev
On Fri, 30 Sep 2022 14:39:01 +0200
Pali Rohár <pali@kernel.org> wrote:
> Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> itself is located on the board) and channel 1 of SA56004ED chip refers to
> external sensor which is connected to temperature diode of the P2020 CPU.
>
> Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <kabel@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-09-30 12:39 [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor Pali Rohár
2022-09-30 12:40 ` Marek Behún
@ 2022-09-30 12:46 ` Pali Rohár
2022-10-09 12:05 ` Pali Rohár
2022-12-08 12:39 ` Michael Ellerman
2 siblings, 1 reply; 9+ messages in thread
From: Pali Rohár @ 2022-09-30 12:46 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: linux-hwmon, Marek Behún, Josef Schlehofer, linuxppc-dev,
linux-kernel
+ CC hwmon ML
On Friday 30 September 2022 14:39:01 Pali Rohár wrote:
> Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> itself is located on the board) and channel 1 of SA56004ED chip refers to
> external sensor which is connected to temperature diode of the P2020 CPU.
>
> Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> Signed-off-by: Pali Rohár <pali@kernel.org>
> ---
> With this change userspace 'sensors' applications prints labels:
>
> $ sensors
> sa56004-i2c-0-4c
> Adapter: MPC adapter (i2c@3000)
> board: +34.2°C (low = +0.0°C, high = +70.0°C)
> (crit = +85.0°C, hyst = +75.0°C)
> cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
> (crit = +85.0°C, hyst = +75.0°C)
>
> And without this change it prints just generic tempX names:
>
> $ sensors
> sa56004-i2c-0-4c
> Adapter: MPC adapter (i2c@3000)
> temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
> (crit = +85.0°C, hyst = +75.0°C)
> temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
> (crit = +85.0°C, hyst = +75.0°C)
> ---
> arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> index 4033c554b06a..5b5278c32e43 100644
> --- a/arch/powerpc/boot/dts/turris1x.dts
> +++ b/arch/powerpc/boot/dts/turris1x.dts
> @@ -69,6 +69,20 @@
> interrupt-parent = <&gpio>;
> interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
> <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* Local temperature sensor (SA56004ED internal) */
> + channel@0 {
> + reg = <0>;
> + label = "board";
> + };
> +
> + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
> + channel@1 {
> + reg = <1>;
> + label = "cpu";
> + };
I'm not sure if you want UPPERCASE, lowercase, PascalCase, kebab-case
or snake_case format of labels. Or if you want also "temp" or
"temperature" keyword in the label. So please adjust label to the
preferred one, if proposed format is not the correct.
> };
>
> /* DDR3 SPD/EEPROM */
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-09-30 12:46 ` Pali Rohár
@ 2022-10-09 12:05 ` Pali Rohár
2022-11-01 22:43 ` Pali Rohár
0 siblings, 1 reply; 9+ messages in thread
From: Pali Rohár @ 2022-10-09 12:05 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: linux-hwmon, Marek Behún, Josef Schlehofer, linuxppc-dev,
linux-kernel
On Friday 30 September 2022 14:46:18 Pali Rohár wrote:
> + CC hwmon ML
>
> On Friday 30 September 2022 14:39:01 Pali Rohár wrote:
> > Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> > itself is located on the board) and channel 1 of SA56004ED chip refers to
> > external sensor which is connected to temperature diode of the P2020 CPU.
> >
> > Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > ---
> > With this change userspace 'sensors' applications prints labels:
> >
> > $ sensors
> > sa56004-i2c-0-4c
> > Adapter: MPC adapter (i2c@3000)
> > board: +34.2°C (low = +0.0°C, high = +70.0°C)
> > (crit = +85.0°C, hyst = +75.0°C)
> > cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
> > (crit = +85.0°C, hyst = +75.0°C)
> >
> > And without this change it prints just generic tempX names:
> >
> > $ sensors
> > sa56004-i2c-0-4c
> > Adapter: MPC adapter (i2c@3000)
> > temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
> > (crit = +85.0°C, hyst = +75.0°C)
> > temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
> > (crit = +85.0°C, hyst = +75.0°C)
> > ---
> > arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
> > 1 file changed, 14 insertions(+)
> >
> > diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> > index 4033c554b06a..5b5278c32e43 100644
> > --- a/arch/powerpc/boot/dts/turris1x.dts
> > +++ b/arch/powerpc/boot/dts/turris1x.dts
> > @@ -69,6 +69,20 @@
> > interrupt-parent = <&gpio>;
> > interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
> > <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + /* Local temperature sensor (SA56004ED internal) */
> > + channel@0 {
> > + reg = <0>;
> > + label = "board";
> > + };
> > +
> > + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
> > + channel@1 {
> > + reg = <1>;
> > + label = "cpu";
> > + };
>
> I'm not sure if you want UPPERCASE, lowercase, PascalCase, kebab-case
> or snake_case format of labels. Or if you want also "temp" or
> "temperature" keyword in the label. So please adjust label to the
> preferred one, if proposed format is not the correct.
Ok, if nobody complains then please take this patch as is.
> > };
> >
> > /* DDR3 SPD/EEPROM */
> > --
> > 2.20.1
> >
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-10-09 12:05 ` Pali Rohár
@ 2022-11-01 22:43 ` Pali Rohár
2022-11-26 16:24 ` Pali Rohár
2022-11-29 1:18 ` Michael Ellerman
0 siblings, 2 replies; 9+ messages in thread
From: Pali Rohár @ 2022-11-01 22:43 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: linux-hwmon, Marek Behún, Josef Schlehofer, linuxppc-dev,
linux-kernel
Michael, could you take this patch?
On Sunday 09 October 2022 14:05:06 Pali Rohár wrote:
> On Friday 30 September 2022 14:46:18 Pali Rohár wrote:
> > + CC hwmon ML
> >
> > On Friday 30 September 2022 14:39:01 Pali Rohár wrote:
> > > Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> > > itself is located on the board) and channel 1 of SA56004ED chip refers to
> > > external sensor which is connected to temperature diode of the P2020 CPU.
> > >
> > > Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> > > Signed-off-by: Pali Rohár <pali@kernel.org>
> > > ---
> > > With this change userspace 'sensors' applications prints labels:
> > >
> > > $ sensors
> > > sa56004-i2c-0-4c
> > > Adapter: MPC adapter (i2c@3000)
> > > board: +34.2°C (low = +0.0°C, high = +70.0°C)
> > > (crit = +85.0°C, hyst = +75.0°C)
> > > cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
> > > (crit = +85.0°C, hyst = +75.0°C)
> > >
> > > And without this change it prints just generic tempX names:
> > >
> > > $ sensors
> > > sa56004-i2c-0-4c
> > > Adapter: MPC adapter (i2c@3000)
> > > temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
> > > (crit = +85.0°C, hyst = +75.0°C)
> > > temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
> > > (crit = +85.0°C, hyst = +75.0°C)
> > > ---
> > > arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
> > > 1 file changed, 14 insertions(+)
> > >
> > > diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> > > index 4033c554b06a..5b5278c32e43 100644
> > > --- a/arch/powerpc/boot/dts/turris1x.dts
> > > +++ b/arch/powerpc/boot/dts/turris1x.dts
> > > @@ -69,6 +69,20 @@
> > > interrupt-parent = <&gpio>;
> > > interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
> > > <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > +
> > > + /* Local temperature sensor (SA56004ED internal) */
> > > + channel@0 {
> > > + reg = <0>;
> > > + label = "board";
> > > + };
> > > +
> > > + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
> > > + channel@1 {
> > > + reg = <1>;
> > > + label = "cpu";
> > > + };
> >
> > I'm not sure if you want UPPERCASE, lowercase, PascalCase, kebab-case
> > or snake_case format of labels. Or if you want also "temp" or
> > "temperature" keyword in the label. So please adjust label to the
> > preferred one, if proposed format is not the correct.
>
> Ok, if nobody complains then please take this patch as is.
>
> > > };
> > >
> > > /* DDR3 SPD/EEPROM */
> > > --
> > > 2.20.1
> > >
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-11-01 22:43 ` Pali Rohár
@ 2022-11-26 16:24 ` Pali Rohár
2022-11-29 1:18 ` Michael Ellerman
1 sibling, 0 replies; 9+ messages in thread
From: Pali Rohár @ 2022-11-26 16:24 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: linux-hwmon, Marek Behún, Josef Schlehofer, linuxppc-dev,
linux-kernel
PING?
On Tuesday 01 November 2022 23:43:48 Pali Rohár wrote:
> Michael, could you take this patch?
>
> On Sunday 09 October 2022 14:05:06 Pali Rohár wrote:
> > On Friday 30 September 2022 14:46:18 Pali Rohár wrote:
> > > + CC hwmon ML
> > >
> > > On Friday 30 September 2022 14:39:01 Pali Rohár wrote:
> > > > Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> > > > itself is located on the board) and channel 1 of SA56004ED chip refers to
> > > > external sensor which is connected to temperature diode of the P2020 CPU.
> > > >
> > > > Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> > > > Signed-off-by: Pali Rohár <pali@kernel.org>
> > > > ---
> > > > With this change userspace 'sensors' applications prints labels:
> > > >
> > > > $ sensors
> > > > sa56004-i2c-0-4c
> > > > Adapter: MPC adapter (i2c@3000)
> > > > board: +34.2°C (low = +0.0°C, high = +70.0°C)
> > > > (crit = +85.0°C, hyst = +75.0°C)
> > > > cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
> > > > (crit = +85.0°C, hyst = +75.0°C)
> > > >
> > > > And without this change it prints just generic tempX names:
> > > >
> > > > $ sensors
> > > > sa56004-i2c-0-4c
> > > > Adapter: MPC adapter (i2c@3000)
> > > > temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
> > > > (crit = +85.0°C, hyst = +75.0°C)
> > > > temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
> > > > (crit = +85.0°C, hyst = +75.0°C)
> > > > ---
> > > > arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
> > > > 1 file changed, 14 insertions(+)
> > > >
> > > > diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> > > > index 4033c554b06a..5b5278c32e43 100644
> > > > --- a/arch/powerpc/boot/dts/turris1x.dts
> > > > +++ b/arch/powerpc/boot/dts/turris1x.dts
> > > > @@ -69,6 +69,20 @@
> > > > interrupt-parent = <&gpio>;
> > > > interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
> > > > <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
> > > > + #address-cells = <1>;
> > > > + #size-cells = <0>;
> > > > +
> > > > + /* Local temperature sensor (SA56004ED internal) */
> > > > + channel@0 {
> > > > + reg = <0>;
> > > > + label = "board";
> > > > + };
> > > > +
> > > > + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
> > > > + channel@1 {
> > > > + reg = <1>;
> > > > + label = "cpu";
> > > > + };
> > >
> > > I'm not sure if you want UPPERCASE, lowercase, PascalCase, kebab-case
> > > or snake_case format of labels. Or if you want also "temp" or
> > > "temperature" keyword in the label. So please adjust label to the
> > > preferred one, if proposed format is not the correct.
> >
> > Ok, if nobody complains then please take this patch as is.
> >
> > > > };
> > > >
> > > > /* DDR3 SPD/EEPROM */
> > > > --
> > > > 2.20.1
> > > >
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-11-01 22:43 ` Pali Rohár
2022-11-26 16:24 ` Pali Rohár
@ 2022-11-29 1:18 ` Michael Ellerman
2022-11-29 18:56 ` Pali Rohár
1 sibling, 1 reply; 9+ messages in thread
From: Michael Ellerman @ 2022-11-29 1:18 UTC (permalink / raw)
To: Pali Rohár, Nicholas Piggin, Christophe Leroy
Cc: linux-hwmon, Marek Behún, Josef Schlehofer, linuxppc-dev,
linux-kernel
Pali Rohár <pali@kernel.org> writes:
> Michael, could you take this patch?
Yep.
With these dts patches it always helps if you tell me that it passes the
DT schema checks, so that I don't get yelled at by the DT people :)
cheers
> On Sunday 09 October 2022 14:05:06 Pali Rohár wrote:
>> On Friday 30 September 2022 14:46:18 Pali Rohár wrote:
>> > + CC hwmon ML
>> >
>> > On Friday 30 September 2022 14:39:01 Pali Rohár wrote:
>> > > Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
>> > > itself is located on the board) and channel 1 of SA56004ED chip refers to
>> > > external sensor which is connected to temperature diode of the P2020 CPU.
>> > >
>> > > Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
>> > > Signed-off-by: Pali Rohár <pali@kernel.org>
>> > > ---
>> > > With this change userspace 'sensors' applications prints labels:
>> > >
>> > > $ sensors
>> > > sa56004-i2c-0-4c
>> > > Adapter: MPC adapter (i2c@3000)
>> > > board: +34.2°C (low = +0.0°C, high = +70.0°C)
>> > > (crit = +85.0°C, hyst = +75.0°C)
>> > > cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
>> > > (crit = +85.0°C, hyst = +75.0°C)
>> > >
>> > > And without this change it prints just generic tempX names:
>> > >
>> > > $ sensors
>> > > sa56004-i2c-0-4c
>> > > Adapter: MPC adapter (i2c@3000)
>> > > temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
>> > > (crit = +85.0°C, hyst = +75.0°C)
>> > > temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
>> > > (crit = +85.0°C, hyst = +75.0°C)
>> > > ---
>> > > arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
>> > > 1 file changed, 14 insertions(+)
>> > >
>> > > diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
>> > > index 4033c554b06a..5b5278c32e43 100644
>> > > --- a/arch/powerpc/boot/dts/turris1x.dts
>> > > +++ b/arch/powerpc/boot/dts/turris1x.dts
>> > > @@ -69,6 +69,20 @@
>> > > interrupt-parent = <&gpio>;
>> > > interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
>> > > <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
>> > > + #address-cells = <1>;
>> > > + #size-cells = <0>;
>> > > +
>> > > + /* Local temperature sensor (SA56004ED internal) */
>> > > + channel@0 {
>> > > + reg = <0>;
>> > > + label = "board";
>> > > + };
>> > > +
>> > > + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
>> > > + channel@1 {
>> > > + reg = <1>;
>> > > + label = "cpu";
>> > > + };
>> >
>> > I'm not sure if you want UPPERCASE, lowercase, PascalCase, kebab-case
>> > or snake_case format of labels. Or if you want also "temp" or
>> > "temperature" keyword in the label. So please adjust label to the
>> > preferred one, if proposed format is not the correct.
>>
>> Ok, if nobody complains then please take this patch as is.
>>
>> > > };
>> > >
>> > > /* DDR3 SPD/EEPROM */
>> > > --
>> > > 2.20.1
>> > >
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-11-29 1:18 ` Michael Ellerman
@ 2022-11-29 18:56 ` Pali Rohár
0 siblings, 0 replies; 9+ messages in thread
From: Pali Rohár @ 2022-11-29 18:56 UTC (permalink / raw)
To: Michael Ellerman
Cc: Marek Behún, linux-hwmon, linux-kernel, Nicholas Piggin,
Josef Schlehofer, linuxppc-dev
On Tuesday 29 November 2022 12:18:28 Michael Ellerman wrote:
> Pali Rohár <pali@kernel.org> writes:
> > Michael, could you take this patch?
>
> Yep.
>
> With these dts patches it always helps if you tell me that it passes the
> DT schema checks, so that I don't get yelled at by the DT people :)
Mostly dt schemas for p1/p2 are incomplete, I sent more patches but they
are waiting and I was not able to setup & run dt schema checker. Hence
I tested everything on the hardware to ensure that it works correctly.
And this patch works on Turris 1.1 board, I also tested sensors tool.
So the important is what is in DTS file, the stuff which is used on HW.
> cheers
>
> > On Sunday 09 October 2022 14:05:06 Pali Rohár wrote:
> >> On Friday 30 September 2022 14:46:18 Pali Rohár wrote:
> >> > + CC hwmon ML
> >> >
> >> > On Friday 30 September 2022 14:39:01 Pali Rohár wrote:
> >> > > Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> >> > > itself is located on the board) and channel 1 of SA56004ED chip refers to
> >> > > external sensor which is connected to temperature diode of the P2020 CPU.
> >> > >
> >> > > Fixes: 54c15ec3b738 ("powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers")
> >> > > Signed-off-by: Pali Rohár <pali@kernel.org>
> >> > > ---
> >> > > With this change userspace 'sensors' applications prints labels:
> >> > >
> >> > > $ sensors
> >> > > sa56004-i2c-0-4c
> >> > > Adapter: MPC adapter (i2c@3000)
> >> > > board: +34.2°C (low = +0.0°C, high = +70.0°C)
> >> > > (crit = +85.0°C, hyst = +75.0°C)
> >> > > cpu: +58.9°C (low = +0.0°C, high = +70.0°C)
> >> > > (crit = +85.0°C, hyst = +75.0°C)
> >> > >
> >> > > And without this change it prints just generic tempX names:
> >> > >
> >> > > $ sensors
> >> > > sa56004-i2c-0-4c
> >> > > Adapter: MPC adapter (i2c@3000)
> >> > > temp1: +43.0°C (low = +0.0°C, high = +70.0°C)
> >> > > (crit = +85.0°C, hyst = +75.0°C)
> >> > > temp2: +63.4°C (low = +0.0°C, high = +70.0°C)
> >> > > (crit = +85.0°C, hyst = +75.0°C)
> >> > > ---
> >> > > arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++
> >> > > 1 file changed, 14 insertions(+)
> >> > >
> >> > > diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> >> > > index 4033c554b06a..5b5278c32e43 100644
> >> > > --- a/arch/powerpc/boot/dts/turris1x.dts
> >> > > +++ b/arch/powerpc/boot/dts/turris1x.dts
> >> > > @@ -69,6 +69,20 @@
> >> > > interrupt-parent = <&gpio>;
> >> > > interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */
> >> > > <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */
> >> > > + #address-cells = <1>;
> >> > > + #size-cells = <0>;
> >> > > +
> >> > > + /* Local temperature sensor (SA56004ED internal) */
> >> > > + channel@0 {
> >> > > + reg = <0>;
> >> > > + label = "board";
> >> > > + };
> >> > > +
> >> > > + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */
> >> > > + channel@1 {
> >> > > + reg = <1>;
> >> > > + label = "cpu";
> >> > > + };
> >> >
> >> > I'm not sure if you want UPPERCASE, lowercase, PascalCase, kebab-case
> >> > or snake_case format of labels. Or if you want also "temp" or
> >> > "temperature" keyword in the label. So please adjust label to the
> >> > preferred one, if proposed format is not the correct.
> >>
> >> Ok, if nobody complains then please take this patch as is.
> >>
> >> > > };
> >> > >
> >> > > /* DDR3 SPD/EEPROM */
> >> > > --
> >> > > 2.20.1
> >> > >
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
2022-09-30 12:39 [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor Pali Rohár
2022-09-30 12:40 ` Marek Behún
2022-09-30 12:46 ` Pali Rohár
@ 2022-12-08 12:39 ` Michael Ellerman
2 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2022-12-08 12:39 UTC (permalink / raw)
To: Nicholas Piggin, Michael Ellerman, Pali Rohár,
Christophe Leroy
Cc: Marek Behún, Josef Schlehofer, linuxppc-dev, linux-kernel
On Fri, 30 Sep 2022 14:39:01 +0200, Pali Rohár wrote:
> Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip
> itself is located on the board) and channel 1 of SA56004ED chip refers to
> external sensor which is connected to temperature diode of the P2020 CPU.
>
>
Applied to powerpc/next.
[1/1] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
https://git.kernel.org/powerpc/c/67bbb62f61e810734da0a1577a9802ddaed24140
cheers
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-12-08 13:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-30 12:39 [PATCH] powerpc: dts: turris1x.dts: Add channel labels for temperature sensor Pali Rohár
2022-09-30 12:40 ` Marek Behún
2022-09-30 12:46 ` Pali Rohár
2022-10-09 12:05 ` Pali Rohár
2022-11-01 22:43 ` Pali Rohár
2022-11-26 16:24 ` Pali Rohár
2022-11-29 1:18 ` Michael Ellerman
2022-11-29 18:56 ` Pali Rohár
2022-12-08 12:39 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).