aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91rm9200/devices.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-at91rm9200/devices.c')
-rw-r--r--arch/arm/mach-at91rm9200/devices.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c
index 28fd4b8f4742..5a3919f09d4d 100644
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
@@ -558,7 +558,7 @@ static struct resource dbgu_resources[] = {
558 }, 558 },
559}; 559};
560 560
561static struct at91_uart_data dbgu_data = { 561static struct atmel_uart_data dbgu_data = {
562 .use_dma_tx = 0, 562 .use_dma_tx = 0,
563 .use_dma_rx = 0, /* DBGU not capable of receive DMA */ 563 .use_dma_rx = 0, /* DBGU not capable of receive DMA */
564}; 564};
@@ -593,7 +593,7 @@ static struct resource uart0_resources[] = {
593 }, 593 },
594}; 594};
595 595
596static struct at91_uart_data uart0_data = { 596static struct atmel_uart_data uart0_data = {
597 .use_dma_tx = 1, 597 .use_dma_tx = 1,
598 .use_dma_rx = 1, 598 .use_dma_rx = 1,
599}; 599};
@@ -635,7 +635,7 @@ static struct resource uart1_resources[] = {
635 }, 635 },
636}; 636};
637 637
638static struct at91_uart_data uart1_data = { 638static struct atmel_uart_data uart1_data = {
639 .use_dma_tx = 1, 639 .use_dma_tx = 1,
640 .use_dma_rx = 1, 640 .use_dma_rx = 1,
641}; 641};
@@ -676,7 +676,7 @@ static struct resource uart2_resources[] = {
676 }, 676 },
677}; 677};
678 678
679static struct at91_uart_data uart2_data = { 679static struct atmel_uart_data uart2_data = {
680 .use_dma_tx = 1, 680 .use_dma_tx = 1,
681 .use_dma_rx = 1, 681 .use_dma_rx = 1,
682}; 682};
@@ -711,7 +711,7 @@ static struct resource uart3_resources[] = {
711 }, 711 },
712}; 712};
713 713
714static struct at91_uart_data uart3_data = { 714static struct atmel_uart_data uart3_data = {
715 .use_dma_tx = 1, 715 .use_dma_tx = 1,
716 .use_dma_rx = 1, 716 .use_dma_rx = 1,
717}; 717};
@@ -733,8 +733,8 @@ static inline void configure_usart3_pins(void)
733 at91_set_B_periph(AT91_PIN_PA6, 0); /* RXD3 */ 733 at91_set_B_periph(AT91_PIN_PA6, 0); /* RXD3 */
734} 734}
735 735
736struct platform_device *at91_uarts[AT91_NR_UART]; /* the UARTs to use */ 736struct platform_device *at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
737struct platform_device *at91_default_console_device; /* the serial console device */ 737struct platform_device *atmel_default_console_device; /* the serial console device */
738 738
739void __init at91_init_serial(struct at91_uart_config *config) 739void __init at91_init_serial(struct at91_uart_config *config)
740{ 740{
@@ -775,9 +775,9 @@ void __init at91_init_serial(struct at91_uart_config *config)
775 } 775 }
776 776
777 /* Set serial console device */ 777 /* Set serial console device */
778 if (config->console_tty < AT91_NR_UART) 778 if (config->console_tty < ATMEL_MAX_UART)
779 at91_default_console_device = at91_uarts[config->console_tty]; 779 atmel_default_console_device = at91_uarts[config->console_tty];
780 if (!at91_default_console_device) 780 if (!atmel_default_console_device)
781 printk(KERN_INFO "AT91: No default serial console defined.\n"); 781 printk(KERN_INFO "AT91: No default serial console defined.\n");
782} 782}
783 783
@@ -785,7 +785,7 @@ void __init at91_add_device_serial(void)
785{ 785{
786 int i; 786 int i;
787 787
788 for (i = 0; i < AT91_NR_UART; i++) { 788 for (i = 0; i < ATMEL_MAX_UART; i++) {
789 if (at91_uarts[i]) 789 if (at91_uarts[i])
790 platform_device_register(at91_uarts[i]); 790 platform_device_register(at91_uarts[i]);
791 } 791 }