3 files changed, 26 insertions, 26 deletions

diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c
index 2d6b8b3a74a5..28fd4b8f4742 100644
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
@@ -564,7 +564,7 @@ static struct at91_uart_data dbgu_data = {
 };
 
 static struct platform_device at91rm9200_dbgu_device = {
-        .name           = "at91_usart",
+        .name           = "atmel_usart",
         .id             = 0,
         .dev            = {
                                 .platform_data  = &dbgu_data,
@@ -599,7 +599,7 @@ static struct at91_uart_data uart0_data = {
 };
 
 static struct platform_device at91rm9200_uart0_device = {
-        .name           = "at91_usart",
+        .name           = "atmel_usart",
         .id             = 1,
         .dev            = {
                                 .platform_data  = &uart0_data,
@@ -641,7 +641,7 @@ static struct at91_uart_data uart1_data = {
 };
 
 static struct platform_device at91rm9200_uart1_device = {
-        .name           = "at91_usart",
+        .name           = "atmel_usart",
         .id             = 2,
         .dev            = {
                                 .platform_data  = &uart1_data,
@@ -682,7 +682,7 @@ static struct at91_uart_data uart2_data = {
 };
 
 static struct platform_device at91rm9200_uart2_device = {
-        .name           = "at91_usart",
+        .name           = "atmel_usart",
         .id             = 3,
         .dev            = {
                                 .platform_data  = &uart2_data,
@@ -717,7 +717,7 @@ static struct at91_uart_data uart3_data = {
 };
 
 static struct platform_device at91rm9200_uart3_device = {
-        .name           = "at91_usart",
+        .name           = "atmel_usart",
         .id             = 4,
         .dev            = {
                                 .platform_data  = &uart3_data,
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 37982b60398e..842e7be7fb5e 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -523,33 +523,33 @@ void __init at32_add_system_devices(void)
  *  USART
  * -------------------------------------------------------------------- */
 
-static struct resource usart0_resource[] = {
+static struct resource atmel_usart0_resource[] = {
         PBMEM(0xffe00c00),
         IRQ(7),
 };
-DEFINE_DEV(usart, 0);
-DEV_CLK(usart, usart0, pba, 4);
+DEFINE_DEV(atmel_usart, 0);
+DEV_CLK(usart, atmel_usart0, pba, 4);
 
-static struct resource usart1_resource[] = {
+static struct resource atmel_usart1_resource[] = {
         PBMEM(0xffe01000),
         IRQ(7),
 };
-DEFINE_DEV(usart, 1);
-DEV_CLK(usart, usart1, pba, 4);
+DEFINE_DEV(atmel_usart, 1);
+DEV_CLK(usart, atmel_usart1, pba, 4);
 
-static struct resource usart2_resource[] = {
+static struct resource atmel_usart2_resource[] = {
         PBMEM(0xffe01400),
         IRQ(8),
 };
-DEFINE_DEV(usart, 2);
-DEV_CLK(usart, usart2, pba, 5);
+DEFINE_DEV(atmel_usart, 2);
+DEV_CLK(usart, atmel_usart2, pba, 5);
 
-static struct resource usart3_resource[] = {
+static struct resource atmel_usart3_resource[] = {
         PBMEM(0xffe01800),
         IRQ(9),
 };
-DEFINE_DEV(usart, 3);
-DEV_CLK(usart, usart3, pba, 6);
+DEFINE_DEV(atmel_usart, 3);
+DEV_CLK(usart, atmel_usart3, pba, 6);
 
 static inline void configure_usart0_pins(void)
 {
@@ -581,19 +581,19 @@ static struct platform_device *setup_usart(unsigned int id)
 
         switch (id) {
         case 0:
-                pdev = &usart0_device;
+                pdev = &atmel_usart0_device;
                 configure_usart0_pins();
                 break;
         case 1:
-                pdev = &usart1_device;
+                pdev = &atmel_usart1_device;
                 configure_usart1_pins();
                 break;
         case 2:
-                pdev = &usart2_device;
+                pdev = &atmel_usart2_device;
                 configure_usart2_pins();
                 break;
         case 3:
-                pdev = &usart3_device;
+                pdev = &atmel_usart3_device;
                 configure_usart3_pins();
                 break;
         default:
@@ -813,10 +813,10 @@ struct clk *at32_clock_list[] = {
         &pio1_mck,
         &pio2_mck,
         &pio3_mck,
-        &usart0_usart,
-        &usart1_usart,
-        &usart2_usart,
-        &usart3_usart,
+        &atmel_usart0_usart,
+        &atmel_usart1_usart,
+        &atmel_usart2_usart,
+        &atmel_usart3_usart,
         &macb0_hclk,
         &macb0_pclk,
         &spi0_mck,
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index b96382da27e0..f14a07ed60b8 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -947,7 +947,7 @@ static struct platform_driver at91_serial_driver = {
         .suspend        = at91_serial_suspend,
         .resume         = at91_serial_resume,
         .driver         = {
-                .name   = "at91_usart",
+                .name   = "atmel_usart",
                 .owner  = THIS_MODULE,
         },
 };