summaryrefslogtreecommitdiff
path: root/target/linux/adm5120/files/arch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-02 15:07:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-02 15:07:31 +0000
commit9240fe972de66eaf3a5cf404618e39e7d1a4c0f3 (patch)
tree7cec7083b1160d573421df7a484f57122f115a47 /target/linux/adm5120/files/arch
parent5acf538f1380f40f80d650a7d0ac655b9e362446 (diff)
downloadmtk-20170518-9240fe972de66eaf3a5cf404618e39e7d1a4c0f3.zip
mtk-20170518-9240fe972de66eaf3a5cf404618e39e7d1a4c0f3.tar.gz
mtk-20170518-9240fe972de66eaf3a5cf404618e39e7d1a4c0f3.tar.bz2
adm5120: merge 2.6.30+ specific patches
SVN-Revision: 18999
Diffstat (limited to 'target/linux/adm5120/files/arch')
-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 d004309..1ada60f 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 9526fe9..7fe86a1 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 = {