Hi Sakari, On Saturday 20 October 2012 17:11:17 Sakari Ailus wrote: > Add the registers used to configure the CSI-2 receiver PHY on OMAP3430 and > 3630 and map them in the ISP driver. The register is part of the control > block but it only is needed by the ISP driver. > > Signed-off-by: Sakari Ailus <sakari.ai...@iki.fi> > Acked-by: Tony Lindgren <t...@atomide.com> > --- > Hi Laurent, > > Could you replace the patch I sent you with this one? I think there's a tiny > conflict there since the interrupt number definition suddenly changed.
I had already resolved the conflict when applying to my tree (http://git.linuxtv.org/pinchartl/media.git/shortlog/refs/heads/omap3isp- omap3isp-next). > arch/arm/mach-omap2/devices.c | 10 ++++++++++ > drivers/media/platform/omap3isp/isp.c | 6 ++++-- > drivers/media/platform/omap3isp/isp.h | 2 ++ > 3 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index c8c2117..5f1ee96 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -200,6 +200,16 @@ static struct resource omap3isp_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > + .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, > + .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE > + 3, > + .flags = IORESOURCE_MEM, > + }, > + { > + .start = OMAP343X_CTRL_BASE + > OMAP3630_CONTROL_CAMERA_PHY_CTRL, > + .end = OMAP343X_CTRL_BASE + > OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, > + .flags = IORESOURCE_MEM, > + }, > + { > .start = 24 + OMAP_INTC_START, > .flags = IORESOURCE_IRQ, > } > diff --git a/drivers/media/platform/omap3isp/isp.c > b/drivers/media/platform/omap3isp/isp.c index 99640d8..5ea5520 100644 > --- a/drivers/media/platform/omap3isp/isp.c > +++ b/drivers/media/platform/omap3isp/isp.c > @@ -102,7 +102,8 @@ static const struct isp_res_mapping isp_res_maps[] = { > 1 << OMAP3_ISP_IOMEM_RESZ | > 1 << OMAP3_ISP_IOMEM_SBL | > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS1 | > - 1 << OMAP3_ISP_IOMEM_CSIPHY2, > + 1 << OMAP3_ISP_IOMEM_CSIPHY2 | > + 1 << OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > }, > { > .isp_rev = ISP_REVISION_15_0, > @@ -119,7 +120,8 @@ static const struct isp_res_mapping isp_res_maps[] = { > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS2 | > 1 << OMAP3_ISP_IOMEM_CSI2C_REGS1 | > 1 << OMAP3_ISP_IOMEM_CSIPHY1 | > - 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2, > + 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2 | > + 1 << OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > }, > }; > > diff --git a/drivers/media/platform/omap3isp/isp.h > b/drivers/media/platform/omap3isp/isp.h index 8be7487..6fed222 100644 > --- a/drivers/media/platform/omap3isp/isp.h > +++ b/drivers/media/platform/omap3isp/isp.h > @@ -72,6 +72,8 @@ enum isp_mem_resources { > OMAP3_ISP_IOMEM_CSI2C_REGS1, > OMAP3_ISP_IOMEM_CSIPHY1, > OMAP3_ISP_IOMEM_CSI2C_REGS2, > + OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > + OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > OMAP3_ISP_IOMEM_LAST > }; -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
