serial/imx: get rid of the uses of cpu_is_mx1()

The patch removes all the uses of cpu_is_mx1().  Instead, it uses
the .id_table of platform_driver to distinguish the uart device type,
IMX1_UART and IMX21_UART.  The IMX21_UART type runs on all i.mx
except i.mx1.

A couple of !cpu_is_mx1 logic gets turned into is_imx21_uart,
as the codes wrapped there are really IMX21 type uart specific.

It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are
not used anywhere.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/mach-imx/clock-imx27.c b/arch/arm/mach-imx/clock-imx27.c
index 583f2515c1d5..8c9a681ebfc1 100644
--- a/arch/arm/mach-imx/clock-imx27.c
+++ b/arch/arm/mach-imx/clock-imx27.c
@@ -624,12 +624,13 @@ DEFINE_CLOCK1(csi_clk,     0, NULL,   0, parent, &csi_clk1, &per4_clk);
         },
 
 static struct clk_lookup lookups[] = {
-        _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)
-        _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)
-        _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)
-        _REGISTER_CLOCK("imx-uart.3", NULL, uart4_clk)
-        _REGISTER_CLOCK("imx-uart.4", NULL, uart5_clk)
-        _REGISTER_CLOCK("imx-uart.5", NULL, uart6_clk)
+        /* i.mx27 has the i.mx21 type uart */
+        _REGISTER_CLOCK("imx21-uart.0", NULL, uart1_clk)
+        _REGISTER_CLOCK("imx21-uart.1", NULL, uart2_clk)
+        _REGISTER_CLOCK("imx21-uart.2", NULL, uart3_clk)
+        _REGISTER_CLOCK("imx21-uart.3", NULL, uart4_clk)
+        _REGISTER_CLOCK("imx21-uart.4", NULL, uart5_clk)
+        _REGISTER_CLOCK("imx21-uart.5", NULL, uart6_clk)
         _REGISTER_CLOCK(NULL, "gpt1", gpt1_clk)
         _REGISTER_CLOCK(NULL, "gpt2", gpt2_clk)
         _REGISTER_CLOCK(NULL, "gpt3", gpt3_clk)