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

  WARNING: unmet direct dependencies detected for DRM_AUX_HPD_BRIDGE
    Depends on [n]: HAS_IOMEM [=y] && DRM_BRIDGE [=y] && OF [=n]
    Selected by [m]:
    - TYPEC_QCOM_PMIC [=m] && USB_SUPPORT [=y] && TYPEC [=m] && TYPEC_TCPM [=m] && (ARCH_QCOM || COMPILE_TEST [=y]) && (DRM [=m] || DRM [=m]=n) && DRM_BRIDGE [=y]

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

Fixes: 7d9f1b72b296 ("usb: typec: qcom-pmic-typec: switch to DRM_AUX_HPD_BRIDGE")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231205-drm_aux_bridge-fixes-v1-2-d242a0ae9df4@kernel.org
drivers/usb/typec/tcpm/Kconfig

index 64d5421c69e690b8d1cdc46aebf34be9f1f01ed4..8cdd84ca5d6f76488b00c02a368749e33c2a2b96 100644 (file)
@@ -80,7 +80,7 @@ config TYPEC_QCOM_PMIC
        tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver"
        depends on ARCH_QCOM || COMPILE_TEST
        depends on DRM || DRM=n
-       select DRM_AUX_HPD_BRIDGE if DRM_BRIDGE
+       select DRM_AUX_HPD_BRIDGE if DRM_BRIDGE && OF
        help
          A Type-C port and Power Delivery driver which aggregates two
          discrete pieces of silicon in the PM8150b PMIC block: the