summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-10-14 07:31:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-28 10:38:55 -0200
commitc19d19ebd200ad1f982159519017129a5ed6515e (patch)
tree6cc5f7962832354502f1429bf909435fd8e28767 /arch
parentd83501a0416160cc45e84b6719f7a2784013cf16 (diff)
downloadlinux-stable-c19d19ebd200ad1f982159519017129a5ed6515e.tar.gz
linux-stable-c19d19ebd200ad1f982159519017129a5ed6515e.tar.bz2
linux-stable-c19d19ebd200ad1f982159519017129a5ed6515e.zip
[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: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/devices.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c72b5a727720..c7cb1325c717 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -201,6 +201,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,
}