]> git.itanic.dy.fi Git - linux-stable/commitdiff
usb: typec: nb7vpq904m: Only select DRM_AUX_BRIDGE with OF
authorNathan Chancellor <nathan@kernel.org>
Tue, 5 Dec 2023 20:13:34 +0000 (13:13 -0700)
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Thu, 7 Dec 2023 10:28:02 +0000 (12:28 +0200)
CONFIG_DRM_AUX_BRIDGE depends on CONFIG_OF but that dependency is not
included when CONFIG_TYPEC_MUX_NB7VPQ904M selects it, resulting in a
Kconfig warning when CONFIG_OF is disabled:

  WARNING: unmet direct dependencies detected for DRM_AUX_BRIDGE
    Depends on [n]: HAS_IOMEM [=y] && DRM_BRIDGE [=y] && OF [=n]
    Selected by [y]:
    - TYPEC_MUX_NB7VPQ904M [=y] && USB_SUPPORT [=y] && TYPEC [=y] && I2C [=y] && (DRM [=y] || DRM [=y]=n) && DRM_BRIDGE [=y]

Only select CONFIG_DRM_AUX_BRIDGE with both CONFIG_DRM_BRIDGE and
CONFIG_OF to clear up the warning.

Fixes: c5d296bad640 ("usb: typec: nb7vpq904m: switch to DRM_AUX_BRIDGE")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231205-drm_aux_bridge-fixes-v1-1-d242a0ae9df4@kernel.org
drivers/usb/typec/mux/Kconfig

index 5120942f309d4d3224a6094d06f219401de77e01..38416fb0cc3ca94bc5b4ce50a3642e83a1607854 100644 (file)
@@ -40,7 +40,7 @@ config TYPEC_MUX_NB7VPQ904M
        tristate "On Semiconductor NB7VPQ904M Type-C redriver driver"
        depends on I2C
        depends on DRM || DRM=n
-       select DRM_AUX_BRIDGE if DRM_BRIDGE
+       select DRM_AUX_BRIDGE if DRM_BRIDGE && OF
        select REGMAP_I2C
        help
          Say Y or M if your system has a On Semiconductor NB7VPQ904M Type-C