* [PATCH v7 0/2] ARM: davinci: add support for dm365 vpbe display @ 2013-03-22 8:03 ` Prabhakar lad 0 siblings, 0 replies; 14+ messages in thread From: Prabhakar lad @ 2013-03-22 8:03 UTC (permalink / raw) To: linux-arm-kernel From: Lad, Prabhakar <prabhakar.csengg@gmail.com> This patch series enables VPBE display driver on DM365. This patch is work on on following pull request from Hans http://davinci-linux-open-source.1494791.n2.nabble.com/GIT-PULL-FOR-v3-10-tvp7002-davinci-blackfin-legacy-cleanups-td7582451.html + http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg25499.html (from me) + http://linux.davincidsp.com/pipermail/davinci-linux-open-source/2013-March/026639.html (from me) Changes for v7: 1: Fixed nits pointed by Sekhar. Changes for v6: 1: Fixed review comments pointed by Sekhar. Changes for v5: 1: pass different platform names to handle different ip's. 2: Fixed review comments pointed by Sekhar. Changes for v4: 1: Replaced the obsolete preset API by timings API. Changes for v3: 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 Changes for v2: 1: Added VPSS clock so that capture and display can work independent. Lad, Prabhakar (2): ARM: davinci: dm365: add support for v4l2 video display ARM: davinci: dm365 EVM: add support for VPBE display arch/arm/mach-davinci/board-dm365-evm.c | 166 ++++++++++++++++++++++++++- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- 3 files changed, 350 insertions(+), 12 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v7 0/2] ARM: davinci: add support for dm365 vpbe display @ 2013-03-22 8:03 ` Prabhakar lad 0 siblings, 0 replies; 14+ messages in thread From: Prabhakar lad @ 2013-03-22 8:03 UTC (permalink / raw) To: DLOS, LAK, Sekhar Nori; +Cc: LKML, Lad, Prabhakar From: Lad, Prabhakar <prabhakar.csengg@gmail.com> This patch series enables VPBE display driver on DM365. This patch is work on on following pull request from Hans http://davinci-linux-open-source.1494791.n2.nabble.com/GIT-PULL-FOR-v3-10-tvp7002-davinci-blackfin-legacy-cleanups-td7582451.html + http://www.mail-archive.com/davinci-linux-open-source@linux.davincidsp.com/msg25499.html (from me) + http://linux.davincidsp.com/pipermail/davinci-linux-open-source/2013-March/026639.html (from me) Changes for v7: 1: Fixed nits pointed by Sekhar. Changes for v6: 1: Fixed review comments pointed by Sekhar. Changes for v5: 1: pass different platform names to handle different ip's. 2: Fixed review comments pointed by Sekhar. Changes for v4: 1: Replaced the obsolete preset API by timings API. Changes for v3: 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 Changes for v2: 1: Added VPSS clock so that capture and display can work independent. Lad, Prabhakar (2): ARM: davinci: dm365: add support for v4l2 video display ARM: davinci: dm365 EVM: add support for VPBE display arch/arm/mach-davinci/board-dm365-evm.c | 166 ++++++++++++++++++++++++++- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- 3 files changed, 350 insertions(+), 12 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display 2013-03-22 8:03 ` Prabhakar lad @ 2013-03-22 8:03 ` Prabhakar lad -1 siblings, 0 replies; 14+ messages in thread From: Prabhakar lad @ 2013-03-22 8:03 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 dm365. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 4 +- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- 3 files changed, 188 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index c2d4958..cf77c46 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { static void __init dm365_evm_map_io(void) { - /* setup input configuration for VPFE input devices */ - dm365_set_vpfe_config(&vpfe_cfg); dm365_init(); } @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) davinci_setup_mmc(0, &dm365evm_mmc_config); + dm365_init_video(&vpfe_cfg, NULL); + /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 12d544b..1c2670f 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); void __init dm365_init_rtc(void); void dm365_init_spi0(unsigned chipselect_mask, const struct spi_board_info *info, unsigned len); -void dm365_set_vpfe_config(struct vpfe_config *cfg); +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); /* DM644x function declarations */ void __init dm644x_init(void); diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index f4c19f7..0a2dba2 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -40,10 +40,16 @@ #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ +#define DM365_VDAC_CONFIG 0x01c4002c + +#define DM365_RTC_BASE 0x01c69000 + /* Base of key scan register bank */ #define DM365_KEYSCAN_BASE 0x01c69400 -#define DM365_RTC_BASE 0x01c69000 +#define DM365_OSD_BASE 0x01c71c00 + +#define DM365_VENC_BASE 0x01c71e00 #define DAVINCI_DM365_VC_BASE 0x01d0c000 #define DAVINCI_DMA_VC_TX 2 @@ -56,6 +62,11 @@ #define DM365_EMAC_CNTRL_RAM_OFFSET 0x1000 #define DM365_EMAC_CNTRL_RAM_SIZE 0x2000 +#define DM365_VPSS_CLK_CTRL_ADDR 0x44 +#define DM365_VPSS_VENCCLKEN_ENABLE BIT(3) +#define DM365_VPSS_DACCLKEN_ENABLE BIT(4) +#define DM365_VPSS_PLLC2SYSCLK5_ENABLE BIT(5) + static struct pll_data pll1_data = { .num = 1, .phys_base = DAVINCI_PLL1_BASE, @@ -1233,6 +1244,179 @@ static struct platform_device dm365_isif_dev = { }, }; +static struct resource dm365_osd_resources[] = { + { + .start = DM365_OSD_BASE, + .end = DM365_OSD_BASE + 0x100, + .flags = IORESOURCE_MEM, + }, +}; + +static u64 dm365_video_dma_mask = DMA_BIT_MASK(32); + +static struct platform_device dm365_osd_dev = { + .name = DM365_VPBE_OSD_SUBDEV_NAME, + .id = -1, + .num_resources = ARRAY_SIZE(dm365_osd_resources), + .resource = dm365_osd_resources, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +static struct resource dm365_venc_resources[] = { + { + .start = IRQ_VENCINT, + .end = IRQ_VENCINT, + .flags = IORESOURCE_IRQ, + }, + /* venc registers io space */ + { + .start = DM365_VENC_BASE, + .end = DM365_VENC_BASE + 0x180, + .flags = IORESOURCE_MEM, + }, + /* vdaccfg registers io space */ + { + .start = DM365_VDAC_CONFIG, + .end = DM365_VDAC_CONFIG + 3, + .flags = IORESOURCE_MEM, + }, +}; + +static struct resource dm365_v4l2_disp_resources[] = { + { + .start = IRQ_VENCINT, + .end = IRQ_VENCINT, + .flags = IORESOURCE_IRQ, + }, + /* venc registers io space */ + { + .start = DM365_VENC_BASE, + .end = DM365_VENC_BASE + 0x180, + .flags = IORESOURCE_MEM, + }, +}; + +static int dm365_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, + int field) +{ + switch (if_type) { + case V4L2_MBUS_FMT_SGRBG8_1X8: + davinci_cfg_reg(DM365_VOUT_FIELD_G81); + davinci_cfg_reg(DM365_VOUT_COUTL_EN); + davinci_cfg_reg(DM365_VOUT_COUTH_EN); + break; + + case V4L2_MBUS_FMT_YUYV10_1X20: + if (field) + davinci_cfg_reg(DM365_VOUT_FIELD); + else + davinci_cfg_reg(DM365_VOUT_FIELD_G81); + davinci_cfg_reg(DM365_VOUT_COUTL_EN); + davinci_cfg_reg(DM365_VOUT_COUTH_EN); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int dm365_venc_setup_clock(enum vpbe_enc_timings_type type, + unsigned int pclock) +{ + void __iomem *vpss_clkctl_reg; + u32 val; + + vpss_clkctl_reg = DAVINCI_SYSMOD_VIRT(DM365_VPSS_CLK_CTRL_ADDR); + + switch (type) { + case VPBE_ENC_STD: + val = DM365_VPSS_VENCCLKEN_ENABLE | DM365_VPSS_DACCLKEN_ENABLE; + break; + + case VPBE_ENC_DV_TIMINGS: + if (pclock <= 27000000) { + val = DM365_VPSS_VENCCLKEN_ENABLE | + DM365_VPSS_DACCLKEN_ENABLE; + } else { + /* set sysclk4 to output 74.25 MHz from pll1 */ + val = DM365_VPSS_PLLC2SYSCLK5_ENABLE | + DM365_VPSS_DACCLKEN_ENABLE | + DM365_VPSS_VENCCLKEN_ENABLE; + } + break; + + default: + return -EINVAL; + } + writel(val, vpss_clkctl_reg); + + return 0; +} + +static struct platform_device dm365_vpbe_display = { + .name = "vpbe-v4l2", + .id = -1, + .num_resources = ARRAY_SIZE(dm365_v4l2_disp_resources), + .resource = dm365_v4l2_disp_resources, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +struct venc_platform_data dm365_venc_pdata = { + .setup_pinmux = dm365_vpbe_setup_pinmux, + .setup_clock = dm365_venc_setup_clock, +}; + +static struct platform_device dm365_venc_dev = { + .name = DM365_VPBE_VENC_SUBDEV_NAME, + .id = -1, + .num_resources = ARRAY_SIZE(dm365_venc_resources), + .resource = dm365_venc_resources, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = (void *)&dm365_venc_pdata, + }, +}; + +static struct platform_device dm365_vpbe_dev = { + .name = "vpbe_controller", + .id = -1, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +int __init dm365_init_video(struct vpfe_config *vpfe_cfg, + struct vpbe_config *vpbe_cfg) +{ + if (vpfe_cfg || vpbe_cfg) + platform_device_register(&dm365_vpss_device); + + if (vpfe_cfg) { + vpfe_capture_dev.dev.platform_data = vpfe_cfg; + platform_device_register(&dm365_isif_dev); + platform_device_register(&vpfe_capture_dev); + } + if (vpbe_cfg) { + dm365_vpbe_dev.dev.platform_data = vpbe_cfg; + platform_device_register(&dm365_osd_dev); + platform_device_register(&dm365_venc_dev); + platform_device_register(&dm365_vpbe_dev); + platform_device_register(&dm365_vpbe_display); + } + + return 0; +} + static int __init dm365_init_devices(void) { if (!cpu_is_davinci_dm365()) @@ -1246,14 +1430,6 @@ static int __init dm365_init_devices(void) clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev), NULL, &dm365_emac_device.dev); - platform_device_register(&dm365_vpss_device); - platform_device_register(&dm365_isif_dev); - platform_device_register(&vpfe_capture_dev); return 0; } postcore_initcall(dm365_init_devices); - -void dm365_set_vpfe_config(struct vpfe_config *cfg) -{ - vpfe_capture_dev.dev.platform_data = cfg; -} -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display @ 2013-03-22 8:03 ` Prabhakar lad 0 siblings, 0 replies; 14+ messages in thread From: Prabhakar lad @ 2013-03-22 8:03 UTC (permalink / raw) To: DLOS, LAK, 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 dm365. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 4 +- arch/arm/mach-davinci/davinci.h | 2 +- arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- 3 files changed, 188 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index c2d4958..cf77c46 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { static void __init dm365_evm_map_io(void) { - /* setup input configuration for VPFE input devices */ - dm365_set_vpfe_config(&vpfe_cfg); dm365_init(); } @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) davinci_setup_mmc(0, &dm365evm_mmc_config); + dm365_init_video(&vpfe_cfg, NULL); + /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 12d544b..1c2670f 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); void __init dm365_init_rtc(void); void dm365_init_spi0(unsigned chipselect_mask, const struct spi_board_info *info, unsigned len); -void dm365_set_vpfe_config(struct vpfe_config *cfg); +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); /* DM644x function declarations */ void __init dm644x_init(void); diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index f4c19f7..0a2dba2 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -40,10 +40,16 @@ #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ +#define DM365_VDAC_CONFIG 0x01c4002c + +#define DM365_RTC_BASE 0x01c69000 + /* Base of key scan register bank */ #define DM365_KEYSCAN_BASE 0x01c69400 -#define DM365_RTC_BASE 0x01c69000 +#define DM365_OSD_BASE 0x01c71c00 + +#define DM365_VENC_BASE 0x01c71e00 #define DAVINCI_DM365_VC_BASE 0x01d0c000 #define DAVINCI_DMA_VC_TX 2 @@ -56,6 +62,11 @@ #define DM365_EMAC_CNTRL_RAM_OFFSET 0x1000 #define DM365_EMAC_CNTRL_RAM_SIZE 0x2000 +#define DM365_VPSS_CLK_CTRL_ADDR 0x44 +#define DM365_VPSS_VENCCLKEN_ENABLE BIT(3) +#define DM365_VPSS_DACCLKEN_ENABLE BIT(4) +#define DM365_VPSS_PLLC2SYSCLK5_ENABLE BIT(5) + static struct pll_data pll1_data = { .num = 1, .phys_base = DAVINCI_PLL1_BASE, @@ -1233,6 +1244,179 @@ static struct platform_device dm365_isif_dev = { }, }; +static struct resource dm365_osd_resources[] = { + { + .start = DM365_OSD_BASE, + .end = DM365_OSD_BASE + 0x100, + .flags = IORESOURCE_MEM, + }, +}; + +static u64 dm365_video_dma_mask = DMA_BIT_MASK(32); + +static struct platform_device dm365_osd_dev = { + .name = DM365_VPBE_OSD_SUBDEV_NAME, + .id = -1, + .num_resources = ARRAY_SIZE(dm365_osd_resources), + .resource = dm365_osd_resources, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +static struct resource dm365_venc_resources[] = { + { + .start = IRQ_VENCINT, + .end = IRQ_VENCINT, + .flags = IORESOURCE_IRQ, + }, + /* venc registers io space */ + { + .start = DM365_VENC_BASE, + .end = DM365_VENC_BASE + 0x180, + .flags = IORESOURCE_MEM, + }, + /* vdaccfg registers io space */ + { + .start = DM365_VDAC_CONFIG, + .end = DM365_VDAC_CONFIG + 3, + .flags = IORESOURCE_MEM, + }, +}; + +static struct resource dm365_v4l2_disp_resources[] = { + { + .start = IRQ_VENCINT, + .end = IRQ_VENCINT, + .flags = IORESOURCE_IRQ, + }, + /* venc registers io space */ + { + .start = DM365_VENC_BASE, + .end = DM365_VENC_BASE + 0x180, + .flags = IORESOURCE_MEM, + }, +}; + +static int dm365_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type, + int field) +{ + switch (if_type) { + case V4L2_MBUS_FMT_SGRBG8_1X8: + davinci_cfg_reg(DM365_VOUT_FIELD_G81); + davinci_cfg_reg(DM365_VOUT_COUTL_EN); + davinci_cfg_reg(DM365_VOUT_COUTH_EN); + break; + + case V4L2_MBUS_FMT_YUYV10_1X20: + if (field) + davinci_cfg_reg(DM365_VOUT_FIELD); + else + davinci_cfg_reg(DM365_VOUT_FIELD_G81); + davinci_cfg_reg(DM365_VOUT_COUTL_EN); + davinci_cfg_reg(DM365_VOUT_COUTH_EN); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int dm365_venc_setup_clock(enum vpbe_enc_timings_type type, + unsigned int pclock) +{ + void __iomem *vpss_clkctl_reg; + u32 val; + + vpss_clkctl_reg = DAVINCI_SYSMOD_VIRT(DM365_VPSS_CLK_CTRL_ADDR); + + switch (type) { + case VPBE_ENC_STD: + val = DM365_VPSS_VENCCLKEN_ENABLE | DM365_VPSS_DACCLKEN_ENABLE; + break; + + case VPBE_ENC_DV_TIMINGS: + if (pclock <= 27000000) { + val = DM365_VPSS_VENCCLKEN_ENABLE | + DM365_VPSS_DACCLKEN_ENABLE; + } else { + /* set sysclk4 to output 74.25 MHz from pll1 */ + val = DM365_VPSS_PLLC2SYSCLK5_ENABLE | + DM365_VPSS_DACCLKEN_ENABLE | + DM365_VPSS_VENCCLKEN_ENABLE; + } + break; + + default: + return -EINVAL; + } + writel(val, vpss_clkctl_reg); + + return 0; +} + +static struct platform_device dm365_vpbe_display = { + .name = "vpbe-v4l2", + .id = -1, + .num_resources = ARRAY_SIZE(dm365_v4l2_disp_resources), + .resource = dm365_v4l2_disp_resources, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +struct venc_platform_data dm365_venc_pdata = { + .setup_pinmux = dm365_vpbe_setup_pinmux, + .setup_clock = dm365_venc_setup_clock, +}; + +static struct platform_device dm365_venc_dev = { + .name = DM365_VPBE_VENC_SUBDEV_NAME, + .id = -1, + .num_resources = ARRAY_SIZE(dm365_venc_resources), + .resource = dm365_venc_resources, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = (void *)&dm365_venc_pdata, + }, +}; + +static struct platform_device dm365_vpbe_dev = { + .name = "vpbe_controller", + .id = -1, + .dev = { + .dma_mask = &dm365_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +int __init dm365_init_video(struct vpfe_config *vpfe_cfg, + struct vpbe_config *vpbe_cfg) +{ + if (vpfe_cfg || vpbe_cfg) + platform_device_register(&dm365_vpss_device); + + if (vpfe_cfg) { + vpfe_capture_dev.dev.platform_data = vpfe_cfg; + platform_device_register(&dm365_isif_dev); + platform_device_register(&vpfe_capture_dev); + } + if (vpbe_cfg) { + dm365_vpbe_dev.dev.platform_data = vpbe_cfg; + platform_device_register(&dm365_osd_dev); + platform_device_register(&dm365_venc_dev); + platform_device_register(&dm365_vpbe_dev); + platform_device_register(&dm365_vpbe_display); + } + + return 0; +} + static int __init dm365_init_devices(void) { if (!cpu_is_davinci_dm365()) @@ -1246,14 +1430,6 @@ static int __init dm365_init_devices(void) clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev), NULL, &dm365_emac_device.dev); - platform_device_register(&dm365_vpss_device); - platform_device_register(&dm365_isif_dev); - platform_device_register(&vpfe_capture_dev); return 0; } postcore_initcall(dm365_init_devices); - -void dm365_set_vpfe_config(struct vpfe_config *cfg) -{ - vpfe_capture_dev.dev.platform_data = cfg; -} -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display 2013-03-22 8:03 ` Prabhakar lad @ 2013-03-25 6:12 ` Sekhar Nori -1 siblings, 0 replies; 14+ messages in thread From: Sekhar Nori @ 2013-03-25 6:12 UTC (permalink / raw) To: linux-arm-kernel Prabhakar, On 3/22/2013 1:33 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 dm365. > > Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> > --- > arch/arm/mach-davinci/board-dm365-evm.c | 4 +- > arch/arm/mach-davinci/davinci.h | 2 +- > arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- > 3 files changed, 188 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c > index c2d4958..cf77c46 100644 > --- a/arch/arm/mach-davinci/board-dm365-evm.c > +++ b/arch/arm/mach-davinci/board-dm365-evm.c > @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { > > static void __init dm365_evm_map_io(void) > { > - /* setup input configuration for VPFE input devices */ > - dm365_set_vpfe_config(&vpfe_cfg); > dm365_init(); > } > > @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) > > davinci_setup_mmc(0, &dm365evm_mmc_config); > > + dm365_init_video(&vpfe_cfg, NULL); > + > /* maybe setup mmc1/etc ... _after_ mmc0 */ > evm_init_cpld(); > > diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h > index 12d544b..1c2670f 100644 > --- a/arch/arm/mach-davinci/davinci.h > +++ b/arch/arm/mach-davinci/davinci.h > @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); > void __init dm365_init_rtc(void); > void dm365_init_spi0(unsigned chipselect_mask, > const struct spi_board_info *info, unsigned len); > -void dm365_set_vpfe_config(struct vpfe_config *cfg); > +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); No need of __init specifier in function declaration. > > /* DM644x function declarations */ > void __init dm644x_init(void); > diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c > index f4c19f7..0a2dba2 100644 > --- a/arch/arm/mach-davinci/dm365.c > +++ b/arch/arm/mach-davinci/dm365.c > @@ -40,10 +40,16 @@ > > #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ > > +#define DM365_VDAC_CONFIG 0x01c4002c Please define this in davinci.h as an offset from DAVINCI_SYSTEM_MODULE_BASE. > + > +#define DM365_RTC_BASE 0x01c69000 > + > /* Base of key scan register bank */ > #define DM365_KEYSCAN_BASE 0x01c69400 > > -#define DM365_RTC_BASE 0x01c69000 > +#define DM365_OSD_BASE 0x01c71c00 > + > +#define DM365_VENC_BASE 0x01c71e00 > > #define DAVINCI_DM365_VC_BASE 0x01d0c000 > #define DAVINCI_DMA_VC_TX 2 > @@ -56,6 +62,11 @@ > #define DM365_EMAC_CNTRL_RAM_OFFSET 0x1000 > #define DM365_EMAC_CNTRL_RAM_SIZE 0x2000 > > +#define DM365_VPSS_CLK_CTRL_ADDR 0x44 This is already defined in davinci.h as SYSMOD_VPSS_CLKCTL. Please use the existing definition. > +#define DM365_VPSS_VENCCLKEN_ENABLE BIT(3) > +#define DM365_VPSS_DACCLKEN_ENABLE BIT(4) > +#define DM365_VPSS_PLLC2SYSCLK5_ENABLE BIT(5) Please move these related defintions to davinci.h as well. > + > static struct pll_data pll1_data = { > .num = 1, > .phys_base = DAVINCI_PLL1_BASE, > @@ -1233,6 +1244,179 @@ static struct platform_device dm365_isif_dev = { > }, > }; > > +static struct resource dm365_osd_resources[] = { > + { > + .start = DM365_OSD_BASE, > + .end = DM365_OSD_BASE + 0x100, You ignored by earlier comment to fix this to 0xFF and other such occurrences in this patch. Thanks, Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display @ 2013-03-25 6:12 ` Sekhar Nori 0 siblings, 0 replies; 14+ messages in thread From: Sekhar Nori @ 2013-03-25 6:12 UTC (permalink / raw) To: Prabhakar lad; +Cc: DLOS, LAK, LKML Prabhakar, On 3/22/2013 1:33 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 dm365. > > Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> > --- > arch/arm/mach-davinci/board-dm365-evm.c | 4 +- > arch/arm/mach-davinci/davinci.h | 2 +- > arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- > 3 files changed, 188 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c > index c2d4958..cf77c46 100644 > --- a/arch/arm/mach-davinci/board-dm365-evm.c > +++ b/arch/arm/mach-davinci/board-dm365-evm.c > @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { > > static void __init dm365_evm_map_io(void) > { > - /* setup input configuration for VPFE input devices */ > - dm365_set_vpfe_config(&vpfe_cfg); > dm365_init(); > } > > @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) > > davinci_setup_mmc(0, &dm365evm_mmc_config); > > + dm365_init_video(&vpfe_cfg, NULL); > + > /* maybe setup mmc1/etc ... _after_ mmc0 */ > evm_init_cpld(); > > diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h > index 12d544b..1c2670f 100644 > --- a/arch/arm/mach-davinci/davinci.h > +++ b/arch/arm/mach-davinci/davinci.h > @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); > void __init dm365_init_rtc(void); > void dm365_init_spi0(unsigned chipselect_mask, > const struct spi_board_info *info, unsigned len); > -void dm365_set_vpfe_config(struct vpfe_config *cfg); > +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); No need of __init specifier in function declaration. > > /* DM644x function declarations */ > void __init dm644x_init(void); > diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c > index f4c19f7..0a2dba2 100644 > --- a/arch/arm/mach-davinci/dm365.c > +++ b/arch/arm/mach-davinci/dm365.c > @@ -40,10 +40,16 @@ > > #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ > > +#define DM365_VDAC_CONFIG 0x01c4002c Please define this in davinci.h as an offset from DAVINCI_SYSTEM_MODULE_BASE. > + > +#define DM365_RTC_BASE 0x01c69000 > + > /* Base of key scan register bank */ > #define DM365_KEYSCAN_BASE 0x01c69400 > > -#define DM365_RTC_BASE 0x01c69000 > +#define DM365_OSD_BASE 0x01c71c00 > + > +#define DM365_VENC_BASE 0x01c71e00 > > #define DAVINCI_DM365_VC_BASE 0x01d0c000 > #define DAVINCI_DMA_VC_TX 2 > @@ -56,6 +62,11 @@ > #define DM365_EMAC_CNTRL_RAM_OFFSET 0x1000 > #define DM365_EMAC_CNTRL_RAM_SIZE 0x2000 > > +#define DM365_VPSS_CLK_CTRL_ADDR 0x44 This is already defined in davinci.h as SYSMOD_VPSS_CLKCTL. Please use the existing definition. > +#define DM365_VPSS_VENCCLKEN_ENABLE BIT(3) > +#define DM365_VPSS_DACCLKEN_ENABLE BIT(4) > +#define DM365_VPSS_PLLC2SYSCLK5_ENABLE BIT(5) Please move these related defintions to davinci.h as well. > + > static struct pll_data pll1_data = { > .num = 1, > .phys_base = DAVINCI_PLL1_BASE, > @@ -1233,6 +1244,179 @@ static struct platform_device dm365_isif_dev = { > }, > }; > > +static struct resource dm365_osd_resources[] = { > + { > + .start = DM365_OSD_BASE, > + .end = DM365_OSD_BASE + 0x100, You ignored by earlier comment to fix this to 0xFF and other such occurrences in this patch. Thanks, Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display 2013-03-25 6:12 ` Sekhar Nori @ 2013-03-25 10:22 ` Prabhakar Lad -1 siblings, 0 replies; 14+ messages in thread From: Prabhakar Lad @ 2013-03-25 10:22 UTC (permalink / raw) To: linux-arm-kernel Hi Sekhar, Thanks for the review! On Mon, Mar 25, 2013 at 11:42 AM, Sekhar Nori <nsekhar@ti.com> wrote: > Prabhakar, > > On 3/22/2013 1:33 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 dm365. >> >> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >> --- >> arch/arm/mach-davinci/board-dm365-evm.c | 4 +- >> arch/arm/mach-davinci/davinci.h | 2 +- >> arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- >> 3 files changed, 188 insertions(+), 12 deletions(-) >> >> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c >> index c2d4958..cf77c46 100644 >> --- a/arch/arm/mach-davinci/board-dm365-evm.c >> +++ b/arch/arm/mach-davinci/board-dm365-evm.c >> @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { >> >> static void __init dm365_evm_map_io(void) >> { >> - /* setup input configuration for VPFE input devices */ >> - dm365_set_vpfe_config(&vpfe_cfg); >> dm365_init(); >> } >> >> @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) >> >> davinci_setup_mmc(0, &dm365evm_mmc_config); >> >> + dm365_init_video(&vpfe_cfg, NULL); >> + >> /* maybe setup mmc1/etc ... _after_ mmc0 */ >> evm_init_cpld(); >> >> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h >> index 12d544b..1c2670f 100644 >> --- a/arch/arm/mach-davinci/davinci.h >> +++ b/arch/arm/mach-davinci/davinci.h >> @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); >> void __init dm365_init_rtc(void); >> void dm365_init_spi0(unsigned chipselect_mask, >> const struct spi_board_info *info, unsigned len); >> -void dm365_set_vpfe_config(struct vpfe_config *cfg); >> +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); > > No need of __init specifier in function declaration. > OK >> >> /* DM644x function declarations */ >> void __init dm644x_init(void); >> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c >> index f4c19f7..0a2dba2 100644 >> --- a/arch/arm/mach-davinci/dm365.c >> +++ b/arch/arm/mach-davinci/dm365.c >> @@ -40,10 +40,16 @@ >> >> #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ >> >> +#define DM365_VDAC_CONFIG 0x01c4002c > > Please define this in davinci.h as an offset from > DAVINCI_SYSTEM_MODULE_BASE. > OK >> + >> +#define DM365_RTC_BASE 0x01c69000 >> + >> /* Base of key scan register bank */ >> #define DM365_KEYSCAN_BASE 0x01c69400 >> >> -#define DM365_RTC_BASE 0x01c69000 >> +#define DM365_OSD_BASE 0x01c71c00 >> + >> +#define DM365_VENC_BASE 0x01c71e00 >> Are you OK with this definitions or you want all of them in davinci.h ? >> #define DAVINCI_DM365_VC_BASE 0x01d0c000 >> #define DAVINCI_DMA_VC_TX 2 >> @@ -56,6 +62,11 @@ >> #define DM365_EMAC_CNTRL_RAM_OFFSET 0x1000 >> #define DM365_EMAC_CNTRL_RAM_SIZE 0x2000 >> >> +#define DM365_VPSS_CLK_CTRL_ADDR 0x44 > > This is already defined in davinci.h as SYSMOD_VPSS_CLKCTL. Please use > the existing definition. > OK >> +#define DM365_VPSS_VENCCLKEN_ENABLE BIT(3) >> +#define DM365_VPSS_DACCLKEN_ENABLE BIT(4) >> +#define DM365_VPSS_PLLC2SYSCLK5_ENABLE BIT(5) > > Please move these related defintions to davinci.h as well. > OK >> + >> static struct pll_data pll1_data = { >> .num = 1, >> .phys_base = DAVINCI_PLL1_BASE, >> @@ -1233,6 +1244,179 @@ static struct platform_device dm365_isif_dev = { >> }, >> }; >> >> +static struct resource dm365_osd_resources[] = { >> + { >> + .start = DM365_OSD_BASE, >> + .end = DM365_OSD_BASE + 0x100, > > You ignored by earlier comment to fix this to 0xFF and other such > occurrences in this patch. > Ah missed it, will fix it in next version. Regards, --Prabhakar > Thanks, > Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display @ 2013-03-25 10:22 ` Prabhakar Lad 0 siblings, 0 replies; 14+ messages in thread From: Prabhakar Lad @ 2013-03-25 10:22 UTC (permalink / raw) To: Sekhar Nori; +Cc: DLOS, LAK, LKML Hi Sekhar, Thanks for the review! On Mon, Mar 25, 2013 at 11:42 AM, Sekhar Nori <nsekhar@ti.com> wrote: > Prabhakar, > > On 3/22/2013 1:33 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 dm365. >> >> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >> --- >> arch/arm/mach-davinci/board-dm365-evm.c | 4 +- >> arch/arm/mach-davinci/davinci.h | 2 +- >> arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- >> 3 files changed, 188 insertions(+), 12 deletions(-) >> >> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c >> index c2d4958..cf77c46 100644 >> --- a/arch/arm/mach-davinci/board-dm365-evm.c >> +++ b/arch/arm/mach-davinci/board-dm365-evm.c >> @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { >> >> static void __init dm365_evm_map_io(void) >> { >> - /* setup input configuration for VPFE input devices */ >> - dm365_set_vpfe_config(&vpfe_cfg); >> dm365_init(); >> } >> >> @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) >> >> davinci_setup_mmc(0, &dm365evm_mmc_config); >> >> + dm365_init_video(&vpfe_cfg, NULL); >> + >> /* maybe setup mmc1/etc ... _after_ mmc0 */ >> evm_init_cpld(); >> >> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h >> index 12d544b..1c2670f 100644 >> --- a/arch/arm/mach-davinci/davinci.h >> +++ b/arch/arm/mach-davinci/davinci.h >> @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); >> void __init dm365_init_rtc(void); >> void dm365_init_spi0(unsigned chipselect_mask, >> const struct spi_board_info *info, unsigned len); >> -void dm365_set_vpfe_config(struct vpfe_config *cfg); >> +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); > > No need of __init specifier in function declaration. > OK >> >> /* DM644x function declarations */ >> void __init dm644x_init(void); >> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c >> index f4c19f7..0a2dba2 100644 >> --- a/arch/arm/mach-davinci/dm365.c >> +++ b/arch/arm/mach-davinci/dm365.c >> @@ -40,10 +40,16 @@ >> >> #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ >> >> +#define DM365_VDAC_CONFIG 0x01c4002c > > Please define this in davinci.h as an offset from > DAVINCI_SYSTEM_MODULE_BASE. > OK >> + >> +#define DM365_RTC_BASE 0x01c69000 >> + >> /* Base of key scan register bank */ >> #define DM365_KEYSCAN_BASE 0x01c69400 >> >> -#define DM365_RTC_BASE 0x01c69000 >> +#define DM365_OSD_BASE 0x01c71c00 >> + >> +#define DM365_VENC_BASE 0x01c71e00 >> Are you OK with this definitions or you want all of them in davinci.h ? >> #define DAVINCI_DM365_VC_BASE 0x01d0c000 >> #define DAVINCI_DMA_VC_TX 2 >> @@ -56,6 +62,11 @@ >> #define DM365_EMAC_CNTRL_RAM_OFFSET 0x1000 >> #define DM365_EMAC_CNTRL_RAM_SIZE 0x2000 >> >> +#define DM365_VPSS_CLK_CTRL_ADDR 0x44 > > This is already defined in davinci.h as SYSMOD_VPSS_CLKCTL. Please use > the existing definition. > OK >> +#define DM365_VPSS_VENCCLKEN_ENABLE BIT(3) >> +#define DM365_VPSS_DACCLKEN_ENABLE BIT(4) >> +#define DM365_VPSS_PLLC2SYSCLK5_ENABLE BIT(5) > > Please move these related defintions to davinci.h as well. > OK >> + >> static struct pll_data pll1_data = { >> .num = 1, >> .phys_base = DAVINCI_PLL1_BASE, >> @@ -1233,6 +1244,179 @@ static struct platform_device dm365_isif_dev = { >> }, >> }; >> >> +static struct resource dm365_osd_resources[] = { >> + { >> + .start = DM365_OSD_BASE, >> + .end = DM365_OSD_BASE + 0x100, > > You ignored by earlier comment to fix this to 0xFF and other such > occurrences in this patch. > Ah missed it, will fix it in next version. Regards, --Prabhakar > Thanks, > Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display 2013-03-25 10:22 ` Prabhakar Lad @ 2013-03-25 10:27 ` Sekhar Nori -1 siblings, 0 replies; 14+ messages in thread From: Sekhar Nori @ 2013-03-25 10:27 UTC (permalink / raw) To: linux-arm-kernel On 3/25/2013 3:52 PM, Prabhakar Lad wrote: > Hi Sekhar, > > Thanks for the review! > > On Mon, Mar 25, 2013 at 11:42 AM, Sekhar Nori <nsekhar@ti.com> wrote: >> Prabhakar, >> >> On 3/22/2013 1:33 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 dm365. >>> >>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >>> --- >>> arch/arm/mach-davinci/board-dm365-evm.c | 4 +- >>> arch/arm/mach-davinci/davinci.h | 2 +- >>> arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- >>> 3 files changed, 188 insertions(+), 12 deletions(-) >>> >>> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c >>> index c2d4958..cf77c46 100644 >>> --- a/arch/arm/mach-davinci/board-dm365-evm.c >>> +++ b/arch/arm/mach-davinci/board-dm365-evm.c >>> @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { >>> >>> static void __init dm365_evm_map_io(void) >>> { >>> - /* setup input configuration for VPFE input devices */ >>> - dm365_set_vpfe_config(&vpfe_cfg); >>> dm365_init(); >>> } >>> >>> @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) >>> >>> davinci_setup_mmc(0, &dm365evm_mmc_config); >>> >>> + dm365_init_video(&vpfe_cfg, NULL); >>> + >>> /* maybe setup mmc1/etc ... _after_ mmc0 */ >>> evm_init_cpld(); >>> >>> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h >>> index 12d544b..1c2670f 100644 >>> --- a/arch/arm/mach-davinci/davinci.h >>> +++ b/arch/arm/mach-davinci/davinci.h >>> @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); >>> void __init dm365_init_rtc(void); >>> void dm365_init_spi0(unsigned chipselect_mask, >>> const struct spi_board_info *info, unsigned len); >>> -void dm365_set_vpfe_config(struct vpfe_config *cfg); >>> +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); >> >> No need of __init specifier in function declaration. >> > OK > >>> >>> /* DM644x function declarations */ >>> void __init dm644x_init(void); >>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c >>> index f4c19f7..0a2dba2 100644 >>> --- a/arch/arm/mach-davinci/dm365.c >>> +++ b/arch/arm/mach-davinci/dm365.c >>> @@ -40,10 +40,16 @@ >>> >>> #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ >>> >>> +#define DM365_VDAC_CONFIG 0x01c4002c >> >> Please define this in davinci.h as an offset from >> DAVINCI_SYSTEM_MODULE_BASE. >> > OK > >>> + >>> +#define DM365_RTC_BASE 0x01c69000 >>> + >>> /* Base of key scan register bank */ >>> #define DM365_KEYSCAN_BASE 0x01c69400 >>> >>> -#define DM365_RTC_BASE 0x01c69000 >>> +#define DM365_OSD_BASE 0x01c71c00 >>> + >>> +#define DM365_VENC_BASE 0x01c71e00 >>> > Are you OK with this definitions or you want all of them in davinci.h ? No please leave these here. The reason I asked you to use davinci.h for SYSMOD is because I don't want those definitions to be strewn all over the place - especially when there is already a consolidated place for them. Thanks, Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display @ 2013-03-25 10:27 ` Sekhar Nori 0 siblings, 0 replies; 14+ messages in thread From: Sekhar Nori @ 2013-03-25 10:27 UTC (permalink / raw) To: Prabhakar Lad; +Cc: DLOS, LAK, LKML On 3/25/2013 3:52 PM, Prabhakar Lad wrote: > Hi Sekhar, > > Thanks for the review! > > On Mon, Mar 25, 2013 at 11:42 AM, Sekhar Nori <nsekhar@ti.com> wrote: >> Prabhakar, >> >> On 3/22/2013 1:33 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 dm365. >>> >>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >>> --- >>> arch/arm/mach-davinci/board-dm365-evm.c | 4 +- >>> arch/arm/mach-davinci/davinci.h | 2 +- >>> arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- >>> 3 files changed, 188 insertions(+), 12 deletions(-) >>> >>> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c >>> index c2d4958..cf77c46 100644 >>> --- a/arch/arm/mach-davinci/board-dm365-evm.c >>> +++ b/arch/arm/mach-davinci/board-dm365-evm.c >>> @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { >>> >>> static void __init dm365_evm_map_io(void) >>> { >>> - /* setup input configuration for VPFE input devices */ >>> - dm365_set_vpfe_config(&vpfe_cfg); >>> dm365_init(); >>> } >>> >>> @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) >>> >>> davinci_setup_mmc(0, &dm365evm_mmc_config); >>> >>> + dm365_init_video(&vpfe_cfg, NULL); >>> + >>> /* maybe setup mmc1/etc ... _after_ mmc0 */ >>> evm_init_cpld(); >>> >>> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h >>> index 12d544b..1c2670f 100644 >>> --- a/arch/arm/mach-davinci/davinci.h >>> +++ b/arch/arm/mach-davinci/davinci.h >>> @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); >>> void __init dm365_init_rtc(void); >>> void dm365_init_spi0(unsigned chipselect_mask, >>> const struct spi_board_info *info, unsigned len); >>> -void dm365_set_vpfe_config(struct vpfe_config *cfg); >>> +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); >> >> No need of __init specifier in function declaration. >> > OK > >>> >>> /* DM644x function declarations */ >>> void __init dm644x_init(void); >>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c >>> index f4c19f7..0a2dba2 100644 >>> --- a/arch/arm/mach-davinci/dm365.c >>> +++ b/arch/arm/mach-davinci/dm365.c >>> @@ -40,10 +40,16 @@ >>> >>> #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ >>> >>> +#define DM365_VDAC_CONFIG 0x01c4002c >> >> Please define this in davinci.h as an offset from >> DAVINCI_SYSTEM_MODULE_BASE. >> > OK > >>> + >>> +#define DM365_RTC_BASE 0x01c69000 >>> + >>> /* Base of key scan register bank */ >>> #define DM365_KEYSCAN_BASE 0x01c69400 >>> >>> -#define DM365_RTC_BASE 0x01c69000 >>> +#define DM365_OSD_BASE 0x01c71c00 >>> + >>> +#define DM365_VENC_BASE 0x01c71e00 >>> > Are you OK with this definitions or you want all of them in davinci.h ? No please leave these here. The reason I asked you to use davinci.h for SYSMOD is because I don't want those definitions to be strewn all over the place - especially when there is already a consolidated place for them. Thanks, Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display 2013-03-25 10:27 ` Sekhar Nori @ 2013-03-25 10:41 ` Prabhakar Lad -1 siblings, 0 replies; 14+ messages in thread From: Prabhakar Lad @ 2013-03-25 10:41 UTC (permalink / raw) To: linux-arm-kernel Hi Sekhar, On Mon, Mar 25, 2013 at 3:57 PM, Sekhar Nori <nsekhar@ti.com> wrote: > On 3/25/2013 3:52 PM, Prabhakar Lad wrote: >> Hi Sekhar, >> >> Thanks for the review! >> >> On Mon, Mar 25, 2013 at 11:42 AM, Sekhar Nori <nsekhar@ti.com> wrote: >>> Prabhakar, >>> >>> On 3/22/2013 1:33 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 dm365. >>>> >>>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >>>> --- >>>> arch/arm/mach-davinci/board-dm365-evm.c | 4 +- >>>> arch/arm/mach-davinci/davinci.h | 2 +- >>>> arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- >>>> 3 files changed, 188 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c >>>> index c2d4958..cf77c46 100644 >>>> --- a/arch/arm/mach-davinci/board-dm365-evm.c >>>> +++ b/arch/arm/mach-davinci/board-dm365-evm.c >>>> @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { >>>> >>>> static void __init dm365_evm_map_io(void) >>>> { >>>> - /* setup input configuration for VPFE input devices */ >>>> - dm365_set_vpfe_config(&vpfe_cfg); >>>> dm365_init(); >>>> } >>>> >>>> @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) >>>> >>>> davinci_setup_mmc(0, &dm365evm_mmc_config); >>>> >>>> + dm365_init_video(&vpfe_cfg, NULL); >>>> + >>>> /* maybe setup mmc1/etc ... _after_ mmc0 */ >>>> evm_init_cpld(); >>>> >>>> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h >>>> index 12d544b..1c2670f 100644 >>>> --- a/arch/arm/mach-davinci/davinci.h >>>> +++ b/arch/arm/mach-davinci/davinci.h >>>> @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); >>>> void __init dm365_init_rtc(void); >>>> void dm365_init_spi0(unsigned chipselect_mask, >>>> const struct spi_board_info *info, unsigned len); >>>> -void dm365_set_vpfe_config(struct vpfe_config *cfg); >>>> +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); >>> >>> No need of __init specifier in function declaration. >>> >> OK >> >>>> >>>> /* DM644x function declarations */ >>>> void __init dm644x_init(void); >>>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c >>>> index f4c19f7..0a2dba2 100644 >>>> --- a/arch/arm/mach-davinci/dm365.c >>>> +++ b/arch/arm/mach-davinci/dm365.c >>>> @@ -40,10 +40,16 @@ >>>> >>>> #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ >>>> >>>> +#define DM365_VDAC_CONFIG 0x01c4002c >>> >>> Please define this in davinci.h as an offset from >>> DAVINCI_SYSTEM_MODULE_BASE. >>> >> OK >> >>>> + >>>> +#define DM365_RTC_BASE 0x01c69000 >>>> + >>>> /* Base of key scan register bank */ >>>> #define DM365_KEYSCAN_BASE 0x01c69400 >>>> >>>> -#define DM365_RTC_BASE 0x01c69000 >>>> +#define DM365_OSD_BASE 0x01c71c00 >>>> + >>>> +#define DM365_VENC_BASE 0x01c71e00 >>>> >> Are you OK with this definitions or you want all of them in davinci.h ? > > No please leave these here. The reason I asked you to use davinci.h for > SYSMOD is because I don't want those definitions to be strewn all over > the place - especially when there is already a consolidated place for them. > OK, that clears my doubt! Regards, --Prabhakar > Thanks, > Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display @ 2013-03-25 10:41 ` Prabhakar Lad 0 siblings, 0 replies; 14+ messages in thread From: Prabhakar Lad @ 2013-03-25 10:41 UTC (permalink / raw) To: Sekhar Nori; +Cc: DLOS, LAK, LKML Hi Sekhar, On Mon, Mar 25, 2013 at 3:57 PM, Sekhar Nori <nsekhar@ti.com> wrote: > On 3/25/2013 3:52 PM, Prabhakar Lad wrote: >> Hi Sekhar, >> >> Thanks for the review! >> >> On Mon, Mar 25, 2013 at 11:42 AM, Sekhar Nori <nsekhar@ti.com> wrote: >>> Prabhakar, >>> >>> On 3/22/2013 1:33 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 dm365. >>>> >>>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >>>> --- >>>> arch/arm/mach-davinci/board-dm365-evm.c | 4 +- >>>> arch/arm/mach-davinci/davinci.h | 2 +- >>>> arch/arm/mach-davinci/dm365.c | 194 +++++++++++++++++++++++++++++-- >>>> 3 files changed, 188 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c >>>> index c2d4958..cf77c46 100644 >>>> --- a/arch/arm/mach-davinci/board-dm365-evm.c >>>> +++ b/arch/arm/mach-davinci/board-dm365-evm.c >>>> @@ -564,8 +564,6 @@ static struct davinci_uart_config uart_config __initdata = { >>>> >>>> static void __init dm365_evm_map_io(void) >>>> { >>>> - /* setup input configuration for VPFE input devices */ >>>> - dm365_set_vpfe_config(&vpfe_cfg); >>>> dm365_init(); >>>> } >>>> >>>> @@ -597,6 +595,8 @@ static __init void dm365_evm_init(void) >>>> >>>> davinci_setup_mmc(0, &dm365evm_mmc_config); >>>> >>>> + dm365_init_video(&vpfe_cfg, NULL); >>>> + >>>> /* maybe setup mmc1/etc ... _after_ mmc0 */ >>>> evm_init_cpld(); >>>> >>>> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h >>>> index 12d544b..1c2670f 100644 >>>> --- a/arch/arm/mach-davinci/davinci.h >>>> +++ b/arch/arm/mach-davinci/davinci.h >>>> @@ -84,7 +84,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); >>>> void __init dm365_init_rtc(void); >>>> void dm365_init_spi0(unsigned chipselect_mask, >>>> const struct spi_board_info *info, unsigned len); >>>> -void dm365_set_vpfe_config(struct vpfe_config *cfg); >>>> +int __init dm365_init_video(struct vpfe_config *, struct vpbe_config *); >>> >>> No need of __init specifier in function declaration. >>> >> OK >> >>>> >>>> /* DM644x function declarations */ >>>> void __init dm644x_init(void); >>>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c >>>> index f4c19f7..0a2dba2 100644 >>>> --- a/arch/arm/mach-davinci/dm365.c >>>> +++ b/arch/arm/mach-davinci/dm365.c >>>> @@ -40,10 +40,16 @@ >>>> >>>> #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ >>>> >>>> +#define DM365_VDAC_CONFIG 0x01c4002c >>> >>> Please define this in davinci.h as an offset from >>> DAVINCI_SYSTEM_MODULE_BASE. >>> >> OK >> >>>> + >>>> +#define DM365_RTC_BASE 0x01c69000 >>>> + >>>> /* Base of key scan register bank */ >>>> #define DM365_KEYSCAN_BASE 0x01c69400 >>>> >>>> -#define DM365_RTC_BASE 0x01c69000 >>>> +#define DM365_OSD_BASE 0x01c71c00 >>>> + >>>> +#define DM365_VENC_BASE 0x01c71e00 >>>> >> Are you OK with this definitions or you want all of them in davinci.h ? > > No please leave these here. The reason I asked you to use davinci.h for > SYSMOD is because I don't want those definitions to be strewn all over > the place - especially when there is already a consolidated place for them. > OK, that clears my doubt! Regards, --Prabhakar > Thanks, > Sekhar ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v7 2/2] ARM: davinci: dm365 EVM: add support for VPBE display 2013-03-22 8:03 ` Prabhakar lad @ 2013-03-22 8:03 ` Prabhakar lad -1 siblings, 0 replies; 14+ messages in thread From: Prabhakar lad @ 2013-03-22 8:03 UTC (permalink / raw) To: linux-arm-kernel From: Lad, Prabhakar <prabhakar.csengg@gmail.com> add support for V4L2 video display to DM365 EVM. Support for SD and ED modes is provided, along with Composite and Component outputs. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 164 ++++++++++++++++++++++++++++++- 1 files changed, 163 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index cf77c46..0518ce5 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -27,6 +27,7 @@ #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/spi/eeprom.h> +#include <linux/v4l2-dv-timings.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -39,6 +40,7 @@ #include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/keyscan-davinci.h> +#include <media/ths7303.h> #include <media/tvp514x.h> #include "davinci.h" @@ -374,6 +376,166 @@ static struct vpfe_config vpfe_cfg = { .ccdc = "ISIF", }; +/* venc standards timings */ +static struct vpbe_enc_mode_info dm365evm_enc_std_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, + }, +}; + +/* venc dv timings */ +static struct vpbe_enc_mode_info dm365evm_enc_preset_timing[] = { + { + .name = "480p59_94", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_720X480P59_94, + .interlaced = 0, + .xres = 720, + .yres = 480, + .aspect = {1, 1}, + .fps = {5994, 100}, + .left_margin = 0x8F, + .upper_margin = 0x2D, + }, + { + .name = "576p50", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_720X576P50, + .interlaced = 0, + .xres = 720, + .yres = 576, + .aspect = {1, 1}, + .fps = {50, 1}, + .left_margin = 0x8C, + .upper_margin = 0x36, + }, + { + .name = "720p60", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_1280X720P60, + .interlaced = 0, + .xres = 1280, + .yres = 720, + .aspect = {1, 1}, + .fps = {60, 1}, + .left_margin = 0x117, + .right_margin = 70, + .upper_margin = 38, + .lower_margin = 3, + .hsync_len = 80, + .vsync_len = 5, + }, + { + .name = "1080i60", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_1920X1080I60, + .interlaced = 1, + .xres = 1920, + .yres = 1080, + .aspect = {1, 1}, + .fps = {30, 1}, + .left_margin = 0xc9, + .right_margin = 80, + .upper_margin = 30, + .lower_margin = 3, + .hsync_len = 88, + .vsync_len = 5, + }, +}; + +#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 dm365evm_vpbe_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .std = VENC_STD_ALL, + .capabilities = V4L2_OUT_CAP_STD, + }, + .subdev_name = DM365_VPBE_VENC_SUBDEV_NAME, + .default_mode = "ntsc", + .num_modes = ARRAY_SIZE(dm365evm_enc_std_timing), + .modes = dm365evm_enc_std_timing, + .if_params = V4L2_MBUS_FMT_FIXED, + }, + { + .output = { + .index = 1, + .name = "Component", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_DV_TIMINGS, + }, + .subdev_name = DM365_VPBE_VENC_SUBDEV_NAME, + .default_mode = "480p59_94", + .num_modes = ARRAY_SIZE(dm365evm_enc_preset_timing), + .modes = dm365evm_enc_preset_timing, + .if_params = V4L2_MBUS_FMT_FIXED, + }, +}; + +/* + * Amplifiers on the board + */ +struct ths7303_platform_data ths7303_pdata = { + .ch_1 = 3, + .ch_2 = 3, + .ch_3 = 3, + .init_enable = 1, +}; + +static struct amp_config_info vpbe_amp = { + .module_name = "ths7303", + .is_i2c = 1, + .board_info = { + I2C_BOARD_INFO("ths7303", 0x2c), + .platform_data = &ths7303_pdata, + } +}; + +static struct vpbe_config dm365evm_display_cfg = { + .module_name = "dm365-vpbe-display", + .i2c_adapter_id = 1, + .amp = &vpbe_amp, + .osd = { + .module_name = DM365_VPBE_OSD_SUBDEV_NAME, + }, + .venc = { + .module_name = DM365_VPBE_VENC_SUBDEV_NAME, + }, + .num_outputs = ARRAY_SIZE(dm365evm_vpbe_outputs), + .outputs = dm365evm_vpbe_outputs, +}; + static void __init evm_init_i2c(void) { davinci_init_i2c(&i2c_pdata); @@ -595,7 +757,7 @@ static __init void dm365_evm_init(void) davinci_setup_mmc(0, &dm365evm_mmc_config); - dm365_init_video(&vpfe_cfg, NULL); + dm365_init_video(&vpfe_cfg, &dm365evm_display_cfg); /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v7 2/2] ARM: davinci: dm365 EVM: add support for VPBE display @ 2013-03-22 8:03 ` Prabhakar lad 0 siblings, 0 replies; 14+ messages in thread From: Prabhakar lad @ 2013-03-22 8:03 UTC (permalink / raw) To: DLOS, LAK, Sekhar Nori; +Cc: LKML, Lad, Prabhakar From: Lad, Prabhakar <prabhakar.csengg@gmail.com> add support for V4L2 video display to DM365 EVM. Support for SD and ED modes is provided, along with Composite and Component outputs. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 164 ++++++++++++++++++++++++++++++- 1 files changed, 163 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index cf77c46..0518ce5 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -27,6 +27,7 @@ #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/spi/eeprom.h> +#include <linux/v4l2-dv-timings.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -39,6 +40,7 @@ #include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/keyscan-davinci.h> +#include <media/ths7303.h> #include <media/tvp514x.h> #include "davinci.h" @@ -374,6 +376,166 @@ static struct vpfe_config vpfe_cfg = { .ccdc = "ISIF", }; +/* venc standards timings */ +static struct vpbe_enc_mode_info dm365evm_enc_std_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, + }, +}; + +/* venc dv timings */ +static struct vpbe_enc_mode_info dm365evm_enc_preset_timing[] = { + { + .name = "480p59_94", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_720X480P59_94, + .interlaced = 0, + .xres = 720, + .yres = 480, + .aspect = {1, 1}, + .fps = {5994, 100}, + .left_margin = 0x8F, + .upper_margin = 0x2D, + }, + { + .name = "576p50", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_720X576P50, + .interlaced = 0, + .xres = 720, + .yres = 576, + .aspect = {1, 1}, + .fps = {50, 1}, + .left_margin = 0x8C, + .upper_margin = 0x36, + }, + { + .name = "720p60", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_1280X720P60, + .interlaced = 0, + .xres = 1280, + .yres = 720, + .aspect = {1, 1}, + .fps = {60, 1}, + .left_margin = 0x117, + .right_margin = 70, + .upper_margin = 38, + .lower_margin = 3, + .hsync_len = 80, + .vsync_len = 5, + }, + { + .name = "1080i60", + .timings_type = VPBE_ENC_DV_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_1920X1080I60, + .interlaced = 1, + .xres = 1920, + .yres = 1080, + .aspect = {1, 1}, + .fps = {30, 1}, + .left_margin = 0xc9, + .right_margin = 80, + .upper_margin = 30, + .lower_margin = 3, + .hsync_len = 88, + .vsync_len = 5, + }, +}; + +#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 dm365evm_vpbe_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .std = VENC_STD_ALL, + .capabilities = V4L2_OUT_CAP_STD, + }, + .subdev_name = DM365_VPBE_VENC_SUBDEV_NAME, + .default_mode = "ntsc", + .num_modes = ARRAY_SIZE(dm365evm_enc_std_timing), + .modes = dm365evm_enc_std_timing, + .if_params = V4L2_MBUS_FMT_FIXED, + }, + { + .output = { + .index = 1, + .name = "Component", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_DV_TIMINGS, + }, + .subdev_name = DM365_VPBE_VENC_SUBDEV_NAME, + .default_mode = "480p59_94", + .num_modes = ARRAY_SIZE(dm365evm_enc_preset_timing), + .modes = dm365evm_enc_preset_timing, + .if_params = V4L2_MBUS_FMT_FIXED, + }, +}; + +/* + * Amplifiers on the board + */ +struct ths7303_platform_data ths7303_pdata = { + .ch_1 = 3, + .ch_2 = 3, + .ch_3 = 3, + .init_enable = 1, +}; + +static struct amp_config_info vpbe_amp = { + .module_name = "ths7303", + .is_i2c = 1, + .board_info = { + I2C_BOARD_INFO("ths7303", 0x2c), + .platform_data = &ths7303_pdata, + } +}; + +static struct vpbe_config dm365evm_display_cfg = { + .module_name = "dm365-vpbe-display", + .i2c_adapter_id = 1, + .amp = &vpbe_amp, + .osd = { + .module_name = DM365_VPBE_OSD_SUBDEV_NAME, + }, + .venc = { + .module_name = DM365_VPBE_VENC_SUBDEV_NAME, + }, + .num_outputs = ARRAY_SIZE(dm365evm_vpbe_outputs), + .outputs = dm365evm_vpbe_outputs, +}; + static void __init evm_init_i2c(void) { davinci_init_i2c(&i2c_pdata); @@ -595,7 +757,7 @@ static __init void dm365_evm_init(void) davinci_setup_mmc(0, &dm365evm_mmc_config); - dm365_init_video(&vpfe_cfg, NULL); + dm365_init_video(&vpfe_cfg, &dm365evm_display_cfg); /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2013-03-25 10:42 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-03-22 8:03 [PATCH v7 0/2] ARM: davinci: add support for dm365 vpbe display Prabhakar lad 2013-03-22 8:03 ` Prabhakar lad 2013-03-22 8:03 ` [PATCH v7 1/2] ARM: davinci: dm365: add support for v4l2 video display Prabhakar lad 2013-03-22 8:03 ` Prabhakar lad 2013-03-25 6:12 ` Sekhar Nori 2013-03-25 6:12 ` Sekhar Nori 2013-03-25 10:22 ` Prabhakar Lad 2013-03-25 10:22 ` Prabhakar Lad 2013-03-25 10:27 ` Sekhar Nori 2013-03-25 10:27 ` Sekhar Nori 2013-03-25 10:41 ` Prabhakar Lad 2013-03-25 10:41 ` Prabhakar Lad 2013-03-22 8:03 ` [PATCH v7 2/2] ARM: davinci: dm365 EVM: add support for VPBE display Prabhakar lad 2013-03-22 8:03 ` 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.