summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2016-09-15 12:18:14 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-09-19 14:37:05 -0300
commit8283a0929922b331dbd73db26520443136941c48 (patch)
tree1263bb26bb97401a2dd73e0fd9222e1bc6d06a83 /drivers/media
parent7aae6e2df127f9f7a96c21e21a277dd7ff063e6a (diff)
downloadblackbird-op-linux-8283a0929922b331dbd73db26520443136941c48.tar.gz
blackbird-op-linux-8283a0929922b331dbd73db26520443136941c48.zip
[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 <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/Kconfig8
-rw-r--r--drivers/media/i2c/Kconfig2
-rw-r--r--drivers/media/spi/Kconfig5
3 files changed, 10 insertions, 5 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 6600e59eb3c0..7b8540291217 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -180,14 +180,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
@@ -216,8 +216,8 @@ 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"
endif # MEDIA_SUPPORT
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 7f929336c409..2669b4bad910 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
OpenPOWER on IntegriCloud