media: omap3isp: Always initialise isp and mutex for csiphy1

The PHY is still relevant for CCP2.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> # on Beagleboard-xM + MPT9P031
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c
index addc6efbb033bcbffeb207e58cb0ae1926de91f0..2028bb519108a3def9dde1fc65df89e7f31523b7 100644 (file)
--- a/drivers/media/platform/omap3isp/ispcsiphy.c
+++ b/drivers/media/platform/omap3isp/ispcsiphy.c
@@ -345,13 +345,14 @@ int omap3isp_csiphy_init(struct isp_device *isp)
        phy2->phy_regs = OMAP3_ISP_IOMEM_CSIPHY2;
        mutex_init(&phy2->mutex);
 
+       phy1->isp = isp;
+       mutex_init(&phy1->mutex);
+
        if (isp->revision == ISP_REVISION_15_0) {
-               phy1->isp = isp;
                phy1->csi2 = &isp->isp_csi2c;
                phy1->num_data_lanes = ISP_CSIPHY1_NUM_DATA_LANES;
                phy1->cfg_regs = OMAP3_ISP_IOMEM_CSI2C_REGS1;
                phy1->phy_regs = OMAP3_ISP_IOMEM_CSIPHY1;
-               mutex_init(&phy1->mutex);
        }
 
        return 0;