mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ixp4xx: refresh patches

Browse Source 
SVN-Revision: 17397
This commit is contained in:
Felix Fietkau 2009-08-25 12:13:18 +00:00
parent 681aa38e22
commit 5211c0c0b7
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/ixp4xx/patches-2.6.28/304-ixp4xx_eth_jumboframe.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c
@@ -53,7 +53,7 @@ @@ -54,7 +54,7 @@
#define POOL_ALLOC_SIZE (sizeof(struct desc) * (RX_DESCS + TX_DESCS)) #define POOL_ALLOC_SIZE (sizeof(struct desc) * (RX_DESCS + TX_DESCS))
#define REGS_SIZE 0x1000 #define REGS_SIZE 0x1000
@ -9,7 +9,7 @@
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4) #define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16 #define NAPI_WEIGHT 16
@@ -927,6 +927,32 @@ @@ -1011,6 +1011,32 @@ static void destroy_queues(struct port *
} }
} }
@ -42,7 +42,7 @@
static int eth_open(struct net_device *dev) static int eth_open(struct net_device *dev)
{ {
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);
@@ -976,6 +1002,8 @@ @@ -1061,6 +1087,8 @@ static int eth_open(struct net_device *d
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE")) if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO; return -EIO;
@ -51,8 +51,8 @@
if ((err = request_queues(port)) != 0) if ((err = request_queues(port)) != 0)
return err; return err;
@@ -1119,6 +1147,24 @@ @@ -1238,6 +1266,24 @@ static void eth_init_mii(struct net_devi
return 0;
} }
+static int eth_change_mtu(struct net_device *dev, int mtu) +static int eth_change_mtu(struct net_device *dev, int mtu)
@ -76,7 +76,7 @@
static int __devinit eth_init_one(struct platform_device *pdev) static int __devinit eth_init_one(struct platform_device *pdev)
{ {
struct port *port; struct port *port;
@@ -1153,6 +1199,7 @@ @@ -1272,6 +1318,7 @@ static int __devinit eth_init_one(struct
goto err_free; goto err_free;
} }

2
target/linux/ixp4xx/patches-2.6.30/050-disable_dmabounce.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -374,7 +374,6 @@ config ARCH_IXP4XX @@ -375,7 +375,6 @@ config ARCH_IXP4XX
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS

14
target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch
View File

@ -124,7 +124,7 @@
unsigned int custom_divisor; unsigned int custom_divisor;
--- a/drivers/serial/8250.c --- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c +++ b/drivers/serial/8250.c
@@ -396,6 +396,20 @@ static void mem_serial_out(struct uart_p @@ -397,6 +397,20 @@ static void mem_serial_out(struct uart_p
writeb(value, p->membase + offset); writeb(value, p->membase + offset);
} }
@ -145,7 +145,7 @@
static void mem32_serial_out(struct uart_port *p, int offset, int value) static void mem32_serial_out(struct uart_port *p, int offset, int value)
{ {
offset = map_8250_out_reg(p, offset) << p->regshift; offset = map_8250_out_reg(p, offset) << p->regshift;
@@ -488,6 +502,11 @@ static void set_io_from_upio(struct uart @@ -490,6 +504,11 @@ static void set_io_from_upio(struct uart
p->serial_out = mem32_serial_out; p->serial_out = mem32_serial_out;
break; break;
@ -157,7 +157,7 @@
#ifdef CONFIG_SERIAL_8250_AU1X00 #ifdef CONFIG_SERIAL_8250_AU1X00
case UPIO_AU: case UPIO_AU:
p->serial_in = au_serial_in; p->serial_in = au_serial_in;
@@ -518,6 +537,7 @@ serial_out_sync(struct uart_8250_port *u @@ -522,6 +541,7 @@ serial_out_sync(struct uart_8250_port *u
switch (p->iotype) { switch (p->iotype) {
case UPIO_MEM: case UPIO_MEM:
case UPIO_MEM32: case UPIO_MEM32:
@ -165,7 +165,7 @@
#ifdef CONFIG_SERIAL_8250_AU1X00 #ifdef CONFIG_SERIAL_8250_AU1X00
case UPIO_AU: case UPIO_AU:
#endif #endif
@@ -2433,6 +2453,7 @@ static int serial8250_request_std_resour @@ -2440,6 +2460,7 @@ static int serial8250_request_std_resour
case UPIO_MEM32: case UPIO_MEM32:
case UPIO_MEM: case UPIO_MEM:
case UPIO_DWAPB: case UPIO_DWAPB:
@ -173,7 +173,7 @@
if (!up->port.mapbase) if (!up->port.mapbase)
break; break;
@@ -2470,6 +2491,7 @@ static void serial8250_release_std_resou @@ -2477,6 +2498,7 @@ static void serial8250_release_std_resou
case UPIO_MEM32: case UPIO_MEM32:
case UPIO_MEM: case UPIO_MEM:
case UPIO_DWAPB: case UPIO_DWAPB:
@ -181,7 +181,7 @@
if (!up->port.mapbase) if (!up->port.mapbase)
break; break;
@@ -2931,6 +2953,7 @@ static int __devinit serial8250_probe(st @@ -2946,6 +2968,7 @@ static int __devinit serial8250_probe(st
port.serial_in = p->serial_in; port.serial_in = p->serial_in;
port.serial_out = p->serial_out; port.serial_out = p->serial_out;
port.dev = &dev->dev; port.dev = &dev->dev;
@ -189,7 +189,7 @@
if (share_irqs) if (share_irqs)
port.flags |= UPF_SHARE_IRQ; port.flags |= UPF_SHARE_IRQ;
ret = serial8250_register_port(&port); ret = serial8250_register_port(&port);
@@ -3080,6 +3103,7 @@ int serial8250_register_port(struct uart @@ -3095,6 +3118,7 @@ int serial8250_register_port(struct uart
uart->port.iotype = port->iotype; uart->port.iotype = port->iotype;
uart->port.flags = port->flags | UPF_BOOT_AUTOCONF; uart->port.flags = port->flags | UPF_BOOT_AUTOCONF;
uart->port.mapbase = port->mapbase; uart->port.mapbase = port->mapbase;

8
target/linux/ixp4xx/patches-2.6.30/203-npe_driver_mask_phy_features.patch
View File

@ -1,8 +1,8 @@
--- a/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c
@@ -1220,6 +1220,10 @@ static int __devinit eth_init_one(struct @@ -1215,6 +1215,10 @@ static int __devinit eth_init_one(struct
return PTR_ERR(port->phydev); if ((err = IS_ERR(port->phydev)))
} goto err_free_mem;
+ /* mask with MAC supported features */ + /* mask with MAC supported features */
+ port->phydev->supported &= PHY_BASIC_FEATURES; + port->phydev->supported &= PHY_BASIC_FEATURES;
@ -10,4 +10,4 @@
+ +
port->phydev->irq = PHY_POLL; port->phydev->irq = PHY_POLL;
printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy, if ((err = register_netdev(dev)))

4
target/linux/ixp4xx/patches-2.6.30/204-npe_driver_add_missing_phy_disconnect.patch
View File

@ -1,10 +1,10 @@
--- a/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c
@@ -1245,6 +1245,7 @@ static int __devexit eth_remove_one(stru @@ -1247,6 +1247,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);
+ phy_disconnect(port->phydev); + phy_disconnect(port->phydev);
unregister_netdev(dev); unregister_netdev(dev);
phy_disconnect(port->phydev);
npe_port_tab[NPE_ID(port->id)] = NULL; npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);

6
target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
View File

@ -73,7 +73,7 @@
if (!ports_open) if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE); qmgr_disable_irq(TXDONE_QUEUE);
@@ -1149,7 +1195,6 @@ static int __devinit eth_init_one(struct @@ -1151,7 +1197,6 @@ static int __devinit eth_init_one(struct
struct net_device *dev; struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data; struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys; u32 regs_phys;
@ -81,7 +81,7 @@
int err; int err;
if (!(dev = alloc_etherdev(sizeof(struct port)))) if (!(dev = alloc_etherdev(sizeof(struct port))))
@@ -1207,18 +1252,10 @@ static int __devinit eth_init_one(struct @@ -1209,18 +1254,10 @@ static int __devinit eth_init_one(struct
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50); udelay(50);
@ -102,7 +102,7 @@
if ((err = register_netdev(dev))) if ((err = register_netdev(dev)))
goto err_phy_dis; goto err_phy_dis;
@@ -1245,7 +1282,7 @@ static int __devexit eth_remove_one(stru @@ -1247,7 +1284,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);

6
target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
View File

@ -9,7 +9,7 @@
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4) #define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16 #define NAPI_WEIGHT 16
@@ -943,6 +943,32 @@ @@ -1066,6 +1066,32 @@ static void destroy_queues(struct port *
} }
} }
@ -42,7 +42,7 @@
static int eth_open(struct net_device *dev) static int eth_open(struct net_device *dev)
{ {
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);
@@ -994,6 +1020,8 @@ @@ -1117,6 +1143,8 @@ static int eth_open(struct net_device *d
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE")) if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO; return -EIO;
@ -51,7 +51,7 @@
if ((err = request_queues(port)) != 0) if ((err = request_queues(port)) != 0)
return err; return err;
@@ -1134,7 +1162,26 @@ @@ -1256,7 +1284,26 @@ static int eth_close(struct net_device *
return 0; return 0;
} }

2
target/linux/ixp4xx/patches-2.6.30/402-ixp4xx_gpiolib.patch
View File

@ -50,7 +50,7 @@
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -374,6 +374,7 @@ config ARCH_IXP4XX @@ -375,6 +375,7 @@ config ARCH_IXP4XX
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS