drm/sun4i: Update Kconfig defaults and descriptions

Allwinner display drivers are split roughly into two generations. The
first generation was found on early 32-bit ARM SoCs and contains DE1.0
and a custom HDMI controller. Clarify that these options only apply to
a specific list of SoCs, and limit selecting them to 32-bit ARM, to
avoid confusion.

The second generation, found in A83T and newer SoCs (both 32-bit and
64-bit), contains a DE2.0 and a DesignWare HDMI controller. Since this
is the most widely-used generation, enable it by default. The previous
default condition (MACH_SUN8I) was limited to 32-bit SoCs. Also enable
the DSI controller by default, which is found on 64-bit SoCs as well.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220702193250.52959-1-samuel@sholland.org

diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index 3a43c436c74a78d08d526146f65c9b39aff6f68c..1c2f8909f3cd516b30d053d07148eaac0908d848 100644 (file)
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -16,23 +16,25 @@ config DRM_SUN4I
 if DRM_SUN4I
 
 config DRM_SUN4I_HDMI
-       tristate "Allwinner A10 HDMI Controller Support"
+       tristate "Allwinner A10/A10s/A20/A31 HDMI Controller Support"
+       depends on ARM || COMPILE_TEST
        default DRM_SUN4I
        help
-         Choose this option if you have an Allwinner SoC with an HDMI
-         controller.
+         Choose this option if you have an Allwinner A10/A10s/A20/A31
+         SoC with an HDMI controller.
 
 config DRM_SUN4I_HDMI_CEC
-       bool "Allwinner A10 HDMI CEC Support"
+       bool "Allwinner A10/A10s/A20/A31 HDMI CEC Support"
        depends on DRM_SUN4I_HDMI
        select CEC_CORE
        select CEC_PIN
        help
-         Choose this option if you have an Allwinner SoC with an HDMI
-         controller and want to use CEC.
+         Choose this option if you have an Allwinner A10/A10s/A20/A31
+         SoC with an HDMI controller and want to use CEC.
 
 config DRM_SUN4I_BACKEND
        tristate "Support for Allwinner A10 Display Engine Backend"
+       depends on ARM || COMPILE_TEST
        default DRM_SUN4I
        help
          Choose this option if you have an Allwinner SoC with the
@@ -41,8 +43,8 @@ config DRM_SUN4I_BACKEND
          selected the module will be called sun4i-backend.
 
 config DRM_SUN6I_DSI
-       tristate "Allwinner A31 MIPI-DSI Controller Support"
-       default MACH_SUN8I
+       tristate "Allwinner A31/A64 MIPI-DSI Controller Support"
+       default DRM_SUN4I
        select CRC_CCITT
        select DRM_MIPI_DSI
        select RESET_CONTROLLER
@@ -55,15 +57,17 @@ config DRM_SUN6I_DSI
 config DRM_SUN8I_DW_HDMI
        tristate "Support for Allwinner version of DesignWare HDMI"
        depends on DRM_SUN4I
+       default DRM_SUN4I
        select DRM_DW_HDMI
        help
          Choose this option if you have an Allwinner SoC with the
-         DesignWare HDMI controller with custom HDMI PHY. If M is
+         DesignWare HDMI controller. SoCs that support HDMI and
+         have a Display Engine 2.0 contain this controller. If M is
          selected the module will be called sun8i_dw_hdmi.
 
 config DRM_SUN8I_MIXER
        tristate "Support for Allwinner Display Engine 2.0 Mixer"
-       default MACH_SUN8I
+       default DRM_SUN4I
        help
          Choose this option if you have an Allwinner SoC with the
          Allwinner Display Engine 2.0, which has a mixer to do some
@@ -75,6 +79,6 @@ config DRM_SUN8I_TCON_TOP
        default DRM_SUN4I if DRM_SUN8I_MIXER!=n
        help
          TCON TOP is responsible for configuring display pipeline for
-         HTMI, TVE and LCD.
+         HDMI, TVE and LCD.
 
 endif