mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 03:13:20 +02:00
[adm5120] fix UART code for 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15980 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f34c09e21c
commit
5226ed98ad
@ -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 = {
|
||||
|
@ -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);
|
Loading…
Reference in New Issue
Block a user