drm/bridge: Put Kconfig entries in a separate menu

Put the Kconfig entries for bridge drivers into a separate menu so that
they are automatically grouped and don't clutter up the top-level menu.

While at it, move the bridge menu towards the end of the top-level menu
where the panel menu is already located.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index c46ca311d8c31d27d2617eb709c1c0776c8568af..beaedd78c4b91b2a99d387940b52775d8fa5c73b 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -79,8 +79,6 @@ config DRM_KMS_CMA_HELPER
 
 source "drivers/gpu/drm/i2c/Kconfig"
 
-source "drivers/gpu/drm/bridge/Kconfig"
-
 config DRM_TDFX
        tristate "3dfx Banshee/Voodoo3+"
        depends on DRM && PCI
@@ -235,6 +233,8 @@ source "drivers/gpu/drm/tegra/Kconfig"
 
 source "drivers/gpu/drm/panel/Kconfig"
 
+source "drivers/gpu/drm/bridge/Kconfig"
+
 source "drivers/gpu/drm/sti/Kconfig"
 
 source "drivers/gpu/drm/amd/amdkfd/Kconfig"

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index adac3250684b9d534bd3df4c6b7b04eb5c0f0ae8..2de52a53a80335a859547956e904851b9249c00c 100644 (file)
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -1,11 +1,18 @@
+config DRM_BRIDGE
+       def_bool y
+       depends on DRM
+       help
+         Bridge registration and lookup framework.
+
+menu "Display Interface Bridges"
+       depends on DRM && DRM_BRIDGE
+
 config DRM_DW_HDMI
        tristate
-       depends on DRM
        select DRM_KMS_HELPER
 
 config DRM_NXP_PTN3460
        tristate "NXP PTN3460 DP/LVDS bridge"
-       depends on DRM
        depends on OF
        select DRM_KMS_HELPER
        select DRM_PANEL
@@ -14,7 +21,6 @@ config DRM_NXP_PTN3460
 
 config DRM_PARADE_PS8622
        tristate "Parade eDP/LVDS bridge"
-       depends on DRM
        depends on OF
        select DRM_PANEL
        select DRM_KMS_HELPER
@@ -22,3 +28,5 @@ config DRM_PARADE_PS8622
        select BACKLIGHT_CLASS_DEVICE
        ---help---
          Parade eDP-LVDS bridge chip driver.
+
+endmenu