Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9b4a1617772d6d5ab5eeda0cd95302fae119e359

Authored by Russell King
Committed by Russell King
1 parent 53ea68ecea
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SERIAL] uart_port iotype member should use UPIO_* 

Convert usage of SERIAL_IO_* to UPIO_*.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 38 changed files with 66 additions and 66 deletions Side-by-side Diff

arch/mips/lasat/setup.c
Diff comments   View file @ 9b4a161
... ... @@ -135,7 +135,7 @@
135 135 memset(&s, 0, sizeof(s));
136 136  
137 137 s.flags = STD_COM_FLAGS;
138   - s.iotype = SERIAL_IO_MEM;
  138 + s.iotype = UPIO_MEM;
139 139  
140 140 if (mips_machtype == MACH_LASAT_100) {
141 141 s.uartclk = LASAT_BASE_BAUD_100 * 16;
arch/mips/mips-boards/atlas/atlas_setup.c
Diff comments   View file @ 9b4a161
... ... @@ -83,7 +83,7 @@
83 83 s.irq = ATLASINT_UART;
84 84 s.uartclk = ATLAS_BASE_BAUD * 16;
85 85 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
86   - s.iotype = SERIAL_IO_PORT;
  86 + s.iotype = UPIO_PORT;
87 87 s.regshift = 3;
88 88  
89 89 if (early_serial_setup(&s) != 0) {
arch/mips/mips-boards/sead/sead_setup.c
Diff comments   View file @ 9b4a161
... ... @@ -72,7 +72,7 @@
72 72 s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
73 73 s.uartclk = SEAD_BASE_BAUD * 16;
74 74 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
75   - s.iotype = 0;
  75 + s.iotype = UPIO_PORT;
76 76 s.regshift = 3;
77 77  
78 78 if (early_serial_setup(&s) != 0) {
arch/mips/mips-boards/sim/sim_setup.c
Diff comments   View file @ 9b4a161
... ... @@ -89,7 +89,7 @@
89 89 s.irq = 0;
90 90 s.uartclk = BASE_BAUD * 16;
91 91 s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST;
92   - s.iotype = SERIAL_IO_PORT | ASYNC_SKIP_TEST;
  92 + s.iotype = UPIO_PORT;
93 93 s.regshift = 0;
94 94 s.timeout = 4;
95 95  
arch/mips/philips/pnx8550/common/platform.c
Diff comments   View file @ 9b4a161
... ... @@ -66,7 +66,7 @@
66 66 [0] = {
67 67 .port = {
68 68 .type = PORT_IP3106,
69   - .iotype = SERIAL_IO_MEM,
  69 + .iotype = UPIO_MEM,
70 70 .membase = (void __iomem *)PNX8550_UART_PORT0,
71 71 .mapbase = PNX8550_UART_PORT0,
72 72 .irq = PNX8550_UART_INT(0),
... ... @@ -80,7 +80,7 @@
80 80 [1] = {
81 81 .port = {
82 82 .type = PORT_IP3106,
83   - .iotype = SERIAL_IO_MEM,
  83 + .iotype = UPIO_MEM,
84 84 .membase = (void __iomem *)PNX8550_UART_PORT1,
85 85 .mapbase = PNX8550_UART_PORT1,
86 86 .irq = PNX8550_UART_INT(1),
arch/ppc/platforms/4xx/bamboo.c
Diff comments   View file @ 9b4a161
... ... @@ -332,7 +332,7 @@
332 332 port.irq = 0;
333 333 port.uartclk = clocks.uart0;
334 334 port.regshift = 0;
335   - port.iotype = SERIAL_IO_MEM;
  335 + port.iotype = UPIO_MEM;
336 336 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
337 337 port.line = 0;
338 338  
arch/ppc/platforms/4xx/bubinga.c
Diff comments   View file @ 9b4a161
... ... @@ -97,7 +97,7 @@
97 97 port.irq = ACTING_UART0_INT;
98 98 port.uartclk = uart_clock;
99 99 port.regshift = 0;
100   - port.iotype = SERIAL_IO_MEM;
  100 + port.iotype = UPIO_MEM;
101 101 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
102 102 port.line = 0;
103 103  
arch/ppc/platforms/4xx/ebony.c
Diff comments   View file @ 9b4a161
... ... @@ -225,7 +225,7 @@
225 225 port.irq = 0;
226 226 port.uartclk = clocks.uart0;
227 227 port.regshift = 0;
228   - port.iotype = SERIAL_IO_MEM;
  228 + port.iotype = UPIO_MEM;
229 229 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
230 230 port.line = 0;
231 231  
arch/ppc/platforms/4xx/luan.c
Diff comments   View file @ 9b4a161
... ... @@ -279,7 +279,7 @@
279 279 port.irq = UART0_INT;
280 280 port.uartclk = clocks.uart0;
281 281 port.regshift = 0;
282   - port.iotype = SERIAL_IO_MEM;
  282 + port.iotype = UPIO_MEM;
283 283 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
284 284 port.line = 0;
285 285  
arch/ppc/platforms/4xx/ocotea.c
Diff comments   View file @ 9b4a161
... ... @@ -248,7 +248,7 @@
248 248 port.irq = UART0_INT;
249 249 port.uartclk = clocks.uart0;
250 250 port.regshift = 0;
251   - port.iotype = SERIAL_IO_MEM;
  251 + port.iotype = UPIO_MEM;
252 252 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
253 253 port.line = 0;
254 254  
arch/ppc/platforms/4xx/xilinx_ml300.c
Diff comments   View file @ 9b4a161
... ... @@ -95,7 +95,7 @@
95 95 port.irq = old_ports[i].irq;
96 96 port.uartclk = old_ports[i].baud_base * 16;
97 97 port.regshift = old_ports[i].iomem_reg_shift;
98   - port.iotype = SERIAL_IO_MEM;
  98 + port.iotype = UPIO_MEM;
99 99 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
100 100 port.line = i;
101 101  
arch/ppc/platforms/4xx/yucca.c
Diff comments   View file @ 9b4a161
... ... @@ -305,7 +305,7 @@
305 305 port.irq = UART0_INT;
306 306 port.uartclk = clocks.uart0;
307 307 port.regshift = 0;
308   - port.iotype = SERIAL_IO_MEM;
  308 + port.iotype = UPIO_MEM;
309 309 port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
310 310 port.line = 0;
311 311  
arch/ppc/platforms/83xx/mpc834x_sys.c
Diff comments   View file @ 9b4a161
... ... @@ -301,14 +301,14 @@
301 301 struct uart_port p;
302 302  
303 303 memset(&p, 0, sizeof (p));
304   - p.iotype = SERIAL_IO_MEM;
  304 + p.iotype = UPIO_MEM;
305 305 p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4500);
306 306 p.uartclk = binfo->bi_busfreq;
307 307  
308 308 gen550_init(0, &p);
309 309  
310 310 memset(&p, 0, sizeof (p));
311   - p.iotype = SERIAL_IO_MEM;
  311 + p.iotype = UPIO_MEM;
312 312 p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4600);
313 313 p.uartclk = binfo->bi_busfreq;
314 314  
arch/ppc/platforms/85xx/mpc8540_ads.c
Diff comments   View file @ 9b4a161
... ... @@ -162,14 +162,14 @@
162 162 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
163 163  
164 164 memset(&p, 0, sizeof (p));
165   - p.iotype = SERIAL_IO_MEM;
  165 + p.iotype = UPIO_MEM;
166 166 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
167 167 p.uartclk = binfo->bi_busfreq;
168 168  
169 169 gen550_init(0, &p);
170 170  
171 171 memset(&p, 0, sizeof (p));
172   - p.iotype = SERIAL_IO_MEM;
  172 + p.iotype = UPIO_MEM;
173 173 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
174 174 p.uartclk = binfo->bi_busfreq;
175 175  
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
Diff comments   View file @ 9b4a161
... ... @@ -534,14 +534,14 @@
534 534 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
535 535  
536 536 memset(&p, 0, sizeof (p));
537   - p.iotype = SERIAL_IO_MEM;
  537 + p.iotype = UPIO_MEM;
538 538 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
539 539 p.uartclk = binfo->bi_busfreq;
540 540  
541 541 gen550_init(0, &p);
542 542  
543 543 memset(&p, 0, sizeof (p));
544   - p.iotype = SERIAL_IO_MEM;
  544 + p.iotype = UPIO_MEM;
545 545 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
546 546 p.uartclk = binfo->bi_busfreq;
547 547  
arch/ppc/platforms/85xx/sbc8560.c
Diff comments   View file @ 9b4a161
... ... @@ -64,7 +64,7 @@
64 64 uart_req.irq = MPC85xx_IRQ_EXT9;
65 65 uart_req.flags = STD_COM_FLAGS;
66 66 uart_req.uartclk = BASE_BAUD * 16;
67   - uart_req.iotype = SERIAL_IO_MEM;
  67 + uart_req.iotype = UPIO_MEM;
68 68 uart_req.mapbase = UARTA_ADDR;
69 69 uart_req.membase = ioremap(uart_req.mapbase, MPC85xx_UART0_SIZE);
70 70 uart_req.type = PORT_16650;
arch/ppc/platforms/85xx/tqm85xx.c
Diff comments   View file @ 9b4a161
... ... @@ -346,14 +346,14 @@
346 346 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
347 347  
348 348 memset(&p, 0, sizeof (p));
349   - p.iotype = SERIAL_IO_MEM;
  349 + p.iotype = UPIO_MEM;
350 350 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
351 351 p.uartclk = binfo->bi_busfreq;
352 352  
353 353 gen550_init(0, &p);
354 354  
355 355 memset(&p, 0, sizeof (p));
356   - p.iotype = SERIAL_IO_MEM;
  356 + p.iotype = UPIO_MEM;
357 357 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
358 358 p.uartclk = binfo->bi_busfreq;
359 359  
arch/ppc/platforms/chestnut.c
Diff comments   View file @ 9b4a161
... ... @@ -116,7 +116,7 @@
116 116 port.uartclk = BASE_BAUD * 16;
117 117 port.irq = UART0_INT;
118 118 port.flags = STD_COM_FLAGS | UPF_IOREMAP;
119   - port.iotype = SERIAL_IO_MEM;
  119 + port.iotype = UPIO_MEM;
120 120 port.mapbase = CHESTNUT_UART0_IO_BASE;
121 121 port.regshift = 0;
122 122  
arch/ppc/platforms/ev64260.c
Diff comments   View file @ 9b4a161
... ... @@ -330,7 +330,7 @@
330 330 port.irq = EV64260_UART_0_IRQ;
331 331 port.uartclk = BASE_BAUD * 16;
332 332 port.regshift = 2;
333   - port.iotype = SERIAL_IO_MEM;
  333 + port.iotype = UPIO_MEM;
334 334 port.flags = STD_COM_FLAGS;
335 335  
336 336 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
arch/ppc/platforms/radstone_ppc7d.c
Diff comments   View file @ 9b4a161
... ... @@ -100,7 +100,7 @@
100 100 serial_req.uartclk = UART_CLK;
101 101 serial_req.irq = 4;
102 102 serial_req.flags = STD_COM_FLAGS;
103   - serial_req.iotype = SERIAL_IO_MEM;
  103 + serial_req.iotype = UPIO_MEM;
104 104 serial_req.membase = (u_char *) PPC7D_SERIAL_0;
105 105  
106 106 gen550_init(0, &serial_req);
arch/ppc/platforms/spruce.c
Diff comments   View file @ 9b4a161
... ... @@ -177,7 +177,7 @@
177 177 serial_req.uartclk = uart_clk;
178 178 serial_req.irq = UART0_INT;
179 179 serial_req.flags = ASYNC_BOOT_AUTOCONF;
180   - serial_req.iotype = SERIAL_IO_MEM;
  180 + serial_req.iotype = UPIO_MEM;
181 181 serial_req.membase = (u_char *)UART0_IO_BASE;
182 182 serial_req.regshift = 0;
183 183  
arch/ppc/syslib/ppc83xx_setup.c
Diff comments   View file @ 9b4a161
... ... @@ -108,7 +108,7 @@
108 108  
109 109 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
110 110 memset(&serial_req, 0, sizeof (serial_req));
111   - serial_req.iotype = SERIAL_IO_MEM;
  111 + serial_req.iotype = UPIO_MEM;
112 112 serial_req.mapbase = pdata[0].mapbase;
113 113 serial_req.membase = pdata[0].membase;
114 114 serial_req.regshift = 0;
arch/ppc/syslib/ppc85xx_setup.c
Diff comments   View file @ 9b4a161
... ... @@ -90,7 +90,7 @@
90 90  
91 91 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
92 92 memset(&serial_req, 0, sizeof (serial_req));
93   - serial_req.iotype = SERIAL_IO_MEM;
  93 + serial_req.iotype = UPIO_MEM;
94 94 serial_req.mapbase = pdata[0].mapbase;
95 95 serial_req.membase = pdata[0].membase;
96 96 serial_req.regshift = 0;
drivers/serial/21285.c
Diff comments   View file @ 9b4a161
... ... @@ -362,7 +362,7 @@
362 362  
363 363 static struct uart_port serial21285_port = {
364 364 .mapbase = 0x42000160,
365   - .iotype = SERIAL_IO_MEM,
  365 + .iotype = UPIO_MEM,
366 366 .irq = NO_IRQ,
367 367 .fifosize = 16,
368 368 .ops = &serial21285_ops,
drivers/serial/amba-pl010.c
Diff comments   View file @ 9b4a161
... ... @@ -561,7 +561,7 @@
561 561 .port = {
562 562 .membase = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE),
563 563 .mapbase = INTEGRATOR_UART0_BASE,
564   - .iotype = SERIAL_IO_MEM,
  564 + .iotype = UPIO_MEM,
565 565 .irq = IRQ_UARTINT0,
566 566 .uartclk = 14745600,
567 567 .fifosize = 16,
... ... @@ -576,7 +576,7 @@
576 576 .port = {
577 577 .membase = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE),
578 578 .mapbase = INTEGRATOR_UART1_BASE,
579   - .iotype = SERIAL_IO_MEM,
  579 + .iotype = UPIO_MEM,
580 580 .irq = IRQ_UARTINT1,
581 581 .uartclk = 14745600,
582 582 .fifosize = 16,
drivers/serial/au1x00_uart.c
Diff comments   View file @ 9b4a161
... ... @@ -892,7 +892,7 @@
892 892 int ret = 0;
893 893  
894 894 switch (up->port.iotype) {
895   - case SERIAL_IO_MEM:
  895 + case UPIO_MEM:
896 896 if (up->port.mapbase) {
897 897 *res = request_mem_region(up->port.mapbase, size, "serial");
898 898 if (!*res)
... ... @@ -900,8 +900,8 @@
900 900 }
901 901 break;
902 902  
903   - case SERIAL_IO_HUB6:
904   - case SERIAL_IO_PORT:
  903 + case UPIO_HUB6:
  904 + case UPIO_PORT:
905 905 *res = request_region(up->port.iobase, size, "serial");
906 906 if (!*res)
907 907 ret = -EBUSY;
... ... @@ -919,7 +919,7 @@
919 919 size <<= up->port.regshift;
920 920  
921 921 switch (up->port.iotype) {
922   - case SERIAL_IO_MEM:
  922 + case UPIO_MEM:
923 923 if (up->port.mapbase) {
924 924 /*
925 925 * Unmap the area.
... ... @@ -935,8 +935,8 @@
935 935 }
936 936 break;
937 937  
938   - case SERIAL_IO_HUB6:
939   - case SERIAL_IO_PORT:
  938 + case UPIO_HUB6:
  939 + case UPIO_PORT:
940 940 start = up->port.iobase;
941 941  
942 942 if (size)
drivers/serial/cpm_uart/cpm_uart_core.c
Diff comments   View file @ 9b4a161
... ... @@ -908,7 +908,7 @@
908 908 .port = {
909 909 .irq = SMC1_IRQ,
910 910 .ops = &cpm_uart_pops,
911   - .iotype = SERIAL_IO_MEM,
  911 + .iotype = UPIO_MEM,
912 912 .lock = SPIN_LOCK_UNLOCKED,
913 913 },
914 914 .flags = FLAG_SMC,
... ... @@ -922,7 +922,7 @@
922 922 .port = {
923 923 .irq = SMC2_IRQ,
924 924 .ops = &cpm_uart_pops,
925   - .iotype = SERIAL_IO_MEM,
  925 + .iotype = UPIO_MEM,
926 926 .lock = SPIN_LOCK_UNLOCKED,
927 927 },
928 928 .flags = FLAG_SMC,
... ... @@ -939,7 +939,7 @@
939 939 .port = {
940 940 .irq = SCC1_IRQ,
941 941 .ops = &cpm_uart_pops,
942   - .iotype = SERIAL_IO_MEM,
  942 + .iotype = UPIO_MEM,
943 943 .lock = SPIN_LOCK_UNLOCKED,
944 944 },
945 945 .tx_nrfifos = TX_NUM_FIFO,
... ... @@ -953,7 +953,7 @@
953 953 .port = {
954 954 .irq = SCC2_IRQ,
955 955 .ops = &cpm_uart_pops,
956   - .iotype = SERIAL_IO_MEM,
  956 + .iotype = UPIO_MEM,
957 957 .lock = SPIN_LOCK_UNLOCKED,
958 958 },
959 959 .tx_nrfifos = TX_NUM_FIFO,
... ... @@ -967,7 +967,7 @@
967 967 .port = {
968 968 .irq = SCC3_IRQ,
969 969 .ops = &cpm_uart_pops,
970   - .iotype = SERIAL_IO_MEM,
  970 + .iotype = UPIO_MEM,
971 971 .lock = SPIN_LOCK_UNLOCKED,
972 972 },
973 973 .tx_nrfifos = TX_NUM_FIFO,
... ... @@ -981,7 +981,7 @@
981 981 .port = {
982 982 .irq = SCC4_IRQ,
983 983 .ops = &cpm_uart_pops,
984   - .iotype = SERIAL_IO_MEM,
  984 + .iotype = UPIO_MEM,
985 985 .lock = SPIN_LOCK_UNLOCKED,
986 986 },
987 987 .tx_nrfifos = TX_NUM_FIFO,
... ... @@ -650,7 +650,7 @@
650 650 for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) {
651 651 spin_lock_init(&dport->port.lock);
652 652 dport->port.membase = (char *) base;
653   - dport->port.iotype = SERIAL_IO_PORT;
  653 + dport->port.iotype = UPIO_PORT;
654 654 dport->port.irq = dec_interrupt[DEC_IRQ_DZ11];
655 655 dport->port.line = i;
656 656 dport->port.fifosize = 1;
drivers/serial/imx.c
Diff comments   View file @ 9b4a161
... ... @@ -668,7 +668,7 @@
668 668 .rtsirq = UART1_MINT_RTS,
669 669 .port = {
670 670 .type = PORT_IMX,
671   - .iotype = SERIAL_IO_MEM,
  671 + .iotype = UPIO_MEM,
672 672 .membase = (void *)IMX_UART1_BASE,
673 673 .mapbase = IMX_UART1_BASE, /* FIXME */
674 674 .irq = UART1_MINT_RX,
... ... @@ -684,7 +684,7 @@
684 684 .rtsirq = UART2_MINT_RTS,
685 685 .port = {
686 686 .type = PORT_IMX,
687   - .iotype = SERIAL_IO_MEM,
  687 + .iotype = UPIO_MEM,
688 688 .membase = (void *)IMX_UART2_BASE,
689 689 .mapbase = IMX_UART2_BASE, /* FIXME */
690 690 .irq = UART2_MINT_RX,
drivers/serial/mux.c
Diff comments   View file @ 9b4a161
... ... @@ -462,7 +462,7 @@
462 462 port->mapbase = dev->hpa.start + MUX_OFFSET +
463 463 (i * MUX_LINE_OFFSET);
464 464 port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET);
465   - port->iotype = SERIAL_IO_MEM;
  465 + port->iotype = UPIO_MEM;
466 466 port->type = PORT_MUX;
467 467 port->irq = NO_IRQ;
468 468 port->uartclk = 0;
drivers/serial/pmac_zilog.c
Diff comments   View file @ 9b4a161
... ... @@ -1492,7 +1492,7 @@
1492 1492 /*
1493 1493 * Init remaining bits of "port" structure
1494 1494 */
1495   - uap->port.iotype = SERIAL_IO_MEM;
  1495 + uap->port.iotype = UPIO_MEM;
1496 1496 uap->port.irq = np->intrs[0].line;
1497 1497 uap->port.uartclk = ZS_CLOCK;
1498 1498 uap->port.fifosize = 1;
drivers/serial/sa1100.c
Diff comments   View file @ 9b4a161
... ... @@ -628,7 +628,7 @@
628 628 sa1100_ports[i].port.ops = &sa1100_pops;
629 629 sa1100_ports[i].port.fifosize = 8;
630 630 sa1100_ports[i].port.line = i;
631   - sa1100_ports[i].port.iotype = SERIAL_IO_MEM;
  631 + sa1100_ports[i].port.iotype = UPIO_MEM;
632 632 init_timer(&sa1100_ports[i].timer);
633 633 sa1100_ports[i].timer.function = sa1100_timeout;
634 634 sa1100_ports[i].timer.data = (unsigned long)&sa1100_ports[i];
drivers/serial/serial_lh7a40x.c
Diff comments   View file @ 9b4a161
... ... @@ -501,7 +501,7 @@
501 501 .port = {
502 502 .membase = (void*) io_p2v (UART1_PHYS),
503 503 .mapbase = UART1_PHYS,
504   - .iotype = SERIAL_IO_MEM,
  504 + .iotype = UPIO_MEM,
505 505 .irq = IRQ_UART1INTR,
506 506 .uartclk = 14745600/2,
507 507 .fifosize = 16,
... ... @@ -514,7 +514,7 @@
514 514 .port = {
515 515 .membase = (void*) io_p2v (UART2_PHYS),
516 516 .mapbase = UART2_PHYS,
517   - .iotype = SERIAL_IO_MEM,
  517 + .iotype = UPIO_MEM,
518 518 .irq = IRQ_UART2INTR,
519 519 .uartclk = 14745600/2,
520 520 .fifosize = 16,
... ... @@ -527,7 +527,7 @@
527 527 .port = {
528 528 .membase = (void*) io_p2v (UART3_PHYS),
529 529 .mapbase = UART3_PHYS,
530   - .iotype = SERIAL_IO_MEM,
  530 + .iotype = UPIO_MEM,
531 531 .irq = IRQ_UART3INTR,
532 532 .uartclk = 14745600/2,
533 533 .fifosize = 16,
drivers/serial/sh-sci.c
Diff comments   View file @ 9b4a161
... ... @@ -1468,7 +1468,7 @@
1468 1468 .port = {
1469 1469 .membase = (void *)0xff923000,
1470 1470 .mapbase = 0xff923000,
1471   - .iotype = SERIAL_IO_MEM,
  1471 + .iotype = UPIO_MEM,
1472 1472 .irq = 61,
1473 1473 .ops = &sci_uart_ops,
1474 1474 .flags = ASYNC_BOOT_AUTOCONF,
... ... @@ -1482,7 +1482,7 @@
1482 1482 .port = {
1483 1483 .membase = (void *)0xff924000,
1484 1484 .mapbase = 0xff924000,
1485   - .iotype = SERIAL_IO_MEM,
  1485 + .iotype = UPIO_MEM,
1486 1486 .irq = 62,
1487 1487 .ops = &sci_uart_ops,
1488 1488 .flags = ASYNC_BOOT_AUTOCONF,
... ... @@ -1496,7 +1496,7 @@
1496 1496 .port = {
1497 1497 .membase = (void *)0xff925000,
1498 1498 .mapbase = 0xff925000,
1499   - .iotype = SERIAL_IO_MEM,
  1499 + .iotype = UPIO_MEM,
1500 1500 .irq = 63,
1501 1501 .ops = &sci_uart_ops,
1502 1502 .flags = ASYNC_BOOT_AUTOCONF,
... ... @@ -1511,7 +1511,7 @@
1511 1511 .port = {
1512 1512 .membase = (void *)0xffe00000,
1513 1513 .mapbase = 0xffe00000,
1514   - .iotype = SERIAL_IO_MEM,
  1514 + .iotype = UPIO_MEM,
1515 1515 .irq = 43,
1516 1516 .ops = &sci_uart_ops,
1517 1517 .flags = ASYNC_BOOT_AUTOCONF,
... ... @@ -1525,7 +1525,7 @@
1525 1525 .port = {
1526 1526 .membase = (void *)0xffe10000,
1527 1527 .mapbase = 0xffe10000,
1528   - .iotype = SERIAL_IO_MEM,
  1528 + .iotype = UPIO_MEM,
1529 1529 .irq = 79,
1530 1530 .ops = &sci_uart_ops,
1531 1531 .flags = ASYNC_BOOT_AUTOCONF,
drivers/serial/sunsab.c
Diff comments   View file @ 9b4a161
... ... @@ -1036,7 +1036,7 @@
1036 1036 up->port.irq = edev->irqs[0];
1037 1037 up->port.fifosize = SAB82532_XMIT_FIFO_SIZE;
1038 1038 up->port.mapbase = (unsigned long)up->regs;
1039   - up->port.iotype = SERIAL_IO_MEM;
  1039 + up->port.iotype = UPIO_MEM;
1040 1040  
1041 1041 writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc);
1042 1042  
drivers/serial/sunsu.c
Diff comments   View file @ 9b4a161
... ... @@ -109,11 +109,11 @@
109 109 offset <<= up->port.regshift;
110 110  
111 111 switch (up->port.iotype) {
112   - case SERIAL_IO_HUB6:
  112 + case UPIO_HUB6:
113 113 outb(up->port.hub6 - 1 + offset, up->port.iobase);
114 114 return inb(up->port.iobase + 1);
115 115  
116   - case SERIAL_IO_MEM:
  116 + case UPIO_MEM:
117 117 return readb(up->port.membase + offset);
118 118  
119 119 default:
120 120  
... ... @@ -139,12 +139,12 @@
139 139 offset <<= up->port.regshift;
140 140  
141 141 switch (up->port.iotype) {
142   - case SERIAL_IO_HUB6:
  142 + case UPIO_HUB6:
143 143 outb(up->port.hub6 - 1 + offset, up->port.iobase);
144 144 outb(value, up->port.iobase + 1);
145 145 break;
146 146  
147   - case SERIAL_IO_MEM:
  147 + case UPIO_MEM:
148 148 writeb(value, up->port.membase + offset);
149 149 break;
150 150  
... ... @@ -1052,7 +1052,7 @@
1052 1052 return;
1053 1053  
1054 1054 up->type_probed = PORT_UNKNOWN;
1055   - up->port.iotype = SERIAL_IO_MEM;
  1055 + up->port.iotype = UPIO_MEM;
1056 1056  
1057 1057 /*
1058 1058 * First we look for Ebus-bases su's
drivers/serial/sunzilog.c
Diff comments   View file @ 9b4a161
... ... @@ -1487,7 +1487,7 @@
1487 1487 up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB;
1488 1488  
1489 1489 /* Channel A */
1490   - up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM;
  1490 + up[(chip * 2) + 0].port.iotype = UPIO_MEM;
1491 1491 up[(chip * 2) + 0].port.irq = zilog_irq;
1492 1492 up[(chip * 2) + 0].port.uartclk = ZS_CLOCK;
1493 1493 up[(chip * 2) + 0].port.fifosize = 1;
... ... @@ -1498,7 +1498,7 @@
1498 1498 up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A;
1499 1499  
1500 1500 /* Channel B */
1501   - up[(chip * 2) + 1].port.iotype = SERIAL_IO_MEM;
  1501 + up[(chip * 2) + 1].port.iotype = UPIO_MEM;
1502 1502 up[(chip * 2) + 1].port.irq = zilog_irq;
1503 1503 up[(chip * 2) + 1].port.uartclk = ZS_CLOCK;
1504 1504 up[(chip * 2) + 1].port.fifosize = 1;
drivers/serial/v850e_uart.c
Diff comments   View file @ 9b4a161
... ... @@ -496,7 +496,7 @@
496 496  
497 497 port->ops = &v850e_uart_ops;
498 498 port->line = chan;
499   - port->iotype = SERIAL_IO_MEM;
  499 + port->iotype = UPIO_MEM;
500 500 port->flags = UPF_BOOT_AUTOCONF;
501 501  
502 502 /* We actually use multiple IRQs, but the serial