Subject: [PATCH v2 3/3] media: atmel-isi: remove mck back compatiable code as it's not need

From: [email-masked] (Josh Wu)
Date: Mon, 13 Apr 2015 18:09:36 +0800

Hi, Laurent

On 4/12/2015 9:08 PM, Laurent Pinchart wrote:
> Hi Josh,
>
> Thank you for the patch.
>
> On Thursday 09 April 2015 17:01:48 Josh Wu wrote:
>> The master clock should handled by sensor itself.
>>
>> Signed-off-by: Josh Wu <[email-masked]>
>> ---
>>
>> Changes in v2:
>> - totally remove clock_start()/clock_stop() as they are optional.
>>
>>   drivers/media/platform/soc_camera/atmel-isi.c | 45 ------------------------
>>   1 file changed, 45 deletions(-)
>>
>> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c
>> b/drivers/media/platform/soc_camera/atmel-isi.c index 2b05f89..7bba7d9
>> 100644
>> --- a/drivers/media/platform/soc_camera/atmel-isi.c
>> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
>> @@ -83,8 +83,6 @@ struct atmel_isi {
>>   	struct completion		complete;
>>   	/* ISI peripherial clock */
>>   	struct clk			*pclk;
>> -	/* ISI_MCK, feed to camera sensor to generate pixel clock */
>> -	struct clk			*mck;
>>   	unsigned int			irq;
>>
>>   	struct isi_platform_data	pdata;
>> @@ -727,31 +725,6 @@ static void isi_camera_remove_device(struct
>> soc_camera_device *icd) icd->devnum);
>>   }
>>
>> -/* Called with .host_lock held */
>> -static int isi_camera_clock_start(struct soc_camera_host *ici)
>> -{
>> -	struct atmel_isi *isi = ici->priv;
>> -	int ret;
>> -
>> -	if (!IS_ERR(isi->mck)) {
>> -		ret = clk_prepare_enable(isi->mck);
>> -		if (ret) {
>> -			return ret;
>> -		}
>> -	}
>> -
>> -	return 0;
>> -}
>> -
>> -/* Called with .host_lock held */
>> -static void isi_camera_clock_stop(struct soc_camera_host *ici)
>> -{
>> -	struct atmel_isi *isi = ici->priv;
>> -
>> -	if (!IS_ERR(isi->mck))
>> -		clk_disable_unprepare(isi->mck);
>> -}
>> -
>>   static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
>>   {
>>   	struct soc_camera_device *icd = file->private_data;
>> @@ -865,8 +838,6 @@ static struct soc_camera_host_ops
>> isi_soc_camera_host_ops = { .owner		= THIS_MODULE,
>>   	.add		= isi_camera_add_device,
>>   	.remove		= isi_camera_remove_device,
>> -	.clock_start	= isi_camera_clock_start,
>> -	.clock_stop	= isi_camera_clock_stop,
>>   	.set_fmt	= isi_camera_set_fmt,
>>   	.try_fmt	= isi_camera_try_fmt,
>>   	.get_formats	= isi_camera_get_formats,
>> @@ -904,7 +875,6 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi,
>>
>>   	/* Default settings for ISI */
>>   	isi->pdata.full_mode = 1;
>> -	isi->pdata.mck_hz = ISI_DEFAULT_MCLK_FREQ;
> You can also remove the #define ISI_DEFAULT_MCLK_FREQ at the beginning of this
> file.

I'll remove the useless definition.

>
> With this fixed,
>
> Acked-by: Laurent Pinchart <[email-masked]>

Thanks.

Best Regards,
Josh Wu

>
>>   	isi->pdata.frate = ISI_CFG1_FRATE_CAPTURE_ALL;
>>
>>   	np = of_graph_get_next_endpoint(np, NULL);
>> @@ -980,21 +950,6 @@ static int atmel_isi_probe(struct platform_device
>> *pdev) INIT_LIST_HEAD(&isi->video_buffer_list);
>>   	INIT_LIST_HEAD(&isi->dma_desc_head);
>>
>> -	/* ISI_MCK is the sensor master clock. It should be handled by the
>> -	 * sensor driver directly, as the ISI has no use for that clock. Make
>> -	 * the clock optional here while platforms transition to the correct
>> -	 * model.
>> -	 */
>> -	isi->mck = devm_clk_get(dev, "isi_mck");
>> -	if (!IS_ERR(isi->mck)) {
>> -		/* Set ISI_MCK's frequency, it should be faster than pixel
>> -		 * clock.
>> -		 */
>> -		ret = clk_set_rate(isi->mck, isi->pdata.mck_hz);
>> -		if (ret < 0)
>> -			return ret;
>> -	}
>> -
>>   	isi->p_fb_descriptors = dma_alloc_coherent(&pdev->dev,
>>   				sizeof(struct fbd) * MAX_BUFFER_NUM,
>>   				&isi->fb_descriptors_phys,