kernel: bump 5.10 to 5.10.103

[openwrt/staging/jow.git] / target / linux / at91 / patches-5.10 / 179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch

diff --git a/target/linux/at91/patches-5.10/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch b/target/linux/at91/patches-5.10/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch
index 74a08b2209b464b5c26838f9a065752a3a965b18..8442925a7ebf4fde73df8f1fa460905022c93e84 100644 (file)
--- a/target/linux/at91/patches-5.10/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch
+++ b/target/linux/at91/patches-5.10/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch
@@ -23,11 +23,9 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  drivers/media/platform/atmel/atmel-sama5d2-isc.c | 10 ++++++++++
  3 files changed, 15 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
-index aef0d6570d39..67c16ca17672 100644
 --- a/drivers/media/platform/atmel/atmel-isc-base.c
 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
-@@ -719,11 +719,10 @@ static void isc_set_histogram(struct isc_device *isc, bool enable)
+@@ -719,11 +719,10 @@ static void isc_set_histogram(struct isc
  static int isc_configure(struct isc_device *isc)
  {
        struct regmap *regmap = isc->regmap;
@@ -40,7 +38,7 @@ index aef0d6570d39..67c16ca17672 100644
        pipeline = isc->config.bits_pipeline;
  
        dcfg = isc->config.dcfg_imode | isc->dcfg;
-@@ -736,8 +735,7 @@ static int isc_configure(struct isc_device *isc)
+@@ -736,8 +735,7 @@ static int isc_configure(struct isc_devi
  
        regmap_update_bits(regmap, ISC_PFE_CFG0, mask, pfe_cfg0);
  
@@ -50,8 +48,6 @@ index aef0d6570d39..67c16ca17672 100644
  
        regmap_write(regmap, ISC_DCFG + isc->offsets.dma, dcfg);
  
-diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
-index 151997c11f56..24006327c5e4 100644
 --- a/drivers/media/platform/atmel/atmel-isc.h
 +++ b/drivers/media/platform/atmel/atmel-isc.h
 @@ -230,6 +230,8 @@ struct isc_reg_offsets {
@@ -71,11 +67,9 @@ index 151997c11f56..24006327c5e4 100644
  
                void (*config_ctrls)(struct isc_device *isc,
                                     const struct v4l2_ctrl_ops *ops);
-diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-index b99849ecb8a1..86704a1a24b9 100644
 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-@@ -117,6 +117,15 @@ static void isc_sama5d2_config_gam(struct isc_device *isc)
+@@ -117,6 +117,15 @@ static void isc_sama5d2_config_gam(struc
        /* No specific gamma configuration */
  }
  
@@ -91,7 +85,7 @@ index b99849ecb8a1..86704a1a24b9 100644
  /* Gamma table with gamma 1/2.2 */
  static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
        /* 0 --> gamma 1/1.8 */
-@@ -288,6 +297,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
+@@ -288,6 +297,7 @@ static int atmel_isc_probe(struct platfo
        isc->config_cbc = isc_sama5d2_config_cbc;
        isc->config_cc = isc_sama5d2_config_cc;
        isc->config_gam = isc_sama5d2_config_gam;
@@ -99,6 +93,3 @@ index b99849ecb8a1..86704a1a24b9 100644
        isc->config_ctrls = isc_sama5d2_config_ctrls;
  
        isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
--- 
-2.32.0
-