Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19d19eb authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: Add CSI configuration registers from control block to ISP resources 



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: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d83501a0

arch/arm/mach-omap2/devices.c

+10 −0
Original line number Diff line number Diff line
@@ -200,6 +200,16 @@ static struct resource omap3isp_resources[] = { 
		.end		= OMAP3630_ISP_CSI2C_REGS2_END,

		.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,

drivers/media/platform/omap3isp/isp.c

+4 −2
Original line number Diff line number Diff line
@@ -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,

	},

};

drivers/media/platform/omap3isp/isp.h

+2 −0
Original line number Diff line number Diff line
@@ -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

};