From 8f013db1d1675313c0d07546d3781ba93c47dd59 Mon Sep 17 00:00:00 2001
From: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Date: Tue, 16 May 2023 07:28:38 +0000
Subject: [PATCH] media: i2c: jaguar1: add SD_H960 NTSC & PAL support

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I25ce7397f6684371c9a3cb136c0338e2e3e66cf9
---
 drivers/media/i2c/jaguar1_drv/jaguar1_v4l2.c | 26 +++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/jaguar1_drv/jaguar1_v4l2.c b/drivers/media/i2c/jaguar1_drv/jaguar1_v4l2.c
index 83525046a3cb..1538a9169ecb 100644
--- a/drivers/media/i2c/jaguar1_drv/jaguar1_v4l2.c
+++ b/drivers/media/i2c/jaguar1_drv/jaguar1_v4l2.c
@@ -96,6 +96,7 @@ struct jaguar1_framesize {
 	u16 height;
 	struct v4l2_fract max_fps;
 	enum NC_VIVO_CH_FORMATDEF fmt_idx;
+	__u32 field;
 };
 
 struct jaguar1_default_rect {
@@ -149,6 +150,26 @@ static const struct jaguar1_framesize jaguar1_framesizes[] = {
 		.fmt_idx	= AHD20_720P_25P,
 	}
 #else
+	{
+		.width		= 960,
+		.height		= 480,
+		.max_fps = {
+			.numerator = 10000,
+			.denominator = 250000,
+		},
+		.fmt_idx	= AHD20_SD_H960_2EX_Btype_NT,
+		.field = V4L2_FIELD_INTERLACED,
+	},
+	{
+		.width		= 960,
+		.height		= 576,
+		.max_fps = {
+			.numerator = 10000,
+			.denominator = 300000,
+		},
+		.fmt_idx	= AHD20_SD_H960_2EX_Btype_PAL,
+		.field = V4L2_FIELD_INTERLACED,
+	},
 	{
 		.width		= 1280,
 		.height		= 720,
@@ -157,6 +178,7 @@ static const struct jaguar1_framesize jaguar1_framesizes[] = {
 			.denominator = 250000,
 		},
 		.fmt_idx	= AHD20_720P_25P_EX_Btype,
+		.field = V4L2_FIELD_NONE
 	},
 	{
 		.width		= 1920,
@@ -166,6 +188,7 @@ static const struct jaguar1_framesize jaguar1_framesizes[] = {
 			.denominator = 250000,
 		},
 		.fmt_idx	= AHD20_1080P_25P,
+		.field = V4L2_FIELD_NONE
 	},
 	{
 		.width		= 2560,
@@ -175,6 +198,7 @@ static const struct jaguar1_framesize jaguar1_framesizes[] = {
 			.denominator = 250000,
 		},
 		.fmt_idx	= AHD20_720P_25P,
+		.field = V4L2_FIELD_NONE
 	}
 #endif
 };
@@ -403,7 +427,7 @@ static void jaguar1_get_default_format(struct jaguar1 *jaguar1)
 	format->colorspace = V4L2_COLORSPACE_SRGB;
 	format->code = jaguar1_formats[0].code;
 	jaguar1->frame_size = match;
-	format->field = V4L2_FIELD_NONE;
+	format->field = match->field;
 }
 
 static int jaguar1_stream(struct v4l2_subdev *sd, int on)