diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2017-03-04 04:55:48 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-08-20 08:16:50 -0400 |
| commit | 19be9fd67c2574304717559293f717d7d0328842 (patch) | |
| tree | 6886d78e1c81654352f4ee7eb1f4b6d0499940c2 | |
| parent | 37a0c6f92cc5edcf47a705ab908d4f9657554396 (diff) | |
| download | linux-19be9fd67c2574304717559293f717d7d0328842.tar.bz2 | |
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>
| -rw-r--r-- | drivers/media/platform/omap3isp/ispcsiphy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c index addc6efbb033..2028bb519108 100644 --- 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; |