Sergio Aguirre <saaguirre@xxxxxx> writes:
> Signed-off-by: Sergio Aguirre <saaguirre@xxxxxx>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
