[media] atmel-isi: remove mck backward compatibility code

The master clock should be handled by sensor itself.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 0ea360acea817731f58a85599153e675adc34ec9..90701726a06a2e5c4bcea8a9f011333d7ae1651c 100644 (file)
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -35,7 +35,6 @@
 #define VID_LIMIT_BYTES                        (16 * 1024 * 1024)
 #define MIN_FRAME_RATE                 15
 #define FRAME_INTERVAL_MILLI_SEC       (1000 / MIN_FRAME_RATE)
-#define ISI_DEFAULT_MCLK_FREQ          25000000
 
 /* Frame buffer descriptor */
 struct fbd {
@@ -83,8 +82,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;
@@ -740,31 +737,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;
@@ -874,8 +846,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,
@@ -912,7 +882,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;
        isi->pdata.frate = ISI_CFG1_FRATE_CAPTURE_ALL;
 
        np = of_graph_get_next_endpoint(np, NULL);
@@ -988,21 +957,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,