ARM: dts: sync amlogic G12A/G12B/SM1 DT from Linux 5.8-rc1

[platform/kernel/u-boot.git] / arch / arm / dts / meson-g12.dtsi

diff --git a/arch/arm/dts/meson-g12.dtsi b/arch/arm/dts/meson-g12.dtsi
index 55d3902..6a1f4dc 100644 (file)
--- a/arch/arm/dts/meson-g12.dtsi
+++ b/arch/arm/dts/meson-g12.dtsi
@@ -343,6 +343,15 @@
                        status = "disabled";
                };
 
+               toacodec: audio-controller@740 {
+                       compatible = "amlogic,g12a-toacodec";
+                       reg = <0x0 0x740 0x0 0x4>;
+                       #sound-dai-cells = <1>;
+                       sound-name-prefix = "TOACODEC";
+                       resets = <&clkc_audio AUD_RESET_TOACODEC>;
+                       status = "disabled";
+               };
+
                tohdmitx: audio-controller@744 {
                        compatible = "amlogic,g12a-tohdmitx";
                        reg = <0x0 0x744 0x0 0x4>;
@@ -354,29 +363,6 @@
        };
 };
 
-&cpu_thermal {
-       cooling-maps {
-               map0 {
-                       trip = <&cpu_passive>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-               map1 {
-                       trip = <&cpu_hot>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                        <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
 &ethmac {
        power-domains = <&pwrc PWRC_G12A_ETH_ID>;
 };