From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [RFC part1/2 merge v2 RESEND][PATCH 05/10] OMAP3: PRCM: Consider UART4 for 3630 chip in prcm_setup_regs Date: Mon, 08 Mar 2010 09:55:57 -0800 Message-ID: <87fx4au28i.fsf@deeprootsystems.com> References: <1268069332-14082-1-git-send-email-saaguirre@ti.com> <1268069332-14082-6-git-send-email-saaguirre@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from qw-out-2122.google.com ([74.125.92.25]:11662 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412Ab0CHR4N (ORCPT ); Mon, 8 Mar 2010 12:56:13 -0500 Received: by qw-out-2122.google.com with SMTP id 5so1172389qwd.37 for ; Mon, 08 Mar 2010 09:56:12 -0800 (PST) In-Reply-To: <1268069332-14082-6-git-send-email-saaguirre@ti.com> (Sergio Aguirre's message of "Mon\, 8 Mar 2010 11\:28\:47 -0600") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Sergio Aguirre Cc: linux-omap@vger.kernel.org, Vikram Pandita , Paul Walmsley , Tony Lindgren Sergio Aguirre writes: > Signed-off-by: Sergio Aguirre This one needs a descriptive changelog. Kevin > --- > arch/arm/mach-omap2/pm34xx.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index fee2efb..81082f2 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -734,6 +734,9 @@ static void __init omap3_d2d_idle(void) > > static void __init prcm_setup_regs(void) > { > + u32 omap3630_auto_uart4 = cpu_is_omap3630() ? OMAP3630_AUTO_UART4 : 0; > + u32 omap3630_en_uart4 = cpu_is_omap3630() ? OMAP3630_EN_UART4 : 0; > + > /* XXX Reset all wkdeps. This should be done when initializing > * powerdomains */ > prm_write_mod_reg(0, OMAP3430_IVA2_MOD, PM_WKDEP); > @@ -820,6 +823,7 @@ static void __init prcm_setup_regs(void) > CM_AUTOIDLE); > > cm_write_mod_reg( > + omap3630_auto_uart4 | > OMAP3430_AUTO_GPIO6 | > OMAP3430_AUTO_GPIO5 | > OMAP3430_AUTO_GPIO4 | > @@ -899,14 +903,14 @@ static void __init prcm_setup_regs(void) > OMAP3430_EN_GPIO4 | OMAP3430_EN_GPIO5 | > OMAP3430_EN_GPIO6 | OMAP3430_EN_UART3 | > OMAP3430_EN_MCBSP2 | OMAP3430_EN_MCBSP3 | > - OMAP3430_EN_MCBSP4, > + OMAP3430_EN_MCBSP4 | omap3630_en_uart4, > OMAP3430_PER_MOD, PM_WKEN); > /* and allow them to wake up MPU */ > prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2 | OMAP3430_EN_GPIO3 | > OMAP3430_GRPSEL_GPIO4 | OMAP3430_EN_GPIO5 | > OMAP3430_GRPSEL_GPIO6 | OMAP3430_EN_UART3 | > OMAP3430_EN_MCBSP2 | OMAP3430_EN_MCBSP3 | > - OMAP3430_EN_MCBSP4, > + OMAP3430_EN_MCBSP4 | omap3630_en_uart4, > OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL); > > /* Don't attach IVA interrupts */ > -- > 1.6.3.3