at91: kernel v5.15: remove upstreamed patches

[openwrt/openwrt.git] / target / linux / at91 / patches-5.15 / 160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch

diff --git a/target/linux/at91/patches-5.15/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch b/target/linux/at91/patches-5.15/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch
deleted file mode 100644 (file)
index afa89ed..0000000
--- a/target/linux/at91/patches-5.15/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From b51819e17260af2ecc152b7dcd61e63bcaa35edf Mon Sep 17 00:00:00 2001
-From: Eugen Hristev <eugen.hristev@microchip.com>
-Date: Tue, 13 Apr 2021 12:57:02 +0200
-Subject: [PATCH 160/247] media: atmel: atmel-isc: specialize max width and max
- height
-
-Move the max width and max height constants to the product specific driver
-and have them in the device struct.
-
-Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- drivers/media/platform/atmel/atmel-isc-base.c | 28 +++++++++----------
- drivers/media/platform/atmel/atmel-isc.h      |  9 ++++--
- .../media/platform/atmel/atmel-sama5d2-isc.c  |  7 +++--
- 3 files changed, 25 insertions(+), 19 deletions(-)
-
---- a/drivers/media/platform/atmel/atmel-isc-base.c
-+++ b/drivers/media/platform/atmel/atmel-isc-base.c
-@@ -1216,8 +1216,8 @@ static void isc_try_fse(struct isc_devic
-        * just use the maximum ISC can receive.
-        */
-       if (ret) {
--              pad_cfg->try_crop.width = ISC_MAX_SUPPORT_WIDTH;
--              pad_cfg->try_crop.height = ISC_MAX_SUPPORT_HEIGHT;
-+              pad_cfg->try_crop.width = isc->max_width;
-+              pad_cfg->try_crop.height = isc->max_height;
-       } else {
-               pad_cfg->try_crop.width = fse.max_width;
-               pad_cfg->try_crop.height = fse.max_height;
-@@ -1294,10 +1294,10 @@ static int isc_try_fmt(struct isc_device
-       isc->try_config.sd_format = sd_fmt;
- 
-       /* Limit to Atmel ISC hardware capabilities */
--      if (pixfmt->width > ISC_MAX_SUPPORT_WIDTH)
--              pixfmt->width = ISC_MAX_SUPPORT_WIDTH;
--      if (pixfmt->height > ISC_MAX_SUPPORT_HEIGHT)
--              pixfmt->height = ISC_MAX_SUPPORT_HEIGHT;
-+      if (pixfmt->width > isc->max_width)
-+              pixfmt->width = isc->max_width;
-+      if (pixfmt->height > isc->max_height)
-+              pixfmt->height = isc->max_height;
- 
-       /*
-        * The mbus format is the one the subdev outputs.
-@@ -1339,10 +1339,10 @@ static int isc_try_fmt(struct isc_device
-       v4l2_fill_pix_format(pixfmt, &format.format);
- 
-       /* Limit to Atmel ISC hardware capabilities */
--      if (pixfmt->width > ISC_MAX_SUPPORT_WIDTH)
--              pixfmt->width = ISC_MAX_SUPPORT_WIDTH;
--      if (pixfmt->height > ISC_MAX_SUPPORT_HEIGHT)
--              pixfmt->height = ISC_MAX_SUPPORT_HEIGHT;
-+      if (pixfmt->width > isc->max_width)
-+              pixfmt->width = isc->max_width;
-+      if (pixfmt->height > isc->max_height)
-+              pixfmt->height = isc->max_height;
- 
-       pixfmt->field = V4L2_FIELD_NONE;
-       pixfmt->bytesperline = (pixfmt->width * isc->try_config.bpp) >> 3;
-@@ -1380,10 +1380,10 @@ static int isc_set_fmt(struct isc_device
-               return ret;
- 
-       /* Limit to Atmel ISC hardware capabilities */
--      if (pixfmt->width > ISC_MAX_SUPPORT_WIDTH)
--              pixfmt->width = ISC_MAX_SUPPORT_WIDTH;
--      if (pixfmt->height > ISC_MAX_SUPPORT_HEIGHT)
--              pixfmt->height = ISC_MAX_SUPPORT_HEIGHT;
-+      if (f->fmt.pix.width > isc->max_width)
-+              f->fmt.pix.width = isc->max_width;
-+      if (f->fmt.pix.height > isc->max_height)
-+              f->fmt.pix.height = isc->max_height;
- 
-       isc->fmt = *f;
- 
---- a/drivers/media/platform/atmel/atmel-isc.h
-+++ b/drivers/media/platform/atmel/atmel-isc.h
-@@ -10,9 +10,6 @@
-  */
- #ifndef _ATMEL_ISC_H_
- 
--#define ISC_MAX_SUPPORT_WIDTH   2592
--#define ISC_MAX_SUPPORT_HEIGHT  1944
--
- #define ISC_CLK_MAX_DIV               255
- 
- enum isc_clk_id {
-@@ -190,6 +187,9 @@ struct isc_ctrls {
-  * @gamma_table:      pointer to the table with gamma values, has
-  *                    gamma_max sets of GAMMA_ENTRIES entries each
-  * @gamma_max:                maximum number of sets of inside the gamma_table
-+ *
-+ * @max_width:                maximum frame width, dependent on the internal RAM
-+ * @max_height:               maximum frame height, dependent on the internal RAM
-  */
- struct isc_device {
-       struct regmap           *regmap;
-@@ -253,6 +253,9 @@ struct isc_device {
-       /* pointer to the defined gamma table */
-       const u32       (*gamma_table)[GAMMA_ENTRIES];
-       u32             gamma_max;
-+
-+      u32             max_width;
-+      u32             max_height;
- };
- 
- extern struct isc_format formats_list[];
---- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-@@ -49,8 +49,8 @@
- #include "atmel-isc-regs.h"
- #include "atmel-isc.h"
- 
--#define ISC_MAX_SUPPORT_WIDTH   2592
--#define ISC_MAX_SUPPORT_HEIGHT  1944
-+#define ISC_SAMA5D2_MAX_SUPPORT_WIDTH   2592
-+#define ISC_SAMA5D2_MAX_SUPPORT_HEIGHT  1944
- 
- #define ISC_CLK_MAX_DIV               255
- 
-@@ -216,6 +216,9 @@ static int atmel_isc_probe(struct platfo
-       isc->gamma_table = isc_sama5d2_gamma_table;
-       isc->gamma_max = 2;
- 
-+      isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;
-+      isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
-+
-       ret = isc_pipeline_init(isc);
-       if (ret)
-               return ret;