From 462336ec0941597e0c86161d0d073a82e6228a17 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 2 Jan 2010 15:07:31 +0000
Subject: adm5120: merge 2.6.30+ specific patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18999 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/adm5120/files/arch/mips/adm5120/common/clock.c    | 5 ++++-
 target/linux/adm5120/files/arch/mips/adm5120/common/platform.c | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'target/linux/adm5120/files/arch')

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 d004309959..1ada60fedd 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 9526fe977f..7fe86a13e8 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		= {
-- 
cgit v1.2.3