media: platform/*/Kconfig: make manufacturer menus more uniform

Do some adjustments at the per-vendor Kconfig, adding a comment at
the beginning in order to identify the manufacturer, and adjust
a few entries to make them look more uniform.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> # For sunxi
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/platform/allegro-dvt/Kconfig
index dd528e9..253d577 100644 (file)
--- a/drivers/media/platform/allegro-dvt/Kconfig
+++ b/drivers/media/platform/allegro-dvt/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Allegro DVT media platform drivers"
+
 config VIDEO_ALLEGRO_DVT
        tristate "Allegro DVT Video IP Core"
        depends on V4L_MEM2MEM_DRIVERS

diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig
index c67e00d..5014957 100644 (file)
--- a/drivers/media/platform/amlogic/Kconfig
+++ b/drivers/media/platform/amlogic/Kconfig
@@ -1,2 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Amlogic media platform drivers"
+
 source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"

diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig
index 5025e89..f46dfdf 100644 (file)
--- a/drivers/media/platform/aspeed/Kconfig
+++ b/drivers/media/platform/aspeed/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Aspeed media platform drivers"
+
 config VIDEO_ASPEED
        tristate "Aspeed AST2400 and AST2500 Video Engine driver"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index 5122290..eab5bef 100644 (file)
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Atmel media platform drivers"
+
 config VIDEO_ATMEL_ISC
        tristate "ATMEL Image Sensor Controller (ISC) support"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig
index 79a7e9f..f7904a2 100644 (file)
--- a/drivers/media/platform/cadence/Kconfig
+++ b/drivers/media/platform/cadence/Kconfig
@@ -1,15 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
-config VIDEO_CADENCE
-       bool "Cadence Video Devices"
-       depends on V4L_PLATFORM_DRIVERS
-       help
-         If you have a media device designed by Cadence, say Y.
-
-         Note that this option doesn't include new drivers in the kernel:
-         saying N will just cause Kconfig to skip all the questions about
-         Cadence media devices.
 
-if VIDEO_CADENCE
+comment "Cadence media platform drivers"
 
 config VIDEO_CADENCE_CSI2RX
        tristate "Cadence MIPI-CSI2 RX Controller"
@@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX
 
          To compile this driver as a module, choose M here: the module will be
          called cdns-csi2tx.
-
-endif

diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig
index ae495fd..5f8bceb 100644 (file)
--- a/drivers/media/platform/chips-media/Kconfig
+++ b/drivers/media/platform/chips-media/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Chips&Media media platform drivers"
+
 config VIDEO_CODA
        tristate "Chips&Media Coda multi-standard codec IP"
        depends on V4L_MEM2MEM_DRIVERS

diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig
index aeda421..a80640c 100644 (file)
--- a/drivers/media/platform/intel/Kconfig
+++ b/drivers/media/platform/intel/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Intel media platform drivers"
+
 config VIDEO_PXA27x
        tristate "PXA27x Quick Capture Interface driver"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig
index bfe655b..5fcaea2 100644 (file)
--- a/drivers/media/platform/marvell/Kconfig
+++ b/drivers/media/platform/marvell/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Marvell media platform drivers"
+
 config VIDEO_CAFE_CCIC
        tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig
index 6d74839..b2cb7a1 100644 (file)
--- a/drivers/media/platform/mediatek/Kconfig
+++ b/drivers/media/platform/mediatek/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Mediatek media platform drivers"
+
 source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
 source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
 source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"

diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig
index 1162e27..b211b46 100644 (file)
--- a/drivers/media/platform/nvidia/Kconfig
+++ b/drivers/media/platform/nvidia/Kconfig
@@ -1,2 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "NVidia media platform drivers"
+
 source "drivers/media/platform/nvidia/tegra-vde/Kconfig"

diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
index df52d32..3f5b8ed 100644 (file)
--- a/drivers/media/platform/nxp/Kconfig
+++ b/drivers/media/platform/nxp/Kconfig
@@ -2,20 +2,10 @@
 
 # V4L drivers
 
-menuconfig VIDEO_IMX
-       bool "V4L2 capture drivers for NXP i.MX devices"
-       depends on V4L_PLATFORM_DRIVERS
-       depends on ARCH_MXC || COMPILE_TEST
-       depends on VIDEO_DEV && VIDEO_V4L2
-       help
-         Say yes here to enable support for capture drivers on i.MX SoCs.
-         Support for the single SoC features are selectable in the sub-menu
-         options.
-
-if VIDEO_IMX
+comment "NXP media platform drivers"
 
 config VIDEO_IMX_MIPI_CSIS
-       tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
+       tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
        select MEDIA_CONTROLLER
        select V4L2_FWNODE
        select VIDEO_V4L2_SUBDEV_API
@@ -24,10 +14,8 @@ config VIDEO_IMX_MIPI_CSIS
          Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
          v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
 
-endif # VIDEO_IMX
-
 config VIDEO_VIU
-       tristate "Freescale/NXP VIU Video Driver"
+       tristate "NXP VIU Video Driver"
        depends on V4L_PLATFORM_DRIVERS
        depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
        select VIDEOBUF_DMA_CONTIG
@@ -42,7 +30,7 @@ config VIDEO_VIU
 # mem2mem drivers
 
 config VIDEO_IMX_PXP
-       tristate "i.MX Pixel Pipeline (PXP)"
+       tristate "NXP i.MX Pixel Pipeline (PXP)"
        depends on V4L_MEM2MEM_DRIVERS
        depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
        select VIDEOBUF2_DMA_CONTIG
@@ -52,7 +40,7 @@ config VIDEO_IMX_PXP
          color space conversion, and rotation.
 
 config VIDEO_MX2_EMMAPRP
-       tristate "Freescale/NXP MX2 eMMa-PrP support"
+       tristate "NXP MX2 eMMa-PrP support"
        depends on V4L_MEM2MEM_DRIVERS
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on SOC_IMX27 || COMPILE_TEST

diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig
index 9f6c91c..cc5799b 100644 (file)
--- a/drivers/media/platform/qcom/Kconfig
+++ b/drivers/media/platform/qcom/Kconfig
@@ -1,4 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+comment "Qualcomm media platform drivers"
+
 source "drivers/media/platform/qcom/camss/Kconfig"
 source "drivers/media/platform/qcom/venus/Kconfig"

diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig
index 3f35f1b..bc174a0 100644 (file)
--- a/drivers/media/platform/renesas/Kconfig
+++ b/drivers/media/platform/renesas/Kconfig
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+comment "Renesas media platform drivers"
+
 # V4L drivers
 
 config VIDEO_RCAR_ISP

diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig
index 2f97c0e..b41d396 100644 (file)
--- a/drivers/media/platform/rockchip/Kconfig
+++ b/drivers/media/platform/rockchip/Kconfig
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Rockchip media platform drivers"
+
 source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/rockchip/rkisp1/Kconfig"

diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig
index 94f30c1..0e34c5f 100644 (file)
--- a/drivers/media/platform/samsung/Kconfig
+++ b/drivers/media/platform/samsung/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "Samsung media platform drivers"
+
 source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
 source "drivers/media/platform/samsung/exynos4-is/Kconfig"
 source "drivers/media/platform/samsung/s3c-camif/Kconfig"

diff --git a/drivers/media/platform/st/Kconfig b/drivers/media/platform/st/Kconfig
index 592c7b9..b29c258 100644 (file)
--- a/drivers/media/platform/st/Kconfig
+++ b/drivers/media/platform/st/Kconfig
@@ -1,4 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+comment "STMicroelectronics media platform drivers"
+
 source "drivers/media/platform/st/sti/Kconfig"
 source "drivers/media/platform/st/stm32/Kconfig"

diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig
index a100322..46b7b9b 100644 (file)
--- a/drivers/media/platform/sunxi/Kconfig
+++ b/drivers/media/platform/sunxi/Kconfig
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
+comment "Sunxi media platform drivers"
+
 source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
 source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"

diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig
index 1dcf789..9080960 100644 (file)
--- a/drivers/media/platform/via/Kconfig
+++ b/drivers/media/platform/via/Kconfig
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+comment "VIA media platform drivers"
+
 config VIDEO_VIA_CAMERA
        tristate "VIAFB camera controller support"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig
index a9531d5..6b38ec7 100644 (file)
--- a/drivers/media/platform/xilinx/Kconfig
+++ b/drivers/media/platform/xilinx/Kconfig
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
+comment "Xilinx media platform drivers"
+
 config VIDEO_XILINX
        tristate "Xilinx Video IP (EXPERIMENTAL)"
        depends on V4L_PLATFORM_DRIVERS
@@ -11,9 +13,8 @@ config VIDEO_XILINX
        help
          Driver for Xilinx Video IP Pipelines
 
-if VIDEO_XILINX
-
 config VIDEO_XILINX_CSI2RXSS
+       depends on VIDEO_XILINX
        tristate "Xilinx CSI-2 Rx Subsystem"
        help
          Driver for Xilinx MIPI CSI-2 Rx Subsystem. This is a V4L sub-device
@@ -32,5 +33,3 @@ config VIDEO_XILINX_VTC
        depends on VIDEO_XILINX
        help
           Driver for the Xilinx Video Timing Controller
-
-endif #VIDEO_XILINX