Commit 27285b099fbc for kernel

commit 27285b099fbc5cb2ae3aef20f3bbd7b3c88b3005
Author: Sakari Ailus <sakari.ailus@linux.intel.com>
Date:   Tue Oct 27 12:09:16 2026 +0200

    Revert "media: Don't hide I²C or SPI drivers by default"

    This reverts commit 3bf8c26a085c7b00dbec67a919b93fa8b7ad70e0.

    In order to avoid exposing fairly rarely needed drivers to ordinary users,
    revert this patch. People needing these drivers will need to enable
    CONFIG_EXPERT until we have a better solution for this.

    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Link: https://patch.msgid.link/20261027100916.4053512-1-sakari.ailus@linux.intel.com
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Message-ID: <20261027100916.4053512-1-sakari.ailus@linux.intel.com>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 7de2d095c969..11c30252540e 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -1042,12 +1042,14 @@ endmenu
 # V4L2 I2C drivers that aren't related with Camera support
 #

-comment "audio, video and radio I2C drivers"
+comment "audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'"
+	depends on MEDIA_HIDE_ANCILLARY_SUBDRV
 #
 # Encoder / Decoder module configuration
 #

 menu "Audio decoders, processors and mixers"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config VIDEO_CS3308
 	tristate "Cirrus Logic CS3308 audio ADC"
@@ -1210,6 +1212,7 @@ config VIDEO_WM8775
 endmenu

 menu "RDS decoders"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config VIDEO_SAA6588
 	tristate "SAA6588 Radio Chip RDS decoder support"
@@ -1226,6 +1229,7 @@ config VIDEO_SAA6588
 endmenu

 menu "Video decoders"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config VIDEO_ADV7180
 	tristate "Analog Devices ADV7180 decoder"
@@ -1585,6 +1589,7 @@ source "drivers/media/i2c/cx25840/Kconfig"
 endmenu

 menu "Video encoders"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config VIDEO_ADV7170
 	tristate "Analog Devices ADV7170 video encoder"
@@ -1683,6 +1688,7 @@ config VIDEO_THS8200
 endmenu

 menu "Video improvement chips"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config VIDEO_UPD64031A
 	tristate "NEC Electronics uPD64031A Ghost Reduction"
@@ -1711,6 +1717,7 @@ config VIDEO_UPD64083
 endmenu

 menu "Audio/Video compression chips"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config VIDEO_SAA6752HS
 	tristate "Philips SAA6752HS MPEG-2 Audio/Video Encoder"
@@ -1726,6 +1733,7 @@ config VIDEO_SAA6752HS
 endmenu

 menu "SDR tuner chips"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 config SDR_MAX2175
 	tristate "Maxim 2175 RF to Bits tuner"
@@ -1742,6 +1750,7 @@ config SDR_MAX2175
 endmenu

 menu "Miscellaneous helper chips"
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

 source "drivers/media/i2c/cvs/Kconfig"

diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig
index da3e225d420d..4656afae5bb4 100644
--- a/drivers/media/spi/Kconfig
+++ b/drivers/media/spi/Kconfig
@@ -1,11 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-only
 if VIDEO_DEV && SPI

+comment "SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'"
+	depends on MEDIA_HIDE_ANCILLARY_SUBDRV && SPI
+
 menu "Media SPI Adapters"

 config CXD2880_SPI_DRV
 	tristate "Sony CXD2880 SPI support"
 	depends on DVB_CORE && SPI
+	default m if !MEDIA_SUBDRV_AUTOSELECT
 	help
 	  Choose if you would like to have SPI interface support for Sony CXD2880.