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

Commit 6b727c68 authored by Antonio Ospite's avatar Antonio Ospite Committed by Mauro Carvalho Chehab
Browse files

pxa_camera: remove init() callback 



pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or
even to request GPIOs to be used by the camera *sensor*. These initializations
can be performed statically in machine init functions.

The current semantics for this init() callback is ambiguous anyways, it is
invoked in pxa_camera_activate(), hence at device node open, but its users use
it like a generic initialization to be done at module init time (configure
MFP, request GPIOs for *sensor* control).

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 81355e40

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

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 
#define PXA_CAMERA_VSP		0x400



struct pxacamera_platform_data {

	int (*init)(struct device *);



	unsigned long flags;

	unsigned long mclk_10khz;

};

drivers/media/video/pxa_camera.c

+0 −10
Original line number Diff line number Diff line
@@ -898,18 +898,8 @@ static void recalculate_fifo_timeout(struct pxa_camera_dev *pcdev, 


static void pxa_camera_activate(struct pxa_camera_dev *pcdev)

{

	struct pxacamera_platform_data *pdata = pcdev->pdata;

	struct device *dev = pcdev->soc_host.v4l2_dev.dev;

	u32 cicr4 = 0;



	dev_dbg(dev, "Registered platform device at %p data %p\n",

		pcdev, pdata);



	if (pdata && pdata->init) {

		dev_dbg(dev, "%s: Init gpios\n", __func__);

		pdata->init(dev);

	}



	/* disable all interrupts */

	__raw_writel(0x3ff, pcdev->base + CICR0);