Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 25d5c7c659825d3b6b3d9a24574d14e06e9be310

Authored by Eric Lee
1 parent 6508f03b07
Exists in v3.2_SMARCT335xPSP_04.06.00.11 and in 2 other branches v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN

Add 0001-mach-omap2-pm33xx-Disable-VT-switch.patch that wasn't part of the offic… 

…ial PSP 04.06.00.11 release

Showing 3 changed files with 15 additions and 0 deletions Side-by-side Diff

arch/arm/configs/am335x_evm_defconfig
Diff comments   View file @ 25d5c7c
... ... @@ -325,6 +325,7 @@
325 325 CONFIG_MACH_AM335XEVM=y
326 326 CONFIG_MACH_AM335XIAEVM=y
327 327 # CONFIG_OMAP3_EMU is not set
  328 +CONFIG_TI_PM_DISABLE_VT_SWITCH=y
328 329 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
329 330 CONFIG_OMAP3_EDMA=y
330 331  
arch/arm/mach-omap2/Kconfig
Diff comments   View file @ 25d5c7c
... ... @@ -372,6 +372,15 @@
372 372 help
373 373 Say Y here to enable debugging hardware of omap3
374 374  
  375 +config TI_PM_DISABLE_VT_SWITCH
  376 + bool "TI Disable PM Console Switch"
  377 + depends on ARCH_OMAP3
  378 + default y
  379 + help
  380 + This option disables the default PM VT switch behavior for TI devices.
  381 + Some platforms hang during suspend due to a failed attempt to
  382 + perform the VT switch. The VT switch is unnecessary on many platforms.
  383 +
375 384 config OMAP3_SDRC_AC_TIMING
376 385 bool "Enable SDRC AC timing register changes"
377 386 depends on ARCH_OMAP3
arch/arm/mach-omap2/pm33xx.c
Diff comments   View file @ 25d5c7c
... ... @@ -615,6 +615,11 @@
615 615 pr_info("Power Management for AM33XX family\n");
616 616  
617 617 #ifdef CONFIG_SUSPEND
  618 +
  619 +#ifdef CONFIG_TI_PM_DISABLE_VT_SWITCH
  620 + pm_set_vt_switch(0);
  621 +#endif
  622 +
618 623 /* Read SDRAM_CONFIG register to determine Memory Type */
619 624 base = am33xx_get_ram_base();
620 625 reg = readl(base + EMIF4_0_SDRAM_CONFIG);