From 3c2b8df02c726f166d7fc4a7260cc4acde489b4a Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Thu, 26 Apr 2018 18:23:49 +0800 Subject: [PATCH] staging: fsl-dpaa2/rtc: support phc_index of ethtool_ts_info This patch is to support phc_index of ethtool_ts_info. Also make the rtc drvier depend on FSL_DPAA2_ETH because this driver is only useful when PTP programs are getting hardware time stamps on the PTP Ethernet packets using the SO_TIMESTAMPING API. Signed-off-by: Yangbo Lu Signed-off-by: Greg Kroah-Hartman --- drivers/staging/fsl-dpaa2/Kconfig | 2 +- drivers/staging/fsl-dpaa2/rtc/rtc.c | 6 ++---- drivers/staging/fsl-dpaa2/rtc/rtc.h | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.h diff --git a/drivers/staging/fsl-dpaa2/Kconfig b/drivers/staging/fsl-dpaa2/Kconfig index ea2d4aa109b0..cad016aee3b5 100644 --- a/drivers/staging/fsl-dpaa2/Kconfig +++ b/drivers/staging/fsl-dpaa2/Kconfig @@ -27,7 +27,7 @@ config FSL_DPAA2_ETHSW config FSL_DPAA2_PTP_CLOCK tristate "Freescale DPAA2 PTP Clock" - depends on FSL_DPAA2 + depends on FSL_DPAA2_ETH select PTP_1588_CLOCK help This driver adds support for using the DPAA2 1588 timer module diff --git a/drivers/staging/fsl-dpaa2/rtc/rtc.c b/drivers/staging/fsl-dpaa2/rtc/rtc.c index 1d6405b8b5c8..0d52cb85441f 100644 --- a/drivers/staging/fsl-dpaa2/rtc/rtc.c +++ b/drivers/staging/fsl-dpaa2/rtc/rtc.c @@ -9,14 +9,12 @@ #include #include -#include "dprtc.h" -#include "dprtc-cmd.h" +#include "rtc.h" struct ptp_dpaa2_priv { struct fsl_mc_device *rtc_mc_dev; struct ptp_clock *clock; struct ptp_clock_info caps; - int phc_index; u32 freq_comp; }; @@ -173,7 +171,7 @@ static int rtc_probe(struct fsl_mc_device *mc_dev) goto err_close; } - ptp_dpaa2->phc_index = ptp_clock_index(ptp_dpaa2->clock); + dpaa2_phc_index = ptp_clock_index(ptp_dpaa2->clock); dev_set_drvdata(dev, ptp_dpaa2); diff --git a/drivers/staging/fsl-dpaa2/rtc/rtc.h b/drivers/staging/fsl-dpaa2/rtc/rtc.h new file mode 100644 index 000000000000..ff2e177395d4 --- /dev/null +++ b/drivers/staging/fsl-dpaa2/rtc/rtc.h @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2018 NXP + */ + +#ifndef __RTC_H +#define __RTC_H + +#include "dprtc.h" +#include "dprtc-cmd.h" + +extern int dpaa2_phc_index; + +#endif -- 2.30.2