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

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

media: omap3isp: Always initialise isp and mutex for csiphy1 



The PHY is still relevant for CCP2.

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

drivers/media/platform/omap3isp/ispcsiphy.c

+3 −2
Original line number Diff line number Diff line
@@ -345,13 +345,14 @@ int omap3isp_csiphy_init(struct isp_device *isp) 
	phy2->phy_regs = OMAP3_ISP_IOMEM_CSIPHY2;

	mutex_init(&phy2->mutex);



	if (isp->revision == ISP_REVISION_15_0) {

	phy1->isp = isp;

	mutex_init(&phy1->mutex);



	if (isp->revision == ISP_REVISION_15_0) {

		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;