From: d-gerlach@ti.com (Dave Gerlach)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] ARM: OMAP2+: sram: remove legacy OMAP3 code
Date: Mon, 9 May 2016 16:49:26 -0500 [thread overview]
Message-ID: <1462830566-28708-7-git-send-email-d-gerlach@ti.com> (raw)
In-Reply-To: <1462830566-28708-1-git-send-email-d-gerlach@ti.com>
Now that we have converted OMAP3 PM code to use generic sram driver we
no longer need to provide OMAP3 specific SRAM code for the omap SRAM
API.
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
---
arch/arm/mach-omap2/pm34xx.c | 16 ----------------
arch/arm/mach-omap2/sram.c | 23 -----------------------
2 files changed, 39 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 5ebbf5c30c6e..22d4c8742f99 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -502,22 +502,6 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
return omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
}
-/*
- * Push functions to SRAM
- *
- * The minimum set of functions is pushed to SRAM for execution:
- * - omap3_do_wfi for erratum i581 WA,
- * - save_secure_ram_context for security extensions.
- */
-void omap_push_sram_idle(void)
-{
- omap3_do_wfi_sram = omap_sram_push(omap3_do_wfi, omap3_do_wfi_sz);
-
- if (omap_type() != OMAP2_DEVICE_TYPE_GP)
- _omap_save_secure_sram = omap_sram_push(save_secure_ram_context,
- save_secure_ram_context_sz);
-}
-
static void __init pm_errata_configure(void)
{
if (cpu_is_omap3630()) {
diff --git a/arch/arm/mach-omap2/sram.c b/arch/arm/mach-omap2/sram.c
index 83d0e61f49e6..7881304b5205 100644
--- a/arch/arm/mach-omap2/sram.c
+++ b/arch/arm/mach-omap2/sram.c
@@ -209,27 +209,6 @@ static inline int omap243x_sram_init(void)
}
#endif
-#ifdef CONFIG_ARCH_OMAP3
-
-void omap3_sram_restore_context(void)
-{
- omap_sram_reset();
-
- omap_push_sram_idle();
-}
-
-static inline int omap34xx_sram_init(void)
-{
- omap3_sram_restore_context();
- return 0;
-}
-#else
-static inline int omap34xx_sram_init(void)
-{
- return 0;
-}
-#endif /* CONFIG_ARCH_OMAP3 */
-
int __init omap_sram_init(void)
{
omap_detect_sram();
@@ -239,8 +218,6 @@ int __init omap_sram_init(void)
omap242x_sram_init();
else if (cpu_is_omap2430())
omap243x_sram_init();
- else if (cpu_is_omap34xx())
- omap34xx_sram_init();
return 0;
}
--
2.7.3
prev parent reply other threads:[~2016-05-09 21:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 21:49 [PATCH 0/6] ARM: OMAP3: Convert OMAP3 PM code to use generic sram driver Dave Gerlach
2016-05-09 21:49 ` [PATCH 1/6] Documentation: sram: ti: Add TI SRAM bindings Dave Gerlach
2016-05-09 21:49 ` [PATCH 2/6] ARM: dts: omap3: Add ocmcram node Dave Gerlach
2016-05-09 21:49 ` [PATCH 3/6] ARM: dts: omap3-n900: Add secure reserved region to " Dave Gerlach
2016-05-09 21:49 ` [PATCH 4/6] ARM: OMAP2+: pm34xx: Convert to use generic sram driver for idle code Dave Gerlach
2016-05-09 21:49 ` [PATCH 5/6] ARM: OMAP2+: Remove legacy sram init code for omap3 platforms Dave Gerlach
2016-05-09 21:49 ` Dave Gerlach [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462830566-28708-7-git-send-email-d-gerlach@ti.com \
--to=d-gerlach@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).