All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] Move camera sensor dependencies to top level menu
@ 2023-06-30 14:03 Sakari Ailus
  2023-06-30 14:03 ` [PATCH 1/2] media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors Sakari Ailus
  2023-06-30 14:03 ` [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers Sakari Ailus
  0 siblings, 2 replies; 7+ messages in thread
From: Sakari Ailus @ 2023-06-30 14:03 UTC (permalink / raw)
  To: linux-media; +Cc: Hans de Goede, Laurent Pinchart

Hi,

This set moves selecting the common sensor driver dependencies to the top
level menu and removes the options from individual driver entries. The
first patch is cc'd to stable from 6.1. It applies with some fuzz while
for 5.15 it applies with a fuzz but to a wrong place. I don't think we'll
need to care much about that version anyway, albeit I'll port one for
that, too, if there that gets reported. Any thouhgts?

Sakari Ailus (2):
  media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors
  media: i2c: Stop selecting common features for individual camera
    drivers

 drivers/media/i2c/Kconfig        | 162 ++-----------------------------
 drivers/media/i2c/ccs/Kconfig    |   3 -
 drivers/media/i2c/et8ek8/Kconfig |   3 -
 3 files changed, 10 insertions(+), 158 deletions(-)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors
  2023-06-30 14:03 [PATCH 0/2] Move camera sensor dependencies to top level menu Sakari Ailus
@ 2023-06-30 14:03 ` Sakari Ailus
  2023-07-02 14:59   ` Laurent Pinchart
  2023-06-30 14:03 ` [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers Sakari Ailus
  1 sibling, 1 reply; 7+ messages in thread
From: Sakari Ailus @ 2023-06-30 14:03 UTC (permalink / raw)
  To: linux-media; +Cc: Hans de Goede, Laurent Pinchart

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.

Reported-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Cc: stable@vger.kernel.org # for >= 6.1
---
 drivers/media/i2c/Kconfig | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 815c83135021..c7ffaa79abeb 100644
--- 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
+	select MEDIA_CONTROLLER
+	select V4L2_FWNODE
+	select VIDEO_V4L2_SUBDEV_API
+	default y
+
+if VIDEO_CAMERA_SENSOR
 
 config VIDEO_APTINA_PLL
 	tristate
@@ -810,7 +817,7 @@ config VIDEO_ST_VGXY61
 source "drivers/media/i2c/ccs/Kconfig"
 source "drivers/media/i2c/et8ek8/Kconfig"
 
-endmenu
+endif
 
 menu "Lens drivers"
 	visible if MEDIA_CAMERA_SUPPORT
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers
  2023-06-30 14:03 [PATCH 0/2] Move camera sensor dependencies to top level menu Sakari Ailus
  2023-06-30 14:03 ` [PATCH 1/2] media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors Sakari Ailus
@ 2023-06-30 14:03 ` Sakari Ailus
  2023-07-02 14:50   ` Hans de Goede
  2023-07-02 15:04   ` Laurent Pinchart
  1 sibling, 2 replies; 7+ messages in thread
From: Sakari Ailus @ 2023-06-30 14:03 UTC (permalink / raw)
  To: linux-media; +Cc: Hans de Goede, Laurent Pinchart

As selecting V4L2_FWNODE, MEDIA_CONTROLLER and VIDEO_V4L2_SUBDEV_API are
now selected by the top level menu, they can be dropped from the
individual drivers. Also dropped selectng V4L2_ASYNC for a single driver
as this is already implied by V4L2_FWNODE.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/Kconfig        | 149 -------------------------------
 drivers/media/i2c/ccs/Kconfig    |   3 -
 drivers/media/i2c/et8ek8/Kconfig |   3 -
 3 files changed, 155 deletions(-)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index c7ffaa79abeb..d8ea6be924c0 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -44,9 +44,6 @@ config VIDEO_CCS_PLL
 config VIDEO_AR0521
 	tristate "ON Semiconductor AR0521 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the ON Semiconductor
 	  AR0521 camera.
@@ -57,9 +54,6 @@ config VIDEO_AR0521
 config VIDEO_HI556
 	tristate "Hynix Hi-556 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Hynix
 	  Hi-556 camera.
@@ -70,9 +64,6 @@ config VIDEO_HI556
 config VIDEO_HI846
 	tristate "Hynix Hi-846 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Hynix
 	  Hi-846 camera.
@@ -83,9 +74,6 @@ config VIDEO_HI846
 config VIDEO_HI847
         tristate "Hynix Hi-847 sensor support"
         depends on I2C && VIDEO_DEV
-        select MEDIA_CONTROLLER
-        select VIDEO_V4L2_SUBDEV_API
-        select V4L2_FWNODE
         help
           This is a Video4Linux2 sensor driver for the Hynix
           Hi-847 camera.
@@ -96,9 +84,6 @@ config VIDEO_HI847
 config VIDEO_IMX208
 	tristate "Sony IMX208 sensor support"
 	depends on I2C && VIDEO_DEV
-	depends on MEDIA_CAMERA_SUPPORT
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX208 camera.
@@ -109,9 +94,6 @@ config VIDEO_IMX208
 config VIDEO_IMX214
 	tristate "Sony IMX214 sensor support"
 	depends on GPIOLIB && I2C && VIDEO_DEV
-	select V4L2_FWNODE
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select REGMAP_I2C
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
@@ -123,9 +105,6 @@ config VIDEO_IMX214
 config VIDEO_IMX219
 	tristate "Sony IMX219 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX219 camera.
@@ -136,8 +115,6 @@ config VIDEO_IMX219
 config VIDEO_IMX258
 	tristate "Sony IMX258 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX258 camera.
@@ -148,8 +125,6 @@ config VIDEO_IMX258
 config VIDEO_IMX274
 	tristate "Sony IMX274 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select REGMAP_I2C
 	help
 	  This is a V4L2 sensor driver for the Sony IMX274
@@ -158,10 +133,7 @@ config VIDEO_IMX274
 config VIDEO_IMX290
 	tristate "Sony IMX290 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select REGMAP_I2C
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX290 camera sensor.
@@ -172,9 +144,6 @@ config VIDEO_IMX290
 config VIDEO_IMX296
 	tristate "Sony IMX296 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX296 camera.
@@ -185,8 +154,6 @@ config VIDEO_IMX296
 config VIDEO_IMX319
 	tristate "Sony IMX319 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX319 camera.
@@ -198,9 +165,6 @@ config VIDEO_IMX334
 	tristate "Sony IMX334 sensor support"
 	depends on OF_GPIO
 	depends on I2C && VIDEO_DEV
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX334 camera.
@@ -212,9 +176,6 @@ config VIDEO_IMX335
 	tristate "Sony IMX335 sensor support"
 	depends on OF_GPIO
 	depends on I2C && VIDEO_DEV
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX335 camera.
@@ -225,8 +186,6 @@ config VIDEO_IMX335
 config VIDEO_IMX355
 	tristate "Sony IMX355 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX355 camera.
@@ -238,9 +197,6 @@ config VIDEO_IMX412
 	tristate "Sony IMX412 sensor support"
 	depends on OF_GPIO
 	depends on I2C && VIDEO_DEV
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX412 camera.
@@ -252,9 +208,6 @@ config VIDEO_IMX415
 	tristate "Sony IMX415 sensor support"
 	depends on OF_GPIO
 	depends on I2C && VIDEO_DEV
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Sony
 	  IMX415 camera.
@@ -268,8 +221,6 @@ config VIDEO_MAX9271_LIB
 config VIDEO_MT9M001
 	tristate "mt9m001 support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This driver supports MT9M001 cameras from Micron, monochrome
 	  and colour models.
@@ -277,7 +228,6 @@ config VIDEO_MT9M001
 config VIDEO_MT9M111
 	tristate "mt9m111, mt9m112 and mt9m131 support"
 	depends on I2C && VIDEO_DEV
-	select V4L2_FWNODE
 	help
 	  This driver supports MT9M111, MT9M112 and MT9M131 cameras from
 	  Micron/Aptina
@@ -285,10 +235,7 @@ config VIDEO_MT9M111
 config VIDEO_MT9P031
 	tristate "Aptina MT9P031 support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select VIDEO_APTINA_PLL
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Aptina
 	  (Micron) mt9p031 5 Mpixel camera.
@@ -314,10 +261,7 @@ config VIDEO_MT9V011
 config VIDEO_MT9V032
 	tristate "Micron MT9V032 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select REGMAP_I2C
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Micron
 	  MT9V032 752x480 CMOS sensor.
@@ -335,9 +279,6 @@ config VIDEO_MT9V111
 config VIDEO_OG01A1B
 	tristate "OmniVision OG01A1B sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OG01A1B camera.
@@ -348,9 +289,6 @@ config VIDEO_OG01A1B
 config VIDEO_OV01A10
 	tristate "OmniVision OV01A10 sensor support"
 	depends on VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV01A10 camera.
@@ -361,9 +299,6 @@ config VIDEO_OV01A10
 config VIDEO_OV02A10
 	tristate "OmniVision OV02A10 sensor support"
 	depends on VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV02A10 camera.
@@ -374,9 +309,6 @@ config VIDEO_OV02A10
 config VIDEO_OV08D10
         tristate "OmniVision OV08D10 sensor support"
         depends on I2C && VIDEO_DEV
-        select MEDIA_CONTROLLER
-        select VIDEO_V4L2_SUBDEV_API
-        select V4L2_FWNODE
         help
           This is a Video4Linux2 sensor driver for the OmniVision
           OV08D10 camera sensor.
@@ -387,9 +319,6 @@ config VIDEO_OV08D10
 config VIDEO_OV08X40
 	tristate "OmniVision OV08X40 sensor support"
 	depends on VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV08X40 camera.
@@ -400,9 +329,6 @@ config VIDEO_OV08X40
 config VIDEO_OV13858
 	tristate "OmniVision OV13858 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV13858 camera.
@@ -410,9 +336,6 @@ config VIDEO_OV13858
 config VIDEO_OV13B10
 	tristate "OmniVision OV13B10 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV13B10 camera.
@@ -420,7 +343,6 @@ config VIDEO_OV13B10
 config VIDEO_OV2640
 	tristate "OmniVision OV2640 sensor support"
 	depends on VIDEO_DEV && I2C
-	select V4L2_ASYNC
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV2640 camera.
@@ -431,7 +353,6 @@ config VIDEO_OV2640
 config VIDEO_OV2659
 	tristate "OmniVision OV2659 sensor support"
 	depends on VIDEO_DEV && I2C && GPIOLIB
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV2659 camera.
@@ -442,8 +363,6 @@ config VIDEO_OV2659
 config VIDEO_OV2680
 	tristate "OmniVision OV2680 sensor support"
 	depends on VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV2680 camera.
@@ -454,9 +373,6 @@ config VIDEO_OV2680
 config VIDEO_OV2685
 	tristate "OmniVision OV2685 sensor support"
 	depends on VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV2685 camera.
@@ -468,9 +384,6 @@ config VIDEO_OV2740
 	tristate "OmniVision OV2740 sensor support"
 	depends on VIDEO_DEV && I2C
 	depends on ACPI || COMPILE_TEST
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	select REGMAP_I2C
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
@@ -482,9 +395,6 @@ config VIDEO_OV2740
 config VIDEO_OV4689
 	tristate "OmniVision OV4689 sensor support"
 	depends on GPIOLIB && VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor-level driver for the OmniVision
 	  OV4689 camera.
@@ -496,9 +406,6 @@ config VIDEO_OV5640
 	tristate "OmniVision OV5640 sensor support"
 	depends on OF
 	depends on GPIOLIB && VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the Omnivision
 	  OV5640 camera sensor with a MIPI CSI-2 interface.
@@ -507,9 +414,6 @@ config VIDEO_OV5645
 	tristate "OmniVision OV5645 sensor support"
 	depends on OF
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5645 camera.
@@ -520,9 +424,6 @@ config VIDEO_OV5645
 config VIDEO_OV5647
 	tristate "OmniVision OV5647 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5647 camera.
@@ -533,9 +434,6 @@ config VIDEO_OV5647
 config VIDEO_OV5648
 	tristate "OmniVision OV5648 sensor support"
 	depends on I2C && PM && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5648 camera.
@@ -546,9 +444,6 @@ config VIDEO_OV5648
 config VIDEO_OV5670
 	tristate "OmniVision OV5670 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5670 camera.
@@ -559,9 +454,6 @@ config VIDEO_OV5670
 config VIDEO_OV5675
 	tristate "OmniVision OV5675 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5675 camera.
@@ -572,7 +464,6 @@ config VIDEO_OV5675
 config VIDEO_OV5693
 	tristate "OmniVision OV5693 sensor support"
 	depends on I2C && VIDEO_DEV
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5693 camera.
@@ -583,7 +474,6 @@ config VIDEO_OV5693
 config VIDEO_OV5695
 	tristate "OmniVision OV5695 sensor support"
 	depends on I2C && VIDEO_DEV
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV5695 camera.
@@ -604,9 +494,6 @@ config VIDEO_OV6650
 config VIDEO_OV7251
 	tristate "OmniVision OV7251 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV7251 camera.
@@ -627,7 +514,6 @@ config VIDEO_OV7640
 config VIDEO_OV7670
 	tristate "OmniVision OV7670 sensor support"
 	depends on I2C && VIDEO_DEV
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV7670 VGA camera.  It currently only works with the M88ALP01
@@ -637,7 +523,6 @@ config VIDEO_OV772X
 	tristate "OmniVision OV772x sensor support"
 	depends on I2C && VIDEO_DEV
 	select REGMAP_SCCB
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV772x camera.
@@ -656,9 +541,6 @@ config VIDEO_OV7740
 config VIDEO_OV8856
 	tristate "OmniVision OV8856 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV8856 camera sensor.
@@ -669,9 +551,6 @@ config VIDEO_OV8856
 config VIDEO_OV8858
 	tristate "OmniVision OV8858 sensor support"
 	depends on I2C && PM && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for OmniVision
 	  OV8858 camera sensor.
@@ -682,9 +561,6 @@ config VIDEO_OV8858
 config VIDEO_OV8865
 	tristate "OmniVision OV8865 sensor support"
 	depends on I2C && PM && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for OmniVision
 	  OV8865 camera sensor.
@@ -696,9 +572,6 @@ config VIDEO_OV9282
 	tristate "OmniVision OV9282 sensor support"
 	depends on OF_GPIO
 	depends on I2C && VIDEO_DEV
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV9282 camera sensor.
@@ -716,8 +589,6 @@ config VIDEO_OV9640
 config VIDEO_OV9650
 	tristate "OmniVision OV9650/OV9652 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select REGMAP_SCCB
 	help
 	  This is a V4L2 sensor driver for the Omnivision
@@ -727,9 +598,6 @@ config VIDEO_OV9734
 	tristate "OmniVision OV9734 sensor support"
 	depends on VIDEO_DEV && I2C
 	depends on ACPI || COMPILE_TEST
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OV9734 camera.
@@ -740,9 +608,6 @@ config VIDEO_OV9734
 config VIDEO_RDACM20
 	tristate "IMI RDACM20 camera support"
 	depends on I2C
-	select V4L2_FWNODE
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
 	select VIDEO_MAX9271_LIB
 	help
 	  This driver supports the IMI RDACM20 GMSL camera, used in
@@ -754,9 +619,6 @@ config VIDEO_RDACM20
 config VIDEO_RDACM21
 	tristate "IMI RDACM21 camera support"
 	depends on I2C
-	select V4L2_FWNODE
-	select VIDEO_V4L2_SUBDEV_API
-	select MEDIA_CONTROLLER
 	select VIDEO_MAX9271_LIB
 	help
 	  This driver supports the IMI RDACM21 GMSL camera, used in
@@ -778,9 +640,6 @@ config VIDEO_RJ54N1
 config VIDEO_S5C73M3
 	tristate "Samsung S5C73M3 sensor support"
 	depends on I2C && SPI && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a V4L2 sensor driver for Samsung S5C73M3
 	  8 Mpixel camera.
@@ -788,9 +647,6 @@ config VIDEO_S5C73M3
 config VIDEO_S5K5BAF
 	tristate "Samsung S5K5BAF sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a V4L2 sensor driver for Samsung S5K5BAF 2M
 	  camera sensor with an embedded SoC image signal processor.
@@ -798,8 +654,6 @@ config VIDEO_S5K5BAF
 config VIDEO_S5K6A3
 	tristate "Samsung S5K6A3 sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	help
 	  This is a V4L2 sensor driver for Samsung S5K6A3 raw
 	  camera sensor.
@@ -807,9 +661,6 @@ config VIDEO_S5K6A3
 config VIDEO_ST_VGXY61
 	tristate "ST VGXY61 sensor support"
 	depends on OF && GPIOLIB && VIDEO_DEV && I2C
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a Video4Linux2 sensor driver for the ST VGXY61
 	  camera sensor.
diff --git a/drivers/media/i2c/ccs/Kconfig b/drivers/media/i2c/ccs/Kconfig
index 71671db3d993..7cc17b0e3153 100644
--- a/drivers/media/i2c/ccs/Kconfig
+++ b/drivers/media/i2c/ccs/Kconfig
@@ -2,10 +2,7 @@
 config VIDEO_CCS
 	tristate "MIPI CCS/SMIA++/SMIA sensor support"
 	depends on I2C && VIDEO_DEV && HAVE_CLK
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
 	select VIDEO_CCS_PLL
-	select V4L2_FWNODE
 	help
 	  This is a generic driver for MIPI CCS, SMIA++ and SMIA compliant
 	  camera sensors.
diff --git a/drivers/media/i2c/et8ek8/Kconfig b/drivers/media/i2c/et8ek8/Kconfig
index 398dd4d21df1..9cd2bcedd550 100644
--- a/drivers/media/i2c/et8ek8/Kconfig
+++ b/drivers/media/i2c/et8ek8/Kconfig
@@ -2,9 +2,6 @@
 config VIDEO_ET8EK8
 	tristate "ET8EK8 camera sensor support"
 	depends on I2C && VIDEO_DEV
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select V4L2_FWNODE
 	help
 	  This is a driver for the Toshiba ET8EK8 5 MP camera sensor.
 	  It is used for example in Nokia N900 (RX-51).
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers
  2023-06-30 14:03 ` [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers Sakari Ailus
@ 2023-07-02 14:50   ` Hans de Goede
  2023-07-02 15:04   ` Laurent Pinchart
  1 sibling, 0 replies; 7+ messages in thread
From: Hans de Goede @ 2023-07-02 14:50 UTC (permalink / raw)
  To: Sakari Ailus, linux-media; +Cc: Laurent Pinchart

Hi,

On 6/30/23 16:03, Sakari Ailus wrote:
> As selecting V4L2_FWNODE, MEDIA_CONTROLLER and VIDEO_V4L2_SUBDEV_API are
> now selected by the top level menu, they can be dropped from the
> individual drivers. Also dropped selectng V4L2_ASYNC for a single driver
> as this is already implied by V4L2_FWNODE.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans



> ---
>  drivers/media/i2c/Kconfig        | 149 -------------------------------
>  drivers/media/i2c/ccs/Kconfig    |   3 -
>  drivers/media/i2c/et8ek8/Kconfig |   3 -
>  3 files changed, 155 deletions(-)
> 
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index c7ffaa79abeb..d8ea6be924c0 100644
> --- a/drivers/media/i2c/Kconfig
> +++ b/drivers/media/i2c/Kconfig
> @@ -44,9 +44,6 @@ config VIDEO_CCS_PLL
>  config VIDEO_AR0521
>  	tristate "ON Semiconductor AR0521 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the ON Semiconductor
>  	  AR0521 camera.
> @@ -57,9 +54,6 @@ config VIDEO_AR0521
>  config VIDEO_HI556
>  	tristate "Hynix Hi-556 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Hynix
>  	  Hi-556 camera.
> @@ -70,9 +64,6 @@ config VIDEO_HI556
>  config VIDEO_HI846
>  	tristate "Hynix Hi-846 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Hynix
>  	  Hi-846 camera.
> @@ -83,9 +74,6 @@ config VIDEO_HI846
>  config VIDEO_HI847
>          tristate "Hynix Hi-847 sensor support"
>          depends on I2C && VIDEO_DEV
> -        select MEDIA_CONTROLLER
> -        select VIDEO_V4L2_SUBDEV_API
> -        select V4L2_FWNODE
>          help
>            This is a Video4Linux2 sensor driver for the Hynix
>            Hi-847 camera.
> @@ -96,9 +84,6 @@ config VIDEO_HI847
>  config VIDEO_IMX208
>  	tristate "Sony IMX208 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	depends on MEDIA_CAMERA_SUPPORT
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX208 camera.
> @@ -109,9 +94,6 @@ config VIDEO_IMX208
>  config VIDEO_IMX214
>  	tristate "Sony IMX214 sensor support"
>  	depends on GPIOLIB && I2C && VIDEO_DEV
> -	select V4L2_FWNODE
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
> @@ -123,9 +105,6 @@ config VIDEO_IMX214
>  config VIDEO_IMX219
>  	tristate "Sony IMX219 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX219 camera.
> @@ -136,8 +115,6 @@ config VIDEO_IMX219
>  config VIDEO_IMX258
>  	tristate "Sony IMX258 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX258 camera.
> @@ -148,8 +125,6 @@ config VIDEO_IMX258
>  config VIDEO_IMX274
>  	tristate "Sony IMX274 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
>  	help
>  	  This is a V4L2 sensor driver for the Sony IMX274
> @@ -158,10 +133,7 @@ config VIDEO_IMX274
>  config VIDEO_IMX290
>  	tristate "Sony IMX290 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX290 camera sensor.
> @@ -172,9 +144,6 @@ config VIDEO_IMX290
>  config VIDEO_IMX296
>  	tristate "Sony IMX296 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX296 camera.
> @@ -185,8 +154,6 @@ config VIDEO_IMX296
>  config VIDEO_IMX319
>  	tristate "Sony IMX319 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX319 camera.
> @@ -198,9 +165,6 @@ config VIDEO_IMX334
>  	tristate "Sony IMX334 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX334 camera.
> @@ -212,9 +176,6 @@ config VIDEO_IMX335
>  	tristate "Sony IMX335 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX335 camera.
> @@ -225,8 +186,6 @@ config VIDEO_IMX335
>  config VIDEO_IMX355
>  	tristate "Sony IMX355 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX355 camera.
> @@ -238,9 +197,6 @@ config VIDEO_IMX412
>  	tristate "Sony IMX412 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX412 camera.
> @@ -252,9 +208,6 @@ config VIDEO_IMX415
>  	tristate "Sony IMX415 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX415 camera.
> @@ -268,8 +221,6 @@ config VIDEO_MAX9271_LIB
>  config VIDEO_MT9M001
>  	tristate "mt9m001 support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This driver supports MT9M001 cameras from Micron, monochrome
>  	  and colour models.
> @@ -277,7 +228,6 @@ config VIDEO_MT9M001
>  config VIDEO_MT9M111
>  	tristate "mt9m111, mt9m112 and mt9m131 support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This driver supports MT9M111, MT9M112 and MT9M131 cameras from
>  	  Micron/Aptina
> @@ -285,10 +235,7 @@ config VIDEO_MT9M111
>  config VIDEO_MT9P031
>  	tristate "Aptina MT9P031 support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select VIDEO_APTINA_PLL
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Aptina
>  	  (Micron) mt9p031 5 Mpixel camera.
> @@ -314,10 +261,7 @@ config VIDEO_MT9V011
>  config VIDEO_MT9V032
>  	tristate "Micron MT9V032 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Micron
>  	  MT9V032 752x480 CMOS sensor.
> @@ -335,9 +279,6 @@ config VIDEO_MT9V111
>  config VIDEO_OG01A1B
>  	tristate "OmniVision OG01A1B sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OG01A1B camera.
> @@ -348,9 +289,6 @@ config VIDEO_OG01A1B
>  config VIDEO_OV01A10
>  	tristate "OmniVision OV01A10 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV01A10 camera.
> @@ -361,9 +299,6 @@ config VIDEO_OV01A10
>  config VIDEO_OV02A10
>  	tristate "OmniVision OV02A10 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV02A10 camera.
> @@ -374,9 +309,6 @@ config VIDEO_OV02A10
>  config VIDEO_OV08D10
>          tristate "OmniVision OV08D10 sensor support"
>          depends on I2C && VIDEO_DEV
> -        select MEDIA_CONTROLLER
> -        select VIDEO_V4L2_SUBDEV_API
> -        select V4L2_FWNODE
>          help
>            This is a Video4Linux2 sensor driver for the OmniVision
>            OV08D10 camera sensor.
> @@ -387,9 +319,6 @@ config VIDEO_OV08D10
>  config VIDEO_OV08X40
>  	tristate "OmniVision OV08X40 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV08X40 camera.
> @@ -400,9 +329,6 @@ config VIDEO_OV08X40
>  config VIDEO_OV13858
>  	tristate "OmniVision OV13858 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV13858 camera.
> @@ -410,9 +336,6 @@ config VIDEO_OV13858
>  config VIDEO_OV13B10
>  	tristate "OmniVision OV13B10 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV13B10 camera.
> @@ -420,7 +343,6 @@ config VIDEO_OV13B10
>  config VIDEO_OV2640
>  	tristate "OmniVision OV2640 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select V4L2_ASYNC
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2640 camera.
> @@ -431,7 +353,6 @@ config VIDEO_OV2640
>  config VIDEO_OV2659
>  	tristate "OmniVision OV2659 sensor support"
>  	depends on VIDEO_DEV && I2C && GPIOLIB
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2659 camera.
> @@ -442,8 +363,6 @@ config VIDEO_OV2659
>  config VIDEO_OV2680
>  	tristate "OmniVision OV2680 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2680 camera.
> @@ -454,9 +373,6 @@ config VIDEO_OV2680
>  config VIDEO_OV2685
>  	tristate "OmniVision OV2685 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2685 camera.
> @@ -468,9 +384,6 @@ config VIDEO_OV2740
>  	tristate "OmniVision OV2740 sensor support"
>  	depends on VIDEO_DEV && I2C
>  	depends on ACPI || COMPILE_TEST
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	select REGMAP_I2C
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
> @@ -482,9 +395,6 @@ config VIDEO_OV2740
>  config VIDEO_OV4689
>  	tristate "OmniVision OV4689 sensor support"
>  	depends on GPIOLIB && VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor-level driver for the OmniVision
>  	  OV4689 camera.
> @@ -496,9 +406,6 @@ config VIDEO_OV5640
>  	tristate "OmniVision OV5640 sensor support"
>  	depends on OF
>  	depends on GPIOLIB && VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Omnivision
>  	  OV5640 camera sensor with a MIPI CSI-2 interface.
> @@ -507,9 +414,6 @@ config VIDEO_OV5645
>  	tristate "OmniVision OV5645 sensor support"
>  	depends on OF
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5645 camera.
> @@ -520,9 +424,6 @@ config VIDEO_OV5645
>  config VIDEO_OV5647
>  	tristate "OmniVision OV5647 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5647 camera.
> @@ -533,9 +434,6 @@ config VIDEO_OV5647
>  config VIDEO_OV5648
>  	tristate "OmniVision OV5648 sensor support"
>  	depends on I2C && PM && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5648 camera.
> @@ -546,9 +444,6 @@ config VIDEO_OV5648
>  config VIDEO_OV5670
>  	tristate "OmniVision OV5670 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5670 camera.
> @@ -559,9 +454,6 @@ config VIDEO_OV5670
>  config VIDEO_OV5675
>  	tristate "OmniVision OV5675 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5675 camera.
> @@ -572,7 +464,6 @@ config VIDEO_OV5675
>  config VIDEO_OV5693
>  	tristate "OmniVision OV5693 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5693 camera.
> @@ -583,7 +474,6 @@ config VIDEO_OV5693
>  config VIDEO_OV5695
>  	tristate "OmniVision OV5695 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5695 camera.
> @@ -604,9 +494,6 @@ config VIDEO_OV6650
>  config VIDEO_OV7251
>  	tristate "OmniVision OV7251 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV7251 camera.
> @@ -627,7 +514,6 @@ config VIDEO_OV7640
>  config VIDEO_OV7670
>  	tristate "OmniVision OV7670 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV7670 VGA camera.  It currently only works with the M88ALP01
> @@ -637,7 +523,6 @@ config VIDEO_OV772X
>  	tristate "OmniVision OV772x sensor support"
>  	depends on I2C && VIDEO_DEV
>  	select REGMAP_SCCB
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV772x camera.
> @@ -656,9 +541,6 @@ config VIDEO_OV7740
>  config VIDEO_OV8856
>  	tristate "OmniVision OV8856 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV8856 camera sensor.
> @@ -669,9 +551,6 @@ config VIDEO_OV8856
>  config VIDEO_OV8858
>  	tristate "OmniVision OV8858 sensor support"
>  	depends on I2C && PM && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for OmniVision
>  	  OV8858 camera sensor.
> @@ -682,9 +561,6 @@ config VIDEO_OV8858
>  config VIDEO_OV8865
>  	tristate "OmniVision OV8865 sensor support"
>  	depends on I2C && PM && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for OmniVision
>  	  OV8865 camera sensor.
> @@ -696,9 +572,6 @@ config VIDEO_OV9282
>  	tristate "OmniVision OV9282 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV9282 camera sensor.
> @@ -716,8 +589,6 @@ config VIDEO_OV9640
>  config VIDEO_OV9650
>  	tristate "OmniVision OV9650/OV9652 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_SCCB
>  	help
>  	  This is a V4L2 sensor driver for the Omnivision
> @@ -727,9 +598,6 @@ config VIDEO_OV9734
>  	tristate "OmniVision OV9734 sensor support"
>  	depends on VIDEO_DEV && I2C
>  	depends on ACPI || COMPILE_TEST
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV9734 camera.
> @@ -740,9 +608,6 @@ config VIDEO_OV9734
>  config VIDEO_RDACM20
>  	tristate "IMI RDACM20 camera support"
>  	depends on I2C
> -	select V4L2_FWNODE
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
>  	select VIDEO_MAX9271_LIB
>  	help
>  	  This driver supports the IMI RDACM20 GMSL camera, used in
> @@ -754,9 +619,6 @@ config VIDEO_RDACM20
>  config VIDEO_RDACM21
>  	tristate "IMI RDACM21 camera support"
>  	depends on I2C
> -	select V4L2_FWNODE
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
>  	select VIDEO_MAX9271_LIB
>  	help
>  	  This driver supports the IMI RDACM21 GMSL camera, used in
> @@ -778,9 +640,6 @@ config VIDEO_RJ54N1
>  config VIDEO_S5C73M3
>  	tristate "Samsung S5C73M3 sensor support"
>  	depends on I2C && SPI && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a V4L2 sensor driver for Samsung S5C73M3
>  	  8 Mpixel camera.
> @@ -788,9 +647,6 @@ config VIDEO_S5C73M3
>  config VIDEO_S5K5BAF
>  	tristate "Samsung S5K5BAF sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a V4L2 sensor driver for Samsung S5K5BAF 2M
>  	  camera sensor with an embedded SoC image signal processor.
> @@ -798,8 +654,6 @@ config VIDEO_S5K5BAF
>  config VIDEO_S5K6A3
>  	tristate "Samsung S5K6A3 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a V4L2 sensor driver for Samsung S5K6A3 raw
>  	  camera sensor.
> @@ -807,9 +661,6 @@ config VIDEO_S5K6A3
>  config VIDEO_ST_VGXY61
>  	tristate "ST VGXY61 sensor support"
>  	depends on OF && GPIOLIB && VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the ST VGXY61
>  	  camera sensor.
> diff --git a/drivers/media/i2c/ccs/Kconfig b/drivers/media/i2c/ccs/Kconfig
> index 71671db3d993..7cc17b0e3153 100644
> --- a/drivers/media/i2c/ccs/Kconfig
> +++ b/drivers/media/i2c/ccs/Kconfig
> @@ -2,10 +2,7 @@
>  config VIDEO_CCS
>  	tristate "MIPI CCS/SMIA++/SMIA sensor support"
>  	depends on I2C && VIDEO_DEV && HAVE_CLK
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select VIDEO_CCS_PLL
> -	select V4L2_FWNODE
>  	help
>  	  This is a generic driver for MIPI CCS, SMIA++ and SMIA compliant
>  	  camera sensors.
> diff --git a/drivers/media/i2c/et8ek8/Kconfig b/drivers/media/i2c/et8ek8/Kconfig
> index 398dd4d21df1..9cd2bcedd550 100644
> --- a/drivers/media/i2c/et8ek8/Kconfig
> +++ b/drivers/media/i2c/et8ek8/Kconfig
> @@ -2,9 +2,6 @@
>  config VIDEO_ET8EK8
>  	tristate "ET8EK8 camera sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a driver for the Toshiba ET8EK8 5 MP camera sensor.
>  	  It is used for example in Nokia N900 (RX-51).


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors
  2023-06-30 14:03 ` [PATCH 1/2] media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors Sakari Ailus
@ 2023-07-02 14:59   ` Laurent Pinchart
  0 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2023-07-02 14:59 UTC (permalink / raw)
  To: Sakari Ailus; +Cc: linux-media, Hans de Goede

Hi Sakari,

Thank you for the patch.

On Fri, Jun 30, 2023 at 05:03:53PM +0300, Sakari Ailus wrote:
> 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.
> 
> Reported-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Cc: stable@vger.kernel.org # for >= 6.1

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/i2c/Kconfig | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index 815c83135021..c7ffaa79abeb 100644
> --- 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
> +	select MEDIA_CONTROLLER
> +	select V4L2_FWNODE
> +	select VIDEO_V4L2_SUBDEV_API
> +	default y
> +
> +if VIDEO_CAMERA_SENSOR
>  
>  config VIDEO_APTINA_PLL
>  	tristate
> @@ -810,7 +817,7 @@ config VIDEO_ST_VGXY61
>  source "drivers/media/i2c/ccs/Kconfig"
>  source "drivers/media/i2c/et8ek8/Kconfig"
>  
> -endmenu
> +endif
>  
>  menu "Lens drivers"
>  	visible if MEDIA_CAMERA_SUPPORT

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers
  2023-06-30 14:03 ` [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers Sakari Ailus
  2023-07-02 14:50   ` Hans de Goede
@ 2023-07-02 15:04   ` Laurent Pinchart
  2023-07-05 12:36     ` Sakari Ailus
  1 sibling, 1 reply; 7+ messages in thread
From: Laurent Pinchart @ 2023-07-02 15:04 UTC (permalink / raw)
  To: Sakari Ailus; +Cc: linux-media, Hans de Goede

Hi Sakari,

Thank you for the patch.

On Fri, Jun 30, 2023 at 05:03:54PM +0300, Sakari Ailus wrote:
> As selecting V4L2_FWNODE, MEDIA_CONTROLLER and VIDEO_V4L2_SUBDEV_API are
> now selected by the top level menu, they can be dropped from the
> individual drivers. Also dropped selectng V4L2_ASYNC for a single driver

s/selectng/selecting/

> as this is already implied by V4L2_FWNODE.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  drivers/media/i2c/Kconfig        | 149 -------------------------------
>  drivers/media/i2c/ccs/Kconfig    |   3 -
>  drivers/media/i2c/et8ek8/Kconfig |   3 -
>  3 files changed, 155 deletions(-)
> 
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index c7ffaa79abeb..d8ea6be924c0 100644
> --- a/drivers/media/i2c/Kconfig
> +++ b/drivers/media/i2c/Kconfig
> @@ -44,9 +44,6 @@ config VIDEO_CCS_PLL
>  config VIDEO_AR0521
>  	tristate "ON Semiconductor AR0521 sensor support"
>  	depends on I2C && VIDEO_DEV

Should VIDEO_DEV also be moved to VIDEO_CAMERA_SENSOR ? Or, even better,
be dropped ? The I2C drivers shouldn't require it.

And given that we're in the i2c/ directory, the I2C dependency should
also be moved to VIDEO_CAMERA_SENSOR. I wonder if we should then rename
it to VIDEO_I2C_CAMERA_SENSOR.

> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the ON Semiconductor
>  	  AR0521 camera.
> @@ -57,9 +54,6 @@ config VIDEO_AR0521
>  config VIDEO_HI556
>  	tristate "Hynix Hi-556 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Hynix
>  	  Hi-556 camera.
> @@ -70,9 +64,6 @@ config VIDEO_HI556
>  config VIDEO_HI846
>  	tristate "Hynix Hi-846 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Hynix
>  	  Hi-846 camera.
> @@ -83,9 +74,6 @@ config VIDEO_HI846
>  config VIDEO_HI847
>          tristate "Hynix Hi-847 sensor support"
>          depends on I2C && VIDEO_DEV
> -        select MEDIA_CONTROLLER
> -        select VIDEO_V4L2_SUBDEV_API
> -        select V4L2_FWNODE
>          help
>            This is a Video4Linux2 sensor driver for the Hynix
>            Hi-847 camera.
> @@ -96,9 +84,6 @@ config VIDEO_HI847
>  config VIDEO_IMX208
>  	tristate "Sony IMX208 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	depends on MEDIA_CAMERA_SUPPORT
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX208 camera.
> @@ -109,9 +94,6 @@ config VIDEO_IMX208
>  config VIDEO_IMX214
>  	tristate "Sony IMX214 sensor support"
>  	depends on GPIOLIB && I2C && VIDEO_DEV
> -	select V4L2_FWNODE
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
> @@ -123,9 +105,6 @@ config VIDEO_IMX214
>  config VIDEO_IMX219
>  	tristate "Sony IMX219 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX219 camera.
> @@ -136,8 +115,6 @@ config VIDEO_IMX219
>  config VIDEO_IMX258
>  	tristate "Sony IMX258 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX258 camera.
> @@ -148,8 +125,6 @@ config VIDEO_IMX258
>  config VIDEO_IMX274
>  	tristate "Sony IMX274 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
>  	help
>  	  This is a V4L2 sensor driver for the Sony IMX274
> @@ -158,10 +133,7 @@ config VIDEO_IMX274
>  config VIDEO_IMX290
>  	tristate "Sony IMX290 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX290 camera sensor.
> @@ -172,9 +144,6 @@ config VIDEO_IMX290
>  config VIDEO_IMX296
>  	tristate "Sony IMX296 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX296 camera.
> @@ -185,8 +154,6 @@ config VIDEO_IMX296
>  config VIDEO_IMX319
>  	tristate "Sony IMX319 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX319 camera.
> @@ -198,9 +165,6 @@ config VIDEO_IMX334
>  	tristate "Sony IMX334 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX334 camera.
> @@ -212,9 +176,6 @@ config VIDEO_IMX335
>  	tristate "Sony IMX335 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX335 camera.
> @@ -225,8 +186,6 @@ config VIDEO_IMX335
>  config VIDEO_IMX355
>  	tristate "Sony IMX355 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX355 camera.
> @@ -238,9 +197,6 @@ config VIDEO_IMX412
>  	tristate "Sony IMX412 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX412 camera.
> @@ -252,9 +208,6 @@ config VIDEO_IMX415
>  	tristate "Sony IMX415 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Sony
>  	  IMX415 camera.
> @@ -268,8 +221,6 @@ config VIDEO_MAX9271_LIB
>  config VIDEO_MT9M001
>  	tristate "mt9m001 support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This driver supports MT9M001 cameras from Micron, monochrome
>  	  and colour models.
> @@ -277,7 +228,6 @@ config VIDEO_MT9M001
>  config VIDEO_MT9M111
>  	tristate "mt9m111, mt9m112 and mt9m131 support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This driver supports MT9M111, MT9M112 and MT9M131 cameras from
>  	  Micron/Aptina
> @@ -285,10 +235,7 @@ config VIDEO_MT9M111
>  config VIDEO_MT9P031
>  	tristate "Aptina MT9P031 support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select VIDEO_APTINA_PLL
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Aptina
>  	  (Micron) mt9p031 5 Mpixel camera.
> @@ -314,10 +261,7 @@ config VIDEO_MT9V011
>  config VIDEO_MT9V032
>  	tristate "Micron MT9V032 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Micron
>  	  MT9V032 752x480 CMOS sensor.
> @@ -335,9 +279,6 @@ config VIDEO_MT9V111
>  config VIDEO_OG01A1B
>  	tristate "OmniVision OG01A1B sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OG01A1B camera.
> @@ -348,9 +289,6 @@ config VIDEO_OG01A1B
>  config VIDEO_OV01A10
>  	tristate "OmniVision OV01A10 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV01A10 camera.
> @@ -361,9 +299,6 @@ config VIDEO_OV01A10
>  config VIDEO_OV02A10
>  	tristate "OmniVision OV02A10 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV02A10 camera.
> @@ -374,9 +309,6 @@ config VIDEO_OV02A10
>  config VIDEO_OV08D10
>          tristate "OmniVision OV08D10 sensor support"
>          depends on I2C && VIDEO_DEV
> -        select MEDIA_CONTROLLER
> -        select VIDEO_V4L2_SUBDEV_API
> -        select V4L2_FWNODE
>          help
>            This is a Video4Linux2 sensor driver for the OmniVision
>            OV08D10 camera sensor.
> @@ -387,9 +319,6 @@ config VIDEO_OV08D10
>  config VIDEO_OV08X40
>  	tristate "OmniVision OV08X40 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV08X40 camera.
> @@ -400,9 +329,6 @@ config VIDEO_OV08X40
>  config VIDEO_OV13858
>  	tristate "OmniVision OV13858 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV13858 camera.
> @@ -410,9 +336,6 @@ config VIDEO_OV13858
>  config VIDEO_OV13B10
>  	tristate "OmniVision OV13B10 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV13B10 camera.
> @@ -420,7 +343,6 @@ config VIDEO_OV13B10
>  config VIDEO_OV2640
>  	tristate "OmniVision OV2640 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select V4L2_ASYNC
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2640 camera.
> @@ -431,7 +353,6 @@ config VIDEO_OV2640
>  config VIDEO_OV2659
>  	tristate "OmniVision OV2659 sensor support"
>  	depends on VIDEO_DEV && I2C && GPIOLIB
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2659 camera.
> @@ -442,8 +363,6 @@ config VIDEO_OV2659
>  config VIDEO_OV2680
>  	tristate "OmniVision OV2680 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2680 camera.
> @@ -454,9 +373,6 @@ config VIDEO_OV2680
>  config VIDEO_OV2685
>  	tristate "OmniVision OV2685 sensor support"
>  	depends on VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV2685 camera.
> @@ -468,9 +384,6 @@ config VIDEO_OV2740
>  	tristate "OmniVision OV2740 sensor support"
>  	depends on VIDEO_DEV && I2C
>  	depends on ACPI || COMPILE_TEST
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	select REGMAP_I2C
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
> @@ -482,9 +395,6 @@ config VIDEO_OV2740
>  config VIDEO_OV4689
>  	tristate "OmniVision OV4689 sensor support"
>  	depends on GPIOLIB && VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor-level driver for the OmniVision
>  	  OV4689 camera.
> @@ -496,9 +406,6 @@ config VIDEO_OV5640
>  	tristate "OmniVision OV5640 sensor support"
>  	depends on OF
>  	depends on GPIOLIB && VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the Omnivision
>  	  OV5640 camera sensor with a MIPI CSI-2 interface.
> @@ -507,9 +414,6 @@ config VIDEO_OV5645
>  	tristate "OmniVision OV5645 sensor support"
>  	depends on OF
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5645 camera.
> @@ -520,9 +424,6 @@ config VIDEO_OV5645
>  config VIDEO_OV5647
>  	tristate "OmniVision OV5647 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5647 camera.
> @@ -533,9 +434,6 @@ config VIDEO_OV5647
>  config VIDEO_OV5648
>  	tristate "OmniVision OV5648 sensor support"
>  	depends on I2C && PM && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5648 camera.
> @@ -546,9 +444,6 @@ config VIDEO_OV5648
>  config VIDEO_OV5670
>  	tristate "OmniVision OV5670 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5670 camera.
> @@ -559,9 +454,6 @@ config VIDEO_OV5670
>  config VIDEO_OV5675
>  	tristate "OmniVision OV5675 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5675 camera.
> @@ -572,7 +464,6 @@ config VIDEO_OV5675
>  config VIDEO_OV5693
>  	tristate "OmniVision OV5693 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5693 camera.
> @@ -583,7 +474,6 @@ config VIDEO_OV5693
>  config VIDEO_OV5695
>  	tristate "OmniVision OV5695 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV5695 camera.
> @@ -604,9 +494,6 @@ config VIDEO_OV6650
>  config VIDEO_OV7251
>  	tristate "OmniVision OV7251 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV7251 camera.
> @@ -627,7 +514,6 @@ config VIDEO_OV7640
>  config VIDEO_OV7670
>  	tristate "OmniVision OV7670 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV7670 VGA camera.  It currently only works with the M88ALP01
> @@ -637,7 +523,6 @@ config VIDEO_OV772X
>  	tristate "OmniVision OV772x sensor support"
>  	depends on I2C && VIDEO_DEV
>  	select REGMAP_SCCB
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV772x camera.
> @@ -656,9 +541,6 @@ config VIDEO_OV7740
>  config VIDEO_OV8856
>  	tristate "OmniVision OV8856 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV8856 camera sensor.
> @@ -669,9 +551,6 @@ config VIDEO_OV8856
>  config VIDEO_OV8858
>  	tristate "OmniVision OV8858 sensor support"
>  	depends on I2C && PM && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for OmniVision
>  	  OV8858 camera sensor.
> @@ -682,9 +561,6 @@ config VIDEO_OV8858
>  config VIDEO_OV8865
>  	tristate "OmniVision OV8865 sensor support"
>  	depends on I2C && PM && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for OmniVision
>  	  OV8865 camera sensor.
> @@ -696,9 +572,6 @@ config VIDEO_OV9282
>  	tristate "OmniVision OV9282 sensor support"
>  	depends on OF_GPIO
>  	depends on I2C && VIDEO_DEV
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV9282 camera sensor.
> @@ -716,8 +589,6 @@ config VIDEO_OV9640
>  config VIDEO_OV9650
>  	tristate "OmniVision OV9650/OV9652 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_SCCB
>  	help
>  	  This is a V4L2 sensor driver for the Omnivision
> @@ -727,9 +598,6 @@ config VIDEO_OV9734
>  	tristate "OmniVision OV9734 sensor support"
>  	depends on VIDEO_DEV && I2C
>  	depends on ACPI || COMPILE_TEST
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the OmniVision
>  	  OV9734 camera.
> @@ -740,9 +608,6 @@ config VIDEO_OV9734
>  config VIDEO_RDACM20
>  	tristate "IMI RDACM20 camera support"
>  	depends on I2C
> -	select V4L2_FWNODE
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
>  	select VIDEO_MAX9271_LIB
>  	help
>  	  This driver supports the IMI RDACM20 GMSL camera, used in
> @@ -754,9 +619,6 @@ config VIDEO_RDACM20
>  config VIDEO_RDACM21
>  	tristate "IMI RDACM21 camera support"
>  	depends on I2C
> -	select V4L2_FWNODE
> -	select VIDEO_V4L2_SUBDEV_API
> -	select MEDIA_CONTROLLER
>  	select VIDEO_MAX9271_LIB
>  	help
>  	  This driver supports the IMI RDACM21 GMSL camera, used in
> @@ -778,9 +640,6 @@ config VIDEO_RJ54N1
>  config VIDEO_S5C73M3
>  	tristate "Samsung S5C73M3 sensor support"
>  	depends on I2C && SPI && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a V4L2 sensor driver for Samsung S5C73M3
>  	  8 Mpixel camera.
> @@ -788,9 +647,6 @@ config VIDEO_S5C73M3
>  config VIDEO_S5K5BAF
>  	tristate "Samsung S5K5BAF sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a V4L2 sensor driver for Samsung S5K5BAF 2M
>  	  camera sensor with an embedded SoC image signal processor.
> @@ -798,8 +654,6 @@ config VIDEO_S5K5BAF
>  config VIDEO_S5K6A3
>  	tristate "Samsung S5K6A3 sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  This is a V4L2 sensor driver for Samsung S5K6A3 raw
>  	  camera sensor.
> @@ -807,9 +661,6 @@ config VIDEO_S5K6A3
>  config VIDEO_ST_VGXY61
>  	tristate "ST VGXY61 sensor support"
>  	depends on OF && GPIOLIB && VIDEO_DEV && I2C
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a Video4Linux2 sensor driver for the ST VGXY61
>  	  camera sensor.
> diff --git a/drivers/media/i2c/ccs/Kconfig b/drivers/media/i2c/ccs/Kconfig
> index 71671db3d993..7cc17b0e3153 100644
> --- a/drivers/media/i2c/ccs/Kconfig
> +++ b/drivers/media/i2c/ccs/Kconfig
> @@ -2,10 +2,7 @@
>  config VIDEO_CCS
>  	tristate "MIPI CCS/SMIA++/SMIA sensor support"
>  	depends on I2C && VIDEO_DEV && HAVE_CLK
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
>  	select VIDEO_CCS_PLL
> -	select V4L2_FWNODE
>  	help
>  	  This is a generic driver for MIPI CCS, SMIA++ and SMIA compliant
>  	  camera sensors.
> diff --git a/drivers/media/i2c/et8ek8/Kconfig b/drivers/media/i2c/et8ek8/Kconfig
> index 398dd4d21df1..9cd2bcedd550 100644
> --- a/drivers/media/i2c/et8ek8/Kconfig
> +++ b/drivers/media/i2c/et8ek8/Kconfig
> @@ -2,9 +2,6 @@
>  config VIDEO_ET8EK8
>  	tristate "ET8EK8 camera sensor support"
>  	depends on I2C && VIDEO_DEV
> -	select MEDIA_CONTROLLER
> -	select VIDEO_V4L2_SUBDEV_API
> -	select V4L2_FWNODE
>  	help
>  	  This is a driver for the Toshiba ET8EK8 5 MP camera sensor.
>  	  It is used for example in Nokia N900 (RX-51).

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers
  2023-07-02 15:04   ` Laurent Pinchart
@ 2023-07-05 12:36     ` Sakari Ailus
  0 siblings, 0 replies; 7+ messages in thread
From: Sakari Ailus @ 2023-07-05 12:36 UTC (permalink / raw)
  To: Laurent Pinchart; +Cc: linux-media, Hans de Goede

Hi Laurent,

On Sun, Jul 02, 2023 at 06:04:51PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
> 
> Thank you for the patch.
> 
> On Fri, Jun 30, 2023 at 05:03:54PM +0300, Sakari Ailus wrote:
> > As selecting V4L2_FWNODE, MEDIA_CONTROLLER and VIDEO_V4L2_SUBDEV_API are
> > now selected by the top level menu, they can be dropped from the
> > individual drivers. Also dropped selectng V4L2_ASYNC for a single driver
> 
> s/selectng/selecting/

I'll fix this for v2.

> 
> > as this is already implied by V4L2_FWNODE.
> > 
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> >  drivers/media/i2c/Kconfig        | 149 -------------------------------
> >  drivers/media/i2c/ccs/Kconfig    |   3 -
> >  drivers/media/i2c/et8ek8/Kconfig |   3 -
> >  3 files changed, 155 deletions(-)
> > 
> > diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> > index c7ffaa79abeb..d8ea6be924c0 100644
> > --- a/drivers/media/i2c/Kconfig
> > +++ b/drivers/media/i2c/Kconfig
> > @@ -44,9 +44,6 @@ config VIDEO_CCS_PLL
> >  config VIDEO_AR0521
> >  	tristate "ON Semiconductor AR0521 sensor support"
> >  	depends on I2C && VIDEO_DEV
> 
> Should VIDEO_DEV also be moved to VIDEO_CAMERA_SENSOR ? Or, even better,
> be dropped ? The I2C drivers shouldn't require it.
> 
> And given that we're in the i2c/ directory, the I2C dependency should
> also be moved to VIDEO_CAMERA_SENSOR. I wonder if we should then rename
> it to VIDEO_I2C_CAMERA_SENSOR.

Makes sense.

CONFIG_RATIONAL is also needed by the ds90ub953 driver, I'll take this into
account for v3.

-- 
Regards,

Sakari Ailus

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-07-05 12:36 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-30 14:03 [PATCH 0/2] Move camera sensor dependencies to top level menu Sakari Ailus
2023-06-30 14:03 ` [PATCH 1/2] media: i2c: Select V4L2_FWNODE and VIDEO_V4L2_SUBDEV_API for sensors Sakari Ailus
2023-07-02 14:59   ` Laurent Pinchart
2023-06-30 14:03 ` [PATCH 2/2] media: i2c: Stop selecting common features for individual camera drivers Sakari Ailus
2023-07-02 14:50   ` Hans de Goede
2023-07-02 15:04   ` Laurent Pinchart
2023-07-05 12:36     ` Sakari Ailus

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.