linux-2.6.35.3-fsl-10.3.2-vpac1.txt patch applied

[linux-imx.git] / arch / arm / mach-mx5 / devices.c

diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index 14f2196405a6d75bd2042b1516c00b63811b97d1..a56c86b002004d6506053b5dc7a4bb829b1d6f94 100644 (file)
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -606,7 +606,11 @@ static struct resource mxcspi1_resources[] = {
 
 static u64 spi_dma_mask = DMA_BIT_MASK(32);
 struct platform_device mxcspi1_device = {
+#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
+       .name = "imx5x-ecspi",
+#else
        .name = "mxc_spi",
+#endif
        .id = 0,
        .num_resources = ARRAY_SIZE(mxcspi1_resources),
        .resource = mxcspi1_resources,
@@ -635,7 +639,11 @@ static struct resource mxcspi2_resources[] = {
 };
 
 struct platform_device mxcspi2_device = {
+#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
+       .name = "imx5x-ecspi",
+#else
        .name = "mxc_spi",
+#endif
        .id = 1,
        .num_resources = ARRAY_SIZE(mxcspi2_resources),
        .resource = mxcspi2_resources,
@@ -659,12 +667,76 @@ static struct resource mxcspi3_resources[] = {
 };
 
 struct platform_device mxcspi3_device = {
+#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
+       .name = "imx5x-cspi",
+#else
        .name = "mxc_spi",
+#endif
        .id = 2,
        .num_resources = ARRAY_SIZE(mxcspi3_resources),
        .resource = mxcspi3_resources,
 };
 
+static struct resource mxcuart1_resources[] = {
+       {
+               .start = UART1_BASE_ADDR,
+               .end = UART1_BASE_ADDR + SZ_4K - 1,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = MXC_INT_UART1,
+               .end = MXC_INT_UART1,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource mxcuart2_resources[] = {
+       {
+               .start = UART2_BASE_ADDR,
+               .end = UART2_BASE_ADDR + SZ_4K - 1,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = MXC_INT_UART2,
+               .end = MXC_INT_UART2,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource mxcuart3_resources[] = {
+       {
+               .start = UART3_BASE_ADDR,
+               .end = UART3_BASE_ADDR + SZ_4K - 1,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = MXC_INT_UART3,
+               .end = MXC_INT_UART3,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+struct platform_device mxcuart_devices[] = {
+       {
+               .name = "imx-uart",
+               .id = 0,
+               .num_resources = ARRAY_SIZE(mxcuart1_resources),
+               .resource = mxcuart1_resources,
+       },
+       {
+               .name = "imx-uart",
+               .id = 1,
+               .num_resources = ARRAY_SIZE(mxcuart2_resources),
+               .resource = mxcuart2_resources,
+       },
+       {
+               .name = "imx-uart",
+               .id = 2,
+               .num_resources = ARRAY_SIZE(mxcuart3_resources),
+               .resource = mxcuart3_resources,
+       },
+};
+
 static struct resource mxci2c1_resources[] = {
        {
                .start = I2C1_BASE_ADDR,
@@ -1261,7 +1333,11 @@ struct platform_device mxc_usbdr_otg_device = {
 };
 
 struct platform_device mxc_usbdr_host_device = {
+#if defined(CONFIG_USB_EHCI_ARC) || defined(CONFIG_USB_EHCI_ARC_MODULE)
        .name = "fsl-ehci",
+#else
+       .name = "mxc-ehci",
+#endif
        .id = 0,
        .num_resources = ARRAY_SIZE(usbotg_host_resources),
        .resource = usbotg_host_resources,
@@ -1302,7 +1378,11 @@ static struct resource usbh1_wakeup_resources[] = {
 };
 
 struct platform_device mxc_usbh1_device = {
+#if defined(CONFIG_USB_EHCI_ARC) || defined(CONFIG_USB_EHCI_ARC_MODULE)
        .name = "fsl-ehci",
+#else
+       .name = "mxc-ehci",
+#endif
        .id = 1,
        .num_resources = ARRAY_SIZE(usbh1_resources),
        .resource = usbh1_resources,