[PATCH 3/3] OMAP2+: UART: replace omap34xx/omap4xx cpu checks with not omap24xx
From: Govindraj.R <hidden>
Date: 2012-03-21 10:25:01
Also in:
linux-omap, linux-serial
Subsystem:
arm port, omap2+ support, the rest · Maintainers:
Russell King, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
From: "Govindraj.R" <redacted> Minor cleanup, replace all omap34xx/omap44xx cpu checks with cpu is not omap24xx check. Cc: Paul Walmsley <paul@pwsan.com> Cc: Felipe Balbi <balbi at ti.com Cc: Kevin Hilman <redacted> Signed-off-by: Govindraj.R <redacted> --- arch/arm/mach-omap2/serial.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 330ee04..83ab5a2 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c@@ -377,8 +377,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, oh->dev_attr = uart; - if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads) - && !uart_debug) + if ((!cpu_is_omap24xx() && bdata->pads) && !uart_debug) device_init_wakeup(&pdev->dev, true); }
@@ -401,7 +400,7 @@ void __init omap_serial_board_init(struct omap_uart_port_info *info) bdata.pads = NULL; bdata.pads_cnt = 0; - if (cpu_is_omap44xx() || cpu_is_omap34xx()) + if (!cpu_is_omap24xx()) omap_serial_fill_default_pads(&bdata); if (!info)
--
1.7.5.4