From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH] OMAP: Voltage: fix typos, compile break Date: Wed, 11 Aug 2010 13:19:08 -0700 Message-ID: <87hbj0298j.fsf@deeprootsystems.com> References: <1281382759-13025-1-git-send-email-mturquette@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-px0-f174.google.com ([209.85.212.174]:57913 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757023Ab0HKUTL (ORCPT ); Wed, 11 Aug 2010 16:19:11 -0400 Received: by pxi10 with SMTP id 10so188453pxi.19 for ; Wed, 11 Aug 2010 13:19:11 -0700 (PDT) In-Reply-To: <1281382759-13025-1-git-send-email-mturquette@ti.com> (mturquette@gmail.com's message of "Mon, 9 Aug 2010 14:39:19 -0500") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: mturquette@gmail.com Cc: linux-omap@vger.kernel.org, Mike Turquette mturquette@gmail.com writes: > From: Mike Turquette > > 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 > --- > > This patch is meant to apply to Kevin's pm-srf branch. Without it > compilation for OMAP3 is broken. pm-srf branch is no longer supported (by me anyways) and this problem is fixed in the pm-sr branch which is included in the latest PM branch. Kevin > 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;