diff options
author | Manjunathappa, Prakash <prakash.pm@ti.com> | 2013-06-19 05:15:38 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2013-07-22 06:04:55 -0400 |
commit | 19955c3d7453757271d05859958ca1804a5d2d67 (patch) | |
tree | 978e156a66db7dae2435c23046a75757958f8e5f /arch/arm/mach-davinci/da830.c | |
parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) |
ARM: davinci: uart: move to devid based clk_get
For modules having single clock, clk_get should be done with dev_id.
But current davinci implementation handles multiple instances
of the UART devices with single platform_device_register. Hence clk_get
is based on con_id rather than dev_id, this is not correct. Do
platform_device_register for each instance and clk_get on dev_id.
Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
[nsekhar@ti.com: actually stop using con_id in clk_get(), squash the
patch adding OF aux data into this one]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/da830.c')
-rw-r--r-- | arch/arm/mach-davinci/da830.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index abbaf0270be6..a3ffd527dbe5 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c | |||
@@ -395,9 +395,9 @@ static struct clk_lookup da830_clks[] = { | |||
395 | CLK(NULL, "tptc0", &tptc0_clk), | 395 | CLK(NULL, "tptc0", &tptc0_clk), |
396 | CLK(NULL, "tptc1", &tptc1_clk), | 396 | CLK(NULL, "tptc1", &tptc1_clk), |
397 | CLK("da830-mmc.0", NULL, &mmcsd_clk), | 397 | CLK("da830-mmc.0", NULL, &mmcsd_clk), |
398 | CLK(NULL, "uart0", &uart0_clk), | 398 | CLK("serial8250.0", NULL, &uart0_clk), |
399 | CLK(NULL, "uart1", &uart1_clk), | 399 | CLK("serial8250.1", NULL, &uart1_clk), |
400 | CLK(NULL, "uart2", &uart2_clk), | 400 | CLK("serial8250.2", NULL, &uart2_clk), |
401 | CLK("spi_davinci.0", NULL, &spi0_clk), | 401 | CLK("spi_davinci.0", NULL, &spi0_clk), |
402 | CLK("spi_davinci.1", NULL, &spi1_clk), | 402 | CLK("spi_davinci.1", NULL, &spi1_clk), |
403 | CLK(NULL, "ecap0", &ecap0_clk), | 403 | CLK(NULL, "ecap0", &ecap0_clk), |
@@ -1199,7 +1199,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = { | |||
1199 | .gpio_base = DA8XX_GPIO_BASE, | 1199 | .gpio_base = DA8XX_GPIO_BASE, |
1200 | .gpio_num = 128, | 1200 | .gpio_num = 128, |
1201 | .gpio_irq = IRQ_DA8XX_GPIO0, | 1201 | .gpio_irq = IRQ_DA8XX_GPIO0, |
1202 | .serial_dev = &da8xx_serial_device, | 1202 | .serial_dev = da8xx_serial_device, |
1203 | .emac_pdata = &da8xx_emac_pdata, | 1203 | .emac_pdata = &da8xx_emac_pdata, |
1204 | }; | 1204 | }; |
1205 | 1205 | ||