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/mach-imx/clock-imx25.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/mach-imx/clock-imx25.c')
-rw-r--r-- | arch/arm/mach-imx/clock-imx25.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c index af1c580b06b..006b30e4b4e 100644 --- a/arch/arm/mach-imx/clock-imx25.c +++ b/arch/arm/mach-imx/clock-imx25.c | |||
@@ -272,11 +272,12 @@ DEFINE_CLOCK(can2_clk, 1, CCM_CGCR1, 3, get_rate_ipg, NULL, NULL); | |||
272 | }, | 272 | }, |
273 | 273 | ||
274 | static struct clk_lookup lookups[] = { | 274 | static struct clk_lookup lookups[] = { |
275 | _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) | 275 | /* i.mx25 has the i.mx21 type uart */ |
276 | _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) | 276 | _REGISTER_CLOCK("imx21-uart.0", NULL, uart1_clk) |
277 | _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) | 277 | _REGISTER_CLOCK("imx21-uart.1", NULL, uart2_clk) |
278 | _REGISTER_CLOCK("imx-uart.3", NULL, uart4_clk) | 278 | _REGISTER_CLOCK("imx21-uart.2", NULL, uart3_clk) |
279 | _REGISTER_CLOCK("imx-uart.4", NULL, uart5_clk) | 279 | _REGISTER_CLOCK("imx21-uart.3", NULL, uart4_clk) |
280 | _REGISTER_CLOCK("imx21-uart.4", NULL, uart5_clk) | ||
280 | _REGISTER_CLOCK("mxc-ehci.0", "usb", usbotg_clk) | 281 | _REGISTER_CLOCK("mxc-ehci.0", "usb", usbotg_clk) |
281 | _REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk) | 282 | _REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk) |
282 | _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) | 283 | _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) |