kernel: bump 5.10 to 5.10.103

[openwrt/staging/mkresin.git] / target / linux / at91 / patches-5.10 / 166-media-atmel-atmel-isc-add-CBC-to-the-reg-offsets-str.patch

diff --git a/target/linux/at91/patches-5.10/166-media-atmel-atmel-isc-add-CBC-to-the-reg-offsets-str.patch b/target/linux/at91/patches-5.10/166-media-atmel-atmel-isc-add-CBC-to-the-reg-offsets-str.patch
index 46482f039763de545c4d32b6acdbad08648ed536..51659f54a409287e61dbc43c847b185852bbcca5 100644 (file)
--- a/target/linux/at91/patches-5.10/166-media-atmel-atmel-isc-add-CBC-to-the-reg-offsets-str.patch
+++ b/target/linux/at91/patches-5.10/166-media-atmel-atmel-isc-add-CBC-to-the-reg-offsets-str.patch
@@ -20,11 +20,9 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  drivers/media/platform/atmel/atmel-sama5d2-isc.c | 7 +++++--
  4 files changed, 11 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
-index 865410e10e70..b7728914fda8 100644
 --- a/drivers/media/platform/atmel/atmel-isc-base.c
 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
-@@ -2325,7 +2325,7 @@ int isc_pipeline_init(struct isc_device *isc)
+@@ -2325,7 +2325,7 @@ int isc_pipeline_init(struct isc_device
                REG_FIELD(ISC_GAM_CTRL, 2, 2),
                REG_FIELD(ISC_GAM_CTRL, 3, 3),
                REG_FIELD(ISC_CSC_CTRL + isc->offsets.csc, 0, 0),
@@ -33,8 +31,6 @@ index 865410e10e70..b7728914fda8 100644
                REG_FIELD(ISC_SUB422_CTRL, 0, 0),
                REG_FIELD(ISC_SUB420_CTRL, 0, 0),
        };
-diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
-index 5a65600c5f88..a5e2fe01ba9f 100644
 --- a/drivers/media/platform/atmel/atmel-isc-regs.h
 +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
 @@ -177,6 +177,9 @@
@@ -47,8 +43,6 @@ index 5a65600c5f88..a5e2fe01ba9f 100644
  /* Contrast And Brightness Control Register */
  #define ISC_CBC_CTRL    0x000003b4
  
-diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
-index 65c3059afb8e..d8b4b1959b94 100644
 --- a/drivers/media/platform/atmel/atmel-isc.h
 +++ b/drivers/media/platform/atmel/atmel-isc.h
 @@ -146,9 +146,11 @@ struct isc_ctrls {
@@ -63,11 +57,9 @@ index 65c3059afb8e..d8b4b1959b94 100644
  };
  
  /*
-diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-index 770d62b483d0..bb9362093efe 100644
 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-@@ -77,8 +77,10 @@ static void isc_sama5d2_config_cbc(struct isc_device *isc)
+@@ -77,8 +77,10 @@ static void isc_sama5d2_config_cbc(struc
  {
        struct regmap *regmap = isc->regmap;
  
@@ -80,7 +72,7 @@ index 770d62b483d0..bb9362093efe 100644
  }
  
  /* Gamma table with gamma 1/2.2 */
-@@ -250,6 +252,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
+@@ -250,6 +252,7 @@ static int atmel_isc_probe(struct platfo
        isc->config_cbc = isc_sama5d2_config_cbc;
  
        isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
@@ -88,6 +80,3 @@ index 770d62b483d0..bb9362093efe 100644
  
        /* sama5d2-isc - 8 bits per beat */
        isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
--- 
-2.32.0
-