Commit f7d488be authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.0-next-dts32' of... 

Merge tag 'v5.0-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

mt7623:
- add cooling mask to all CPUs
- add compatible to sysirq binding

* tag 'v5.0-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux

:
  dt-bindings: interrupt-controller: update bindings for MT7623
  ARM: dts: mt7623: Add all CPUs in cooling maps

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1228c051 60b71a23

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
	"mediatek,mt8135-sysirq", "mediatek,mt6577-sysirq": for MT8135

	"mediatek,mt8127-sysirq", "mediatek,mt6577-sysirq": for MT8127

	"mediatek,mt7622-sysirq", "mediatek,mt6577-sysirq": for MT7622

	"mediatek,mt7623-sysirq", "mediatek,mt6577-sysirq": for MT7623

	"mediatek,mt6795-sysirq", "mediatek,mt6577-sysirq": for MT6795

	"mediatek,mt6797-sysirq", "mediatek,mt6577-sysirq": for MT6797

	"mediatek,mt6765-sysirq", "mediatek,mt6577-sysirq": for MT6765

arch/arm/boot/dts/mt7623.dtsi

+12 −3
Original line number Diff line number Diff line
@@ -187,17 +187,26 @@ 
			cooling-maps {

				map0 {

					trip = <&cpu_passive>;

					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					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>;

				};



				map1 {

					trip = <&cpu_active>;

					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					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>;

				};



				map2 {

					trip = <&cpu_hot>;

					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					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>;

				};

			};

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE