[media] media: davinci: kconfig: fix incorrect selects

drivers/media/platform/davinci/Kconfig uses selects where
it should be using 'depends on'. This results in warnings of
the following sort when doing randconfig builds.
warning: (VIDEO_DM6446_CCDC && VIDEO_DM355_CCDC && VIDEO_ISIF && VIDEO_DAVINCI_VPBE_DISPLAY) selects VIDEO_VPSS_SYSTEM which has unmet direct dependencies (MEDIA_SUPPORT && V4L_PLATFORM_DRIVERS && ARCH_DAVINCI)
The VPIF kconfigs had a strange 'select' and 'depends on' cross
linkage which have been fixed as well by removing unneeded
VIDEO_DAVINCI_VPIF config symbol.
Similarly, remove the unnecessary VIDEO_VPSS_SYSTEM and
VIDEO_VPFE_CAPTURE. They don't select any independent functionality
and were being used to manage code dependencies which can
be handled using makefile.
Selecting video modules is now dependent on all ARCH_DAVINCI
instead of specific EVMs and SoCs earlier. This should help build
coverage. Remove unnecessary 'default y' for some config symbols.
While at it, fix the Kconfig help text to make it more readable
and fix names of modules created during module build.
Rename VIDEO_ISIF to VIDEO_DM365_ISIF as per suggestion from
Prabhakar.
This patch has only been build tested; I have tried to not break
any existing assumptions. I do not have the setup to test video,
so any test reports welcome.

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
[prabhakar.csengg@gmail.com: Fixed typo]
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 41 insertions, 79 deletions

diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index ccfde4eb626a..afb3aec1320e 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -1,79 +1,47 @@
 config VIDEO_DAVINCI_VPIF_DISPLAY
-        tristate "DM646x/DA850/OMAPL138 EVM Video Display"
-        depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
+        tristate "TI DaVinci VPIF V4L2-Display driver"
+        depends on VIDEO_DEV && ARCH_DAVINCI
         select VIDEOBUF2_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
         select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT
         select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT
         help
           Enables Davinci VPIF module used for display devices.
-          This module is common for following DM6467/DA850/OMAPL138
-          based display devices.
+          This module is used for display on TI DM6467/DA850/OMAPL138
+          SoCs.
 
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_display.
+          To compile this driver as a module, choose M here. There will
+          be two modules called vpif.ko and vpif_display.ko
 
 config VIDEO_DAVINCI_VPIF_CAPTURE
-        tristate "DM646x/DA850/OMAPL138 EVM Video Capture"
-        depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
+        tristate "TI DaVinci VPIF video capture driver"
+        depends on VIDEO_DEV && ARCH_DAVINCI
         select VIDEOBUF2_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
         help
-          Enables Davinci VPIF module used for captur devices.
-          This module is common for following DM6467/DA850/OMAPL138
-          based capture devices.
+          Enables Davinci VPIF module used for capture devices.
+          This module is used for capture on TI DM6467/DA850/OMAPL138
+          SoCs.
 
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_capture.
+          To compile this driver as a module, choose M here. There will
+          be two modules called vpif.ko and vpif_capture.ko
 
-config VIDEO_DAVINCI_VPIF
-        tristate "DaVinci VPIF Driver"
-        depends on VIDEO_DAVINCI_VPIF_DISPLAY || VIDEO_DAVINCI_VPIF_CAPTURE
-        help
-          Support for DaVinci VPIF Driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpif.
-
-config VIDEO_VPSS_SYSTEM
-        tristate "VPSS System module driver"
-        depends on ARCH_DAVINCI
-        help
-          Support for vpss system module for video driver
-
-config VIDEO_VPFE_CAPTURE
-        tristate "VPFE Video Capture Driver"
+config VIDEO_DM6446_CCDC
+        tristate "TI DM6446 CCDC video capture driver"
         depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3)
-        depends on I2C
         select VIDEOBUF_DMA_CONTIG
         help
-          Support for DMx/AMx VPFE based frame grabber. This is the
-          common V4L2 module for following DMx/AMx SoCs from Texas
-          Instruments:- DM6446, DM365, DM355 & AM3517/05.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpfe-capture.
-
-config VIDEO_DM6446_CCDC
-        tristate "DM6446 CCDC HW module"
-        depends on VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
            Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
            with decoder modules such as TVP5146 over BT656 or
            sensor module such as MT9T001 over a raw interface. This
            module configures the interface and CCDC/ISIF to do
            video frame capture from slave decoders.
 
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+           To compile this driver as a module, choose M here. There will
+           be three modules called vpfe_capture.ko, vpss.ko and dm644x_ccdc.ko
 
 config VIDEO_DM355_CCDC
-        tristate "DM355 CCDC HW module"
-        depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
+        tristate "TI DM355 CCDC video capture driver"
+        depends on VIDEO_V4L2 && ARCH_DAVINCI
+        select VIDEOBUF_DMA_CONTIG
         help
            Enables DM355 CCD hw module. DM355 CCDC hw interfaces
            with decoder modules such as TVP5146 over BT656 or
@@ -81,31 +49,30 @@ config VIDEO_DM355_CCDC
            module configures the interface and CCDC/ISIF to do
            video frame capture from a slave decoders
 
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+           To compile this driver as a module, choose M here. There will
+           be three modules called vpfe_capture.ko, vpss.ko and dm355_ccdc.ko
 
-config VIDEO_ISIF
-        tristate "ISIF HW module"
-        depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
+config VIDEO_DM365_ISIF
+        tristate "TI DM365 ISIF video capture driver"
+        depends on VIDEO_V4L2 && ARCH_DAVINCI
+        select VIDEOBUF_DMA_CONTIG
         help
            Enables ISIF hw module. This is the hardware module for
-           configuring ISIF in VPFE to capture Raw Bayer RGB data  from
+           configuring ISIF in VPFE to capture Raw Bayer RGB data from
            a image sensor or YUV data from a YUV source.
 
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+           To compile this driver as a module, choose M here. There will
+           be three modules called vpfe_capture.ko, vpss.ko and isif.ko
 
 config VIDEO_DAVINCI_VPBE_DISPLAY
-        tristate "DM644X/DM365/DM355 VPBE HW module"
-        depends on ARCH_DAVINCI_DM644x || ARCH_DAVINCI_DM355 || ARCH_DAVINCI_DM365
-        select VIDEO_VPSS_SYSTEM
+        tristate "TI DaVinci VPBE V4L2-Display driver"
+        depends on ARCH_DAVINCI
         select VIDEOBUF2_DMA_CONTIG
         help
             Enables Davinci VPBE module used for display devices.
-            This module is common for following DM644x/DM365/DM355
+            This module is used for display on TI DM644x/DM365/DM355
             based display devices.
 
-            To compile this driver as a module, choose M here: the
-            module will be called vpbe.
+            To compile this driver as a module, choose M here. There will
+            be five modules created called vpss.ko, vpbe.ko, vpbe_osd.ko,
+            vpbe_venc.ko and vpbe_display.ko
diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platform/davinci/Makefile
index f40f5219ca50..d74d9eeb0e9e 100644
--- a/drivers/media/platform/davinci/Makefile
+++ b/drivers/media/platform/davinci/Makefile
@@ -2,19 +2,14 @@
 # Makefile for the davinci video device drivers.
 #
 
-# VPIF
-obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o
-
 #VPIF Display driver
-obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif_display.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o
 #VPIF Capture driver
-obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif_capture.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o
 
 # Capture: DM6446 and DM355
-obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o
-obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o
-obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o
-obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o
-obj-$(CONFIG_VIDEO_ISIF) += isif.o
-obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpbe.o vpbe_osd.o \
+obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o vpss.o dm644x_ccdc.o
+obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o vpss.o dm355_ccdc.o
+obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o vpss.o isif.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o vpbe.o vpbe_osd.o \
         vpbe_venc.o vpbe_display.o