diff options
author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2022-02-04 15:57:50 +0200 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2022-02-24 19:05:28 +0100 |
commit | e58cd453d58b20c6a6f34d3591640aa19aa14d25 (patch) | |
tree | a4fef5f5d79575a7a60b516482ee114c1dbc932e /target/linux/at91/patches-5.10/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch | |
parent | 3ed992a99630457f660761ce199e3d2a00f06168 (diff) | |
download | upstream-e58cd453d58b20c6a6f34d3591640aa19aa14d25.tar.gz upstream-e58cd453d58b20c6a6f34d3591640aa19aa14d25.tar.bz2 upstream-e58cd453d58b20c6a6f34d3591640aa19aa14d25.zip |
at91: add kernel support for sama7g5 soc
Add kernel support for SAMA7G5 by back-porting mainline kernel patches.
Among SAMA7G5 features could be remembered:
- ARM Cortex-A7
- double data rate multi-port dynamic RAM controller supporting DDR2,
DDR3, DDR3L, LPDDR2, LPDDR3 up to 533MHz
- peripherals for audio, video processing
- 1 gigabit + 1 megabit Ethernet controllers
- 6 CAN controllers
- trust zone support
- DVFS for CPU
- criptography IPs
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch')
-rw-r--r-- | target/linux/at91/patches-5.10/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch | 140 |
1 files changed, 140 insertions, 0 deletions
diff --git a/target/linux/at91/patches-5.10/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch b/target/linux/at91/patches-5.10/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch new file mode 100644 index 0000000000..1508f8485f --- /dev/null +++ b/target/linux/at91/patches-5.10/160-media-atmel-atmel-isc-specialize-max-width-and-max-h.patch @@ -0,0 +1,140 @@ +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(-) + +diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c +index 02f1d1c6b06e..ed0048e79f3b 100644 +--- 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_device *isc, + * 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, struct v4l2_format *f, + 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 *isc, struct v4l2_format *f, + 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 *isc, struct v4l2_format *f) + 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; + +diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h +index bb43d3a93052..f208fb691ac9 100644 +--- 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[]; +diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c +index cba6e6c8810b..39fc8d4f9bdc 100644 +--- 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 platform_device *pdev) + 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; +-- +2.32.0 + |