You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 9dad88f61f7400939a4076b641b6cd80904358cf Mon Sep 17 00:00:00 2001
|
|
From: Yangbo Lu <yangbo.lu@nxp.com>
|
|
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 <yangbo.lu@nxp.com>
|
|
---
|
|
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
|