aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/clock-mx28.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2011-01-04 01:20:52 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-12 08:47:15 -0500
commitdbc4245bb520580fc1b01105727fde7d7cbe452d (patch)
tree993aa43d0831ddb9a981640a9bf48bb92e8e78bf /arch/arm/mach-mxs/clock-mx28.c
parent48f76ed1cc034c682666c43815fd0ef27c2a7215 (diff)
ARM: mxs: Change duart device to use amba-pl011
The mxs duart is actually an amba-pl011 device. This commit changes the duart device code to dynamically allocate amba-pl011 device, so that drivers/serial/amba-pl011.c can be used on mxs. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs/clock-mx28.c')
-rw-r--r--arch/arm/mach-mxs/clock-mx28.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index fbb8d7424d0c..fcac1a5663b4 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -602,7 +602,10 @@ _DEFINE_CLOCK(fec_clk, ENET, DISABLE, &hbus_clk);
602 }, 602 },
603 603
604static struct clk_lookup lookups[] = { 604static struct clk_lookup lookups[] = {
605 _REGISTER_CLOCK("mxs-duart.0", NULL, uart_clk) 605 /* for amba bus driver */
606 _REGISTER_CLOCK("duart", "apb_pclk", xbus_clk)
607 /* for amba-pl011 driver */
608 _REGISTER_CLOCK("duart", NULL, uart_clk)
606 _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) 609 _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk)
607 _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) 610 _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk)
608 _REGISTER_CLOCK("fec.0", NULL, fec_clk) 611 _REGISTER_CLOCK("fec.0", NULL, fec_clk)
@@ -728,6 +731,12 @@ int __init mx28_clocks_init(void)
728{ 731{
729 clk_misc_init(); 732 clk_misc_init();
730 733
734 clk_enable(&cpu_clk);
735 clk_enable(&hbus_clk);
736 clk_enable(&xbus_clk);
737 clk_enable(&emi_clk);
738 clk_enable(&uart_clk);
739
731 clkdev_add_table(lookups, ARRAY_SIZE(lookups)); 740 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
732 741
733 mxs_timer_init(&clk32k_clk, MX28_INT_TIMER0); 742 mxs_timer_init(&clk32k_clk, MX28_INT_TIMER0);