From: Nishanth Menon <nm@ti.com>
To: linux-omap <linux-omap@vger.kernel.org>
Cc: Nishanth Menon <nm@ti.com>,
Ameya Palande <ameya.palande@nokia.com>,
Deepak Chitriki <deepak.chitriki@ti.com>,
Felipe Contreras <felipe.contreras@nokia.com>,
Hiroshi Doyu <hiroshi.doyu@nokia.com>,
Omar Ramirez Luna <omar.ramirez@ti.com>,
Romit Dasgupta <romit@ti.com>
Subject: [PATCH 2/2 v2] DSPBRIDGE: pm: use old implementation for opps
Date: Tue, 2 Feb 2010 01:17:26 -0600 [thread overview]
Message-ID: <1265095046-25253-3-git-send-email-nm@ti.com> (raw)
In-Reply-To: <1265095046-25253-2-git-send-email-nm@ti.com>
Use the old implementation for OPP list generation and update.
this is a 1-1 implementation of what we had previously without
support for 3630.
Cc: Ameya Palande <ameya.palande@nokia.com>
Cc: Deepak Chitriki <deepak.chitriki@ti.com>
Cc: Felipe Contreras <felipe.contreras@nokia.com>
Cc: Hiroshi Doyu <hiroshi.doyu@nokia.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Romit Dasgupta <romit@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Ref:
v1: http://marc.info/?t=126402609100007&r=1&w=2
v2: comment fixes from v1
arch/arm/mach-omap2/dspbridge.c | 65 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/dspbridge.c b/arch/arm/mach-omap2/dspbridge.c
index 8b71e5f..0bcbf2e 100644
--- a/arch/arm/mach-omap2/dspbridge.c
+++ b/arch/arm/mach-omap2/dspbridge.c
@@ -42,7 +42,70 @@ static struct dspbridge_platform_data dspbridge_pdata __initdata = {
static int get_opp_table(struct dspbridge_platform_data *pdata)
{
#ifdef CONFIG_BRIDGE_DVFS
- /* Do nothing now - fill based on PM implementation */
+ /*
+ * TODO: The following code is a direct replacement
+ * improvements are possible.
+ */
+ /* legacy values for 3430 */
+ u32 vdd1_dsp_freq[6][4] = {
+ {0, 0, 0, 0},
+ /*OPP1*/
+ {0, 90000, 0, 86000},
+ /*OPP2*/
+ {0, 180000, 80000, 170000},
+ /*OPP3*/
+ {0, 360000, 160000, 340000},
+ /*OPP4*/
+ {0, 396000, 325000, 376000},
+ /*OPP5*/
+ {0, 430000, 355000, 430000},
+ };
+ struct omap_opp vdd1_rate_table_bridge[] = {
+ {0, 0, 0},
+ /*OPP1*/
+ {S125M, VDD1_OPP1, 0},
+ /*OPP2*/
+ {S250M, VDD1_OPP2, 0},
+ /*OPP3*/
+ {S500M, VDD1_OPP3, 0},
+ /*OPP4*/
+ {S550M, VDD1_OPP4, 0},
+ /*OPP5*/
+ {S600M, VDD1_OPP5, 0},
+ };
+ pdata->mpu_num_speeds = VDD1_OPP5;
+ pdata->mpu_speeds = kzalloc(sizeof(u32) * (pdata->mpu_num_speeds + 1),
+ GFP_KERNEL);
+ if (!pdata->mpu_speeds) {
+ pr_err("%s: unable to allocate memory for the mpu"
+ "frequencies\n", __func__);
+ return -ENOMEM;
+ }
+ pdata->dsp_num_speeds = VDD1_OPP5;
+ pdata->dsp_freq_table = kzalloc(
+ sizeof(struct dsp_shm_freq_table) *
+ (pdata->dsp_num_speeds + 1), GFP_KERNEL);
+ if (!pdata->dsp_freq_table) {
+ pr_err("%s: unable to allocate memory for the dsp"
+ "frequencies\n", __func__);
+ kfree(pdata->mpu_speeds);
+ pdata->mpu_speeds = NULL;
+ return -ENOMEM;
+ }
+ for (i = 0; i <= pdata->mpu_num_speeds; i++)
+ pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate;
+ pdata->mpu_max_speed = pdata->mpu_speed[VDD1_OPP5];
+ pdata->mpu_min_speed = pdata->mpu_speed[VDD1_OPP1];
+
+ for (i = 0; i <= pdata->dsp_num_speeds; i++) {
+ pdata->dsp_freq_table[i].u_volts =
+ vdd1_dsp_freq[i][0];
+ pdata->dsp_freq_table[i].dsp_freq = vdd1_dsp_freq[i][1];
+ pdata->dsp_freq_table[i].thresh_min_freq =
+ vdd1_dsp_freq[i][2];
+ pdata->dsp_freq_table[i].thresh_max_freq =
+ vdd1_dsp_freq[i][3];
+ }
#endif
return 0;
}
--
1.6.3.3
next prev parent reply other threads:[~2010-02-02 7:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-02 7:17 [PATCH 0/2 v2] DSPBRIDGE: cleanup OPP handling Nishanth Menon
2010-02-02 7:17 ` [PATCH 1/2 v2] DSPBRIDGE: remove dependency of mpu freq Nishanth Menon
2010-02-02 7:17 ` Nishanth Menon [this message]
2010-02-02 13:00 ` Felipe Contreras
2010-02-02 13:41 ` Menon, Nishanth
2010-02-02 13:44 ` Felipe Contreras
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=1265095046-25253-3-git-send-email-nm@ti.com \
--to=nm@ti.com \
--cc=ameya.palande@nokia.com \
--cc=deepak.chitriki@ti.com \
--cc=felipe.contreras@nokia.com \
--cc=hiroshi.doyu@nokia.com \
--cc=linux-omap@vger.kernel.org \
--cc=omar.ramirez@ti.com \
--cc=romit@ti.com \
/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