On Wed, Dec 18, 2019 at 5:03 PM Ondřej Jirman <megous@xxxxxxxxxx> wrote:
>
> On Wed, Dec 18, 2019 at 03:18:51PM -0800, Vasily Khoruzhick wrote:
> > On Tue, Dec 17, 2019 at 8:32 PM Chen-Yu Tsai <wens@xxxxxxxx> wrote:
> > >
> > > On Wed, Dec 18, 2019 at 12:22 PM Vasily Khoruzhick <anarsoul@xxxxxxxxx> wrote:
> > > >
> > > > From: Ondrej Jirman <megous@xxxxxxxxxx>
> > > >
> > > > There are two sensors, one for CPU, one for GPU.
> > > >
> > > > Signed-off-by: Ondrej Jirman <megous@xxxxxxxxxx>
> > > > Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
> > > > ---
> > > > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
> > > > 1 file changed, 33 insertions(+)
> > > >
> > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> > > > index 29824081b43b..cdcb1a36301a 100644
> > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> > > > @@ -11,6 +11,7 @@
> > > > #include <dt-bindings/reset/sun50i-h6-ccu.h>
> > > > #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
> > > > #include <dt-bindings/reset/sun8i-de2.h>
> > > > +#include <dt-bindings/thermal/thermal.h>
> > > >
> > > > / {
> > > > interrupt-parent = <&gic>;
> > > > @@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
> > > > sid: efuse@3006000 {
> > > > compatible = "allwinner,sun50i-h6-sid";
> > > > reg = <0x03006000 0x400>;
> > > > + #address-cells = <1>;
> > > > + #size-cells = <1>;
> > > > +
> > > > + ths_calibration: thermal-sensor-calibration@14 {
> > > > + reg = <0x14 0x6>;
> > >
> > > Nit: my preference is to use words as the smallest increment, so this
> > > would have a size of 8 instead of 6. Same goes for the A64 dts.
> > >
> > > AFAICT this doesn't impact the driver in any way.
> >
> > H6 has only 2 sensors, so it should be 4. That's my overlook, I'll
> > change it to 4 for H6 and to 8 for A64.
>
> No it's correct. There's 2 bytes reference temperature and 2x 2 byte
> values for individual sensor calibration constants.
So it should be 8 if we round it up to word boundary?
> regards,
> o.
>
> > >
> > > ChenYu
> > >
> > >
> > > > + };
> > > > };
> > > >
> > > > watchdog: watchdog@30090a0 {
> > > > @@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
> > > > #address-cells = <1>;
> > > > #size-cells = <0>;
> > > > };
> > > > +
> > > > + ths: thermal-sensor@5070400 {
> > > > + compatible = "allwinner,sun50i-h6-ths";
> > > > + reg = <0x05070400 0x100>;
> > > > + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
> > > > + clocks = <&ccu CLK_BUS_THS>;
> > > > + clock-names = "bus";
> > > > + resets = <&ccu RST_BUS_THS>;
> > > > + nvmem-cells = <&ths_calibration>;
> > > > + nvmem-cell-names = "calibration";
> > > > + #thermal-sensor-cells = <1>;
> > > > + };
> > > > + };
> > > > +
> > > > + thermal-zones {
> > > > + cpu-thermal {
> > > > + polling-delay-passive = <0>;
> > > > + polling-delay = <0>;
> > > > + thermal-sensors = <&ths 0>;
> > > > + };
> > > > +
> > > > + gpu-thermal {
> > > > + polling-delay-passive = <0>;
> > > > + polling-delay = <0>;
> > > > + thermal-sensors = <&ths 1>;
> > > > + };
> > > > };
> > > > };
> > > > --
> > > > 2.24.1
> > > >
