Skip to contentSkip to conversation

ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX

PATCH Applied Fabio Estevam 2 participants 2 messages May 13, 2019 – May 20, 2019

Subsystems (4)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/1 ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX

Since commit 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") some characters loss is noticed on i.MX6ULL UART as reported by Christoph Niedermaier.

The intention of such commit was to increase the SW2ISO field for i.MX6SX only, but since cpuidle-imx6sx is also used on i.MX6UL/i.MX6ULL this caused unintended side effects on other SoCs.

Fix this problem by keeping the original SW2ISO value for i.MX6UL/i.MX6ULL and only increase SW2ISO in the i.MX6SX case.

Fixes 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx")

---
Changes since v1:
- Simplify the code by using the C ternary operator so that the patch can be backported all the way to kernel 4.4

 arch/arm/mach-imx/cpuidle-imx6sx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-imx/cpuidle-imx6sx.c +2 -1
index fd0053e47a15..4016b717da1b 100644
@@ -15,6 +15,7 @@
 
 #include "common.h"
 #include "cpuidle.h"
+#include "hardware.h"
 
 static int imx6sx_idle_finish(unsigned long val)
 {
@@ -110,7 +111,7 @@ int __init imx6sx_cpuidle_init(void)
 	 * except for power up sw2iso which need to be
 	 * larger than LDO ramp up time.
 	 */
-	imx_gpc_set_arm_power_up_timing(0xf, 1);
+	imx_gpc_set_arm_power_up_timing(cpu_is_imx6sx() ? 0xf : 0x2, 1);
 	imx_gpc_set_arm_power_down_timing(1, 1);
 
 	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);
Signature · 1 line
2.17.1
Applied
#1 lore raw
Quoted 11 lines · Fabio Estevam

Since commit 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") some characters loss is noticed on i.MX6ULL UART as reported by Christoph Niedermaier.

The intention of such commit was to increase the SW2ISO field for i.MX6SX only, but since cpuidle-imx6sx is also used on i.MX6UL/i.MX6ULL this caused unintended side effects on other SoCs.

Fix this problem by keeping the original SW2ISO value for i.MX6UL/i.MX6ULL and only increase SW2ISO in the i.MX6SX case.

Quoted 6 lines
Fixes 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx")

Applied, thanks.