mediatek: re-add dropped properties on BPi-R3

Unfortunately some device tree properties have slipped under the table
when switching from our downstream device tree.

Bring back 3W power for SFP cages and restore thermal trip points to
make sense again.

Fixes: 7a0ec001ff ("mediatek: sync MT7986 device trees with upstream")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 06a150aed795066ce79a623011884cc0abf290f1)

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
index af4a4309bda4b93191601f6e38fc6044211278a9..1d3c575b7d4c4233cce890f4cdc1a746a796d969 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
@@ -129,6 +129,7 @@
                mod-def0-gpios = <&pio 49 GPIO_ACTIVE_LOW>;
                tx-disable-gpios = <&pio 20 GPIO_ACTIVE_HIGH>;
                tx-fault-gpios = <&pio 7 GPIO_ACTIVE_HIGH>;
+               maximum-power-milliwatt = <3000>;
        };
 
        /* right SFP cage (lan) */
@@ -139,6 +140,7 @@
                mod-def0-gpios = <&pio 47 GPIO_ACTIVE_LOW>;
                tx-disable-gpios = <&pio 15 GPIO_ACTIVE_HIGH>;
                tx-fault-gpios = <&pio 48 GPIO_ACTIVE_HIGH>;
+               maximum-power-milliwatt = <3000>;
        };
 };
 
@@ -150,16 +152,16 @@
                        trip = <&cpu_trip_active_high>;
                };
 
-               cpu-active-low {
+               cpu-active-med {
                        /* active: set fan to cooling level 1 */
                        cooling-device = <&fan 1 1>;
-                       trip = <&cpu_trip_active_low>;
+                       trip = <&cpu_trip_active_med>;
                };
 
-               cpu-passive {
-                       /* passive: set fan to cooling level 0 */
+               cpu-active-low {
+                       /* active: set fan to cooling level 0 */
                        cooling-device = <&fan 0 0>;
-                       trip = <&cpu_trip_passive>;
+                       trip = <&cpu_trip_active_low>;
                };
        };
 };

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
index 68539ea788dfcce5e52cb996693de7766607e05e..64f2cf3756a8b89ac8ed8cb8f50fdaeafcf632f1 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
@@ -610,22 +610,34 @@
                        thermal-sensors = <&thermal 0>;
 
                        trips {
+                               cpu_trip_crit: crit {
+                                       temperature = <125000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+
+                               cpu_trip_hot: hot {
+                                       temperature = <120000>;
+                                       hysteresis = <2000>;
+                                       type = "hot";
+                               };
+
                                cpu_trip_active_high: active-high {
                                        temperature = <115000>;
                                        hysteresis = <2000>;
                                        type = "active";
                                };
 
-                               cpu_trip_active_low: active-low {
+                               cpu_trip_active_med: active-med {
                                        temperature = <85000>;
                                        hysteresis = <2000>;
                                        type = "active";
                                };
 
-                               cpu_trip_passive: passive {
-                                       temperature = <40000>;
+                               cpu_trip_active_low: active-low {
+                                       temperature = <60000>;
                                        hysteresis = <2000>;
-                                       type = "passive";
+                                       type = "active";
                                };
                        };
                };

diff --git a/target/linux/mediatek/patches-5.15/195-dts-mt7986a-bpi-r3-leds-port-names-and-wifi-eeprom.patch b/target/linux/mediatek/patches-5.15/195-dts-mt7986a-bpi-r3-leds-port-names-and-wifi-eeprom.patch
index 7126da788beabae4df550478b7f0abbef1ab4dc6..336920bafea67a6f0b89abf518b171d3838f8a2e 100644 (file)
--- a/target/linux/mediatek/patches-5.15/195-dts-mt7986a-bpi-r3-leds-port-names-and-wifi-eeprom.patch
+++ b/target/linux/mediatek/patches-5.15/195-dts-mt7986a-bpi-r3-leds-port-names-and-wifi-eeprom.patch
@@ -11,7 +11,7 @@
        };
  
        chosen {
-@@ -417,27 +421,27 @@
+@@ -419,27 +423,27 @@
  
                port@1 {
                        reg = <1>;
@@ -44,7 +44,7 @@
                        phy-mode = "2500base-x";
                        sfp = <&sfp2>;
                        managed = "in-band-status";
-@@ -488,9 +492,137 @@
+@@ -490,9 +494,137 @@
  
  &wifi {
        status = "okay";