[media] ARM: davinci: dm355: add support for v4l2 video display

Create platform devices for various video modules like venc,osd,
vpbe and v4l2 driver for dm355.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 147b8e1a4407f794052de4579ba6630f195f982b..37d12cc202afeadfb768cc6d097c7065480a452d 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -253,8 +253,6 @@ static struct davinci_uart_config uart_config __initdata = {
 
 static void __init dm355_evm_map_io(void)
 {
-       /* setup input configuration for VPFE input devices */
-       dm355_set_vpfe_config(&vpfe_cfg);
        dm355_init();
 }
 
@@ -344,6 +342,8 @@ static __init void dm355_evm_init(void)
        davinci_setup_mmc(0, &dm355evm_mmc_config);
        davinci_setup_mmc(1, &dm355evm_mmc_config);
 
+       dm355_init_video(&vpfe_cfg, NULL);
+
        dm355_init_spi0(BIT(0), dm355_evm_spi_info,
                        ARRAY_SIZE(dm355_evm_spi_info));
 

diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index c8b1e0bebcfb3b1e2aa604d43b58c857ca6999ae..1ab3df423dacc2998711e31b5aad6c8e78d94249 100644 (file)
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -44,6 +44,7 @@
 #define SYSMOD_PUPDCTL1                        0x7c
 
 /* VPSS CLKCTL bit definitions */
+#define VPSS_MUXSEL_EXTCLK_ENABLE      BIT(1)
 #define VPSS_VENCCLKEN_ENABLE          BIT(3)
 #define VPSS_DACCLKEN_ENABLE           BIT(4)
 #define VPSS_PLLC2SYSCLK5_ENABLE       BIT(5)
@@ -80,7 +81,7 @@ void __init dm355_init(void);
 void dm355_init_spi0(unsigned chipselect_mask,
                const struct spi_board_info *info, unsigned len);
 void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);
-void dm355_set_vpfe_config(struct vpfe_config *cfg);
+int dm355_init_video(struct vpfe_config *, struct vpbe_config *);
 
 /* DM365 function declarations */
 void __init dm365_init(void);

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 8e98bb06b1c1e4056f9daba6cbc418a0f54be606..bf9a9d4ad9f5ec425edd00704aaa1ad2ad408c23 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -35,6 +35,8 @@
 #include "asp.h"
 
 #define DM355_UART2_BASE       (IO_PHYS + 0x206000)
+#define DM355_OSD_BASE         (IO_PHYS + 0x70200)
+#define DM355_VENC_BASE                (IO_PHYS + 0x70400)
 
 /*
  * Device specific clocks
@@ -744,11 +746,146 @@ static struct platform_device vpfe_capture_dev = {
        },
 };
 
-void dm355_set_vpfe_config(struct vpfe_config *cfg)
+static struct resource dm355_osd_resources[] = {
+       {
+               .start  = DM355_OSD_BASE,
+               .end    = DM355_OSD_BASE + 0x17f,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device dm355_osd_dev = {
+       .name           = DM355_VPBE_OSD_SUBDEV_NAME,
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(dm355_osd_resources),
+       .resource       = dm355_osd_resources,
+       .dev            = {
+               .dma_mask               = &vpfe_capture_dma_mask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+       },
+};
+
+static struct resource dm355_venc_resources[] = {
+       {
+               .start  = IRQ_VENCINT,
+               .end    = IRQ_VENCINT,
+               .flags  = IORESOURCE_IRQ,
+       },
+       /* venc registers io space */
+       {
+               .start  = DM355_VENC_BASE,
+               .end    = DM355_VENC_BASE + 0x17f,
+               .flags  = IORESOURCE_MEM,
+       },
+       /* VDAC config register io space */
+       {
+               .start  = DAVINCI_SYSTEM_MODULE_BASE + SYSMOD_VDAC_CONFIG,
+               .end    = DAVINCI_SYSTEM_MODULE_BASE + SYSMOD_VDAC_CONFIG + 3,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct resource dm355_v4l2_disp_resources[] = {
+       {
+               .start  = IRQ_VENCINT,
+               .end    = IRQ_VENCINT,
+               .flags  = IORESOURCE_IRQ,
+       },
+       /* venc registers io space */
+       {
+               .start  = DM355_VENC_BASE,
+               .end    = DM355_VENC_BASE + 0x17f,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type,
+                           int field)
+{
+       switch (if_type) {
+       case V4L2_MBUS_FMT_SGRBG8_1X8:
+               davinci_cfg_reg(DM355_VOUT_FIELD_G70);
+               break;
+       case V4L2_MBUS_FMT_YUYV10_1X20:
+               if (field)
+                       davinci_cfg_reg(DM355_VOUT_FIELD);
+               else
+                       davinci_cfg_reg(DM355_VOUT_FIELD_G70);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       davinci_cfg_reg(DM355_VOUT_COUTL_EN);
+       davinci_cfg_reg(DM355_VOUT_COUTH_EN);
+
+       return 0;
+}
+
+static int dm355_venc_setup_clock(enum vpbe_enc_timings_type type,
+                                  unsigned int pclock)
 {
-       vpfe_capture_dev.dev.platform_data = cfg;
+       void __iomem *vpss_clk_ctrl_reg;
+
+       vpss_clk_ctrl_reg = DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL);
+
+       switch (type) {
+       case VPBE_ENC_STD:
+               writel(VPSS_DACCLKEN_ENABLE | VPSS_VENCCLKEN_ENABLE,
+                      vpss_clk_ctrl_reg);
+               break;
+       case VPBE_ENC_DV_TIMINGS:
+               if (pclock > 27000000)
+                       /*
+                        * For HD, use external clock source since we cannot
+                        * support HD mode with internal clocks.
+                        */
+                       writel(VPSS_MUXSEL_EXTCLK_ENABLE, vpss_clk_ctrl_reg);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
 }
 
+static struct platform_device dm355_vpbe_display = {
+       .name           = "vpbe-v4l2",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(dm355_v4l2_disp_resources),
+       .resource       = dm355_v4l2_disp_resources,
+       .dev            = {
+               .dma_mask               = &vpfe_capture_dma_mask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+       },
+};
+
+struct venc_platform_data dm355_venc_pdata = {
+       .setup_pinmux   = dm355_vpbe_setup_pinmux,
+       .setup_clock    = dm355_venc_setup_clock,
+};
+
+static struct platform_device dm355_venc_dev = {
+       .name           = DM355_VPBE_VENC_SUBDEV_NAME,
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(dm355_venc_resources),
+       .resource       = dm355_venc_resources,
+       .dev            = {
+               .dma_mask               = &vpfe_capture_dma_mask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .platform_data          = (void *)&dm355_venc_pdata,
+       },
+};
+
+static struct platform_device dm355_vpbe_dev = {
+       .name           = "vpbe_controller",
+       .id             = -1,
+       .dev            = {
+               .dma_mask               = &vpfe_capture_dma_mask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+       },
+};
+
 /*----------------------------------------------------------------------*/
 
 static struct map_desc dm355_io_desc[] = {
@@ -868,6 +1005,29 @@ void __init dm355_init(void)
        davinci_map_sysmod();
 }
 
+int __init dm355_init_video(struct vpfe_config *vpfe_cfg,
+                               struct vpbe_config *vpbe_cfg)
+{
+       if (vpfe_cfg || vpbe_cfg)
+               platform_device_register(&dm355_vpss_device);
+
+       if (vpfe_cfg) {
+               vpfe_capture_dev.dev.platform_data = vpfe_cfg;
+               platform_device_register(&dm355_ccdc_dev);
+               platform_device_register(&vpfe_capture_dev);
+       }
+
+       if (vpbe_cfg) {
+               dm355_vpbe_dev.dev.platform_data = vpbe_cfg;
+               platform_device_register(&dm355_osd_dev);
+               platform_device_register(&dm355_venc_dev);
+               platform_device_register(&dm355_vpbe_dev);
+               platform_device_register(&dm355_vpbe_display);
+       }
+
+       return 0;
+}
+
 static int __init dm355_init_devices(void)
 {
        if (!cpu_is_davinci_dm355())
@@ -875,9 +1035,6 @@ static int __init dm355_init_devices(void)
 
        davinci_cfg_reg(DM355_INT_EDMA_CC);
        platform_device_register(&dm355_edma_device);
-       platform_device_register(&dm355_vpss_device);
-       platform_device_register(&dm355_ccdc_dev);
-       platform_device_register(&vpfe_capture_dev);
 
        return 0;
 }