3 files changed, 16 insertions, 2 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,
         }
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 99640d8c1db0..5ea5520ff467 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 8be7487c326f..6fed2228e780 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
 };