Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5340965867407108d0db50b9e5c1c30e71233ef8

Authored by Dave Gerlach
Committed by Darren Etheridge
1 parent 938ee203d6
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

ARM: OMAP2+: am43xx: Add context offset for dss hwmod 

Add context_offs to the DSS hwmod for am43xx as the driver uses the
context loss count to determine whether or not to restore context to the
module. Also add prcm flag indicating this bit is valid. Without this the
display does not return after a suspend cycle.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>

Showing 2 changed files with 5 additions and 0 deletions Side-by-side Diff

arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Diff comments   View file @ 5340965
... ... @@ -1921,7 +1921,9 @@
1921 1921 .prcm = {
1922 1922 .omap4 = {
1923 1923 .clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
  1924 + .context_offs = AM43XX_PRM_RM_PER_DSS_CONTEXT,
1924 1925 .modulemode = MODULEMODE_SWCTRL,
  1926 + .flags = HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT,
1925 1927 },
1926 1928 },
1927 1929 };
arch/arm/mach-omap2/prcm43xx.h
Diff comments   View file @ 5340965
... ... @@ -25,6 +25,9 @@
25 25 #define AM43XX_PRM_WKUP_INST 0x2000
26 26 #define AM43XX_PRM_DEVICE_INST 0x4000
27 27  
  28 +/* PRM.PRM_PER offsets */
  29 +#define AM43XX_PRM_RM_PER_DSS_CONTEXT 0x0A24
  30 +
28 31 /* RM RSTCTRL offsets */
29 32 #define AM43XX_RM_PER_RSTCTRL_OFFSET 0x0010
30 33 #define AM43XX_RM_GFX_RSTCTRL_OFFSET 0x0010