github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

[GIT PULL for v7.4] media updates

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmrg2E0ACgkQCF8+vY7k
 4RWEKA/+I4c2uxiTd4GCEGeKCUnAf/sPGA3Bi1qqA68o5bPFEKp/mXtED5b5I96P
 61Hk2zrrlfwdXULG7oASLFoMtENDpnk9XOyaxmuN9wORUBfmuN7GjOC2mjo3WbMY
 LV0Whci5prMTxlDmhrdl3cO0pOXIui9vvzqths+1yQBrEfibJb+bV8gTGmYlyRul
 3hqeAPa3fKTcjVYNtdVEP9ToQqPWaU+Q3yS2wVMMtsHBs3YS6a1+9lij3D4JPI/T
 uRm1zXJndKiSrht+doQeIlkwf2MwN32sdtbZBexEmppAYM5QuZ8eAkRvI5jcC1SV
 aK5SAZ1xNWloKVhSy4GvOucA287UvpUZUJg4dvyDZ3ByhnTwy4OSdQQjCbkFqHp5
 KVjA039gk/J8ghBE6UYbgPlGWU0386ssqKwI8wTOFpDS6jmbhMYZQV0Tn9u64ldV
 Rjzz+V8WgAunwnh2lEOKLLzWbMprjnpoRFeps5OeZbD29CCu5Nd+KgNd1us9AoTy
 uzsnv28sJmfv98PfGe4ufejNfXBWtpVsdJnCsu3D+Gj5rQI3vos1FLVwt6ILlbO0
 P7EF0wdafaNIrwdSFJDnARFg2BmFHHnrg4XJya/nHpZHmziu1b2PGbZ0HJCdjCWk
 pN3G4xFEYWuaTqNgHr7SVX1/hPdnndWn2o7nToVD4SjCLCMJtTA=
 =nBn5
 -----END PGP SIGNATURE-----

Merge tag 'media/v7.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media update from Mauro Carvalho Chehab:
 "Revert 'media: Don't hide I²C or SPI drivers by default'"

* tag 'media/v7.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  Revert "media: Don't hide I²C or SPI drivers by default"
This commit is contained in:
Linus Torvalds 2026-10-28 07:32:13 -10:00
commit d738fbd1a8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/i2c/Kconfig
View File

@ -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"

4
drivers/media/spi/Kconfig
View File

@ -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.