ARM: dts: amlogic updates for v5.12
- add thermal zones with cooling configuration -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmAa9fgACgkQWTcYmtP7 xmU+Mg/9HEEEaD8Z5f0Fwv4U5DMC0RjmXgtsiZqGfNd2laG0FAPzq4eaTdwDybtQ VZBmmjx9FfO8oCW/gm3UGqBVOOxuZ1F/OFGd5DeHnKaevgJC2E3+x2jrunwzoeiI nUMyRd660WGqTvZDq74YLUJcenFBUN/5jTeefGW/ZDx/xgTFWA+k2d62yXi6C8jG p1CuggxbDMe+wmgcicDqVGnAm9j7uNYlS7zlWiVDcuMjJLxhMBnpHpYy+XAS/Bu4 X9dRCY683OtpmZNkG25wjKk0VPdu+RrBW5HlARBO7FWOWx03CzX3jMCnQkCwF1cV pfBfTvCc/nG3JAvxpsziwo6jb1ZKcAud3i8AYb9qQrhT26VtqHV+kJPUiUPSvX+t p5XYD9ZDaMa1zT+cKzs+YBSRn/hnuTgZw419IXoVd+iELw9dYODIekj/lJSm5rNS DnAl+cukueFriDArZkxBfWVA3fRBu8vJDfdgZTILUZQplvSsyMn0y470wh9+znrD srIZ3bnbGEcA/RgVX27WlxmTycLvnwwIZ7slwheEbNKlj70w/ZON+5Vv1aNkIJzq q1437QzZ6wRKE9voX8LITs9oiZqh2CRQ34QN+WxQvhPhPdsl+kVRLTXNXOZ3SSvC JWHNJRJ8l+VP7vkb+JRbRnJ3ETw6ZeG1AylDtplcMLrlrqBL40k= =Q9GJ -----END PGP SIGNATURE----- Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt ARM: dts: amlogic updates for v5.12 - add thermal zones with cooling configuration * tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: dts: meson8b: add the thermal-zones with cooling configuration ARM: dts: meson8: add the thermal-zones with cooling configuration ARM: dts: meson: add the ADC thermal sensor to meson.dtsi ARM: dts: meson: move iio-hwmon for the SoC temperature to meson.dtsi Link: https://lore.kernel.org/r/7ho8h12bto.fsf@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
02bb4cb4c4
@ -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>;
|
||||
@ -293,6 +298,13 @@
|
||||
};
|
||||
};
|
||||
|
||||
thermal_sensor: thermal-sensor {
|
||||
compatible = "generic-adc-thermal";
|
||||
#thermal-sensor-cells = <0>;
|
||||
io-channels = <&saradc 8>;
|
||||
io-channel-names = "sensor-channel";
|
||||
};
|
||||
|
||||
xtal: xtal-clk {
|
||||
compatible = "fixed-clock";
|
||||
clock-frequency = <24000000>;
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
#include <dt-bindings/power/meson8-power.h>
|
||||
#include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
|
||||
#include <dt-bindings/reset/amlogic,meson8b-reset.h>
|
||||
#include <dt-bindings/thermal/thermal.h>
|
||||
#include "meson.dtsi"
|
||||
|
||||
/ {
|
||||
@ -28,6 +29,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU0_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
|
||||
cpu1: cpu@201 {
|
||||
@ -39,6 +41,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU1_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
|
||||
cpu2: cpu@202 {
|
||||
@ -50,6 +53,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU2_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
|
||||
cpu3: cpu@203 {
|
||||
@ -61,6 +65,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU3_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
};
|
||||
|
||||
@ -190,6 +195,54 @@
|
||||
};
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
soc {
|
||||
polling-delay-passive = <250>; /* milliseconds */
|
||||
polling-delay = <1000>; /* milliseconds */
|
||||
thermal-sensors = <&thermal_sensor>;
|
||||
|
||||
cooling-maps {
|
||||
map0 {
|
||||
trip = <&soc_passive>;
|
||||
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
};
|
||||
|
||||
map1 {
|
||||
trip = <&soc_hot>;
|
||||
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
};
|
||||
};
|
||||
|
||||
trips {
|
||||
soc_passive: soc-passive {
|
||||
temperature = <80000>; /* millicelsius */
|
||||
hysteresis = <2000>; /* millicelsius */
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
soc_hot: soc-hot {
|
||||
temperature = <90000>; /* millicelsius */
|
||||
hysteresis = <2000>; /* millicelsius */
|
||||
type = "hot";
|
||||
};
|
||||
|
||||
soc_critical: soc-critical {
|
||||
temperature = <110000>; /* millicelsius */
|
||||
hysteresis = <2000>; /* millicelsius */
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mmcbus: bus@c8000000 {
|
||||
compatible = "simple-bus";
|
||||
reg = <0xc8000000 0x8000>;
|
||||
@ -254,6 +307,7 @@
|
||||
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;
|
||||
clock-names = "bus", "core";
|
||||
operating-points-v2 = <&gpu_opp_table>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
};
|
||||
}; /* end of / */
|
||||
|
||||
@ -70,11 +70,6 @@
|
||||
timeout-ms = <20000>;
|
||||
};
|
||||
|
||||
iio-hwmon {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&saradc 8>;
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
|
||||
|
||||
@ -27,11 +27,6 @@
|
||||
reg = <0x40000000 0x40000000>;
|
||||
};
|
||||
|
||||
iio-hwmon {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&saradc 8>;
|
||||
};
|
||||
|
||||
vcck: regulator-vcck {
|
||||
compatible = "pwm-regulator";
|
||||
|
||||
|
||||
@ -85,11 +85,6 @@
|
||||
1800000 1>;
|
||||
};
|
||||
|
||||
iio-hwmon {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&saradc 8>;
|
||||
};
|
||||
|
||||
rtc32k_xtal: rtc32k-xtal-clk {
|
||||
/* X3 in the schematics */
|
||||
compatible = "fixed-clock";
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
#include <dt-bindings/power/meson8-power.h>
|
||||
#include <dt-bindings/reset/amlogic,meson8b-reset.h>
|
||||
#include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
|
||||
#include <dt-bindings/thermal/thermal.h>
|
||||
#include "meson.dtsi"
|
||||
|
||||
/ {
|
||||
@ -26,6 +27,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU0_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
|
||||
cpu1: cpu@201 {
|
||||
@ -37,6 +39,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU1_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
|
||||
cpu2: cpu@202 {
|
||||
@ -48,6 +51,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU2_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
|
||||
cpu3: cpu@203 {
|
||||
@ -59,6 +63,7 @@
|
||||
resets = <&clkc CLKC_RESET_CPU3_SOFT_RESET>;
|
||||
operating-points-v2 = <&cpu_opp_table>;
|
||||
clocks = <&clkc CLKID_CPUCLK>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
};
|
||||
|
||||
@ -167,6 +172,54 @@
|
||||
};
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
soc {
|
||||
polling-delay-passive = <250>; /* milliseconds */
|
||||
polling-delay = <1000>; /* milliseconds */
|
||||
thermal-sensors = <&thermal_sensor>;
|
||||
|
||||
cooling-maps {
|
||||
map0 {
|
||||
trip = <&soc_passive>;
|
||||
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
};
|
||||
|
||||
map1 {
|
||||
trip = <&soc_hot>;
|
||||
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
<&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
};
|
||||
};
|
||||
|
||||
trips {
|
||||
soc_passive: soc-passive {
|
||||
temperature = <80000>; /* millicelsius */
|
||||
hysteresis = <2000>; /* millicelsius */
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
soc_hot: soc-hot {
|
||||
temperature = <90000>; /* millicelsius */
|
||||
hysteresis = <2000>; /* millicelsius */
|
||||
type = "hot";
|
||||
};
|
||||
|
||||
soc_critical: soc-critical {
|
||||
temperature = <110000>; /* millicelsius */
|
||||
hysteresis = <2000>; /* millicelsius */
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mmcbus: bus@c8000000 {
|
||||
compatible = "simple-bus";
|
||||
reg = <0xc8000000 0x8000>;
|
||||
@ -221,6 +274,7 @@
|
||||
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;
|
||||
clock-names = "bus", "core";
|
||||
operating-points-v2 = <&gpu_opp_table>;
|
||||
#cooling-cells = <2>; /* min followed by max */
|
||||
};
|
||||
};
|
||||
}; /* end of / */
|
||||
|
||||
@ -45,11 +45,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
iio-hwmon {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&saradc 8>;
|
||||
};
|
||||
|
||||
vcc_3v3: regulator-vcc3v3 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "VCC3V3";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user