diff options
author | Rajesh Hosakote <rhosakote@nvidia.com> | 2016-10-17 10:48:39 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-11-16 14:04:23 -0500 |
commit | ddbed75fbebb66fe5ae534c9284986197f96c247 (patch) | |
tree | 13f858545129eb7176e70fd409f68cabfe20f82e /drivers/net | |
parent | 0697a2d2826a66c86dae9ce0b280dad63e48f681 (diff) |
PTP update notification framework
Bug 1823033
Change-Id: I345e707455e5e64ad316143e3cea085b20588110
Signed-off-by: Rajesh Hosakote <rhosakote@nvidia.com>
Reviewed-on: http://git-master/r/1237704
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Dmitry Pervushin <dpervushin@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sumeet Gupta <sumeetg@nvidia.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/nvidia/eqos/drv.c | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/nvidia/eqos/ptp.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/nvidia/eqos/yheader.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/ethernet/nvidia/eqos/drv.c b/drivers/net/ethernet/nvidia/eqos/drv.c index 7163708a5..1ee3ca2fa 100644 --- a/drivers/net/ethernet/nvidia/eqos/drv.c +++ b/drivers/net/ethernet/nvidia/eqos/drv.c | |||
@@ -5789,6 +5789,11 @@ void eqos_stop_dev(struct eqos_prv_data *pdata) | |||
5789 | 5789 | ||
5790 | DBGPR("-->%s()\n", __func__); | 5790 | DBGPR("-->%s()\n", __func__); |
5791 | 5791 | ||
5792 | #ifdef CONFIG_TEGRA_PTP_NOTIFIER | ||
5793 | /* Unregister broadcasting MAC timestamp to clients */ | ||
5794 | tegra_unregister_hwtime_source(); | ||
5795 | #endif | ||
5796 | |||
5792 | /* turn off sources of data into dev */ | 5797 | /* turn off sources of data into dev */ |
5793 | netif_tx_disable(pdata->dev); | 5798 | netif_tx_disable(pdata->dev); |
5794 | 5799 | ||
diff --git a/drivers/net/ethernet/nvidia/eqos/ptp.c b/drivers/net/ethernet/nvidia/eqos/ptp.c index 29fc737af..4f83666d8 100644 --- a/drivers/net/ethernet/nvidia/eqos/ptp.c +++ b/drivers/net/ethernet/nvidia/eqos/ptp.c | |||
@@ -137,6 +137,9 @@ static int eqos_adjust_time(struct ptp_clock_info *ptp, s64 delta) | |||
137 | 137 | ||
138 | spin_unlock(&pdata->ptp_lock); | 138 | spin_unlock(&pdata->ptp_lock); |
139 | 139 | ||
140 | /* Register broadcasting MAC timestamp to clients */ | ||
141 | tegra_register_hwtime_source(hw_if->get_systime); | ||
142 | |||
140 | DBGPR_PTP("<--eqos_adjust_time\n"); | 143 | DBGPR_PTP("<--eqos_adjust_time\n"); |
141 | 144 | ||
142 | return 0; | 145 | return 0; |
diff --git a/drivers/net/ethernet/nvidia/eqos/yheader.h b/drivers/net/ethernet/nvidia/eqos/yheader.h index db1faf6c8..030d715de 100644 --- a/drivers/net/ethernet/nvidia/eqos/yheader.h +++ b/drivers/net/ethernet/nvidia/eqos/yheader.h | |||
@@ -91,6 +91,7 @@ | |||
91 | #include <linux/phy.h> | 91 | #include <linux/phy.h> |
92 | #include <linux/mdio.h> | 92 | #include <linux/mdio.h> |
93 | #include <linux/thermal.h> | 93 | #include <linux/thermal.h> |
94 | #include <linux/platform/tegra/ptp-notifier.h> | ||
94 | 95 | ||
95 | #define L32(data) ((data)&0xFFFFFFFF) | 96 | #define L32(data) ((data)&0xFFFFFFFF) |
96 | #define H32(data) (((data)&0xFFFFFFFF00000000)>>32) | 97 | #define H32(data) (((data)&0xFFFFFFFF00000000)>>32) |