[PATCH] OMAP: Zoom3: Fix Zoom3 booting issue

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The commit id "5550bc33a1a9002976022cc794fe8c52ad9a0021" seems to be broken
zoom3 boot which adds support for UART4 on OMAP4 and OMAP3630.

But, it looks like OMAP3630 UART4 interface and functional clock nodes needs
to be added for omap3630. Thus limiting no. of UART's for 3630 to 3 to prevent
boot up issues until clock nodes are added for UART4 on OMAP3630.

Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Manjunatha GK <manjugk@xxxxxx>
Signed-off-by: Govindraj R <govindraj.raja@xxxxxx>
---
 arch/arm/mach-omap2/serial.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index b79bc89..ac22a4e 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -764,7 +764,12 @@ void __init omap_serial_init(void)
 {
 	int i, nr_ports;
 
-	if (!(cpu_is_omap3630() || cpu_is_omap4430()))
+	/* Limit no.of UART ports to three for OMAP3630 since
+	 * clock nodes are yet to be updated for 3630 UART4.
+	 * TODO: update clock nodes for 3630 UART4 and then enable
+	 * check for !(cpu_is_omap3630())
+	 */
+	if (!cpu_is_omap4430())
 		nr_ports = 3;
 	else
 		nr_ports = ARRAY_SIZE(omap_uart);
-- 
1.6.0.4

--
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

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux