mediatek: filogic: set correct PWM clock and clean thermal zone

 * set correct clocks for PWM to work.
 * MT7986 PWM does have the 26MHz-clock-select, set that in patch
 * drop useless 'passive' trip point in thermal zone
 * extend pwm-fan to have 3 active operating points
 * set reasonable trip points in thermal zone
 * invert pwm-fan operating points and set shorter period to allow
   less noisy operation of the PWM fan of the BPi-R3.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts
index 37588e2ac408f7a9810eebe7045bebe8afe2835d..8e47cb85790b468427051a7ac5ea6bc1f0a90775 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts
+++ b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts
@@ -447,7 +447,8 @@
 };
 
 &fan {
-       pwms = <&pwm 0 500000 0>;
+       pwms = <&pwm 0 10000 0>;
+       cooling-levels = <255 96 52 0>;
        status = "okay";
 };
 

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 ade4cebbd59495392dc213ab203b64cad4747881..be82acd204c9c934ca559497ba6c9f4a8393607e 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
@@ -206,8 +206,8 @@
                        #clock-cells = <1>;
                        #pwm-cells = <2>;
                        interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&topckgen CLK_TOP_PWM_SEL>,
-                                <&infracfg CLK_INFRA_PWM_BSEL>,
+                       clocks = <&infracfg CLK_INFRA_PWM_HCK>,
+                                <&infracfg CLK_INFRA_PWM_STA>,
                                 <&infracfg CLK_INFRA_PWM1_CK>,
                                 <&infracfg CLK_INFRA_PWM2_CK>;
                        clock-names = "top", "main", "pwm1", "pwm2";
@@ -664,8 +664,8 @@
 
        fan: pwm-fan {
                compatible = "pwm-fan";
-               /* cooling level (0, 1, 2) : (0% duty, 50% duty, 100% duty) */
-               cooling-levels = <0 128 255>;
+               /* cooling level (0, 1, 2, 3) : (0% duty, 33% duty, 66% duty, 100% duty) */
+               cooling-levels = <0 86 172 255>;
                #cooling-cells = <2>;
                status = "disabled";
        };
@@ -694,14 +694,14 @@
                                        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";
                                };
@@ -709,24 +709,23 @@
 
                        cooling-maps {
                                cpu-active-high {
+                                       /* active: set fan to cooling level 3 */
+                                       cooling-device = <&fan 3 3>;
+                                       trip = <&cpu_trip_active_high>;
+                               };
+
+                               cpu-active-med {
                                        /* active: set fan to cooling level 2 */
                                        cooling-device = <&fan 2 2>;
-                                       trip = <&cpu_trip_active_high>;
+                                       trip = <&cpu_trip_active_med>;
                                };
 
                                cpu-active-low {
-                                       /* active: set fan to cooling level 1 */
+                                       /* passive: set fan to cooling level 1 */
                                        cooling-device = <&fan 1 1>;
                                        trip = <&cpu_trip_active_low>;
                                };
-
-                               cpu-passive {
-                                       /* passive: set fan to cooling level 0 */
-                                       cooling-device = <&fan 0 0>;
-                                       trip = <&cpu_trip_passive>;
-                               };
                        };
-
                };
        };
 };

diff --git a/target/linux/mediatek/patches-5.15/804-pwm-add-mt7986-support.patch b/target/linux/mediatek/patches-5.15/804-pwm-add-mt7986-support.patch
index fe095c5633a6d0cd2b67823c6d74de9a8c0a88a3..7a10dac051c020e9c1ebf91871f1d2c66741ab4a 100644 (file)
--- a/target/linux/mediatek/patches-5.15/804-pwm-add-mt7986-support.patch
+++ b/target/linux/mediatek/patches-5.15/804-pwm-add-mt7986-support.patch
@@ -7,7 +7,7 @@
 +static const struct pwm_mediatek_of_data mt7986_pwm_data = {
 +      .num_pwms = 2,
 +      .pwm45_fixup = false,
-+      .has_ck_26m_sel = false,
++      .has_ck_26m_sel = true,
 +};
 +
  static const struct pwm_mediatek_of_data mt8516_pwm_data = {