Merge branch 'msm-uart' into for-next

* msm-uart:
  serial: msm: Add support for UARTDM cores
  msm: Add name field to UART resources

3 files changed, 7 insertions, 2 deletions

diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index fb548a8a21d..2549fb23ee9 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -38,6 +38,7 @@ static struct resource resources_uart1[] = {
                 .start  = MSM_UART1_PHYS,
                 .end    = MSM_UART1_PHYS + MSM_UART1_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
@@ -51,6 +52,7 @@ static struct resource resources_uart2[] = {
                 .start  = MSM_UART2_PHYS,
                 .end    = MSM_UART2_PHYS + MSM_UART2_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
@@ -64,6 +66,7 @@ static struct resource resources_uart3[] = {
                 .start  = MSM_UART3_PHYS,
                 .end    = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 4e9a0ab3e93..d4c7afccbdb 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -41,6 +41,7 @@ static struct resource resources_uart2[] = {
                 .start  = MSM_UART2_PHYS,
                 .end    = MSM_UART2_PHYS + MSM_UART2_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index a4b798f20cc..93bddacad90 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -38,6 +38,7 @@ static struct resource resources_uart3[] = {
                 .start  = MSM_UART3_PHYS,
                 .end    = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };