* [PATCH v10 5/8] davinci vpbe: platform specific additions
@ 2010-12-23 14:43 Manjunath Hadli
2010-12-23 17:49 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Manjunath Hadli @ 2010-12-23 14:43 UTC (permalink / raw)
To: LMML, Kevin Hilman
Cc: dlos, Mauro Carvalho Chehab, Hans Verkuil, Manjunath Hadli
This patch implements the overall device creation for the Video
display driver
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Muralidharan Karicheri <m-karicheri2@ti.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
---
arch/arm/mach-davinci/dm644x.c | 173 +++++++++++++++++++++++++--
arch/arm/mach-davinci/include/mach/dm644x.h | 4 +
2 files changed, 169 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 9a2376b..eb87867 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -370,6 +370,7 @@ static struct platform_device dm644x_mdio_device = {
* soc description mux mode mode mux dbg
* reg offset mask mode
*/
+
static const struct mux_config dm644x_pins[] = {
#ifdef CONFIG_DAVINCI_MUX
MUX_CFG(DM644X, HDIREN, 0, 16, 1, 1, true)
@@ -654,6 +655,146 @@ void dm644x_set_vpfe_config(struct vpfe_config *cfg)
vpfe_capture_dev.dev.platform_data = cfg;
}
+static struct resource dm644x_osd_resources[] = {
+ {
+ .start = 0x01C72600,
+ .end = 0x01C72600 + 0x1ff,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static u64 dm644x_osd_dma_mask = DMA_BIT_MASK(32);
+
+static struct platform_device dm644x_osd_dev = {
+ .name = VPBE_OSD_SUBDEV_NAME,
+ .id = -1,
+ .num_resources = ARRAY_SIZE(dm644x_osd_resources),
+ .resource = dm644x_osd_resources,
+ .dev = {
+ .dma_mask = &dm644x_osd_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = DM644X_VPBE,
+ },
+};
+
+static struct resource dm644x_venc_resources[] = {
+ /* venc registers io space */
+ {
+ .start = 0x01C72400,
+ .end = 0x01C72400 + 0x17f,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static u64 dm644x_venc_dma_mask = DMA_BIT_MASK(32);
+
+#define VPSS_CLKCTL 0x01C40044
+
+static void __iomem *vpss_clkctl_reg;
+
+/* TBD. Check what VENC_CLOCK_SEL settings for HDTV and EDTV */
+static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, __u64 mode)
+{
+ int ret = 0;
+
+ if (NULL == vpss_clkctl_reg)
+ return -EINVAL;
+ switch (type) {
+ case VPBE_ENC_STD:
+ __raw_writel(0x18, vpss_clkctl_reg);
+ break;
+ case VPBE_ENC_DV_PRESET:
+ switch ((unsigned int)mode) {
+ case V4L2_DV_480P59_94:
+ case V4L2_DV_576P50:
+ __raw_writel(0x19, vpss_clkctl_reg);
+ break;
+ case V4L2_DV_720P60:
+ case V4L2_DV_1080I60:
+ case V4L2_DV_1080P30:
+ /*
+ * For HD, use external clock source since
+ * HD requires higher clock rate
+ */
+ __raw_writel(0xa, vpss_clkctl_reg);
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ break;
+ default:
+ ret = -EINVAL;
+ }
+ return ret;
+}
+
+static inline u32 dm644x_reg_modify(void *reg, u32 val, u32 mask)
+{
+ u32 new_val = (__raw_readl(reg) & ~mask) | (val & mask);
+ __raw_writel(new_val, reg);
+ return new_val;
+}
+
+static u64 vpbe_display_dma_mask = DMA_BIT_MASK(32);
+
+static struct resource dm644x_v4l2_disp_resources[] = {
+ {
+ .start = IRQ_VENCINT,
+ .end = IRQ_VENCINT,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = 0x01C724B8,
+ .end = 0x01C724B8 + 0x3,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device vpbe_v4l2_display = {
+ .name = "vpbe-v4l2",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(dm644x_v4l2_disp_resources),
+ .resource = dm644x_v4l2_disp_resources,
+ .dev = {
+ .dma_mask = &vpbe_display_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+};
+
+struct venc_platform_data dm644x_venc_pdata = {
+ .venc_type = DM644X_VPBE,
+ .setup_clock = dm644x_venc_setup_clock,
+};
+
+static struct platform_device dm644x_venc_dev = {
+ .name = VPBE_VENC_SUBDEV_NAME,
+ .id = -1,
+ .num_resources = ARRAY_SIZE(dm644x_venc_resources),
+ .resource = dm644x_venc_resources,
+ .dev = {
+ .dma_mask = &dm644x_venc_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = &dm644x_venc_pdata,
+ },
+};
+
+static u64 dm644x_vpbe_dma_mask = DMA_BIT_MASK(32);
+
+static struct platform_device dm644x_vpbe_dev = {
+ .name = "vpbe_controller",
+ .id = -1,
+ .dev = {
+ .dma_mask = &dm644x_vpbe_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+};
+
+void dm644x_set_vpbe_display_config(struct vpbe_display_config *cfg)
+{
+ dm644x_vpbe_dev.dev.platform_data = cfg;
+}
+
/*----------------------------------------------------------------------*/
static struct map_desc dm644x_io_desc[] = {
@@ -781,25 +922,41 @@ void __init dm644x_init(void)
davinci_common_init(&davinci_soc_info_dm644x);
}
+static struct platform_device *dm644x_video_devices[] __initdata = {
+ &dm644x_vpss_device,
+ &dm644x_ccdc_dev,
+ &vpfe_capture_dev,
+ &dm644x_osd_dev,
+ &dm644x_venc_dev,
+ &dm644x_vpbe_dev,
+ &vpbe_v4l2_display,
+};
+
+static int __init dm644x_init_video(void)
+{
+ /* Add ccdc clock aliases */
+ clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL);
+ clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL);
+ vpss_clkctl_reg = ioremap_nocache(VPSS_CLKCTL, 4);
+ if (!vpss_clkctl_reg)
+ return -ENODEV;
+ platform_add_devices(dm644x_video_devices,
+ ARRAY_SIZE(dm644x_video_devices));
+ return 0;
+}
+
static int __init dm644x_init_devices(void)
{
if (!cpu_is_davinci_dm644x())
return 0;
- /* Add ccdc clock aliases */
- clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL);
- clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL);
platform_device_register(&dm644x_edma_device);
-
platform_device_register(&dm644x_mdio_device);
platform_device_register(&dm644x_emac_device);
clk_add_alias(NULL, dev_name(&dm644x_mdio_device.dev),
NULL, &dm644x_emac_device.dev);
- platform_device_register(&dm644x_vpss_device);
- platform_device_register(&dm644x_ccdc_dev);
- platform_device_register(&vpfe_capture_dev);
-
+ dm644x_init_video();
return 0;
}
postcore_initcall(dm644x_init_devices);
diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h
index 5a1b26d..8c0fad2 100644
--- a/arch/arm/mach-davinci/include/mach/dm644x.h
+++ b/arch/arm/mach-davinci/include/mach/dm644x.h
@@ -26,6 +26,9 @@
#include <mach/hardware.h>
#include <mach/asp.h>
#include <media/davinci/vpfe_capture.h>
+#include <media/davinci/vpbe_types.h>
+#include <media/davinci/vpbe.h>
+#include <media/davinci/vpss.h>
#define DM644X_EMAC_BASE (0x01C80000)
#define DM644X_EMAC_MDIO_BASE (DM644X_EMAC_BASE + 0x4000)
@@ -43,5 +46,6 @@
void __init dm644x_init(void);
void __init dm644x_init_asp(struct snd_platform_data *pdata);
void dm644x_set_vpfe_config(struct vpfe_config *cfg);
+void dm644x_set_vpbe_display_config(struct vpbe_display_config *cfg);
#endif /* __ASM_ARCH_DM644X_H */
--
1.6.2.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v10 5/8] davinci vpbe: platform specific additions
2010-12-23 14:43 [PATCH v10 5/8] davinci vpbe: platform specific additions Manjunath Hadli
@ 2010-12-23 17:49 ` Sergei Shtylyov
2010-12-24 9:58 ` Hadli, Manjunath
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2010-12-23 17:49 UTC (permalink / raw)
To: Manjunath Hadli; +Cc: LMML, Kevin Hilman, dlos, Mauro Carvalho Chehab
Hello.
Manjunath Hadli wrote:
> This patch implements the overall device creation for the Video
> display driver
> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> Acked-by: Muralidharan Karicheri <m-karicheri2@ti.com>
> Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
[...]
> diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
> index 9a2376b..eb87867 100644
> --- a/arch/arm/mach-davinci/dm644x.c
> +++ b/arch/arm/mach-davinci/dm644x.c
> @@ -370,6 +370,7 @@ static struct platform_device dm644x_mdio_device = {
> * soc description mux mode mode mux dbg
> * reg offset mask mode
> */
> +
Stray newline?
[...]
> +static struct resource dm644x_venc_resources[] = {
> + /* venc registers io space */
> + {
> + .start = 0x01C72400,
> + .end = 0x01C72400 + 0x17f,
> + .flags = IORESOURCE_MEM,
> + },
> +};
> +
[...]
> +static struct resource dm644x_v4l2_disp_resources[] = {
> + {
> + .start = IRQ_VENCINT,
> + .end = IRQ_VENCINT,
> + .flags = IORESOURCE_IRQ,
> + },
> + {
> + .start = 0x01C724B8,
> + .end = 0x01C724B8 + 0x3,
> + .flags = IORESOURCE_MEM,
> + },
> +};
Still intersects with dm644x_venc_resources[]. Is it intended?
> static int __init dm644x_init_devices(void)
> {
> if (!cpu_is_davinci_dm644x())
> return 0;
>
> - /* Add ccdc clock aliases */
> - clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL);
> - clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL);
> platform_device_register(&dm644x_edma_device);
> -
Should've left this newline alone...
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH v10 5/8] davinci vpbe: platform specific additions
2010-12-23 17:49 ` Sergei Shtylyov
@ 2010-12-24 9:58 ` Hadli, Manjunath
0 siblings, 0 replies; 3+ messages in thread
From: Hadli, Manjunath @ 2010-12-24 9:58 UTC (permalink / raw)
To: 'Sergei Shtylyov'; +Cc: LMML, Kevin Hilman, dlos, Mauro Carvalho Chehab
Sergei,
On Thu, Dec 23, 2010 at 23:19:30, Sergei Shtylyov wrote:
> Hello.
>
> Manjunath Hadli wrote:
>
> > This patch implements the overall device creation for the Video
> > display driver
>
> > Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> > Acked-by: Muralidharan Karicheri <m-karicheri2@ti.com>
> > Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
> [...]
>
> > diff --git a/arch/arm/mach-davinci/dm644x.c
> > b/arch/arm/mach-davinci/dm644x.c index 9a2376b..eb87867 100644
> > --- a/arch/arm/mach-davinci/dm644x.c
> > +++ b/arch/arm/mach-davinci/dm644x.c
> > @@ -370,6 +370,7 @@ static struct platform_device dm644x_mdio_device = {
> > * soc description mux mode mode mux dbg
> > * reg offset mask mode
> > */
> > +
>
> Stray newline?
>
> [...]
> > +static struct resource dm644x_venc_resources[] = {
> > + /* venc registers io space */
> > + {
> > + .start = 0x01C72400,
> > + .end = 0x01C72400 + 0x17f,
> > + .flags = IORESOURCE_MEM,
> > + },
> > +};
> > +
> [...]
> > +static struct resource dm644x_v4l2_disp_resources[] = {
> > + {
> > + .start = IRQ_VENCINT,
> > + .end = IRQ_VENCINT,
> > + .flags = IORESOURCE_IRQ,
> > + },
> > + {
> > + .start = 0x01C724B8,
> > + .end = 0x01C724B8 + 0x3,
> > + .flags = IORESOURCE_MEM,
> > + },
> > +};
>
> Still intersects with dm644x_venc_resources[]. Is it intended?
Yes. We need one VENC register in the display ISR to check the field status.
I have reduced the access of the full range to only one reg.
>
> > static int __init dm644x_init_devices(void) {
> > if (!cpu_is_davinci_dm644x())
> > return 0;
> >
> > - /* Add ccdc clock aliases */
> > - clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL);
> > - clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL);
> > platform_device_register(&dm644x_edma_device);
> > -
>
> Should've left this newline alone...
>
> WBR, Sergei
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-24 9:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-23 14:43 [PATCH v10 5/8] davinci vpbe: platform specific additions Manjunath Hadli
2010-12-23 17:49 ` Sergei Shtylyov
2010-12-24 9:58 ` Hadli, Manjunath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox