diff options
-rw-r--r-- | arch/arm/configs/at91rm9200dk_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/at91rm9200ek_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/ateb9200_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/carmeva_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/csb337_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/csb637_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/kafa_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/kb9202_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/onearm_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/devices.c | 2 | ||||
-rw-r--r-- | arch/avr32/configs/atstk1002_defconfig | 6 | ||||
-rw-r--r-- | drivers/serial/Kconfig | 14 | ||||
-rw-r--r-- | drivers/serial/Makefile | 2 | ||||
-rw-r--r-- | drivers/serial/atmel_serial.c | 6 | ||||
-rw-r--r-- | include/asm-arm/mach/serial_at91.h | 2 | ||||
-rw-r--r-- | include/asm-avr32/mach/serial_at91.h | 2 |
16 files changed, 42 insertions, 42 deletions
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index 4f3d8d37741e..c82e4667f45e 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
@@ -553,9 +553,9 @@ CONFIG_HW_CONSOLE=y | |||
553 | # | 553 | # |
554 | # Non-8250 serial port support | 554 | # Non-8250 serial port support |
555 | # | 555 | # |
556 | CONFIG_SERIAL_AT91=y | 556 | CONFIG_SERIAL_ATMEL=y |
557 | CONFIG_SERIAL_AT91_CONSOLE=y | 557 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
558 | # CONFIG_SERIAL_AT91_TTYAT is not set | 558 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
559 | CONFIG_SERIAL_CORE=y | 559 | CONFIG_SERIAL_CORE=y |
560 | CONFIG_SERIAL_CORE_CONSOLE=y | 560 | CONFIG_SERIAL_CORE_CONSOLE=y |
561 | CONFIG_UNIX98_PTYS=y | 561 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index 08b5dc38876f..b983fc59aa42 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
@@ -534,9 +534,9 @@ CONFIG_HW_CONSOLE=y | |||
534 | # | 534 | # |
535 | # Non-8250 serial port support | 535 | # Non-8250 serial port support |
536 | # | 536 | # |
537 | CONFIG_SERIAL_AT91=y | 537 | CONFIG_SERIAL_ATMEL=y |
538 | CONFIG_SERIAL_AT91_CONSOLE=y | 538 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
539 | # CONFIG_SERIAL_AT91_TTYAT is not set | 539 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
540 | CONFIG_SERIAL_CORE=y | 540 | CONFIG_SERIAL_CORE=y |
541 | CONFIG_SERIAL_CORE_CONSOLE=y | 541 | CONFIG_SERIAL_CORE_CONSOLE=y |
542 | CONFIG_UNIX98_PTYS=y | 542 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig index bee7813d040e..15e6b0bbbde8 100644 --- a/arch/arm/configs/ateb9200_defconfig +++ b/arch/arm/configs/ateb9200_defconfig | |||
@@ -656,9 +656,9 @@ CONFIG_HW_CONSOLE=y | |||
656 | # | 656 | # |
657 | # Non-8250 serial port support | 657 | # Non-8250 serial port support |
658 | # | 658 | # |
659 | CONFIG_SERIAL_AT91=y | 659 | CONFIG_SERIAL_ATMEL=y |
660 | CONFIG_SERIAL_AT91_CONSOLE=y | 660 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
661 | # CONFIG_SERIAL_AT91_TTYAT is not set | 661 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
662 | CONFIG_SERIAL_CORE=y | 662 | CONFIG_SERIAL_CORE=y |
663 | CONFIG_SERIAL_CORE_CONSOLE=y | 663 | CONFIG_SERIAL_CORE_CONSOLE=y |
664 | CONFIG_UNIX98_PTYS=y | 664 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/carmeva_defconfig b/arch/arm/configs/carmeva_defconfig index 8a075c8ecc63..d24ae8777c35 100644 --- a/arch/arm/configs/carmeva_defconfig +++ b/arch/arm/configs/carmeva_defconfig | |||
@@ -455,8 +455,8 @@ CONFIG_HW_CONSOLE=y | |||
455 | # | 455 | # |
456 | # Non-8250 serial port support | 456 | # Non-8250 serial port support |
457 | # | 457 | # |
458 | CONFIG_SERIAL_AT91=y | 458 | CONFIG_SERIAL_ATMEL=y |
459 | CONFIG_SERIAL_AT91_CONSOLE=y | 459 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
460 | CONFIG_SERIAL_CORE=y | 460 | CONFIG_SERIAL_CORE=y |
461 | CONFIG_SERIAL_CORE_CONSOLE=y | 461 | CONFIG_SERIAL_CORE_CONSOLE=y |
462 | CONFIG_UNIX98_PTYS=y | 462 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig index cf3fa5cb26e4..a2d6fd398f16 100644 --- a/arch/arm/configs/csb337_defconfig +++ b/arch/arm/configs/csb337_defconfig | |||
@@ -591,9 +591,9 @@ CONFIG_HW_CONSOLE=y | |||
591 | # | 591 | # |
592 | # Non-8250 serial port support | 592 | # Non-8250 serial port support |
593 | # | 593 | # |
594 | CONFIG_SERIAL_AT91=y | 594 | CONFIG_SERIAL_ATMEL=y |
595 | CONFIG_SERIAL_AT91_CONSOLE=y | 595 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
596 | # CONFIG_SERIAL_AT91_TTYAT is not set | 596 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
597 | CONFIG_SERIAL_CORE=y | 597 | CONFIG_SERIAL_CORE=y |
598 | CONFIG_SERIAL_CORE_CONSOLE=y | 598 | CONFIG_SERIAL_CORE_CONSOLE=y |
599 | CONFIG_UNIX98_PTYS=y | 599 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig index 640d70c1f066..2a1ac6c60abc 100644 --- a/arch/arm/configs/csb637_defconfig +++ b/arch/arm/configs/csb637_defconfig | |||
@@ -591,9 +591,9 @@ CONFIG_HW_CONSOLE=y | |||
591 | # | 591 | # |
592 | # Non-8250 serial port support | 592 | # Non-8250 serial port support |
593 | # | 593 | # |
594 | CONFIG_SERIAL_AT91=y | 594 | CONFIG_SERIAL_ATMEL=y |
595 | CONFIG_SERIAL_AT91_CONSOLE=y | 595 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
596 | # CONFIG_SERIAL_AT91_TTYAT is not set | 596 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
597 | CONFIG_SERIAL_CORE=y | 597 | CONFIG_SERIAL_CORE=y |
598 | CONFIG_SERIAL_CORE_CONSOLE=y | 598 | CONFIG_SERIAL_CORE_CONSOLE=y |
599 | CONFIG_UNIX98_PTYS=y | 599 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig index 1db633e2c940..54fcd75779da 100644 --- a/arch/arm/configs/kafa_defconfig +++ b/arch/arm/configs/kafa_defconfig | |||
@@ -536,9 +536,9 @@ CONFIG_HW_CONSOLE=y | |||
536 | # | 536 | # |
537 | # Non-8250 serial port support | 537 | # Non-8250 serial port support |
538 | # | 538 | # |
539 | CONFIG_SERIAL_AT91=y | 539 | CONFIG_SERIAL_ATMEL=y |
540 | CONFIG_SERIAL_AT91_CONSOLE=y | 540 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
541 | # CONFIG_SERIAL_AT91_TTYAT is not set | 541 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
542 | CONFIG_SERIAL_CORE=y | 542 | CONFIG_SERIAL_CORE=y |
543 | CONFIG_SERIAL_CORE_CONSOLE=y | 543 | CONFIG_SERIAL_CORE_CONSOLE=y |
544 | CONFIG_UNIX98_PTYS=y | 544 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig index 45396e087196..b4cd4b414836 100644 --- a/arch/arm/configs/kb9202_defconfig +++ b/arch/arm/configs/kb9202_defconfig | |||
@@ -418,8 +418,8 @@ CONFIG_HW_CONSOLE=y | |||
418 | # | 418 | # |
419 | # Non-8250 serial port support | 419 | # Non-8250 serial port support |
420 | # | 420 | # |
421 | CONFIG_SERIAL_AT91=y | 421 | CONFIG_SERIAL_ATMEL=y |
422 | CONFIG_SERIAL_AT91_CONSOLE=y | 422 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
423 | CONFIG_SERIAL_CORE=y | 423 | CONFIG_SERIAL_CORE=y |
424 | CONFIG_SERIAL_CORE_CONSOLE=y | 424 | CONFIG_SERIAL_CORE_CONSOLE=y |
425 | CONFIG_UNIX98_PTYS=y | 425 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig index 6a93e3aae106..cb1d94f9049e 100644 --- a/arch/arm/configs/onearm_defconfig +++ b/arch/arm/configs/onearm_defconfig | |||
@@ -583,9 +583,9 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
583 | # | 583 | # |
584 | # Non-8250 serial port support | 584 | # Non-8250 serial port support |
585 | # | 585 | # |
586 | CONFIG_SERIAL_AT91=y | 586 | CONFIG_SERIAL_ATMEL=y |
587 | CONFIG_SERIAL_AT91_CONSOLE=y | 587 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
588 | # CONFIG_SERIAL_AT91_TTYAT is not set | 588 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
589 | CONFIG_SERIAL_CORE=y | 589 | CONFIG_SERIAL_CORE=y |
590 | CONFIG_SERIAL_CORE_CONSOLE=y | 590 | CONFIG_SERIAL_CORE_CONSOLE=y |
591 | CONFIG_UNIX98_PTYS=y | 591 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c index 01525530c287..2d6b8b3a74a5 100644 --- a/arch/arm/mach-at91rm9200/devices.c +++ b/arch/arm/mach-at91rm9200/devices.c | |||
@@ -544,7 +544,7 @@ void __init at91_init_leds(u8 cpu_led, u8 timer_led) {} | |||
544 | * UART | 544 | * UART |
545 | * -------------------------------------------------------------------- */ | 545 | * -------------------------------------------------------------------- */ |
546 | 546 | ||
547 | #if defined(CONFIG_SERIAL_AT91) | 547 | #if defined(CONFIG_SERIAL_ATMEL) |
548 | static struct resource dbgu_resources[] = { | 548 | static struct resource dbgu_resources[] = { |
549 | [0] = { | 549 | [0] = { |
550 | .start = AT91_VA_BASE_SYS + AT91_DBGU, | 550 | .start = AT91_VA_BASE_SYS + AT91_DBGU, |
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index 1d22255009fd..6c2c5e00dfc7 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_defconfig | |||
@@ -385,9 +385,9 @@ CONFIG_PPP_DEFLATE=m | |||
385 | # | 385 | # |
386 | # Non-8250 serial port support | 386 | # Non-8250 serial port support |
387 | # | 387 | # |
388 | CONFIG_SERIAL_AT91=y | 388 | CONFIG_SERIAL_ATMEL=y |
389 | CONFIG_SERIAL_AT91_CONSOLE=y | 389 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
390 | # CONFIG_SERIAL_AT91_TTYAT is not set | 390 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
391 | CONFIG_SERIAL_CORE=y | 391 | CONFIG_SERIAL_CORE=y |
392 | CONFIG_SERIAL_CORE_CONSOLE=y | 392 | CONFIG_SERIAL_CORE_CONSOLE=y |
393 | CONFIG_UNIX98_PTYS=y | 393 | CONFIG_UNIX98_PTYS=y |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 8edee745888a..ba19ab571f98 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -299,17 +299,17 @@ config SERIAL_AMBA_PL011_CONSOLE | |||
299 | your boot loader (lilo or loadlin) about how to pass options to the | 299 | your boot loader (lilo or loadlin) about how to pass options to the |
300 | kernel at boot time.) | 300 | kernel at boot time.) |
301 | 301 | ||
302 | config SERIAL_AT91 | 302 | config SERIAL_ATMEL |
303 | bool "AT91RM9200 / AT91SAM9261 serial port support" | 303 | bool "AT91 / AT32 on-chip serial port support" |
304 | depends on ARM && (ARCH_AT91RM9200 || ARCH_AT91SAM9261) | 304 | depends on ARM && (ARCH_AT91RM9200 || ARCH_AT91SAM9261) |
305 | select SERIAL_CORE | 305 | select SERIAL_CORE |
306 | help | 306 | help |
307 | This enables the driver for the on-chip UARTs of the Atmel | 307 | This enables the driver for the on-chip UARTs of the Atmel |
308 | AT91RM9200 and AT91SAM926 processor. | 308 | AT91RM9200 and AT91SAM926 processor. |
309 | 309 | ||
310 | config SERIAL_AT91_CONSOLE | 310 | config SERIAL_ATMEL_CONSOLE |
311 | bool "Support for console on AT91RM9200 / AT91SAM9261 serial port" | 311 | bool "Support for console on AT91 / AT32 serial port" |
312 | depends on SERIAL_AT91=y | 312 | depends on SERIAL_ATMEL=y |
313 | select SERIAL_CORE_CONSOLE | 313 | select SERIAL_CORE_CONSOLE |
314 | help | 314 | help |
315 | Say Y here if you wish to use a UART on the Atmel AT91RM9200 or | 315 | Say Y here if you wish to use a UART on the Atmel AT91RM9200 or |
@@ -317,9 +317,9 @@ config SERIAL_AT91_CONSOLE | |||
317 | which receives all kernel messages and warnings and which allows | 317 | which receives all kernel messages and warnings and which allows |
318 | logins in single user mode). | 318 | logins in single user mode). |
319 | 319 | ||
320 | config SERIAL_AT91_TTYAT | 320 | config SERIAL_ATMEL_TTYAT |
321 | bool "Install as device ttyAT0-4 instead of ttyS0-4" | 321 | bool "Install as device ttyAT0-4 instead of ttyS0-4" |
322 | depends on SERIAL_AT91=y | 322 | depends on SERIAL_ATMEL=y |
323 | help | 323 | help |
324 | Say Y here if you wish to have the five internal AT91RM9200 UARTs | 324 | Say Y here if you wish to have the five internal AT91RM9200 UARTs |
325 | appear as /dev/ttyAT0-4 (major 204, minor 154-158) instead of the | 325 | appear as /dev/ttyAT0-4 (major 204, minor 154-158) instead of the |
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index e49808ab4b02..b4d8a7c182e3 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
@@ -54,5 +54,5 @@ obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o | |||
54 | obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o | 54 | obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o |
55 | obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o | 55 | obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o |
56 | obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o | 56 | obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o |
57 | obj-$(CONFIG_SERIAL_AT91) += atmel_serial.o | 57 | obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o |
58 | obj-$(CONFIG_SERIAL_NETX) += netx-serial.o | 58 | obj-$(CONFIG_SERIAL_NETX) += netx-serial.o |
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 3b420aeafc24..b96382da27e0 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
@@ -44,13 +44,13 @@ | |||
44 | 44 | ||
45 | #include "atmel_serial.h" | 45 | #include "atmel_serial.h" |
46 | 46 | ||
47 | #if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 47 | #if defined(CONFIG_SERIAL_ATMEL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
48 | #define SUPPORT_SYSRQ | 48 | #define SUPPORT_SYSRQ |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #include <linux/serial_core.h> | 51 | #include <linux/serial_core.h> |
52 | 52 | ||
53 | #ifdef CONFIG_SERIAL_AT91_TTYAT | 53 | #ifdef CONFIG_SERIAL_ATMEL_TTYAT |
54 | 54 | ||
55 | /* Use device name ttyAT, major 204 and minor 154-169. This is necessary if we | 55 | /* Use device name ttyAT, major 204 and minor 154-169. This is necessary if we |
56 | * should coexist with the 8250 driver, such as if we have an external 16C550 | 56 | * should coexist with the 8250 driver, such as if we have an external 16C550 |
@@ -726,7 +726,7 @@ void __init at91_register_uart_fns(struct at91_port_fns *fns) | |||
726 | } | 726 | } |
727 | 727 | ||
728 | 728 | ||
729 | #ifdef CONFIG_SERIAL_AT91_CONSOLE | 729 | #ifdef CONFIG_SERIAL_ATMEL_CONSOLE |
730 | static void at91_console_putchar(struct uart_port *port, int ch) | 730 | static void at91_console_putchar(struct uart_port *port, int ch) |
731 | { | 731 | { |
732 | while (!(UART_GET_CSR(port) & AT91_US_TXRDY)) | 732 | while (!(UART_GET_CSR(port) & AT91_US_TXRDY)) |
diff --git a/include/asm-arm/mach/serial_at91.h b/include/asm-arm/mach/serial_at91.h index 1290bb32802d..239e1f65d67b 100644 --- a/include/asm-arm/mach/serial_at91.h +++ b/include/asm-arm/mach/serial_at91.h | |||
@@ -24,7 +24,7 @@ struct at91_port_fns { | |||
24 | void (*close)(struct uart_port *); | 24 | void (*close)(struct uart_port *); |
25 | }; | 25 | }; |
26 | 26 | ||
27 | #if defined(CONFIG_SERIAL_AT91) | 27 | #if defined(CONFIG_SERIAL_ATMEL) |
28 | void at91_register_uart_fns(struct at91_port_fns *fns); | 28 | void at91_register_uart_fns(struct at91_port_fns *fns); |
29 | #else | 29 | #else |
30 | #define at91_register_uart_fns(fns) do { } while (0) | 30 | #define at91_register_uart_fns(fns) do { } while (0) |
diff --git a/include/asm-avr32/mach/serial_at91.h b/include/asm-avr32/mach/serial_at91.h index 1290bb32802d..239e1f65d67b 100644 --- a/include/asm-avr32/mach/serial_at91.h +++ b/include/asm-avr32/mach/serial_at91.h | |||
@@ -24,7 +24,7 @@ struct at91_port_fns { | |||
24 | void (*close)(struct uart_port *); | 24 | void (*close)(struct uart_port *); |
25 | }; | 25 | }; |
26 | 26 | ||
27 | #if defined(CONFIG_SERIAL_AT91) | 27 | #if defined(CONFIG_SERIAL_ATMEL) |
28 | void at91_register_uart_fns(struct at91_port_fns *fns); | 28 | void at91_register_uart_fns(struct at91_port_fns *fns); |
29 | #else | 29 | #else |
30 | #define at91_register_uart_fns(fns) do { } while (0) | 30 | #define at91_register_uart_fns(fns) do { } while (0) |