* [PATCH v5 0/2] ARM: davinci: dm355: add support for vpbe display @ 2013-03-16 10:17 ` Prabhakar lad 0 siblings, 0 replies; 10+ messages in thread From: Prabhakar lad @ 2013-03-16 10:17 UTC (permalink / raw) To: linux-arm-kernel From: Lad, Prabhakar <prabhakar.csengg@gmail.com> This patch series enables VPBE display driver on DM355. Changes for v5: 1: Rebased on 3.9, fix review comments pointed by Sekhar for DM365 series. Changes for v4: 1: pass different platform names to handle different ip's. Changes for v3: 1: Replaced obsolete preset API by timings API. Changes for v2: 1: Removed VPSS clock alias for master and slave which was sent for VPSS driver. since this patch was dependent on patch[1]. I will revist this patch once MC(captrure driver) goes into mainline. [1] http://www.spinics.net/lists/linux-media/msg50562.html Lad, Prabhakar (2): ARM: davinci: dm355: add support for v4l2 video display ARM: davinci: dm355 EVM: add support for VPBE display arch/arm/mach-davinci/board-dm355-evm.c | 71 +++++++++++- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm355.c | 202 +++++++++++++++++++++++++++++-- 3 files changed, 264 insertions(+), 11 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 0/2] ARM: davinci: dm355: add support for vpbe display @ 2013-03-16 10:17 ` Prabhakar lad 0 siblings, 0 replies; 10+ messages in thread From: Prabhakar lad @ 2013-03-16 10:17 UTC (permalink / raw) To: LAK, DLOS, Sekhar Nori; +Cc: LKML, Lad, Prabhakar From: Lad, Prabhakar <prabhakar.csengg@gmail.com> This patch series enables VPBE display driver on DM355. Changes for v5: 1: Rebased on 3.9, fix review comments pointed by Sekhar for DM365 series. Changes for v4: 1: pass different platform names to handle different ip's. Changes for v3: 1: Replaced obsolete preset API by timings API. Changes for v2: 1: Removed VPSS clock alias for master and slave which was sent for VPSS driver. since this patch was dependent on patch[1]. I will revist this patch once MC(captrure driver) goes into mainline. [1] http://www.spinics.net/lists/linux-media/msg50562.html Lad, Prabhakar (2): ARM: davinci: dm355: add support for v4l2 video display ARM: davinci: dm355 EVM: add support for VPBE display arch/arm/mach-davinci/board-dm355-evm.c | 71 +++++++++++- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm355.c | 202 +++++++++++++++++++++++++++++-- 3 files changed, 264 insertions(+), 11 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display 2013-03-16 10:17 ` Prabhakar lad @ 2013-03-16 10:17 ` Prabhakar lad -1 siblings, 0 replies; 10+ messages in thread From: Prabhakar lad @ 2013-03-16 10:17 UTC (permalink / raw) To: linux-arm-kernel From: Lad, Prabhakar <prabhakar.csengg@gmail.com> 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> --- arch/arm/mach-davinci/board-dm355-evm.c | 4 +- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm355.c | 202 +++++++++++++++++++++++++++++-- 3 files changed, 197 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 147b8e1..37d12cc 100644 --- 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 1c2670f..acfe0bb 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -74,7 +74,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 __init 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 b49c3b7..761fcba 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -36,6 +36,17 @@ #define DM355_UART2_BASE (IO_PHYS + 0x206000) +#define DM3XX_VDAC_CONFIG_BASE 0x01c4002c + +#define DM355_OSD_BASE 0x01c70200 + +#define DM355_VENC_BASE 0x01c70400 + +#define DM355_VPSS_CLK_CTRL_ADDR 0x44 +#define DM355_VPSS_MUXSEL_EXTCLK_ENABLE BIT(1) +#define DM355_VPSS_VENCCLKEN_ENABLE BIT(3) +#define DM355_VPSS_DACCLKEN_ENABLE BIT(4) + /* * Device specific clocks */ @@ -744,11 +755,165 @@ 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 + 0x180, + .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 + 0x180, + .flags = IORESOURCE_MEM, + }, + /* VDAC config register io space */ + { + .start = DM3XX_VDAC_CONFIG_BASE, + .end = DM3XX_VDAC_CONFIG_BASE + 4, + .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 + 0x180, + .flags = IORESOURCE_MEM, + }, +}; + +static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, + int field) { - vpfe_capture_dev.dev.platform_data = cfg; + switch (if_type) { + case V4L2_MBUS_FMT_SGRBG8_1X8: + davinci_cfg_reg(DM355_VOUT_FIELD_G70); + break; + + case V4L2_MBUS_FMT_YUYV10_1X20: + /* + * This was VPBE_DIGITAL_IF_YCC16. Replace the enum + * accordingly when the right one gets into open source + */ + 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 inline u32 dm355_reg_modify(void *reg, u32 val, u32 mask) +{ + u32 new_val = (readl(reg) & ~mask) | (val & mask); + + writel(new_val, reg); + + return new_val; +} + +static int dm355_venc_setup_clock(enum vpbe_enc_timings_type type, + unsigned int pclock) +{ + void __iomem *vpss_clk_ctrl_reg; + + vpss_clk_ctrl_reg = DAVINCI_SYSMOD_VIRT(DM355_VPSS_CLK_CTRL_ADDR); + + switch (type) { + case VPBE_ENC_STD: + vpss_enable_clock(VPSS_VENC_CLOCK_SEL, 0); + writel(DM355_VPSS_DACCLKEN_ENABLE | + DM355_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(DM355_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,19 +1033,40 @@ 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) { + /* Add ccdc clock aliases */ + clk_add_alias("master", dm355_ccdc_dev.name, + "vpss_master", NULL); + clk_add_alias("slave", dm355_ccdc_dev.name, "vpss_slave", NULL); + 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()) return 0; - /* Add ccdc clock aliases */ - clk_add_alias("master", dm355_ccdc_dev.name, "vpss_master", NULL); - clk_add_alias("slave", dm355_ccdc_dev.name, "vpss_master", NULL); 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; } -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display @ 2013-03-16 10:17 ` Prabhakar lad 0 siblings, 0 replies; 10+ messages in thread From: Prabhakar lad @ 2013-03-16 10:17 UTC (permalink / raw) To: LAK, DLOS, Sekhar Nori; +Cc: LKML, Lad, Prabhakar From: Lad, Prabhakar <prabhakar.csengg@gmail.com> 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> --- arch/arm/mach-davinci/board-dm355-evm.c | 4 +- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm355.c | 202 +++++++++++++++++++++++++++++-- 3 files changed, 197 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 147b8e1..37d12cc 100644 --- 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 1c2670f..acfe0bb 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -74,7 +74,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 __init 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 b49c3b7..761fcba 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -36,6 +36,17 @@ #define DM355_UART2_BASE (IO_PHYS + 0x206000) +#define DM3XX_VDAC_CONFIG_BASE 0x01c4002c + +#define DM355_OSD_BASE 0x01c70200 + +#define DM355_VENC_BASE 0x01c70400 + +#define DM355_VPSS_CLK_CTRL_ADDR 0x44 +#define DM355_VPSS_MUXSEL_EXTCLK_ENABLE BIT(1) +#define DM355_VPSS_VENCCLKEN_ENABLE BIT(3) +#define DM355_VPSS_DACCLKEN_ENABLE BIT(4) + /* * Device specific clocks */ @@ -744,11 +755,165 @@ 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 + 0x180, + .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 + 0x180, + .flags = IORESOURCE_MEM, + }, + /* VDAC config register io space */ + { + .start = DM3XX_VDAC_CONFIG_BASE, + .end = DM3XX_VDAC_CONFIG_BASE + 4, + .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 + 0x180, + .flags = IORESOURCE_MEM, + }, +}; + +static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, + int field) { - vpfe_capture_dev.dev.platform_data = cfg; + switch (if_type) { + case V4L2_MBUS_FMT_SGRBG8_1X8: + davinci_cfg_reg(DM355_VOUT_FIELD_G70); + break; + + case V4L2_MBUS_FMT_YUYV10_1X20: + /* + * This was VPBE_DIGITAL_IF_YCC16. Replace the enum + * accordingly when the right one gets into open source + */ + 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 inline u32 dm355_reg_modify(void *reg, u32 val, u32 mask) +{ + u32 new_val = (readl(reg) & ~mask) | (val & mask); + + writel(new_val, reg); + + return new_val; +} + +static int dm355_venc_setup_clock(enum vpbe_enc_timings_type type, + unsigned int pclock) +{ + void __iomem *vpss_clk_ctrl_reg; + + vpss_clk_ctrl_reg = DAVINCI_SYSMOD_VIRT(DM355_VPSS_CLK_CTRL_ADDR); + + switch (type) { + case VPBE_ENC_STD: + vpss_enable_clock(VPSS_VENC_CLOCK_SEL, 0); + writel(DM355_VPSS_DACCLKEN_ENABLE | + DM355_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(DM355_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,19 +1033,40 @@ 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) { + /* Add ccdc clock aliases */ + clk_add_alias("master", dm355_ccdc_dev.name, + "vpss_master", NULL); + clk_add_alias("slave", dm355_ccdc_dev.name, "vpss_slave", NULL); + 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()) return 0; - /* Add ccdc clock aliases */ - clk_add_alias("master", dm355_ccdc_dev.name, "vpss_master", NULL); - clk_add_alias("slave", dm355_ccdc_dev.name, "vpss_master", NULL); 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; } -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display 2013-03-16 10:17 ` Prabhakar lad @ 2013-03-18 8:41 ` Sekhar Nori -1 siblings, 0 replies; 10+ messages in thread From: Sekhar Nori @ 2013-03-18 8:41 UTC (permalink / raw) To: linux-arm-kernel On 3/16/2013 3:47 PM, Prabhakar lad wrote: > From: Lad, Prabhakar <prabhakar.csengg@gmail.com> > > 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> Comments on the DM365 series apply to this one too. In addition: > +static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, > + int field) > { > - vpfe_capture_dev.dev.platform_data = cfg; > + switch (if_type) { > + case V4L2_MBUS_FMT_SGRBG8_1X8: > + davinci_cfg_reg(DM355_VOUT_FIELD_G70); > + break; > + > + case V4L2_MBUS_FMT_YUYV10_1X20: > + /* > + * This was VPBE_DIGITAL_IF_YCC16. Replace the enum "was VPBE_DIGITAL_IF_YCC16" when? This is the first time this code is getting in. > + * accordingly when the right one gets into open source What is the "right one"? And "open source" == kernel? Then may be just call it that. > + */ > + 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 inline u32 dm355_reg_modify(void *reg, u32 val, u32 mask) > +{ > + u32 new_val = (readl(reg) & ~mask) | (val & mask); > + > + writel(new_val, reg); > + > + return new_val; > +} This function needs to be removed. Thanks, Sekhar ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display @ 2013-03-18 8:41 ` Sekhar Nori 0 siblings, 0 replies; 10+ messages in thread From: Sekhar Nori @ 2013-03-18 8:41 UTC (permalink / raw) To: Prabhakar lad; +Cc: LAK, DLOS, LKML On 3/16/2013 3:47 PM, Prabhakar lad wrote: > From: Lad, Prabhakar <prabhakar.csengg@gmail.com> > > 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> Comments on the DM365 series apply to this one too. In addition: > +static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, > + int field) > { > - vpfe_capture_dev.dev.platform_data = cfg; > + switch (if_type) { > + case V4L2_MBUS_FMT_SGRBG8_1X8: > + davinci_cfg_reg(DM355_VOUT_FIELD_G70); > + break; > + > + case V4L2_MBUS_FMT_YUYV10_1X20: > + /* > + * This was VPBE_DIGITAL_IF_YCC16. Replace the enum "was VPBE_DIGITAL_IF_YCC16" when? This is the first time this code is getting in. > + * accordingly when the right one gets into open source What is the "right one"? And "open source" == kernel? Then may be just call it that. > + */ > + 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 inline u32 dm355_reg_modify(void *reg, u32 val, u32 mask) > +{ > + u32 new_val = (readl(reg) & ~mask) | (val & mask); > + > + writel(new_val, reg); > + > + return new_val; > +} This function needs to be removed. Thanks, Sekhar ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display 2013-03-18 8:41 ` Sekhar Nori @ 2013-03-18 9:09 ` Prabhakar Lad -1 siblings, 0 replies; 10+ messages in thread From: Prabhakar Lad @ 2013-03-18 9:09 UTC (permalink / raw) To: linux-arm-kernel Sekhar, On Mon, Mar 18, 2013 at 2:11 PM, Sekhar Nori <nsekhar@ti.com> wrote: > On 3/16/2013 3:47 PM, Prabhakar lad wrote: >> From: Lad, Prabhakar <prabhakar.csengg@gmail.com> >> >> 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> > > Comments on the DM365 series apply to this one too. In addition: > OK. >> +static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, >> + int field) >> { >> - vpfe_capture_dev.dev.platform_data = cfg; >> + switch (if_type) { >> + case V4L2_MBUS_FMT_SGRBG8_1X8: >> + davinci_cfg_reg(DM355_VOUT_FIELD_G70); >> + break; >> + >> + case V4L2_MBUS_FMT_YUYV10_1X20: >> + /* >> + * This was VPBE_DIGITAL_IF_YCC16. Replace the enum > > "was VPBE_DIGITAL_IF_YCC16" when? This is the first time this code is > getting in. > >> + * accordingly when the right one gets into open source > > What is the "right one"? And "open source" == kernel? Then may be just > call it that. > Ah this comment doesn't make any sense ' V4L2_MBUS_FMT_YUYV10_1X20' is the correct one itself. I'll remove this comment. >> + */ >> + 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 inline u32 dm355_reg_modify(void *reg, u32 val, u32 mask) >> +{ >> + u32 new_val = (readl(reg) & ~mask) | (val & mask); >> + >> + writel(new_val, reg); >> + >> + return new_val; >> +} > > This function needs to be removed. > Ah missed, I wonder how the compiler didn't catch it! Regards, --Prabhakar > Thanks, > Sekhar ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display @ 2013-03-18 9:09 ` Prabhakar Lad 0 siblings, 0 replies; 10+ messages in thread From: Prabhakar Lad @ 2013-03-18 9:09 UTC (permalink / raw) To: Sekhar Nori; +Cc: LAK, DLOS, LKML Sekhar, On Mon, Mar 18, 2013 at 2:11 PM, Sekhar Nori <nsekhar@ti.com> wrote: > On 3/16/2013 3:47 PM, Prabhakar lad wrote: >> From: Lad, Prabhakar <prabhakar.csengg@gmail.com> >> >> 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> > > Comments on the DM365 series apply to this one too. In addition: > OK. >> +static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, >> + int field) >> { >> - vpfe_capture_dev.dev.platform_data = cfg; >> + switch (if_type) { >> + case V4L2_MBUS_FMT_SGRBG8_1X8: >> + davinci_cfg_reg(DM355_VOUT_FIELD_G70); >> + break; >> + >> + case V4L2_MBUS_FMT_YUYV10_1X20: >> + /* >> + * This was VPBE_DIGITAL_IF_YCC16. Replace the enum > > "was VPBE_DIGITAL_IF_YCC16" when? This is the first time this code is > getting in. > >> + * accordingly when the right one gets into open source > > What is the "right one"? And "open source" == kernel? Then may be just > call it that. > Ah this comment doesn't make any sense ' V4L2_MBUS_FMT_YUYV10_1X20' is the correct one itself. I'll remove this comment. >> + */ >> + 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 inline u32 dm355_reg_modify(void *reg, u32 val, u32 mask) >> +{ >> + u32 new_val = (readl(reg) & ~mask) | (val & mask); >> + >> + writel(new_val, reg); >> + >> + return new_val; >> +} > > This function needs to be removed. > Ah missed, I wonder how the compiler didn't catch it! Regards, --Prabhakar > Thanks, > Sekhar ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 2/2] ARM: davinci: dm355 EVM: add support for VPBE display 2013-03-16 10:17 ` Prabhakar lad @ 2013-03-16 10:17 ` Prabhakar lad -1 siblings, 0 replies; 10+ messages in thread From: Prabhakar lad @ 2013-03-16 10:17 UTC (permalink / raw) To: linux-arm-kernel From: Lad, Prabhakar <prabhakar.csengg@gmail.com> add support for V4L2 video display to DM355 EVM. Support for SD modes is provided, along with Composite output Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- arch/arm/mach-davinci/board-dm355-evm.c | 69 ++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 37d12cc..1043506 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -242,6 +242,73 @@ static struct vpfe_config vpfe_cfg = { .ccdc = "DM355 CCDC", }; +/* venc standards timings */ +static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = { + { + .name = "ntsc", + .timings_type = VPBE_ENC_STD, + .std_id = V4L2_STD_525_60, + .interlaced = 1, + .xres = 720, + .yres = 480, + .aspect = {11, 10}, + .fps = {30000, 1001}, + .left_margin = 0x79, + .upper_margin = 0x10, + }, + { + .name = "pal", + .timings_type = VPBE_ENC_STD, + .std_id = V4L2_STD_625_50, + .interlaced = 1, + .xres = 720, + .yres = 576, + .aspect = {54, 59}, + .fps = {25, 1}, + .left_margin = 0x7E, + .upper_margin = 0x16 + }, +}; + +#define VENC_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) + +/* + * The outputs available from VPBE + ecnoders. Keep the + * the order same as that of encoders. First those from venc followed by that + * from encoders. Index in the output refers to index on a particular encoder. + * Driver uses this index to pass it to encoder when it supports more than + * one output. Application uses index of the array to set an output. + */ +static struct vpbe_output dm355evm_vpbe_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .std = VENC_STD_ALL, + .capabilities = V4L2_OUT_CAP_STD, + }, + .subdev_name = DM355_VPBE_VENC_SUBDEV_NAME, + .default_mode = "ntsc", + .num_modes = ARRAY_SIZE(dm355evm_enc_preset_timing), + .modes = dm355evm_enc_preset_timing, + .if_params = V4L2_MBUS_FMT_FIXED, + }, +}; + +static struct vpbe_config dm355evm_display_cfg = { + .module_name = "dm355-vpbe-display", + .i2c_adapter_id = 1, + .osd = { + .module_name = DM355_VPBE_OSD_SUBDEV_NAME, + }, + .venc = { + .module_name = DM355_VPBE_VENC_SUBDEV_NAME, + }, + .num_outputs = ARRAY_SIZE(dm355evm_vpbe_outputs), + .outputs = dm355evm_vpbe_outputs, +}; + static struct platform_device *davinci_evm_devices[] __initdata = { &dm355evm_dm9000, &davinci_nand_device, @@ -342,7 +409,7 @@ 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_video(&vpfe_cfg, &dm355evm_display_cfg); dm355_init_spi0(BIT(0), dm355_evm_spi_info, ARRAY_SIZE(dm355_evm_spi_info)); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 2/2] ARM: davinci: dm355 EVM: add support for VPBE display @ 2013-03-16 10:17 ` Prabhakar lad 0 siblings, 0 replies; 10+ messages in thread From: Prabhakar lad @ 2013-03-16 10:17 UTC (permalink / raw) To: LAK, DLOS, Sekhar Nori; +Cc: LKML, Lad, Prabhakar From: Lad, Prabhakar <prabhakar.csengg@gmail.com> add support for V4L2 video display to DM355 EVM. Support for SD modes is provided, along with Composite output Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- arch/arm/mach-davinci/board-dm355-evm.c | 69 ++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 37d12cc..1043506 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -242,6 +242,73 @@ static struct vpfe_config vpfe_cfg = { .ccdc = "DM355 CCDC", }; +/* venc standards timings */ +static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = { + { + .name = "ntsc", + .timings_type = VPBE_ENC_STD, + .std_id = V4L2_STD_525_60, + .interlaced = 1, + .xres = 720, + .yres = 480, + .aspect = {11, 10}, + .fps = {30000, 1001}, + .left_margin = 0x79, + .upper_margin = 0x10, + }, + { + .name = "pal", + .timings_type = VPBE_ENC_STD, + .std_id = V4L2_STD_625_50, + .interlaced = 1, + .xres = 720, + .yres = 576, + .aspect = {54, 59}, + .fps = {25, 1}, + .left_margin = 0x7E, + .upper_margin = 0x16 + }, +}; + +#define VENC_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) + +/* + * The outputs available from VPBE + ecnoders. Keep the + * the order same as that of encoders. First those from venc followed by that + * from encoders. Index in the output refers to index on a particular encoder. + * Driver uses this index to pass it to encoder when it supports more than + * one output. Application uses index of the array to set an output. + */ +static struct vpbe_output dm355evm_vpbe_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .std = VENC_STD_ALL, + .capabilities = V4L2_OUT_CAP_STD, + }, + .subdev_name = DM355_VPBE_VENC_SUBDEV_NAME, + .default_mode = "ntsc", + .num_modes = ARRAY_SIZE(dm355evm_enc_preset_timing), + .modes = dm355evm_enc_preset_timing, + .if_params = V4L2_MBUS_FMT_FIXED, + }, +}; + +static struct vpbe_config dm355evm_display_cfg = { + .module_name = "dm355-vpbe-display", + .i2c_adapter_id = 1, + .osd = { + .module_name = DM355_VPBE_OSD_SUBDEV_NAME, + }, + .venc = { + .module_name = DM355_VPBE_VENC_SUBDEV_NAME, + }, + .num_outputs = ARRAY_SIZE(dm355evm_vpbe_outputs), + .outputs = dm355evm_vpbe_outputs, +}; + static struct platform_device *davinci_evm_devices[] __initdata = { &dm355evm_dm9000, &davinci_nand_device, @@ -342,7 +409,7 @@ 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_video(&vpfe_cfg, &dm355evm_display_cfg); dm355_init_spi0(BIT(0), dm355_evm_spi_info, ARRAY_SIZE(dm355_evm_spi_info)); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-03-18 9:09 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-03-16 10:17 [PATCH v5 0/2] ARM: davinci: dm355: add support for vpbe display Prabhakar lad 2013-03-16 10:17 ` Prabhakar lad 2013-03-16 10:17 ` [PATCH v5 1/2] ARM: davinci: dm355: add support for v4l2 video display Prabhakar lad 2013-03-16 10:17 ` Prabhakar lad 2013-03-18 8:41 ` Sekhar Nori 2013-03-18 8:41 ` Sekhar Nori 2013-03-18 9:09 ` Prabhakar Lad 2013-03-18 9:09 ` Prabhakar Lad 2013-03-16 10:17 ` [PATCH v5 2/2] ARM: davinci: dm355 EVM: add support for VPBE display Prabhakar lad 2013-03-16 10:17 ` Prabhakar lad
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.