From 9dad88f61f7400939a4076b641b6cd80904358cf Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Thu, 5 Dec 2019 15:03:05 +0800 Subject: [PATCH] LF-183 ptp: depend on !FSL_SDK_FMAN_RTC_API for ptp_qoriq When kernel uses SDK version DPAA/FMan drivers, user could select to use ptp_qoriq driver, or FMan RTC driver to manage 1588 timer. But neither should not be enabled together. This patch is to add dependency !FSL_SDK_FMAN_RTC_API for ptp_qoriq driver. Signed-off-by: Yangbo Lu --- drivers/ptp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -44,7 +44,7 @@ config PTP_1588_CLOCK_DTE config PTP_1588_CLOCK_QORIQ tristate "Freescale QorIQ 1588 timer as PTP clock" - depends on GIANFAR || FSL_DPAA_ETH || FSL_SDK_DPAA_ETH || FSL_DPAA2_ETH || FSL_ENETC || FSL_ENETC_VF || COMPILE_TEST + depends on !FSL_SDK_FMAN_RTC_API && (GIANFAR || FSL_DPAA_ETH || FSL_SDK_DPAA_ETH || FSL_DPAA2_ETH || FSL_ENETC || FSL_ENETC_VF) || COMPILE_TEST depends on PTP_1588_CLOCK default y help