Skip to content

Commit 7e74b60

Browse files
aakoskinkhilman
authored andcommitted
ARM: OMAP1: Fix DEBUG_LL and earlyprintk on OMAP16XX
On OMAP16XX, the UART enable bit shifts are written instead of the actual bits. This breaks the boot when DEBUG_LL and earlyprintk is enabled; the UART gets disabled and some random bits get enabled. Fix that. Fixes: 34c8623 ("ARM: OMAP1: clock: Fix early UART rate issues") Signed-off-by: Aaro Koskinen <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Kevin Hilman <[email protected]>
1 parent de70eef commit 7e74b60

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm/mach-omap1/clock_data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ int __init omap1_clk_init(void)
700700
/* Make sure UART clocks are enabled early */
701701
if (cpu_is_omap16xx())
702702
omap_writel(omap_readl(MOD_CONF_CTRL_0) |
703-
CONF_MOD_UART1_CLK_MODE_R |
704-
CONF_MOD_UART3_CLK_MODE_R, MOD_CONF_CTRL_0);
703+
(1 << CONF_MOD_UART1_CLK_MODE_R) |
704+
(1 << CONF_MOD_UART3_CLK_MODE_R), MOD_CONF_CTRL_0);
705705
#endif
706706

707707
/* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */

0 commit comments

Comments
 (0)