| 1 | --- a/arch/arm/mach-ixp4xx/cambria-setup.c |
| 2 | +++ b/arch/arm/mach-ixp4xx/cambria-setup.c |
| 3 | @@ -34,6 +34,7 @@ |
| 4 | #include <asm/mach/arch.h> |
| 5 | #include <asm/mach/flash.h> |
| 6 | #include <asm/setup.h> |
| 7 | +#include <linux/irq.h> |
| 8 | |
| 9 | struct cambria_board_info { |
| 10 | unsigned char *model; |
| 11 | @@ -127,6 +128,45 @@ static struct platform_device cambria_ua |
| 12 | .resource = &cambria_uart_resource, |
| 13 | }; |
| 14 | |
| 15 | +static struct resource cambria_optional_uart_resources[] = { |
| 16 | + { |
| 17 | + .start = 0x52000000, |
| 18 | + .end = 0x52000fff, |
| 19 | + .flags = IORESOURCE_MEM |
| 20 | + }, |
| 21 | + { |
| 22 | + .start = 0x53000000, |
| 23 | + .end = 0x53000fff, |
| 24 | + .flags = IORESOURCE_MEM |
| 25 | + } |
| 26 | +}; |
| 27 | + |
| 28 | +static struct plat_serial8250_port cambria_optional_uart_data[] = { |
| 29 | + { |
| 30 | + .flags = UPF_BOOT_AUTOCONF, |
| 31 | + .iotype = UPIO_MEM_DELAY, |
| 32 | + .regshift = 0, |
| 33 | + .uartclk = 1843200, |
| 34 | + .rw_delay = 2, |
| 35 | + }, |
| 36 | + { |
| 37 | + .flags = UPF_BOOT_AUTOCONF, |
| 38 | + .iotype = UPIO_MEM_DELAY, |
| 39 | + .regshift = 0, |
| 40 | + .uartclk = 1843200, |
| 41 | + .rw_delay = 2, |
| 42 | + }, |
| 43 | + { }, |
| 44 | +}; |
| 45 | + |
| 46 | +static struct platform_device cambria_optional_uart = { |
| 47 | + .name = "serial8250", |
| 48 | + .id = PLAT8250_DEV_PLATFORM1, |
| 49 | + .dev.platform_data = cambria_optional_uart_data, |
| 50 | + .num_resources = 2, |
| 51 | + .resource = cambria_optional_uart_resources, |
| 52 | +}; |
| 53 | + |
| 54 | static struct resource cambria_pata_resources[] = { |
| 55 | { |
| 56 | .flags = IORESOURCE_MEM |
| 57 | @@ -283,6 +323,19 @@ static void __init cambria_gw23xx_setup( |
| 58 | |
| 59 | static void __init cambria_gw2350_setup(void) |
| 60 | { |
| 61 | + *IXP4XX_EXP_CS2 = 0xBFFF3C43; |
| 62 | + set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); |
| 63 | + cambria_optional_uart_data[0].mapbase = 0x52FF0000; |
| 64 | + cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52FF0000, 0x0fff); |
| 65 | + cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3; |
| 66 | + |
| 67 | + *IXP4XX_EXP_CS3 = 0xBFFF3C43; |
| 68 | + set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING); |
| 69 | + cambria_optional_uart_data[1].mapbase = 0x53FF0000; |
| 70 | + cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53FF0000, 0x0fff); |
| 71 | + cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4; |
| 72 | + |
| 73 | + platform_device_register(&cambria_optional_uart); |
| 74 | platform_device_register(&cambria_npec_device); |
| 75 | platform_device_register(&cambria_npea_device); |
| 76 | |
| 77 | @@ -294,6 +347,19 @@ static void __init cambria_gw2350_setup( |
| 78 | |
| 79 | static void __init cambria_gw2358_setup(void) |
| 80 | { |
| 81 | + *IXP4XX_EXP_CS3 = 0xBFFF3C43; |
| 82 | + set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); |
| 83 | + cambria_optional_uart_data[0].mapbase = 0x53FC0000; |
| 84 | + cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x53FC0000, 0x0fff); |
| 85 | + cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3; |
| 86 | + |
| 87 | + set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING); |
| 88 | + cambria_optional_uart_data[1].mapbase = 0x53F80000; |
| 89 | + cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53F80000, 0x0fff); |
| 90 | + cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4; |
| 91 | + |
| 92 | + platform_device_register(&cambria_optional_uart); |
| 93 | + |
| 94 | platform_device_register(&cambria_npec_device); |
| 95 | platform_device_register(&cambria_npea_device); |
| 96 | |
| 97 | --- a/include/linux/serial_8250.h |
| 98 | +++ b/include/linux/serial_8250.h |
| 99 | @@ -27,6 +27,7 @@ struct plat_serial8250_port { |
| 100 | void *private_data; |
| 101 | unsigned char regshift; /* register shift */ |
| 102 | unsigned char iotype; /* UPIO_* */ |
| 103 | + unsigned int rw_delay; /* udelay for slower busses IXP4XX Expansion Bus */ |
| 104 | unsigned char hub6; |
| 105 | upf_t flags; /* UPF_* flags */ |
| 106 | unsigned int type; /* If UPF_FIXED_TYPE */ |
| 107 | --- a/include/linux/serial_core.h |
| 108 | +++ b/include/linux/serial_core.h |
| 109 | @@ -316,6 +316,7 @@ struct uart_port { |
| 110 | #define UPIO_DWAPB (6) /* DesignWare APB UART */ |
| 111 | #define UPIO_RM9000 (7) /* RM9000 type IO */ |
| 112 | #define UPIO_DWAPB32 (8) /* DesignWare APB UART (32 bit accesses) */ |
| 113 | +#define UPIO_MEM_DELAY (9) |
| 114 | |
| 115 | unsigned int read_status_mask; /* driver specific */ |
| 116 | unsigned int ignore_status_mask; /* driver specific */ |
| 117 | @@ -358,6 +359,7 @@ struct uart_port { |
| 118 | |
| 119 | unsigned int mctrl; /* current modem ctrl settings */ |
| 120 | unsigned int timeout; /* character-based timeout */ |
| 121 | + unsigned int rw_delay; /* udelay for slow busses, IXP4XX Expansion Bus */ |
| 122 | unsigned int type; /* port type */ |
| 123 | const struct uart_ops *ops; |
| 124 | unsigned int custom_divisor; |
| 125 | --- a/drivers/tty/serial/8250.c |
| 126 | +++ b/drivers/tty/serial/8250.c |
| 127 | @@ -413,6 +413,20 @@ static void mem_serial_out(struct uart_p |
| 128 | writeb(value, p->membase + offset); |
| 129 | } |
| 130 | |
| 131 | +static unsigned int memdelay_serial_in(struct uart_port *p, int offset) |
| 132 | +{ |
| 133 | + struct uart_8250_port *up = (struct uart_8250_port *)p; |
| 134 | + udelay(up->port.rw_delay); |
| 135 | + return mem_serial_in(p, offset); |
| 136 | +} |
| 137 | + |
| 138 | +static void memdelay_serial_out(struct uart_port *p, int offset, int value) |
| 139 | +{ |
| 140 | + struct uart_8250_port *up = (struct uart_8250_port *)p; |
| 141 | + udelay(up->port.rw_delay); |
| 142 | + mem_serial_out(p, offset, value); |
| 143 | +} |
| 144 | + |
| 145 | static void mem32_serial_out(struct uart_port *p, int offset, int value) |
| 146 | { |
| 147 | offset = map_8250_out_reg(p, offset) << p->regshift; |
| 148 | @@ -524,6 +538,11 @@ static void set_io_from_upio(struct uart |
| 149 | p->serial_out = mem32_serial_out; |
| 150 | break; |
| 151 | |
| 152 | + case UPIO_MEM_DELAY: |
| 153 | + p->serial_in = memdelay_serial_in; |
| 154 | + p->serial_out = memdelay_serial_out; |
| 155 | + break; |
| 156 | + |
| 157 | case UPIO_AU: |
| 158 | p->serial_in = au_serial_in; |
| 159 | p->serial_out = au_serial_out; |
| 160 | @@ -560,6 +579,7 @@ serial_out_sync(struct uart_8250_port *u |
| 161 | switch (p->iotype) { |
| 162 | case UPIO_MEM: |
| 163 | case UPIO_MEM32: |
| 164 | + case UPIO_MEM_DELAY: |
| 165 | case UPIO_AU: |
| 166 | case UPIO_DWAPB: |
| 167 | case UPIO_DWAPB32: |
| 168 | @@ -2534,6 +2554,7 @@ static int serial8250_request_std_resour |
| 169 | case UPIO_MEM: |
| 170 | case UPIO_DWAPB: |
| 171 | case UPIO_DWAPB32: |
| 172 | + case UPIO_MEM_DELAY: |
| 173 | if (!up->port.mapbase) |
| 174 | break; |
| 175 | |
| 176 | @@ -2572,6 +2593,7 @@ static void serial8250_release_std_resou |
| 177 | case UPIO_MEM: |
| 178 | case UPIO_DWAPB: |
| 179 | case UPIO_DWAPB32: |
| 180 | + case UPIO_MEM_DELAY: |
| 181 | if (!up->port.mapbase) |
| 182 | break; |
| 183 | |
| 184 | @@ -3083,6 +3105,7 @@ static int __devinit serial8250_probe(st |
| 185 | port.set_termios = p->set_termios; |
| 186 | port.pm = p->pm; |
| 187 | port.dev = &dev->dev; |
| 188 | + port.rw_delay = p->rw_delay; |
| 189 | port.irqflags |= irqflag; |
| 190 | ret = serial8250_register_port(&port); |
| 191 | if (ret < 0) { |
| 192 | @@ -3232,6 +3255,7 @@ int serial8250_register_port(struct uart |
| 193 | uart->port.iotype = port->iotype; |
| 194 | uart->port.flags = port->flags | UPF_BOOT_AUTOCONF; |
| 195 | uart->port.mapbase = port->mapbase; |
| 196 | + uart->port.rw_delay = port->rw_delay; |
| 197 | uart->port.private_data = port->private_data; |
| 198 | if (port->dev) |
| 199 | uart->port.dev = port->dev; |
| 200 | --- 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 | snprintf(address, sizeof(address), |
| 204 | "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); |
| 205 | break; |
| 206 | + case UPIO_MEM_DELAY: |
| 207 | case UPIO_MEM: |
| 208 | case UPIO_MEM32: |
| 209 | case UPIO_AU: |
| 210 | @@ -2554,6 +2555,7 @@ int uart_match_port(struct uart_port *po |
| 211 | case UPIO_HUB6: |
| 212 | return (port1->iobase == port2->iobase) && |
| 213 | (port1->hub6 == port2->hub6); |
| 214 | + case UPIO_MEM_DELAY: |
| 215 | case UPIO_MEM: |
| 216 | case UPIO_MEM32: |
| 217 | case UPIO_AU: |
| 218 | |
