This is a note to let you know that I've just added the patch titled
media: i2c: Add a camera sensor top level menu
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-i2c-add-a-camera-sensor-top-level-menu.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7d3c7d2a2914e10bec3b9cdacdadb8e1f65f715a Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Date: Thu, 15 Jun 2023 10:29:07 +0200
Subject: media: i2c: Add a camera sensor top level menu
From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
commit 7d3c7d2a2914e10bec3b9cdacdadb8e1f65f715a upstream.
Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for all sensor drivers. This
also adds the options to drivers that don't specifically need them, these
are still seldom used drivers using old APIs. The upside is that these
should now all compile --- many drivers have had missing dependencies.
The "menu" is replaced by selectable "menuconfig" to select the needed
V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API options.
Also select MEDIA_CONTROLLER which VIDEO_V4L2_SUBDEV_API effectively
depends on, and add the I2C dependency to the menu.
Reported-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # for >= 6.1
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/media/i2c/Kconfig | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -25,8 +25,15 @@ config VIDEO_IR_I2C
# V4L2 I2C drivers that are related with Camera support
#
-menu "Camera sensor devices"
- visible if MEDIA_CAMERA_SUPPORT
+menuconfig VIDEO_CAMERA_SENSOR
+ bool "Camera sensor devices"
+ depends on MEDIA_CAMERA_SUPPORT && I2C
+ select MEDIA_CONTROLLER
+ select V4L2_FWNODE
+ select VIDEO_V4L2_SUBDEV_API
+ default y
+
+if VIDEO_CAMERA_SENSOR
config VIDEO_APTINA_PLL
tristate
@@ -783,7 +790,7 @@ source "drivers/media/i2c/ccs/Kconfig"
source "drivers/media/i2c/et8ek8/Kconfig"
source "drivers/media/i2c/m5mols/Kconfig"
-endmenu
+endif
menu "Lens drivers"
visible if MEDIA_CAMERA_SUPPORT
Patches currently in stable-queue which might be from sakari.ailus@xxxxxxxxxxxxxxx are
queue-6.1/media-ov5640-fix-initial-resetb-state-and-annotate-t.patch
queue-6.1/media-ov2680-fix-vflip-hflip-set-functions.patch
queue-6.1/media-i2c-ov2680-set-v4l2_ctrl_flag_modify_layout-on.patch
queue-6.1/media-ov2680-remove-auto-gain-and-auto-exposure-cont.patch
queue-6.1/media-ov2680-add-ov2680_fill_format-helper-function.patch
queue-6.1/media-v4l2-core-fix-a-potential-resource-leak-in-v4l.patch
queue-6.1/media-i2c-add-a-camera-sensor-top-level-menu.patch
queue-6.1/media-ov2680-fix-ov2680_bayer_order.patch
queue-6.1/media-ad5820-drop-unsupported-ad5823-from-i2c_-and-o.patch
queue-6.1/media-ov5640-fix-low-resolution-image-abnormal-issue.patch
queue-6.1/media-ov2680-fix-ov2680_set_fmt-which-v4l2_subdev_fo.patch
queue-6.1/media-ov5640-enable-mipi-interface-in-ov5640_set_pow.patch
queue-6.1/media-i2c-ccs-check-rules-is-non-null.patch
queue-6.1/media-ov2680-don-t-take-the-lock-for-try_fmt-calls.patch
queue-6.1/media-i2c-tvp5150-check-return-value-of-devm_kasprin.patch
queue-6.1/media-ov2680-fix-regulators-being-left-enabled-on-ov.patch
queue-6.1/media-ov2680-remove-video_v4l2_subdev_api-ifdef-s.patch
