Changeset 26268
- Timestamp:
- 2011-03-22T16:04:17+01:00 (7 years ago)
- Location:
- trunk/target/linux/ixp4xx
- Files:
-
- 6 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/target/linux/ixp4xx/patches-2.6.38/020-gateworks_i2c_pld.patch
r25725 r26268 375 375 --- a/drivers/gpio/Kconfig 376 376 +++ b/drivers/gpio/Kconfig 377 @@ -3 48,6 +348,14 @@ config GPIO_RDC321X377 @@ -358,6 +358,14 @@ config GPIO_RDC321X 378 378 Support for the RDC R321x SoC GPIOs over southbridge 379 379 PCI configuration space. … … 392 392 --- a/drivers/gpio/Makefile 393 393 +++ b/drivers/gpio/Makefile 394 @@ -41,3 +41,4 @@ obj-$(CONFIG_GPIO_RDC321X) += rdc321x-gp 395 obj-$(CONFIG_GPIO_JANZ_TTL) += janz-ttl.o 394 @@ -42,3 +42,4 @@ obj-$(CONFIG_GPIO_JANZ_TTL) += janz-ttl. 396 395 obj-$(CONFIG_GPIO_SX150X) += sx150x.o 397 396 obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o 397 obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o 398 398 +obj-$(CONFIG_GPIO_GW_I2C_PLD) += gw_i2c_pld.o 399 399 --- /dev/null -
trunk/target/linux/ixp4xx/patches-2.6.38/191-cambria_optional_uart.patch
r25727 r26268 107 107 --- a/include/linux/serial_core.h 108 108 +++ b/include/linux/serial_core.h 109 @@ -311,6 +311,7 @@ struct uart_port { 110 #define UPIO_TSI (5) /* Tsi108/109 type IO */ 109 @@ -316,6 +316,7 @@ struct uart_port { 111 110 #define UPIO_DWAPB (6) /* DesignWare APB UART */ 112 111 #define UPIO_RM9000 (7) /* RM9000 type IO */ 113 +#define UPIO_MEM_DELAY (8) 112 #define UPIO_DWAPB32 (8) /* DesignWare APB UART (32 bit accesses) */ 113 +#define UPIO_MEM_DELAY (9) 114 114 115 115 unsigned int read_status_mask; /* driver specific */ 116 116 unsigned int ignore_status_mask; /* driver specific */ 117 @@ -35 3,6 +354,7 @@ struct uart_port {117 @@ -358,6 +359,7 @@ struct uart_port { 118 118 119 119 unsigned int mctrl; /* current modem ctrl settings */ … … 123 123 const struct uart_ops *ops; 124 124 unsigned int custom_divisor; 125 --- a/drivers/ serial/8250.c126 +++ b/drivers/ serial/8250.c125 --- a/drivers/tty/serial/8250.c 126 +++ b/drivers/tty/serial/8250.c 127 127 @@ -413,6 +413,20 @@ static void mem_serial_out(struct uart_p 128 128 writeb(value, p->membase + offset); … … 146 146 { 147 147 offset = map_8250_out_reg(p, offset) << p->regshift; 148 @@ -5 04,6 +518,11 @@ static void set_io_from_upio(struct uart148 @@ -524,6 +538,11 @@ static void set_io_from_upio(struct uart 149 149 p->serial_out = mem32_serial_out; 150 150 break; … … 158 158 p->serial_in = au_serial_in; 159 159 p->serial_out = au_serial_out; 160 @@ -5 35,6 +554,7 @@ serial_out_sync(struct uart_8250_port *u160 @@ -560,6 +579,7 @@ serial_out_sync(struct uart_8250_port *u 161 161 switch (p->iotype) { 162 162 case UPIO_MEM: … … 165 165 case UPIO_AU: 166 166 case UPIO_DWAPB: 167 p->serial_out(p, offset, value); 168 @@ -2477,6 +2497,7 @@ static int serial8250_request_std_resour 169 case UPIO_MEM32: 167 case UPIO_DWAPB32: 168 @@ -2521,6 +2541,7 @@ static int serial8250_request_std_resour 170 169 case UPIO_MEM: 171 170 case UPIO_DWAPB: 171 case UPIO_DWAPB32: 172 172 + case UPIO_MEM_DELAY: 173 173 if (!up->port.mapbase) 174 174 break; 175 175 176 @@ -2514,6 +2535,7 @@ static void serial8250_release_std_resou 177 case UPIO_MEM32: 176 @@ -2559,6 +2580,7 @@ static void serial8250_release_std_resou 178 177 case UPIO_MEM: 179 178 case UPIO_DWAPB: 179 case UPIO_DWAPB32: 180 180 + case UPIO_MEM_DELAY: 181 181 if (!up->port.mapbase) 182 182 break; 183 183 184 @@ -30 25,6 +3047,7 @@ static int __devinit serial8250_probe(st184 @@ -3074,6 +3096,7 @@ static int __devinit serial8250_probe(st 185 185 port.set_termios = p->set_termios; 186 186 port.pm = p->pm; … … 190 190 ret = serial8250_register_port(&port); 191 191 if (ret < 0) { 192 @@ -3 174,6 +3197,7 @@ int serial8250_register_port(struct uart192 @@ -3223,6 +3246,7 @@ int serial8250_register_port(struct uart 193 193 uart->port.iotype = port->iotype; 194 194 uart->port.flags = port->flags | UPF_BOOT_AUTOCONF; … … 198 198 if (port->dev) 199 199 uart->port.dev = port->dev; 200 --- a/drivers/ serial/serial_core.c201 +++ b/drivers/ serial/serial_core.c202 @@ -21 29,6 +2129,7 @@ uart_report_port(struct uart_driver *drv200 --- a/drivers/tty/serial/serial_core.c 201 +++ b/drivers/tty/serial/serial_core.c 202 @@ -2133,6 +2133,7 @@ uart_report_port(struct uart_driver *drv 203 203 snprintf(address, sizeof(address), 204 204 "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); … … 208 208 case UPIO_MEM32: 209 209 case UPIO_AU: 210 @@ -25 49,6 +2550,7 @@ int uart_match_port(struct uart_port *po210 @@ -2554,6 +2555,7 @@ int uart_match_port(struct uart_port *po 211 211 case UPIO_HUB6: 212 212 return (port1->iobase == port2->iobase) && -
trunk/target/linux/ixp4xx/patches-2.6.38/193-cambria_pld_gpio.patch
r25727 r26268 91 91 92 92 static struct cambria_board_info cambria_boards[] __initdata = { 93 @@ -460,6 +507,14 @@ static struct i2c_board_info __initdata 93 @@ -460,6 +507,14 @@ static struct i2c_board_info __initdata 94 94 I2C_BOARD_INFO("24c08", 0x51), 95 95 .platform_data = &cambria_eeprom_info -
trunk/target/linux/ixp4xx/patches-2.6.38/203-npe_driver_mask_phy_features.patch
r23776 r26268 1 1 --- a/drivers/net/arm/ixp4xx_eth.c 2 2 +++ b/drivers/net/arm/ixp4xx_eth.c 3 @@ -1232,6 +1232,10 @@ static int __devinit eth_init_one(struct 4 if ((err = IS_ERR(port->phydev))) 3 @@ -1234,6 +1234,10 @@ static int __devinit eth_init_one(struct 5 4 goto err_free_mem; 5 } 6 6 7 7 + /* mask with MAC supported features */ -
trunk/target/linux/ixp4xx/patches-2.6.38/205-npe_driver_separate_phy_functions.patch
r23776 r26268 79 79 80 80 if (!(dev = alloc_etherdev(sizeof(struct port)))) 81 @@ -1226,1 8 +1268,10@@ static int __devinit eth_init_one(struct81 @@ -1226,19 +1268,9 @@ static int __devinit eth_init_one(struct 82 82 __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); 83 83 udelay(50); … … 86 86 - port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, 87 87 - PHY_INTERFACE_MODE_MII); 88 - if ((err = IS_ERR(port->phydev))) 88 - if (IS_ERR(port->phydev)) { 89 - err = PTR_ERR(port->phydev); 89 90 + err = ixp4xx_phy_connect(dev); 90 91 + if (err) 91 92 goto err_free_mem; 92 93 - } 94 - 93 95 - /* mask with MAC supported features */ 94 96 - port->phydev->supported &= PHY_BASIC_FEATURES; … … 96 98 - 97 99 - port->phydev->irq = PHY_POLL; 98 - 100 99 101 if ((err = register_netdev(dev))) 100 102 goto err_phy_dis; 101 102 @@ -1247,7 +1281,7 @@ static int __devinit eth_init_one(struct 103 @@ -1249,7 +1281,7 @@ static int __devinit eth_init_one(struct 103 104 return 0; 104 105 … … 109 110 npe_port_tab[NPE_ID(port->id)] = NULL; 110 111 platform_set_drvdata(pdev, NULL); 111 @@ -126 5,7 +1299,7 @@ static int __devexit eth_remove_one(stru112 @@ -1267,7 +1299,7 @@ static int __devexit eth_remove_one(stru 112 113 struct port *port = netdev_priv(dev); 113 114 -
trunk/target/linux/ixp4xx/patches-2.6.38/402-ixp4xx_gpiolib.patch
r23775 r26268 1 1 --- a/arch/arm/mach-ixp4xx/common.c 2 2 +++ b/arch/arm/mach-ixp4xx/common.c 3 @@ -35,6 +35,7 @@ 4 #include <asm/pgtable.h> 3 @@ -36,6 +36,7 @@ 5 4 #include <asm/page.h> 6 5 #include <asm/irq.h> 6 #include <asm/sched_clock.h> 7 7 +#include <asm/gpio.h> 8 8 9 9 #include <asm/mach/map.h> 10 10 #include <asm/mach/irq.h> 11 @@ -37 4,12 +375,50 @@ static struct platform_device *ixp46x_de11 @@ -375,12 +376,50 @@ static struct platform_device *ixp46x_de 12 12 unsigned long ixp4xx_exp_bus_size; 13 13 EXPORT_SYMBOL(ixp4xx_exp_bus_size); … … 62 62 --- a/arch/arm/Kconfig 63 63 +++ b/arch/arm/Kconfig 64 @@ -4 31,7 +431,7 @@ config ARCH_IXP4XX64 @@ -448,7 +448,7 @@ config ARCH_IXP4XX 65 65 bool "IXP4xx-based" 66 66 depends on MMU … … 69 69 + select ARCH_REQUIRE_GPIOLIB 70 70 select GENERIC_CLOCKEVENTS 71 select DMABOUNCE if PCI72 help71 select HAVE_SCHED_CLOCK 72 select MIGHT_HAVE_PCI 73 73 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h 74 74 +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
Note: See TracChangeset
for help on using the changeset viewer.