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

Commit 81034663 authored by Stefan Herbrechtsmeier's avatar Stefan Herbrechtsmeier Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8687): soc-camera: Move .power and .reset from soc_camera host to sensor driver 



Make .power and .reset callbacks per camera instead of per host, also move
their invocation to camera drivers.

.arch/arm/mach-pxa/include/mach/camera.h    |    2 -

Signed-off-by: default avatarStefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 506c629a

arch/arm/mach-pxa/include/mach/camera.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 


struct pxacamera_platform_data {

	int (*init)(struct device *);

	int (*power)(struct device *, int);

	int (*reset)(struct device *, int);



	unsigned long flags;

	unsigned long mclk_10khz;

drivers/media/video/mt9m001.c

+30 −3
Original line number Diff line number Diff line
@@ -117,13 +117,33 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg, 


static int mt9m001_init(struct soc_camera_device *icd)

{

	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);

	struct soc_camera_link *icl = mt9m001->client->dev.platform_data;

	int ret;



	dev_dbg(icd->vdev->parent, "%s\n", __func__);



	if (icl->power) {

		ret = icl->power(&mt9m001->client->dev, 1);

		if (ret < 0) {

			dev_err(icd->vdev->parent,

				"Platform failed to power-on the camera.\n");

			return ret;

		}

	}



	/* The camera could have been already on, we reset it additionally */

	if (icl->reset)

		ret = icl->reset(&mt9m001->client->dev);

	else

		ret = -ENODEV;



	if (ret < 0) {

		/* Either no platform reset, or platform reset failed */

		ret = reg_write(icd, MT9M001_RESET, 1);

		if (!ret)

			ret = reg_write(icd, MT9M001_RESET, 0);

	}

	/* Disable chip, synchronous option update */

	if (!ret)

		ret = reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);
@@ -133,8 +153,15 @@ static int mt9m001_init(struct soc_camera_device *icd) 


static int mt9m001_release(struct soc_camera_device *icd)

{

	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);

	struct soc_camera_link *icl = mt9m001->client->dev.platform_data;



	/* Disable the chip */

	reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);



	if (icl->power)

		icl->power(&mt9m001->client->dev, 0);



	return 0;

}

drivers/media/video/mt9m111.c

+15 −0
Original line number Diff line number Diff line
@@ -351,8 +351,18 @@ static int mt9m111_setfmt_yuv(struct soc_camera_device *icd) 
static int mt9m111_enable(struct soc_camera_device *icd)

{

	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);

	struct soc_camera_link *icl = mt9m111->client->dev.platform_data;

	int ret;



	if (icl->power) {

		ret = icl->power(&mt9m111->client->dev, 1);

		if (ret < 0) {

			dev_err(icd->vdev->parent,

				"Platform failed to power-on the camera.\n");

			return ret;

		}

	}



	ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);

	if (!ret)

		mt9m111->powered = 1;
@@ -362,11 +372,16 @@ static int mt9m111_enable(struct soc_camera_device *icd) 
static int mt9m111_disable(struct soc_camera_device *icd)

{

	struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);

	struct soc_camera_link *icl = mt9m111->client->dev.platform_data;

	int ret;



	ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);

	if (!ret)

		mt9m111->powered = 0;



	if (icl->power)

		icl->power(&mt9m111->client->dev, 0);



	return ret;

}

drivers/media/video/mt9v022.c

+23 −1
Original line number Diff line number Diff line
@@ -134,8 +134,25 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg, 
static int mt9v022_init(struct soc_camera_device *icd)

{

	struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);

	struct soc_camera_link *icl = mt9v022->client->dev.platform_data;

	int ret;



	if (icl->power) {

		ret = icl->power(&mt9v022->client->dev, 1);

		if (ret < 0) {

			dev_err(icd->vdev->parent,

				"Platform failed to power-on the camera.\n");

			return ret;

		}

	}



	/*

	 * The camera could have been already on, we hard-reset it additionally,

	 * if available. Soft reset is done in video_probe().

	 */

	if (icl->reset)

		icl->reset(&mt9v022->client->dev);



	/* Almost the default mode: master, parallel, simultaneous, and an

	 * undocumented bit 0x200, which is present in table 7, but not in 8,

	 * plus snapshot mode to disable scan for now */
@@ -161,7 +178,12 @@ static int mt9v022_init(struct soc_camera_device *icd) 


static int mt9v022_release(struct soc_camera_device *icd)

{

	/* Nothing? */

	struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);

	struct soc_camera_link *icl = mt9v022->client->dev.platform_data;



	if (icl->power)

		icl->power(&mt9v022->client->dev, 0);



	return 0;

}

drivers/media/video/pxa_camera.c

+0 −24
Original line number Diff line number Diff line
@@ -629,17 +629,6 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev) 
		pdata->init(pcdev->dev);

	}



	if (pdata && pdata->power) {

		dev_dbg(pcdev->dev, "%s: Power on camera\n", __func__);

		pdata->power(pcdev->dev, 1);

	}



	if (pdata && pdata->reset) {

		dev_dbg(pcdev->dev, "%s: Releasing camera reset\n",

			__func__);

		pdata->reset(pcdev->dev, 1);

	}



	CICR0 = 0x3FF;   /* disable all interrupts */



	if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
@@ -660,20 +649,7 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev) 


static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)

{

	struct pxacamera_platform_data *board = pcdev->pdata;



	clk_disable(pcdev->clk);



	if (board && board->reset) {

		dev_dbg(pcdev->dev, "%s: Asserting camera reset\n",

			__func__);

		board->reset(pcdev->dev, 0);

	}



	if (board && board->power) {

		dev_dbg(pcdev->dev, "%s: Power off camera\n", __func__);

		board->power(pcdev->dev, 0);

	}

}



static irqreturn_t pxa_camera_irq(int irq, void *data)