redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
(cherry picked from commit 88573b6472bf6d91c69f024b0f2a4e85533f6c0e)
5.4-rM2-2.2.x-imx-squashed
Yangbo Lu 2019-12-05 15:03:05 +08:00 committed by Jason Liu
parent b660c46a24
commit 02b7e8038d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ptp/Kconfig
View File

@ -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