Merge "[Bugfix][API-1483] mtk patch for rcu schedule" into GSW3.0-No-Connman
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/mt2735.dtsi b/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/mt2735.dtsi
index 19f1b9b..c233f90 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/mt2735.dtsi
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/mt2735.dtsi
@@ -156,7 +156,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -168,7 +167,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -180,7 +178,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -192,7 +189,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -214,6 +210,7 @@
};
};
+#if 0
idle-states {
entry-method = "arm,psci";
cpuoff_l: cpuoff_l {
@@ -241,6 +238,7 @@
min-residency-us = <2600>;
};
};
+#endif
};
diff --git a/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/mt2735.dtsi b/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/mt2735.dtsi
index ad2444c..cac4d53 100644
--- a/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/mt2735.dtsi
+++ b/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/mt2735.dtsi
@@ -136,7 +136,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l &mcusysoff>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -148,7 +147,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l &mcusysoff>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -159,7 +157,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l &mcusysoff>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -171,7 +168,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l &mcusysoff>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -183,7 +179,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l &mcusysoff>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -194,7 +189,6 @@
enable-method = "psci";
clock-frequency = <1701000000>;
operating-points-v2 = <&cluster0_opp>;
- cpu-idle-states = <&cpuoff_l &clusteroff_l &mcusysoff>;
dynamic-power-coefficient = <85>;
#cooling-cells = <2>;
};
@@ -225,6 +219,7 @@
};
};
+#if 0
idle-states {
entry-method = "arm,psci";
cpuoff_l: cpuoff_l {
@@ -252,6 +247,7 @@
min-residency-us = <2600>;
};
};
+#endif
};
diff --git a/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c b/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c
index 6f5ad6b..0e2fd79 100644
--- a/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c
+++ b/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c
@@ -833,8 +833,11 @@
MT_LPM_ISSUER_CPUIDLE,
"MCUSYSOFF", NULL);
mtk_logger_help.prev = mtk_logger_help.cur;
- } else
+ }
+ /*
+ else
pr_info("[name:spm&][SPM] MCUSYSOFF Didn't enter low power scenario\n");
+ */
timer->fired = info->fired;
return 0;