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

Commit 833e1063 authored by Josh Wu's avatar Josh Wu Committed by Mauro Carvalho Chehab
Browse files

[media] media: atmel-isi: convert the pdata from pointer to structure 



Now the platform data is initialized by allocation of isi
structure. In the future, we use pdata to store the dt parameters.

Signed-off-by: default avatarJosh Wu <josh.wu@atmel.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3900623b

drivers/media/platform/soc_camera/atmel-isi.c

+11 −11
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct atmel_isi { 
	struct clk			*mck;

	unsigned int			irq;



	struct isi_platform_data	*pdata;

	struct isi_platform_data	pdata;

	u16				width_flags;	/* max 12 bits */



	struct list_head		video_buffer_list;
@@ -350,7 +350,7 @@ static void start_dma(struct atmel_isi *isi, struct frame_buffer *buffer) 


	cfg1 &= ~ISI_CFG1_FRATE_DIV_MASK;

	/* Enable linked list */

	cfg1 |= isi->pdata->frate | ISI_CFG1_DISCR;

	cfg1 |= isi->pdata.frate | ISI_CFG1_DISCR;



	/* Enable codec path and ISI */

	ctrl = ISI_CTRL_CDC | ISI_CTRL_EN;
@@ -795,7 +795,7 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd) 
	/* Make choises, based on platform preferences */

	if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&

	    (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {

		if (isi->pdata->hsync_act_low)

		if (isi->pdata.hsync_act_low)

			common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;

		else

			common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
@@ -803,7 +803,7 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd) 


	if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&

	    (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {

		if (isi->pdata->vsync_act_low)

		if (isi->pdata.vsync_act_low)

			common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;

		else

			common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
@@ -811,7 +811,7 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd) 


	if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&

	    (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {

		if (isi->pdata->pclk_act_falling)

		if (isi->pdata.pclk_act_falling)

			common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;

		else

			common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
@@ -833,9 +833,9 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd) 
	if (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)

		cfg1 |= ISI_CFG1_PIXCLK_POL_ACTIVE_FALLING;



	if (isi->pdata->has_emb_sync)

	if (isi->pdata.has_emb_sync)

		cfg1 |= ISI_CFG1_EMB_SYNC;

	if (isi->pdata->full_mode)

	if (isi->pdata.full_mode)

		cfg1 |= ISI_CFG1_FULL_MODE;



	isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
@@ -903,7 +903,7 @@ static int atmel_isi_probe(struct platform_device *pdev) 
	if (IS_ERR(isi->pclk))

		return PTR_ERR(isi->pclk);



	isi->pdata = pdata;

	memcpy(&isi->pdata, pdata, sizeof(isi->pdata));

	isi->active = NULL;

	spin_lock_init(&isi->lock);

	INIT_LIST_HEAD(&isi->video_buffer_list);
@@ -919,7 +919,7 @@ static int atmel_isi_probe(struct platform_device *pdev) 
		/* Set ISI_MCK's frequency, it should be faster than pixel

		 * clock.

		 */

		ret = clk_set_rate(isi->mck, pdata->mck_hz);

		ret = clk_set_rate(isi->mck, isi->pdata.mck_hz);

		if (ret < 0)

			return ret;

	}
@@ -953,9 +953,9 @@ static int atmel_isi_probe(struct platform_device *pdev) 
		goto err_ioremap;

	}



	if (pdata->data_width_flags & ISI_DATAWIDTH_8)

	if (isi->pdata.data_width_flags & ISI_DATAWIDTH_8)

		isi->width_flags = 1 << 7;

	if (pdata->data_width_flags & ISI_DATAWIDTH_10)

	if (isi->pdata.data_width_flags & ISI_DATAWIDTH_10)

		isi->width_flags |= 1 << 9;



	isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);