Commit ba42f1918e7ba64000a192524d05d59db3dbb73c
Exists in
ti-linux-3.12.y
and in
3 other branches
Merge branch 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-lin…
…ux-kernel/audio-display-linux-feature-tree into ti-linux-3.12.y TI-Feature: audio-display TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git TI-Branch: audio-display-ti-linux-3.12.y * 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree: ARM: OMAP2+: am43xx: Add context offset for dss hwmod Signed-off-by: Dan Murphy <DMurphy@ti.com>
Showing 2 changed files Side-by-side Diff
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
| ... | ... | @@ -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
| ... | ... | @@ -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 |