From: Kevin Hilman <khilman@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/17] OMAP3: voltage: rename "mpu" voltagedomain to "mpu_iva"
Date: Wed, 30 Mar 2011 17:16:08 -0700 [thread overview]
Message-ID: <1301530580-12046-6-git-send-email-khilman@ti.com> (raw)
In-Reply-To: <1301530580-12046-1-git-send-email-khilman@ti.com>
This voltage domain (a.k.a. VDD1) contains both the MPU and the IVA, so
rename appropriately.
Also fixup any users of the "mpu" name to use "mpu_iva"
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 ++--
arch/arm/mach-omap2/omap_twl.c | 2 +-
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index b98e2df..3cd91ac 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -2912,7 +2912,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {
.name = "sr1_hwmod",
.class = &omap34xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck",
- .vdd_name = "mpu",
+ .vdd_name = "mpu_iva",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@ -2934,7 +2934,7 @@ static struct omap_hwmod omap36xx_sr1_hwmod = {
.name = "sr1_hwmod",
.class = &omap36xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck",
- .vdd_name = "mpu",
+ .vdd_name = "mpu_iva",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
index 287aef2..57c325a 100644
--- a/arch/arm/mach-omap2/omap_twl.c
+++ b/arch/arm/mach-omap2/omap_twl.c
@@ -288,7 +288,7 @@ int __init omap3_twl_init(void)
if (!twl_sr_enable_autoinit)
omap3_twl_set_sr_bit(true);
- voltdm = voltdm_lookup("mpu");
+ voltdm = voltdm_lookup("mpu_iva");
omap_voltage_register_pmic(voltdm, &omap3_mpu_volt_info);
voltdm = voltdm_lookup("core");
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 917e1e3..820b7b5 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -226,7 +226,7 @@ static void __init omap3_init_voltages(void)
if (!cpu_is_omap34xx())
return;
- omap2_set_init_voltage("mpu", "dpll1_ck", mpu_dev);
+ omap2_set_init_voltage("mpu_iva", "dpll1_ck", mpu_dev);
omap2_set_init_voltage("core", "l3_ick", l3_dev);
}
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index 4bee412..2167ef4 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -60,7 +60,7 @@ static struct omap_vdd_info omap3_vdd2_info = {
};
static struct voltagedomain omap3_voltdm_mpu = {
- .name = "mpu",
+ .name = "mpu_iva",
.vdd = &omap3_vdd1_info,
};
--
1.7.4
next prev parent reply other threads:[~2011-03-31 0:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 0:16 [PATCH 00/17] OMAP: voltage layer cleanup and restructure: part 1 Kevin Hilman
2011-03-31 0:16 ` [PATCH 01/17] OMAP2+: hwmod: remove unused voltagedomain pointer Kevin Hilman
2011-03-31 0:16 ` [PATCH 02/17] OMAP2+: voltage: move PRCM mod offets into VC/VP structures Kevin Hilman
2011-03-31 0:16 ` [PATCH 03/17] OMAP2+: voltage: move prm_irqst_reg from VP into voltage domain Kevin Hilman
2011-03-31 0:16 ` [PATCH 04/17] OMAP2+: voltage: start towards a new voltagedomain layer Kevin Hilman
2011-03-31 0:16 ` Kevin Hilman [this message]
2011-03-31 0:16 ` [PATCH 06/17] OMAP3: voltagedomain data: add wakeup domain Kevin Hilman
2011-03-31 0:16 ` [PATCH 07/17] OMAP3+: voltage: add scalable flag to voltagedomain Kevin Hilman
2011-03-31 0:16 ` [PATCH 08/17] OMAP2+: powerdomain: add voltagedomain to struct powerdomain Kevin Hilman
2011-03-31 0:16 ` [PATCH 09/17] OMAP2: add voltage domains and connect to powerdomains Kevin Hilman
2011-03-31 0:16 ` [PATCH 10/17] OMAP3: powerdomain data: add voltage domains Kevin Hilman
2011-03-31 0:16 ` [PATCH 11/17] OMAP4: " Kevin Hilman
2011-03-31 0:16 ` [PATCH 12/17] OMAP2+: powerdomain: add voltage domain lookup during register Kevin Hilman
2011-03-31 0:16 ` [PATCH 13/17] OMAP2+: voltage: keep track of powerdomains in each voltagedomain Kevin Hilman
2011-03-31 0:16 ` [PATCH 14/17] OMAP2+: voltage: split voltage controller (VC) code into dedicated layer Kevin Hilman
2011-03-31 0:16 ` [PATCH 15/17] OMAP2+: voltage: move VC into struct voltagedomain, misc. renames Kevin Hilman
2011-03-31 0:16 ` [PATCH 16/17] OMAP2+: voltage: split out voltage processor (VP) code into new layer Kevin Hilman
2011-03-31 0:16 ` [PATCH 17/17] OMAP2+: VC: support PMICs with separate voltage and command registers Kevin Hilman
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=1301530580-12046-6-git-send-email-khilman@ti.com \
--to=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.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).