summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-22 09:28:23 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-22 09:28:23 +0000
commit5226ed98ad838ab441540190364b5c505edc329b (patch)
tree502beda25756addfcb9c22b4dc0a48de33c1afbd
parentf34c09e21cf3eef6d476e02c251a8e4be7c2cf13 (diff)
[adm5120] fix UART code for 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15980 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch6
-rw-r--r--target/linux/adm5120/patches-2.6.30/803-adm5120-fix-clock-for-amba-uart.patch21
2 files changed, 25 insertions, 2 deletions
diff --git a/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch b/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
index e2435fbfab..6be70ca09a 100644
--- a/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
+++ b/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
@@ -1,18 +1,20 @@
--- a/arch/mips/adm5120/common/platform.c
+++ b/arch/mips/adm5120/common/platform.c
-@@ -190,7 +190,6 @@ struct amba_pl010_data adm5120_uart0_dat
+@@ -190,7 +190,7 @@ struct amba_pl010_data adm5120_uart0_dat
struct amba_device adm5120_uart0_device = {
.dev = {
- .bus_id = "APB:UART0",
++ .init_name = "apb:uart0",
.platform_data = &adm5120_uart0_data,
},
.res = {
-@@ -208,7 +207,6 @@ struct amba_pl010_data adm5120_uart1_dat
+@@ -208,7 +208,7 @@ struct amba_pl010_data adm5120_uart1_dat
struct amba_device adm5120_uart1_device = {
.dev = {
- .bus_id = "APB:UART1",
++ .init_name = "apb:uart1",
.platform_data = &adm5120_uart1_data,
},
.res = {
diff --git a/target/linux/adm5120/patches-2.6.30/803-adm5120-fix-clock-for-amba-uart.patch b/target/linux/adm5120/patches-2.6.30/803-adm5120-fix-clock-for-amba-uart.patch
new file mode 100644
index 0000000000..795c28578e
--- /dev/null
+++ b/target/linux/adm5120/patches-2.6.30/803-adm5120-fix-clock-for-amba-uart.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/adm5120/common/clock.c
++++ b/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);