adm5120: merge 2.6.30+ specific patches

[openwrt/svn-archive/archive.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / clock.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c b/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c
index d0043099595fcf9dc172f281e465167df10984ea..1ada60fedd1c17c99fb1b5ebd1dd95a1e7acfac1 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/device.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
 
@@ -32,7 +33,9 @@ static struct clk uart_clk = {
 
 struct clk *clk_get(struct device *dev, const char *id)
 {
-       if (!strcmp(id, "UARTCLK"))
+       char *name = dev_name(dev);
+
+       if (!strcmp(name, "apb:uart0") || !strcmp(name, "apb:uart1"))
                return &uart_clk;
 
        return ERR_PTR(-ENOENT);