Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / mfd / timberdale.c

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 1ac77d16dce97eb1a1e7d4eded94703dc52a9f01..ac5995026c8836f392806293a6092c4f1ce30ac7 100644 (file)
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -41,6 +41,8 @@
 
 #include <media/timb_radio.h>
 
+#include <linux/timb_dma.h>
+
 #include "timberdale.h"
 
 #define DRIVER_NAME "timberdale"
@@ -84,7 +86,7 @@ timberdale_ocores_platform_data = {
        .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
 };
 
-const static __devinitconst struct resource timberdale_xiic_resources[] = {
+static const __devinitconst struct resource timberdale_xiic_resources[] = {
        {
                .start  = XIICOFFSET,
                .end    = XIICEND,
@@ -97,7 +99,7 @@ const static __devinitconst struct resource timberdale_xiic_resources[] = {
        },
 };
 
-const static __devinitconst struct resource timberdale_ocores_resources[] = {
+static const __devinitconst struct resource timberdale_ocores_resources[] = {
        {
                .start  = OCORESOFFSET,
                .end    = OCORESEND,
@@ -146,7 +148,7 @@ static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = {
         */
 };
 
-const static __devinitconst struct resource timberdale_spi_resources[] = {
+static const __devinitconst struct resource timberdale_spi_resources[] = {
        {
                .start  = SPIOFFSET,
                .end    = SPIEND,
@@ -159,7 +161,7 @@ const static __devinitconst struct resource timberdale_spi_resources[] = {
        },
 };
 
-const static __devinitconst struct resource timberdale_eth_resources[] = {
+static const __devinitconst struct resource timberdale_eth_resources[] = {
        {
                .start  = ETHOFFSET,
                .end    = ETHEND,
@@ -179,7 +181,7 @@ static __devinitdata struct timbgpio_platform_data
        .irq_base = 200,
 };
 
-const static __devinitconst struct resource timberdale_gpio_resources[] = {
+static const __devinitconst struct resource timberdale_gpio_resources[] = {
        {
                .start  = GPIOOFFSET,
                .end    = GPIOEND,
@@ -192,7 +194,7 @@ const static __devinitconst struct resource timberdale_gpio_resources[] = {
        },
 };
 
-const static __devinitconst struct resource timberdale_mlogicore_resources[] = {
+static const __devinitconst struct resource timberdale_mlogicore_resources[] = {
        {
                .start  = MLCOREOFFSET,
                .end    = MLCOREEND,
@@ -210,7 +212,7 @@ const static __devinitconst struct resource timberdale_mlogicore_resources[] = {
        },
 };
 
-const static __devinitconst struct resource timberdale_uart_resources[] = {
+static const __devinitconst struct resource timberdale_uart_resources[] = {
        {
                .start  = UARTOFFSET,
                .end    = UARTEND,
@@ -223,7 +225,7 @@ const static __devinitconst struct resource timberdale_uart_resources[] = {
        },
 };
 
-const static __devinitconst struct resource timberdale_uartlite_resources[] = {
+static const __devinitconst struct resource timberdale_uartlite_resources[] = {
        {
                .start  = UARTLITEOFFSET,
                .end    = UARTLITEEND,
@@ -236,7 +238,7 @@ const static __devinitconst struct resource timberdale_uartlite_resources[] = {
        },
 };
 
-const static __devinitconst struct resource timberdale_radio_resources[] = {
+static const __devinitconst struct resource timberdale_radio_resources[] = {
        {
                .start  = RDSOFFSET,
                .end    = RDSEND,
@@ -270,7 +272,66 @@ static __devinitdata struct timb_radio_platform_data
        }
 };
 
-const static __devinitconst struct resource timberdale_dma_resources[] = {
+static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = {
+       .nr_channels = 10,
+       .channels = {
+               {
+                       /* UART RX */
+                       .rx = true,
+                       .descriptors = 2,
+                       .descriptor_elements = 1
+               },
+               {
+                       /* UART TX */
+                       .rx = false,
+                       .descriptors = 2,
+                       .descriptor_elements = 1
+               },
+               {
+                       /* MLB RX */
+                       .rx = true,
+                       .descriptors = 2,
+                       .descriptor_elements = 1
+               },
+               {
+                       /* MLB TX */
+                       .rx = false,
+                       .descriptors = 2,
+                       .descriptor_elements = 1
+               },
+               {
+                       /* Video RX */
+                       .rx = true,
+                       .bytes_per_line = 1440,
+                       .descriptors = 2,
+                       .descriptor_elements = 16
+               },
+               {
+                       /* Video framedrop */
+               },
+               {
+                       /* SDHCI RX */
+                       .rx = true,
+               },
+               {
+                       /* SDHCI TX */
+               },
+               {
+                       /* ETH RX */
+                       .rx = true,
+                       .descriptors = 2,
+                       .descriptor_elements = 1
+               },
+               {
+                       /* ETH TX */
+                       .rx = false,
+                       .descriptors = 2,
+                       .descriptor_elements = 1
+               },
+       }
+};
+
+static const __devinitconst struct resource timberdale_dma_resources[] = {
        {
                .start  = DMAOFFSET,
                .end    = DMAEND,
@@ -284,6 +345,13 @@ const static __devinitconst struct resource timberdale_dma_resources[] = {
 };
 
 static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
+       {
+               .name = "timb-dma",
+               .num_resources = ARRAY_SIZE(timberdale_dma_resources),
+               .resources = timberdale_dma_resources,
+               .platform_data = &timb_dma_platform_data,
+               .data_size = sizeof(timb_dma_platform_data),
+       },
        {
                .name = "timb-uart",
                .num_resources = ARRAY_SIZE(timberdale_uart_resources),
@@ -322,14 +390,16 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
                .num_resources = ARRAY_SIZE(timberdale_eth_resources),
                .resources = timberdale_eth_resources,
        },
+};
+
+static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
        {
                .name = "timb-dma",
                .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                .resources = timberdale_dma_resources,
+               .platform_data = &timb_dma_platform_data,
+               .data_size = sizeof(timb_dma_platform_data),
        },
-};
-
-static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
        {
                .name = "timb-uart",
                .num_resources = ARRAY_SIZE(timberdale_uart_resources),
@@ -378,14 +448,16 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                .num_resources = ARRAY_SIZE(timberdale_eth_resources),
                .resources = timberdale_eth_resources,
        },
+};
+
+static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
        {
                .name = "timb-dma",
                .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                .resources = timberdale_dma_resources,
+               .platform_data = &timb_dma_platform_data,
+               .data_size = sizeof(timb_dma_platform_data),
        },
-};
-
-static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
        {
                .name = "timb-uart",
                .num_resources = ARRAY_SIZE(timberdale_uart_resources),
@@ -419,14 +491,16 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
                .platform_data = &timberdale_xspi_platform_data,
                .data_size = sizeof(timberdale_xspi_platform_data),
        },
+};
+
+static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
        {
                .name = "timb-dma",
                .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                .resources = timberdale_dma_resources,
+               .platform_data = &timb_dma_platform_data,
+               .data_size = sizeof(timb_dma_platform_data),
        },
-};
-
-static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
        {
                .name = "timb-uart",
                .num_resources = ARRAY_SIZE(timberdale_uart_resources),
@@ -465,11 +539,6 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
                .num_resources = ARRAY_SIZE(timberdale_eth_resources),
                .resources = timberdale_eth_resources,
        },
-       {
-               .name = "timb-dma",
-               .num_resources = ARRAY_SIZE(timberdale_dma_resources),
-               .resources = timberdale_dma_resources,
-       },
 };
 
 static const __devinitconst struct resource timberdale_sdhc_resources[] = {