diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-06-24 14:04:33 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2011-07-26 21:30:38 -0400 |
commit | fe6b540ac033be6e9fa00dab1c8902dea0ad4016 (patch) | |
tree | b71e37f03ba8e35667a1128b0d0356b46c6597b3 /arch/arm/plat-mxc/devices/platform-imx-uart.c | |
parent | b0189cd087aa82bd23277cb5c8960ab030e13e5c (diff) |
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>
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-imx-uart.c')
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-uart.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-uart.c b/arch/arm/plat-mxc/devices/platform-imx-uart.c index cfce8c918b73..2020d84956c3 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-uart.c +++ b/arch/arm/plat-mxc/devices/platform-imx-uart.c | |||
@@ -152,7 +152,7 @@ struct platform_device *__init imx_add_imx_uart_3irq( | |||
152 | }, | 152 | }, |
153 | }; | 153 | }; |
154 | 154 | ||
155 | return imx_add_platform_device("imx-uart", data->id, res, | 155 | return imx_add_platform_device("imx1-uart", data->id, res, |
156 | ARRAY_SIZE(res), pdata, sizeof(*pdata)); | 156 | ARRAY_SIZE(res), pdata, sizeof(*pdata)); |
157 | } | 157 | } |
158 | 158 | ||
@@ -172,6 +172,7 @@ struct platform_device *__init imx_add_imx_uart_1irq( | |||
172 | }, | 172 | }, |
173 | }; | 173 | }; |
174 | 174 | ||
175 | return imx_add_platform_device("imx-uart", data->id, res, ARRAY_SIZE(res), | 175 | /* i.mx21 type uart runs on all i.mx except i.mx1 */ |
176 | pdata, sizeof(*pdata)); | 176 | return imx_add_platform_device("imx21-uart", data->id, |
177 | res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); | ||
177 | } | 178 | } |