media: i2c/Kconfig: use sub-menus for I2C support

There are *lots* of I2C ancillary drivers. While we're using
comments to group them, all options appear at the same menu.

It should be a lot clearer to group them into sub-menus, with
may help people to go directly to the driver(s) he's needing
to enable.

Suggested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-15 15:39:38 +02:00
parent 63735af86d
commit 5c57ae64e8
5 changed files with 46 additions and 27 deletions

View File

@ -247,7 +247,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV
default y default y
menu "Media ancillary drivers" menu "Media ancillary drivers"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config MEDIA_ATTACH config MEDIA_ATTACH
bool bool

View File

@ -2,7 +2,7 @@
if MEDIA_DIGITAL_TV_SUPPORT if MEDIA_DIGITAL_TV_SUPPORT
comment "DVB Frontend drivers hidden by 'Autoselect ancillary drivers'" comment "DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers'"
depends on MEDIA_HIDE_ANCILLARY_SUBDRV depends on MEDIA_HIDE_ANCILLARY_SUBDRV
menu "Customise DVB Frontends" menu "Customise DVB Frontends"

View File

@ -5,6 +5,9 @@
if VIDEO_V4L2 if VIDEO_V4L2
comment "IR I2C driver auto-selected by 'Autoselect ancillary drivers'"
depends on MEDIA_SUBDRV_AUTOSELECT && I2C && RC_CORE
config VIDEO_IR_I2C config VIDEO_IR_I2C
tristate "I2C module for IR" if !MEDIA_SUBDRV_AUTOSELECT || EXPERT tristate "I2C module for IR" if !MEDIA_SUBDRV_AUTOSELECT || EXPERT
depends on I2C && RC_CORE depends on I2C && RC_CORE
@ -22,17 +25,14 @@ config VIDEO_IR_I2C
# V4L2 I2C drivers that aren't related with Camera support # V4L2 I2C drivers that aren't related with Camera support
# #
comment "I2C drivers hidden by 'Autoselect ancillary drivers'" comment "audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'"
depends on MEDIA_HIDE_ANCILLARY_SUBDRV depends on MEDIA_HIDE_ANCILLARY_SUBDRV
menu "I2C Encoders, decoders, sensors and other helper chips"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
# #
# Encoder / Decoder module configuration # Encoder / Decoder module configuration
# #
comment "Audio decoders, processors and mixers" menu "Audio decoders, processors and mixers"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_TVAUDIO config VIDEO_TVAUDIO
tristate "Simple audio decoder chips" tristate "Simple audio decoder chips"
@ -191,8 +191,10 @@ config VIDEO_SONY_BTF_MPX
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called sony-btf-mpx. module will be called sony-btf-mpx.
endmenu
comment "RDS decoders" menu "RDS decoders"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_SAA6588 config VIDEO_SAA6588
tristate "SAA6588 Radio Chip RDS decoder support" tristate "SAA6588 Radio Chip RDS decoder support"
@ -205,8 +207,10 @@ config VIDEO_SAA6588
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called saa6588. module will be called saa6588.
endmenu
comment "Video decoders" menu "Video decoders"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_ADV7180 config VIDEO_ADV7180
tristate "Analog Devices ADV7180 decoder" tristate "Analog Devices ADV7180 decoder"
@ -473,7 +477,10 @@ config VIDEO_SAA717X
source "drivers/media/i2c/cx25840/Kconfig" source "drivers/media/i2c/cx25840/Kconfig"
comment "Video encoders" endmenu
menu "Video encoders"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_SAA7127 config VIDEO_SAA7127
tristate "Philips SAA7127/9 digital video encoders" tristate "Philips SAA7127/9 digital video encoders"
@ -580,8 +587,10 @@ config VIDEO_THS8200
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called ths8200. module will be called ths8200.
endmenu
comment "Video improvement chips" menu "Video improvement chips"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_UPD64031A config VIDEO_UPD64031A
tristate "NEC Electronics uPD64031A Ghost Reduction" tristate "NEC Electronics uPD64031A Ghost Reduction"
@ -605,8 +614,10 @@ config VIDEO_UPD64083
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called upd64083. module will be called upd64083.
endmenu
comment "Audio/Video compression chips" menu "Audio/Video compression chips"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_SAA6752HS config VIDEO_SAA6752HS
tristate "Philips SAA6752HS MPEG-2 Audio/Video Encoder" tristate "Philips SAA6752HS MPEG-2 Audio/Video Encoder"
@ -619,7 +630,10 @@ config VIDEO_SAA6752HS
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called saa6752hs. module will be called saa6752hs.
comment "SDR tuner chips" endmenu
menu "SDR tuner chips"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config SDR_MAX2175 config SDR_MAX2175
tristate "Maxim 2175 RF to Bits tuner" tristate "Maxim 2175 RF to Bits tuner"
@ -632,7 +646,11 @@ config SDR_MAX2175
To compile this driver as a module, choose M here; the To compile this driver as a module, choose M here; the
module will be called max2175. module will be called max2175.
comment "Miscellaneous helper chips"
endmenu
menu "Miscellaneous helper chips"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
config VIDEO_THS7303 config VIDEO_THS7303
tristate "THS7303/53 Video Amplifier" tristate "THS7303/53 Video Amplifier"
@ -679,16 +697,14 @@ config VIDEO_ST_MIPID02
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called st-mipid02. module will be called st-mipid02.
endmenu endmenu
# #
# All drivers that are related to Media Camera Support should be here # V4L2 I2C drivers that are related with Camera support
# #
if MEDIA_CAMERA_SUPPORT menu "Camera sensor devices"
visible if MEDIA_CAMERA_SUPPORT
comment "Camera sensor devices"
config VIDEO_APTINA_PLL config VIDEO_APTINA_PLL
tristate tristate
@ -1189,7 +1205,10 @@ config VIDEO_S5C73M3
This is a V4L2 sensor driver for Samsung S5C73M3 This is a V4L2 sensor driver for Samsung S5C73M3
8 Mpixel camera. 8 Mpixel camera.
comment "Lens drivers" endmenu
menu "Lens drivers"
visible if MEDIA_CAMERA_SUPPORT
config VIDEO_AD5820 config VIDEO_AD5820
tristate "AD5820 lens voice coil support" tristate "AD5820 lens voice coil support"
@ -1232,8 +1251,10 @@ config VIDEO_DW9807_VCM
capability. This is designed for linear control of capability. This is designed for linear control of
voice coil motors, controlled via I2C serial interface. voice coil motors, controlled via I2C serial interface.
endmenu
comment "Flash devices" menu "Flash devices"
visible if MEDIA_CAMERA_SUPPORT
config VIDEO_ADP1653 config VIDEO_ADP1653
tristate "ADP1653 flash support" tristate "ADP1653 flash support"
@ -1260,7 +1281,6 @@ config VIDEO_LM3646
help help
This is a driver for the lm3646 dual flash controllers. It controls This is a driver for the lm3646 dual flash controllers. It controls
flash, torch LEDs. flash, torch LEDs.
endmenu
endif # MEDIA_CAMERA_SUPPORT
endif # VIDEO_V4L2 endif # VIDEO_V4L2

View File

@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
if VIDEO_V4L2 if VIDEO_V4L2
comment "SPI drivers hidden by 'Autoselect ancillary drivers'" comment "SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'"
depends on MEDIA_HIDE_ANCILLARY_SUBDRV depends on MEDIA_HIDE_ANCILLARY_SUBDRV && SPI
menu "SPI helper chips" menu "SPI helper chips"
visible if !MEDIA_HIDE_ANCILLARY_SUBDRV visible if !MEDIA_HIDE_ANCILLARY_SUBDRV

View File

@ -15,7 +15,7 @@ config MEDIA_TUNER
select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT
comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" comment "Tuner drivers auto-selected by 'Autoselect ancillary drivers'"
depends on MEDIA_HIDE_ANCILLARY_SUBDRV depends on MEDIA_HIDE_ANCILLARY_SUBDRV
depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT