summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-08-30 00:34:03 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2010-09-20 08:56:42 +0200
commita1ea745cb0a59d3627a3f8f2fda3ca913014cae0 (patch)
treee95301d782c1ba7d9e2f3033151c45535cf6b447 /arch
parent3c605668b497648a98ad894119442776f7152fd1 (diff)
downloadbarebox-a1ea745cb0a59d3627a3f8f2fda3ca913014cae0.tar.gz
barebox-a1ea745cb0a59d3627a3f8f2fda3ca913014cae0.tar.xz
stm8815: fix the uart device clock match
that use the device name + id to found it's clock to use the right match as we fix the dev_name macro Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-nomadik/8815.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
index 5cf5d14354..c984cb03a2 100644
--- a/arch/arm/mach-nomadik/8815.c
+++ b/arch/arm/mach-nomadik/8815.c
@@ -50,12 +50,14 @@ void st8815_add_device_sdram(u32 size)
}
static struct device_d uart0_serial_device = {
+ .id = 0,
.name = "uart-pl011",
.map_base = NOMADIK_UART0_BASE,
.size = 4096,
};
static struct device_d uart1_serial_device = {
+ .id = 1,
.name = "uart-pl011",
.map_base = NOMADIK_UART1_BASE,
.size = 4096,
@@ -65,11 +67,11 @@ void st8815_register_uart(unsigned id)
{
switch (id) {
case 0:
- nmdk_clk_create(&st8815_clk_48, uart0_serial_device.name);
+ nmdk_clk_create(&st8815_clk_48, dev_name(&uart0_serial_device));
register_device(&uart0_serial_device);
break;
case 1:
- nmdk_clk_create(&st8815_clk_48, uart1_serial_device.name);
+ nmdk_clk_create(&st8815_clk_48, dev_name(&uart1_serial_device));
register_device(&uart1_serial_device);
break;
}