| Message ID | 20201221181306.904272-2-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Thermal zone configuration for Meson8/Meson8b/Meson8m2 | expand |
On 21/12/2020 19:13, Martin Blumenstingl wrote: > The SoC temperature can be retrieved from ADC channel 8 on all 32-bit > SoCs (Meson6, Meson8, Meson8b and Meson8m2). Move the iio-hwmon instance > to meson.dtsi instead of duplicating it in all board.dts. > If the temperature sensor calibration data is missing for a board then > iio-hwmon will simply not probe. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > arch/arm/boot/dts/meson.dtsi | 5 +++++ > arch/arm/boot/dts/meson8b-ec100.dts | 5 ----- > arch/arm/boot/dts/meson8b-mxq.dts | 5 ----- > arch/arm/boot/dts/meson8b-odroidc1.dts | 5 ----- > arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 5 ----- > 5 files changed, 5 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi > index 7649dd1e0b9e..5f074f7aa1a2 100644 > --- a/arch/arm/boot/dts/meson.dtsi > +++ b/arch/arm/boot/dts/meson.dtsi > @@ -11,6 +11,11 @@ / { > #size-cells = <1>; > interrupt-parent = <&gic>; > > + iio-hwmon { > + compatible = "iio-hwmon"; > + io-channels = <&saradc 8>; > + }; > + > soc { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/meson8b-ec100.dts b/arch/arm/boot/dts/meson8b-ec100.dts > index ed06102a4014..8e48ccc6b634 100644 > --- a/arch/arm/boot/dts/meson8b-ec100.dts > +++ b/arch/arm/boot/dts/meson8b-ec100.dts > @@ -70,11 +70,6 @@ gpio-poweroff { > timeout-ms = <20000>; > }; > > - iio-hwmon { > - compatible = "iio-hwmon"; > - io-channels = <&saradc 8>; > - }; > - > leds { > compatible = "gpio-leds"; > > diff --git a/arch/arm/boot/dts/meson8b-mxq.dts b/arch/arm/boot/dts/meson8b-mxq.dts > index 33037ef62d0a..f3937d55472d 100644 > --- a/arch/arm/boot/dts/meson8b-mxq.dts > +++ b/arch/arm/boot/dts/meson8b-mxq.dts > @@ -27,11 +27,6 @@ memory { > reg = <0x40000000 0x40000000>; > }; > > - iio-hwmon { > - compatible = "iio-hwmon"; > - io-channels = <&saradc 8>; > - }; > - > vcck: regulator-vcck { > compatible = "pwm-regulator"; > > diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts > index 5963566dbcc9..c440ef94e082 100644 > --- a/arch/arm/boot/dts/meson8b-odroidc1.dts > +++ b/arch/arm/boot/dts/meson8b-odroidc1.dts > @@ -85,11 +85,6 @@ tf_io: gpio-regulator-tf_io { > 1800000 1>; > }; > > - iio-hwmon { > - compatible = "iio-hwmon"; > - io-channels = <&saradc 8>; > - }; > - > rtc32k_xtal: rtc32k-xtal-clk { > /* X3 in the schematics */ > compatible = "fixed-clock"; > diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts > index 8f4eb1ed4581..fa6d55f1cfb9 100644 > --- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts > +++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts > @@ -45,11 +45,6 @@ button-function { > }; > }; > > - iio-hwmon { > - compatible = "iio-hwmon"; > - io-channels = <&saradc 8>; > - }; > - > vcc_3v3: regulator-vcc3v3 { > compatible = "regulator-fixed"; > regulator-name = "VCC3V3"; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 7649dd1e0b9e..5f074f7aa1a2 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -11,6 +11,11 @@ / { #size-cells = <1>; interrupt-parent = <&gic>; + iio-hwmon { + compatible = "iio-hwmon"; + io-channels = <&saradc 8>; + }; + soc { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/meson8b-ec100.dts b/arch/arm/boot/dts/meson8b-ec100.dts index ed06102a4014..8e48ccc6b634 100644 --- a/arch/arm/boot/dts/meson8b-ec100.dts +++ b/arch/arm/boot/dts/meson8b-ec100.dts @@ -70,11 +70,6 @@ gpio-poweroff { timeout-ms = <20000>; }; - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&saradc 8>; - }; - leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/meson8b-mxq.dts b/arch/arm/boot/dts/meson8b-mxq.dts index 33037ef62d0a..f3937d55472d 100644 --- a/arch/arm/boot/dts/meson8b-mxq.dts +++ b/arch/arm/boot/dts/meson8b-mxq.dts @@ -27,11 +27,6 @@ memory { reg = <0x40000000 0x40000000>; }; - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&saradc 8>; - }; - vcck: regulator-vcck { compatible = "pwm-regulator"; diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts index 5963566dbcc9..c440ef94e082 100644 --- a/arch/arm/boot/dts/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/meson8b-odroidc1.dts @@ -85,11 +85,6 @@ tf_io: gpio-regulator-tf_io { 1800000 1>; }; - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&saradc 8>; - }; - rtc32k_xtal: rtc32k-xtal-clk { /* X3 in the schematics */ compatible = "fixed-clock"; diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts index 8f4eb1ed4581..fa6d55f1cfb9 100644 --- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts +++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts @@ -45,11 +45,6 @@ button-function { }; }; - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&saradc 8>; - }; - vcc_3v3: regulator-vcc3v3 { compatible = "regulator-fixed"; regulator-name = "VCC3V3";
The SoC temperature can be retrieved from ADC channel 8 on all 32-bit SoCs (Meson6, Meson8, Meson8b and Meson8m2). Move the iio-hwmon instance to meson.dtsi instead of duplicating it in all board.dts. If the temperature sensor calibration data is missing for a board then iio-hwmon will simply not probe. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- arch/arm/boot/dts/meson.dtsi | 5 +++++ arch/arm/boot/dts/meson8b-ec100.dts | 5 ----- arch/arm/boot/dts/meson8b-mxq.dts | 5 ----- arch/arm/boot/dts/meson8b-odroidc1.dts | 5 ----- arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 5 ----- 5 files changed, 5 insertions(+), 20 deletions(-)