summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/arch/mips
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-02 15:07:31 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-02 15:07:31 +0000
commit462336ec0941597e0c86161d0d073a82e6228a17 (patch)
tree3ccd31a3986076d17215fa325af2e9affc0e65b1 /target/linux/adm5120/files/arch/mips
parentc6380a3c3b43d5602157a1aa493de6e8441c6364 (diff)
adm5120: merge 2.6.30+ specific patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18999 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/arch/mips')
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/common/clock.c5
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/common/platform.c4
2 files changed, 6 insertions, 3 deletions
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 d00430995..1ada60fed 100644
--- 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);
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c b/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c
index 9526fe977..7fe86a13e 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c
@@ -190,7 +190,7 @@ struct amba_pl010_data adm5120_uart0_data = {
struct amba_device adm5120_uart0_device = {
.dev = {
- .bus_id = "APB:UART0",
+ .init_name = "apb:uart0",
.platform_data = &adm5120_uart0_data,
},
.res = {
@@ -208,7 +208,7 @@ struct amba_pl010_data adm5120_uart1_data = {
struct amba_device adm5120_uart1_device = {
.dev = {
- .bus_id = "APB:UART1",
+ .init_name = "apb:uart1",
.platform_data = &adm5120_uart1_data,
},
.res = {