diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
commit | 7ad3423ebb02f340671f70a916bdc8dbec7573ee (patch) | |
tree | b9168d363c24f2af2626e63011ec1f6c81e81d09 /arch/arm/mach-omap2/omap-secure.c | |
parent | 56a23ee52611ca76421f3d7cac100e1616716dae (diff) | |
parent | 44be77c590f381bc629815ac789b8b15ecc4ddcf (diff) | |
download | talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.tar.gz talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.zip |
Merge branch 'for-linus' into for-next
Back-merge the upstream branch for applying further cleanup patches
for HD-Audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/arm/mach-omap2/omap-secure.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-secure.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c index 5ac122e88f67..fa7f308c9027 100644 --- a/arch/arm/mach-omap2/omap-secure.c +++ b/arch/arm/mach-omap2/omap-secure.c @@ -73,6 +73,27 @@ phys_addr_t omap_secure_ram_mempool_base(void) return omap_secure_memblock_base; } +#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) +u32 omap3_save_secure_ram(void __iomem *addr, int size) +{ + u32 ret; + u32 param[5]; + + if (size != OMAP3_SAVE_SECURE_RAM_SZ) + return OMAP3_SAVE_SECURE_RAM_SZ; + + param[0] = 4; /* Number of arguments */ + param[1] = __pa(addr); /* Physical address for saving */ + param[2] = 0; + param[3] = 1; + param[4] = 1; + + ret = save_secure_ram_context(__pa(param)); + + return ret; +} +#endif + /** * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls * @idx: The PPA API index |