KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix UART code for 2.6.30

Browse source 
SVN-Revision: 15980
This commit is contained in:
Gabor Juhos 2009-05-22 09:28:23 +00:00
parent d31a7b51ab
commit 118c184e50
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
View file

@ -1,18 +1,20 @@
--- a/arch/mips/adm5120/common/platform.c --- a/arch/mips/adm5120/common/platform.c
+++ b/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 = { struct amba_device adm5120_uart0_device = {
.dev = { .dev = {
- .bus_id = "APB:UART0", - .bus_id = "APB:UART0",
+ .init_name = "apb:uart0",
.platform_data = &adm5120_uart0_data, .platform_data = &adm5120_uart0_data,
}, },
.res = { .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 = { struct amba_device adm5120_uart1_device = {
.dev = { .dev = {
- .bus_id = "APB:UART1", - .bus_id = "APB:UART1",
+ .init_name = "apb:uart1",
.platform_data = &adm5120_uart1_data, .platform_data = &adm5120_uart1_data,
}, },
.res = { .res = {

21
target/linux/adm5120/patches-2.6.30/803-adm5120-fix-clock-for-amba-uart.patch Normal file
View file

@ -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);