drivers: video: ov7670 driver changes in prep for adding OV7675

drivers: video: ov7670 driver changes in prep for adding OV7675

Updates ov7670.c in prep for incorporation of OV7675. See previous PR.  Includes revisions requested by reviewers (9/25).

Signed-off-by: Michael Smorto <[email protected]>

Author: mjs513

drivers/video/ov7670.c

@@ -18,8 +18,12 @@ LOG_MODULE_REGISTER(video_ov7670, CONFIG_VIDEO_LOG_LEVEL);
 
 struct ov7670_config {
 	struct i2c_dt_spec bus;
-	const struct gpio_dt_spec reset;
-	const struct gpio_dt_spec pwdn;
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+	struct gpio_dt_spec reset;
+#endif
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(pwdn_gpios)
+	struct gpio_dt_spec pwdn;
+#endif
 };
 
 struct ov7670_ctrls {
@@ -142,7 +146,7 @@ static const struct video_reg8 ov7670_init_regtbl[] = {
 
 	/* configure the output timing */
 	/* PCLK does not toggle during horizontal blank, one PCLK, one pixel */
-	{OV7670_COM10, 0x03}, /* COM10 */
+	{OV7670_COM10, 0x20}, /* COM10 */
 	{OV7670_COM12, 0x00}, /* COM12,No HREF when VSYNC is low */
 	/* Brightness Control, with signal -128 to +128, 0x00 is middle value */
 	{OV7670_BRIGHT, 0x2f},
@@ -291,7 +295,6 @@ static const struct video_reg8 ov7670_init_regtbl[] = {
 	{0xb8, 0x0a},
 };
 
-#if DT_HAS_COMPAT_STATUS_OKAY(ovti_ov7670)
 /* Resolution settings for camera, based on those present in MCUX SDK */
 static const struct video_reg8 ov7670_regs_qcif[] = {
 	{OV7670_COM7, 0x2c},
@@ -346,8 +349,8 @@ static const struct video_format_cap fmts[] = {
 	OV767X_VIDEO_FORMAT_CAP(320, 240, VIDEO_PIX_FMT_YUYV),   /* QVGA  */
 	OV767X_VIDEO_FORMAT_CAP(352, 288, VIDEO_PIX_FMT_YUYV),   /* CIF   */
 	OV767X_VIDEO_FORMAT_CAP(640, 480, VIDEO_PIX_FMT_YUYV),   /* VGA   */
-	{0}};
-#endif
+	{0}
+};
 
 static int ov7670_get_caps(const struct device *dev, struct video_caps *caps)
 {
@@ -361,7 +364,7 @@ static int ov7670_set_fmt(const struct device *dev, struct video_format *fmt)
 	const struct ov7670_config *config = dev->config;
 	struct ov7670_data *data = dev->data;
 	int ret;
-	uint8_t i = 0U;
+	uint8_t icount = 0U;
 
 	if (fmt->pixelformat != VIDEO_PIX_FMT_RGB565 && fmt->pixelformat != VIDEO_PIX_FMT_YUYV) {
 		LOG_ERR("Only RGB565 and YUYV supported!");
@@ -375,40 +378,46 @@ static int ov7670_set_fmt(const struct device *dev, struct video_format *fmt)
 
 	memcpy(&data->fmt, fmt, sizeof(data->fmt));
 
+	uint32_t a, b, c;
+
 	/* Set output resolution */
-	while (fmts[i].pixelformat) {
-		if (fmts[i].width_min == fmt->width &&
-		    fmts[i].height_min == fmt->height &&
-		    fmts[i].pixelformat == fmt->pixelformat) {
+	ret = -ENOTSUP;
+	icount = 0;
+	while (fmts[icount].pixelformat) {
+		a = fmts[icount].width_min;
+		b = fmts[icount].height_min;
+		c = fmts[icount].pixelformat;
+		if (a == fmt->width && b == fmt->height && c == fmt->pixelformat) {
 			/* Set output format */
-			switch (fmts[i].width_min) {
+			switch (fmts[icount].width_min) {
 			case 176: /* QCIF */
 				ret = video_write_cci_multiregs8(&config->bus, ov7670_regs_qcif,
 								 ARRAY_SIZE(ov7670_regs_qcif));
 				break;
-			case 352: /* CIF */
+			case 352: /* QCIF */
 				ret = video_write_cci_multiregs8(&config->bus, ov7670_regs_cif,
 								 ARRAY_SIZE(ov7670_regs_cif));
 				break;
 			case 320: /* QVGA */
 				ret = video_write_cci_multiregs8(&config->bus, ov7670_regs_qvga,
 								 ARRAY_SIZE(ov7670_regs_qvga));
-				break;
-
-			default: /* VGA */
+			case 640: /* VGA */
 				ret = video_write_cci_multiregs8(&config->bus, ov7670_regs_vga,
 								 ARRAY_SIZE(ov7670_regs_vga));
+			default: /* QVGA */
+				ret = video_write_cci_multiregs8(&config->bus, ov7670_regs_qvga,
+								 ARRAY_SIZE(ov7670_regs_vga));
 				break;
 			}
 			if (ret < 0) {
-				LOG_ERR("Resolution not set or not supported!");
+				LOG_ERR("Resolution not set!");
 				return ret;
 			}
 		}
-		i++;
+		icount++;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int ov7670_get_fmt(const struct device *dev, struct video_format *fmt)
@@ -564,22 +573,31 @@ static DEVICE_API(video, ov7670_api) = {
 	.set_ctrl = ov7670_set_ctrl,
 };
 
-#define OV7670_INIT(n, id)                                \
-	static const struct ov7670_config ov7670_config_##n = {		\
-		.bus			= I2C_DT_SPEC_INST_GET(n),		\
-		.reset		=					\
-			GPIO_DT_SPEC_INST_GET_OR(n, reset_gpios, {}),		\
-		.pwdn		=					\
-			GPIO_DT_SPEC_INST_GET_OR(n, pwdn_gpios, {}),		\
-	};									\
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+#define OV7670_RESET_GPIO(n) .reset = GPIO_DT_SPEC_INST_GET_OR(n, reset_gpios, {}),
+#else
+#define OV7670_RESET_GPIO(n)
+#endif
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(pwdn_gpios)
+#define OV7670_PWDN_GPIO(n) .pwdn = GPIO_DT_SPEC_INST_GET_OR(n, pwdn_gpios, {}),
+#else
+#define OV7670_PWDN_GPIO(n)
+#endif
+
+#define OV7670_INIT(n)                                \
+	const struct ov7670_config ov7670_config_##n = {      \
+			      .bus = I2C_DT_SPEC_INST_GET(n),      \
+			      OV7670_RESET_GPIO(n)                 \
+			      OV7670_PWDN_GPIO(n)};        \
 										\
 	static struct ov7670_data ov7670_data_##n;        \
 										\
 	DEVICE_DT_INST_DEFINE(n,						\
 			      ov7670_init,					\
 			      NULL,                  \
-			      &ov7670##_data_##n,				\
-			      &ov7670##_config_##n,				\
+			      &ov7670_data_##n,				\
+			      &ov7670_config_##n,				\
 			      POST_KERNEL, CONFIG_VIDEO_INIT_PRIORITY,		\
 			      &ov7670_api);         \
                                    \
@@ -588,4 +606,4 @@ static DEVICE_API(video, ov7670_api) = {
 
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT ovti_ov7670
-DT_INST_FOREACH_STATUS_OKAY_VARGS(OV7670_INIT, 7670)
+DT_INST_FOREACH_STATUS_OKAY(OV7670_INIT)