linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: mturquette@gmail.com
To: linux-omap@vger.kernel.org
Cc: khilman@deeprootsystems.com, Mike Turquette <mturquette@ti.com>
Subject: [PATCH] OMAP: Voltage: fix typos, compile break
Date: Mon,  9 Aug 2010 14:39:19 -0500	[thread overview]
Message-ID: <1281382759-13025-1-git-send-email-mturquette@ti.com> (raw)

From: Mike Turquette <mturquette@ti.com>

mach-omap/voltage.c incorrectly called omap_get_mpuss_device and
omap_get_l3_device.  The correct function names are
omap2_get_mpuss_device and omap2_get_l3_device respectively.

This fixes a compile break.  Test on OMAP3430 SDP.

Signed-off-by: Mike Turquette <mturquette@ti.com>
---

This patch is meant to apply to Kevin's pm-srf branch.  Without it
compilation for OMAP3 is broken.

 arch/arm/mach-omap2/voltage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index e7055f6..148e4d4 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -385,7 +385,7 @@ static void __init omap3_vdd_data_configure(int vdd)
 		vdd_info[vdd].volt_clk = clk_get(NULL, "dpll1_ck");
 		WARN(IS_ERR(vdd_info[vdd].volt_clk),
 				"unable to get clock for VDD%d\n", vdd + 1);
-		vdd_info[vdd].opp_dev = omap_get_mpuss_device();
+		vdd_info[vdd].opp_dev = omap2_get_mpuss_device();
 		vdd_info[vdd].vp_reg.tranxdone_status =
 				OMAP3430_VP1_TRANXDONE_ST_MASK;
 		vdd_info[vdd].cmdval_reg = OMAP3_PRM_VC_CMD_VAL_0_OFFSET;
@@ -411,7 +411,7 @@ static void __init omap3_vdd_data_configure(int vdd)
 		vdd_info[vdd].volt_clk = clk_get(NULL, "l3_ick");
 		WARN(IS_ERR(vdd_info[vdd].volt_clk),
 				"unable to get clock for VDD%d\n", vdd + 1);
-		vdd_info[vdd].opp_dev = omap_get_l3_device();
+		vdd_info[vdd].opp_dev = omap2_get_l3_device();
 		vdd_info[vdd].vp_reg.tranxdone_status =
 					OMAP3430_VP2_TRANXDONE_ST_MASK;
 		vdd_info[vdd].cmdval_reg = OMAP3_PRM_VC_CMD_VAL_1_OFFSET;
-- 
1.7.0.5


             reply	other threads:[~2010-08-09 19:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-09 19:39 mturquette [this message]
2010-08-11 20:19 ` [PATCH] OMAP: Voltage: fix typos, compile break 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=1281382759-13025-1-git-send-email-mturquette@ti.com \
    --to=mturquette@gmail.com \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=mturquette@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;
as well as URLs for NNTP newsgroup(s).