kernel: bump 5.10 to 5.10.103

[openwrt/staging/mkresin.git] / target / linux / at91 / patches-5.10 / 155-media-atmel-properly-get-pm_runtime.patch

diff --git a/target/linux/at91/patches-5.10/155-media-atmel-properly-get-pm_runtime.patch b/target/linux/at91/patches-5.10/155-media-atmel-properly-get-pm_runtime.patch
index f8e7a24ce6d80221183b88011a71b3e163f5bf3c..58f90db46dafa43aa60eaff6ec6ad6db770d0ab4 100644 (file)
--- a/target/linux/at91/patches-5.10/155-media-atmel-properly-get-pm_runtime.patch
+++ b/target/linux/at91/patches-5.10/155-media-atmel-properly-get-pm_runtime.patch
@@ -25,11 +25,9 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  drivers/media/platform/atmel/atmel-isi.c      | 19 +++++++++---
  2 files changed, 38 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
-index fe3ec8d0eaee..ce8e1351fa53 100644
 --- a/drivers/media/platform/atmel/atmel-isc-base.c
 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
-@@ -294,9 +294,13 @@ static int isc_wait_clk_stable(struct clk_hw *hw)
+@@ -294,9 +294,13 @@ static int isc_wait_clk_stable(struct cl
  static int isc_clk_prepare(struct clk_hw *hw)
  {
        struct isc_clk *isc_clk = to_isc_clk(hw);
@@ -45,7 +43,7 @@ index fe3ec8d0eaee..ce8e1351fa53 100644
  
        return isc_wait_clk_stable(hw);
  }
-@@ -353,9 +357,13 @@ static int isc_clk_is_enabled(struct clk_hw *hw)
+@@ -353,9 +357,13 @@ static int isc_clk_is_enabled(struct clk
  {
        struct isc_clk *isc_clk = to_isc_clk(hw);
        u32 status;
@@ -61,7 +59,7 @@ index fe3ec8d0eaee..ce8e1351fa53 100644
  
        regmap_read(isc_clk->regmap, ISC_CLKSR, &status);
  
-@@ -807,7 +815,12 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -807,7 +815,12 @@ static int isc_start_streaming(struct vb
                goto err_start_stream;
        }
  
@@ -75,7 +73,7 @@ index fe3ec8d0eaee..ce8e1351fa53 100644
  
        ret = isc_configure(isc);
        if (unlikely(ret))
-@@ -838,7 +851,7 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -838,7 +851,7 @@ static int isc_start_streaming(struct vb
  
  err_configure:
        pm_runtime_put_sync(isc->dev);
@@ -84,7 +82,7 @@ index fe3ec8d0eaee..ce8e1351fa53 100644
        v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 0);
  
  err_start_stream:
-@@ -1809,6 +1822,7 @@ static void isc_awb_work(struct work_struct *w)
+@@ -1809,6 +1822,7 @@ static void isc_awb_work(struct work_str
        u32 baysel;
        unsigned long flags;
        u32 min, max;
@@ -92,7 +90,7 @@ index fe3ec8d0eaee..ce8e1351fa53 100644
  
        /* streaming is not active anymore */
        if (isc->stop)
-@@ -1831,7 +1845,9 @@ static void isc_awb_work(struct work_struct *w)
+@@ -1831,7 +1845,9 @@ static void isc_awb_work(struct work_str
        ctrls->hist_id = hist_id;
        baysel = isc->config.sd_format->cfa_baycfg << ISC_HIS_CFG_BAYSEL_SHIFT;
  
@@ -103,11 +101,9 @@ index fe3ec8d0eaee..ce8e1351fa53 100644
  
        /*
         * only update if we have all the required histograms and controls
-diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c
-index d74aa73f26be..4ac5b7c19d0c 100644
 --- a/drivers/media/platform/atmel/atmel-isi.c
 +++ b/drivers/media/platform/atmel/atmel-isi.c
-@@ -423,7 +423,9 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -423,7 +423,9 @@ static int start_streaming(struct vb2_qu
        struct frame_buffer *buf, *node;
        int ret;
  
@@ -118,7 +114,7 @@ index d74aa73f26be..4ac5b7c19d0c 100644
  
        /* Enable stream on the sub device */
        ret = v4l2_subdev_call(isi->entity.subdev, video, s_stream, 1);
-@@ -783,9 +785,10 @@ static int isi_enum_frameintervals(struct file *file, void *fh,
+@@ -783,9 +785,10 @@ static int isi_enum_frameintervals(struc
        return 0;
  }
  
@@ -130,7 +126,7 @@ index d74aa73f26be..4ac5b7c19d0c 100644
  
        /* set bus param for ISI */
        if (isi->pdata.hsync_act_low)
-@@ -802,12 +805,16 @@ static void isi_camera_set_bus_param(struct atmel_isi *isi)
+@@ -802,12 +805,16 @@ static void isi_camera_set_bus_param(str
        cfg1 |= ISI_CFG1_THMASK_BEATS_16;
  
        /* Enable PM and peripheral clock before operate isi registers */
@@ -148,7 +144,7 @@ index d74aa73f26be..4ac5b7c19d0c 100644
  }
  
  /* -----------------------------------------------------------------------*/
-@@ -1086,7 +1093,11 @@ static int isi_graph_notify_complete(struct v4l2_async_notifier *notifier)
+@@ -1086,7 +1093,11 @@ static int isi_graph_notify_complete(str
                dev_err(isi->dev, "No supported mediabus format found\n");
                return ret;
        }
@@ -161,6 +157,3 @@ index d74aa73f26be..4ac5b7c19d0c 100644
  
        ret = isi_set_default_fmt(isi);
        if (ret) {
--- 
-2.32.0
-