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

Commit 65d76488 authored by Kalle Jokiniemi's avatar Kalle Jokiniemi Committed by Mauro Carvalho Chehab
Browse files

[media] OMAP3: ISP: Add regulator control for omap34xx 



The current omap3isp driver is missing regulator handling
for CSIb complex in omap34xx based devices. This patch
adds a mechanism for this to the omap3isp driver.

Signed-off-by: default avatarKalle Jokiniemi <kalle.jokiniemi@nokia.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 118314c0

drivers/media/video/omap3isp/ispccp2.c

+25 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/uaccess.h>

#include <linux/regulator/consumer.h>



#include "isp.h"

#include "ispreg.h"
@@ -163,6 +164,9 @@ static void ccp2_if_enable(struct isp_ccp2_device *ccp2, u8 enable) 
	struct isp_pipeline *pipe = to_isp_pipeline(&ccp2->subdev.entity);

	int i;



	if (enable && ccp2->vdds_csib)

		regulator_enable(ccp2->vdds_csib);



	/* Enable/Disable all the LCx channels */

	for (i = 0; i < CCP2_LCx_CHANS_NUM; i++)

		isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCx_CTRL(i),
@@ -186,6 +190,9 @@ static void ccp2_if_enable(struct isp_ccp2_device *ccp2, u8 enable) 
				    ISPCCP2_LC01_IRQENABLE,

				    ISPCCP2_LC01_IRQSTATUS_LC0_FS_IRQ);

	}



	if (!enable && ccp2->vdds_csib)

		regulator_disable(ccp2->vdds_csib);

}



/*
@@ -1137,6 +1144,9 @@ error: 
 */

void omap3isp_ccp2_cleanup(struct isp_device *isp)

{

	struct isp_ccp2_device *ccp2 = &isp->isp_ccp2;



	regulator_put(ccp2->vdds_csib);

}



/*
@@ -1151,14 +1161,27 @@ int omap3isp_ccp2_init(struct isp_device *isp) 


	init_waitqueue_head(&ccp2->wait);



	/* On the OMAP36xx, the CCP2 uses the CSI PHY1 or PHY2, shared with

	/*

	 * On the OMAP34xx the CSI1 receiver is operated in the CSIb IO

	 * complex, which is powered by vdds_csib power rail. Hence the

	 * request for the regulator.

	 *

	 * On the OMAP36xx, the CCP2 uses the CSI PHY1 or PHY2, shared with

	 * the CSI2c or CSI2a receivers. The PHY then needs to be explicitly

	 * configured.

	 *

	 * TODO: Don't hardcode the usage of PHY1 (shared with CSI2c).

	 */

	if (isp->revision == ISP_REVISION_15_0)

	if (isp->revision == ISP_REVISION_2_0) {

		ccp2->vdds_csib = regulator_get(isp->dev, "vdds_csib");

		if (IS_ERR(ccp2->vdds_csib)) {

			dev_dbg(isp->dev,

				"Could not get regulator vdds_csib\n");

			ccp2->vdds_csib = NULL;

		}

	} else if (isp->revision == ISP_REVISION_15_0) {

		ccp2->phy = &isp->isp_csiphy1;

	}



	ret = ccp2_init_entities(ccp2);

	if (ret < 0)

drivers/media/video/omap3isp/ispccp2.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct isp_ccp2_device { 
	struct isp_interface_mem_config mem_cfg;

	struct isp_video video_in;

	struct isp_csiphy *phy;

	struct regulator *vdds_csib;

	unsigned int error;

	enum isp_pipeline_stream_state state;

	wait_queue_head_t wait;