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/tnetv107x.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/tnetv107x.c')
-rw-r--r-- | arch/arm/mach-davinci/tnetv107x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c index 4545667ecd3c..f4d7fbb24b3b 100644 --- a/arch/arm/mach-davinci/tnetv107x.c +++ b/arch/arm/mach-davinci/tnetv107x.c | |||
@@ -264,7 +264,7 @@ static struct clk_lookup clks[] = { | |||
264 | CLK(NULL, "clk_chipcfg", &clk_chipcfg), | 264 | CLK(NULL, "clk_chipcfg", &clk_chipcfg), |
265 | CLK("tnetv107x-ts.0", NULL, &clk_tsc), | 265 | CLK("tnetv107x-ts.0", NULL, &clk_tsc), |
266 | CLK(NULL, "clk_rom", &clk_rom), | 266 | CLK(NULL, "clk_rom", &clk_rom), |
267 | CLK(NULL, "uart2", &clk_uart2), | 267 | CLK("serial8250.2", NULL, &clk_uart2), |
268 | CLK(NULL, "clk_pktsec", &clk_pktsec), | 268 | CLK(NULL, "clk_pktsec", &clk_pktsec), |
269 | CLK("tnetv107x-rng.0", NULL, &clk_rng), | 269 | CLK("tnetv107x-rng.0", NULL, &clk_rng), |
270 | CLK("tnetv107x-pka.0", NULL, &clk_pka), | 270 | CLK("tnetv107x-pka.0", NULL, &clk_pka), |
@@ -274,8 +274,8 @@ static struct clk_lookup clks[] = { | |||
274 | CLK(NULL, "clk_gpio", &clk_gpio), | 274 | CLK(NULL, "clk_gpio", &clk_gpio), |
275 | CLK(NULL, "clk_mdio", &clk_mdio), | 275 | CLK(NULL, "clk_mdio", &clk_mdio), |
276 | CLK("dm6441-mmc.0", NULL, &clk_sdio0), | 276 | CLK("dm6441-mmc.0", NULL, &clk_sdio0), |
277 | CLK(NULL, "uart0", &clk_uart0), | 277 | CLK("serial8250.0", NULL, &clk_uart0), |
278 | CLK(NULL, "uart1", &clk_uart1), | 278 | CLK("serial8250.1", NULL, &clk_uart1), |
279 | CLK(NULL, "timer0", &clk_timer0), | 279 | CLK(NULL, "timer0", &clk_timer0), |
280 | CLK(NULL, "timer1", &clk_timer1), | 280 | CLK(NULL, "timer1", &clk_timer1), |
281 | CLK("tnetv107x_wdt.0", NULL, &clk_wdt_arm), | 281 | CLK("tnetv107x_wdt.0", NULL, &clk_wdt_arm), |
@@ -757,7 +757,7 @@ static struct davinci_soc_info tnetv107x_soc_info = { | |||
757 | .gpio_type = GPIO_TYPE_TNETV107X, | 757 | .gpio_type = GPIO_TYPE_TNETV107X, |
758 | .gpio_num = TNETV107X_N_GPIO, | 758 | .gpio_num = TNETV107X_N_GPIO, |
759 | .timer_info = &timer_info, | 759 | .timer_info = &timer_info, |
760 | .serial_dev = &tnetv107x_serial_device, | 760 | .serial_dev = tnetv107x_serial_device, |
761 | }; | 761 | }; |
762 | 762 | ||
763 | void __init tnetv107x_init(void) | 763 | void __init tnetv107x_init(void) |