From d1dbde442d5981f2af7e9cae3e08fa0a1d5034ee Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 15 Sep 2016 12:18:14 -0300 Subject: [PATCH] UPSTREAM: [media] media Kconfig: improve the spi integration The SPI driver looked a bit lonely in the config menu, and it didn't support the autoselect. Shift things around a bit so it looks more logical. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab (cherry picked from commit 8283a0929922b331dbd73db26520443136941c48) Change-Id: I8f67aa29dffe477b349b0a503b6db7abfd2357ec Signed-off-by: Tao Huang --- drivers/media/Kconfig | 8 ++++---- drivers/media/i2c/Kconfig | 2 +- drivers/media/spi/Kconfig | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index ee862da35f6e..300cbc3e30d7 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -198,14 +198,14 @@ source "drivers/media/firewire/Kconfig" # Common driver options source "drivers/media/common/Kconfig" -comment "Media ancillary drivers (tuners, sensors, i2c, frontends)" +comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" # -# Ancillary drivers (tuners, i2c, frontends) +# Ancillary drivers (tuners, i2c, spi, frontends) # config MEDIA_SUBDRV_AUTOSELECT - bool "Autoselect ancillary drivers (tuners, sensors, i2c, frontends)" + bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT depends on HAS_IOMEM select I2C @@ -234,9 +234,9 @@ config MEDIA_ATTACH default MODULES source "drivers/media/i2c/Kconfig" +source "drivers/media/spi/Kconfig" source "drivers/media/tuners/Kconfig" source "drivers/media/dvb-frontends/Kconfig" -source "drivers/media/spi/Kconfig" source "drivers/media/video/rk_camsys/Kconfig" source "drivers/media/video/Kconfig" diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 3cafbb6ef2cb..99b93b1d74b2 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -21,7 +21,7 @@ config VIDEO_IR_I2C # Encoder / Decoder module configuration # -menu "Encoders, decoders, sensors and other helper chips" +menu "I2C Encoders, decoders, sensors and other helper chips" visible if !MEDIA_SUBDRV_AUTOSELECT || COMPILE_TEST comment "Audio decoders, processors and mixers" diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index fa47c90f857d..a21f5a39a440 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -1,9 +1,14 @@ if VIDEO_V4L2 +menu "SPI helper chips" + visible if !MEDIA_SUBDRV_AUTOSELECT || COMPILE_TEST + config VIDEO_GS1662 tristate "Gennum Serializers video" depends on SPI && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API ---help--- Enable the GS1662 driver which serializes video streams. +endmenu + endif