This patch removes MEDIA_BUS_FMT_RBG888_1X24 and MEDIA_BUS_FMT_BGR888_1X24
as of that formats are not supported by Alvium currently.
The missing and supported MEDIA_BUS_FMT_RGB565_1X16 has been added.
Signed-off-by: Martin Hecht <mhecht73@gmail.com>
---
drivers/media/i2c/alvium-csi2.c | 28 +++++++++-------------------
drivers/media/i2c/alvium-csi2.h | 3 +--
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c
index c63af96d3b31..743b300fba4c 100644
--- a/drivers/media/i2c/alvium-csi2.c
+++ b/drivers/media/i2c/alvium-csi2.c
@@ -94,19 +94,9 @@ static const struct alvium_pixfmt alvium_csi2_fmts[] = {
.bay_fmt_regval = -1,
.is_raw = 0,
}, {
- /* RBG888_1X24 */
- .id = ALVIUM_FMT_RBG888_1X24,
- .code = MEDIA_BUS_FMT_RBG888_1X24,
- .colorspace = V4L2_COLORSPACE_SRGB,
- .fmt_av_bit = ALVIUM_BIT_RGB888,
- .bay_av_bit = ALVIUM_BIT_BAY_NONE,
- .mipi_fmt_regval = MIPI_CSI2_DT_RGB888,
- .bay_fmt_regval = -1,
- .is_raw = 0,
- }, {
- /* BGR888_1X24 */
- .id = ALVIUM_FMT_BGR888_1X24,
- .code = MEDIA_BUS_FMT_BGR888_1X24,
+ /* RGB888_3X8 */
+ .id = ALVIUM_FMT_RGB888_3X8,
+ .code = MEDIA_BUS_FMT_RGB888_3X8,
.colorspace = V4L2_COLORSPACE_SRGB,
.fmt_av_bit = ALVIUM_BIT_RGB888,
.bay_av_bit = ALVIUM_BIT_BAY_NONE,
@@ -114,15 +104,15 @@ static const struct alvium_pixfmt alvium_csi2_fmts[] = {
.bay_fmt_regval = -1,
.is_raw = 0,
}, {
- /* RGB888_3X8 */
- .id = ALVIUM_FMT_RGB888_3X8,
- .code = MEDIA_BUS_FMT_RGB888_3X8,
+ /* RGB565_1X16 */
+ .id = ALVIUM_FMT_RGB565_1X16,
+ .code = MEDIA_BUS_FMT_RGB565_1X16,
.colorspace = V4L2_COLORSPACE_SRGB,
- .fmt_av_bit = ALVIUM_BIT_RGB888,
+ .fmt_av_bit = ALVIUM_BIT_RGB565,
.bay_av_bit = ALVIUM_BIT_BAY_NONE,
- .mipi_fmt_regval = MIPI_CSI2_DT_RGB888,
+ .mipi_fmt_regval = MIPI_CSI2_DT_RGB565,
.bay_fmt_regval = -1,
- .is_raw = 0,
+ .is_raw = 0,
}, {
/* Y8_1X8 */
.id = ALVIUM_FMT_Y8_1X8,
diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h
index 978af44f76c7..0f1af5e5355c 100644
--- a/drivers/media/i2c/alvium-csi2.h
+++ b/drivers/media/i2c/alvium-csi2.h
@@ -224,9 +224,8 @@ enum alvium_mipi_fmt {
ALVIUM_FMT_YUYV8_2X8,
ALVIUM_FMT_YUYV10_1X20,
ALVIUM_FMT_RGB888_1X24,
- ALVIUM_FMT_RBG888_1X24,
- ALVIUM_FMT_BGR888_1X24,
ALVIUM_FMT_RGB888_3X8,
+ ALVIUM_FMT_RGB565_1X16,
ALVIUM_FMT_Y8_1X8,
ALVIUM_FMT_SGRBG8_1X8,
ALVIUM_FMT_SRGGB8_1X8,
--
2.43.0