Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mfd / timberdale.c

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 727f62c15a6055612b0f4939d55474ff7b440d23..6ad8a7f8d390770124b23b0f5c225bf365c345f8 100644 (file)
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -40,6 +40,7 @@
 #include <linux/spi/mc33880.h>
 
 #include <media/timb_radio.h>
+#include <media/timb_video.h>
 
 #include <linux/timb_dma.h>
 
@@ -246,7 +247,23 @@ static const __devinitconst struct resource timberdale_uartlite_resources[] = {
        },
 };
 
-static const __devinitconst struct resource timberdale_radio_resources[] = {
+static __devinitdata struct i2c_board_info timberdale_adv7180_i2c_board_info = {
+       /* Requires jumper JP9 to be off */
+       I2C_BOARD_INFO("adv7180", 0x42 >> 1),
+       .irq = IRQ_TIMBERDALE_ADV7180
+};
+
+static __devinitdata struct timb_video_platform_data
+       timberdale_video_platform_data = {
+       .dma_channel = DMA_VIDEO_RX,
+       .i2c_adapter = 0,
+       .encoder = {
+               .info = &timberdale_adv7180_i2c_board_info
+       }
+};
+
+static const __devinitconst struct resource
+timberdale_radio_resources[] = {
        {
                .start  = RDSOFFSET,
                .end    = RDSEND,
@@ -271,15 +288,25 @@ static __devinitdata struct timb_radio_platform_data
        timberdale_radio_platform_data = {
        .i2c_adapter = 0,
        .tuner = {
-               .module_name = "tef6862",
                .info = &timberdale_tef6868_i2c_board_info
        },
        .dsp = {
-               .module_name = "saa7706h",
                .info = &timberdale_saa7706_i2c_board_info
        }
 };
 
+static const __devinitconst struct resource timberdale_video_resources[] = {
+       {
+               .start  = LOGIWOFFSET,
+               .end    = LOGIWEND,
+               .flags  = IORESOURCE_MEM,
+       },
+       /*
+       note that the "frame buffer" is located in DMA area
+       starting at 0x1200000
+       */
+};
+
 static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = {
        .nr_channels = 10,
        .channels = {
@@ -379,6 +406,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
                .platform_data = &timberdale_gpio_platform_data,
                .data_size = sizeof(timberdale_gpio_platform_data),
        },
+       {
+               .name = "timb-video",
+               .num_resources = ARRAY_SIZE(timberdale_video_resources),
+               .resources = timberdale_video_resources,
+               .platform_data = &timberdale_video_platform_data,
+               .data_size = sizeof(timberdale_video_platform_data),
+       },
        {
                .name = "timb-radio",
                .num_resources = ARRAY_SIZE(timberdale_radio_resources),
@@ -439,6 +473,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                .num_resources = ARRAY_SIZE(timberdale_mlogicore_resources),
                .resources = timberdale_mlogicore_resources,
        },
+       {
+               .name = "timb-video",
+               .num_resources = ARRAY_SIZE(timberdale_video_resources),
+               .resources = timberdale_video_resources,
+               .platform_data = &timberdale_video_platform_data,
+               .data_size = sizeof(timberdale_video_platform_data),
+       },
        {
                .name = "timb-radio",
                .num_resources = ARRAY_SIZE(timberdale_radio_resources),
@@ -489,6 +530,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
                .platform_data = &timberdale_gpio_platform_data,
                .data_size = sizeof(timberdale_gpio_platform_data),
        },
+       {
+               .name = "timb-video",
+               .num_resources = ARRAY_SIZE(timberdale_video_resources),
+               .resources = timberdale_video_resources,
+               .platform_data = &timberdale_video_platform_data,
+               .data_size = sizeof(timberdale_video_platform_data),
+       },
        {
                .name = "timb-radio",
                .num_resources = ARRAY_SIZE(timberdale_radio_resources),
@@ -532,6 +580,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
                .platform_data = &timberdale_gpio_platform_data,
                .data_size = sizeof(timberdale_gpio_platform_data),
        },
+       {
+               .name = "timb-video",
+               .num_resources = ARRAY_SIZE(timberdale_video_resources),
+               .resources = timberdale_video_resources,
+               .platform_data = &timberdale_video_platform_data,
+               .data_size = sizeof(timberdale_video_platform_data),
+       },
        {
                .name = "timb-radio",
                .num_resources = ARRAY_SIZE(timberdale_radio_resources),