diff options
-rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/fec_ptp.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ptp.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ptp.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_clock.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/cpts.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 1 | ||||
-rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 1 | ||||
-rw-r--r-- | drivers/ptp/ptp_pch.c | 1 |
12 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c index c0f68dcd1dc1..83a8cdbcd936 100644 --- a/drivers/net/ethernet/adi/bfin_mac.c +++ b/drivers/net/ethernet/adi/bfin_mac.c | |||
@@ -1040,6 +1040,7 @@ static struct ptp_clock_info bfin_ptp_caps = { | |||
1040 | .n_alarm = 0, | 1040 | .n_alarm = 0, |
1041 | .n_ext_ts = 0, | 1041 | .n_ext_ts = 0, |
1042 | .n_per_out = 0, | 1042 | .n_per_out = 0, |
1043 | .n_pins = 0, | ||
1043 | .pps = 0, | 1044 | .pps = 0, |
1044 | .adjfreq = bfin_ptp_adjfreq, | 1045 | .adjfreq = bfin_ptp_adjfreq, |
1045 | .adjtime = bfin_ptp_adjtime, | 1046 | .adjtime = bfin_ptp_adjtime, |
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index bbbd2a4bc161..37422af9ef13 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -6322,6 +6322,7 @@ static const struct ptp_clock_info tg3_ptp_caps = { | |||
6322 | .n_alarm = 0, | 6322 | .n_alarm = 0, |
6323 | .n_ext_ts = 0, | 6323 | .n_ext_ts = 0, |
6324 | .n_per_out = 1, | 6324 | .n_per_out = 1, |
6325 | .n_pins = 0, | ||
6325 | .pps = 0, | 6326 | .pps = 0, |
6326 | .adjfreq = tg3_ptp_adjfreq, | 6327 | .adjfreq = tg3_ptp_adjfreq, |
6327 | .adjtime = tg3_ptp_adjtime, | 6328 | .adjtime = tg3_ptp_adjtime, |
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 89ccb5b08708..82386b29914a 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c | |||
@@ -372,6 +372,7 @@ void fec_ptp_init(struct platform_device *pdev) | |||
372 | fep->ptp_caps.n_alarm = 0; | 372 | fep->ptp_caps.n_alarm = 0; |
373 | fep->ptp_caps.n_ext_ts = 0; | 373 | fep->ptp_caps.n_ext_ts = 0; |
374 | fep->ptp_caps.n_per_out = 0; | 374 | fep->ptp_caps.n_per_out = 0; |
375 | fep->ptp_caps.n_pins = 0; | ||
375 | fep->ptp_caps.pps = 0; | 376 | fep->ptp_caps.pps = 0; |
376 | fep->ptp_caps.adjfreq = fec_ptp_adjfreq; | 377 | fep->ptp_caps.adjfreq = fec_ptp_adjfreq; |
377 | fep->ptp_caps.adjtime = fec_ptp_adjtime; | 378 | fep->ptp_caps.adjtime = fec_ptp_adjtime; |
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c index abc28da27042..bb568006f37d 100644 --- a/drivers/net/ethernet/freescale/gianfar_ptp.c +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c | |||
@@ -414,6 +414,7 @@ static struct ptp_clock_info ptp_gianfar_caps = { | |||
414 | .n_alarm = 0, | 414 | .n_alarm = 0, |
415 | .n_ext_ts = N_EXT_TS, | 415 | .n_ext_ts = N_EXT_TS, |
416 | .n_per_out = 0, | 416 | .n_per_out = 0, |
417 | .n_pins = 0, | ||
417 | .pps = 1, | 418 | .pps = 1, |
418 | .adjfreq = ptp_gianfar_adjfreq, | 419 | .adjfreq = ptp_gianfar_adjfreq, |
419 | .adjtime = ptp_gianfar_adjtime, | 420 | .adjtime = ptp_gianfar_adjtime, |
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c index 3bd79a3ff829..fb1a914a3ad4 100644 --- a/drivers/net/ethernet/intel/e1000e/ptp.c +++ b/drivers/net/ethernet/intel/e1000e/ptp.c | |||
@@ -189,6 +189,7 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = { | |||
189 | .n_alarm = 0, | 189 | .n_alarm = 0, |
190 | .n_ext_ts = 0, | 190 | .n_ext_ts = 0, |
191 | .n_per_out = 0, | 191 | .n_per_out = 0, |
192 | .n_pins = 0, | ||
192 | .pps = 0, | 193 | .pps = 0, |
193 | .adjfreq = e1000e_phc_adjfreq, | 194 | .adjfreq = e1000e_phc_adjfreq, |
194 | .adjtime = e1000e_phc_adjtime, | 195 | .adjtime = e1000e_phc_adjtime, |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c index abaf6bb22416..57dda95b67d8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c | |||
@@ -276,6 +276,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = { | |||
276 | .n_alarm = 0, | 276 | .n_alarm = 0, |
277 | .n_ext_ts = 0, | 277 | .n_ext_ts = 0, |
278 | .n_per_out = 0, | 278 | .n_per_out = 0, |
279 | .n_pins = 0, | ||
279 | .pps = 0, | 280 | .pps = 0, |
280 | .adjfreq = mlx4_en_phc_adjfreq, | 281 | .adjfreq = mlx4_en_phc_adjfreq, |
281 | .adjtime = mlx4_en_phc_adjtime, | 282 | .adjtime = mlx4_en_phc_adjtime, |
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 722344fcd155..6b861e3de4b0 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c | |||
@@ -1194,6 +1194,7 @@ static const struct ptp_clock_info efx_phc_clock_info = { | |||
1194 | .n_alarm = 0, | 1194 | .n_alarm = 0, |
1195 | .n_ext_ts = 0, | 1195 | .n_ext_ts = 0, |
1196 | .n_per_out = 0, | 1196 | .n_per_out = 0, |
1197 | .n_pins = 0, | ||
1197 | .pps = 1, | 1198 | .pps = 1, |
1198 | .adjfreq = efx_phc_adjfreq, | 1199 | .adjfreq = efx_phc_adjfreq, |
1199 | .adjtime = efx_phc_adjtime, | 1200 | .adjtime = efx_phc_adjtime, |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 7680581ebe12..b7ad3565566c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | |||
@@ -164,6 +164,7 @@ static struct ptp_clock_info stmmac_ptp_clock_ops = { | |||
164 | .n_alarm = 0, | 164 | .n_alarm = 0, |
165 | .n_ext_ts = 0, | 165 | .n_ext_ts = 0, |
166 | .n_per_out = 0, | 166 | .n_per_out = 0, |
167 | .n_pins = 0, | ||
167 | .pps = 0, | 168 | .pps = 0, |
168 | .adjfreq = stmmac_adjust_freq, | 169 | .adjfreq = stmmac_adjust_freq, |
169 | .adjtime = stmmac_adjust_time, | 170 | .adjtime = stmmac_adjust_time, |
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 8c351f100aca..372cb192c5aa 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c | |||
@@ -217,6 +217,7 @@ static struct ptp_clock_info cpts_info = { | |||
217 | .name = "CTPS timer", | 217 | .name = "CTPS timer", |
218 | .max_adj = 1000000, | 218 | .max_adj = 1000000, |
219 | .n_ext_ts = 0, | 219 | .n_ext_ts = 0, |
220 | .n_pins = 0, | ||
220 | .pps = 0, | 221 | .pps = 0, |
221 | .adjfreq = cpts_ptp_adjfreq, | 222 | .adjfreq = cpts_ptp_adjfreq, |
222 | .adjtime = cpts_ptp_adjtime, | 223 | .adjtime = cpts_ptp_adjtime, |
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index b43f1b3b9632..7e1c91d41a87 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
@@ -873,6 +873,7 @@ static struct ptp_clock_info ptp_mpipe_caps = { | |||
873 | .name = "mPIPE clock", | 873 | .name = "mPIPE clock", |
874 | .max_adj = 999999999, | 874 | .max_adj = 999999999, |
875 | .n_ext_ts = 0, | 875 | .n_ext_ts = 0, |
876 | .n_pins = 0, | ||
876 | .pps = 0, | 877 | .pps = 0, |
877 | .adjfreq = ptp_mpipe_adjfreq, | 878 | .adjfreq = ptp_mpipe_adjfreq, |
878 | .adjtime = ptp_mpipe_adjtime, | 879 | .adjtime = ptp_mpipe_adjtime, |
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c index 4a08727fcaf3..604d340f2095 100644 --- a/drivers/ptp/ptp_ixp46x.c +++ b/drivers/ptp/ptp_ixp46x.c | |||
@@ -244,6 +244,7 @@ static struct ptp_clock_info ptp_ixp_caps = { | |||
244 | .name = "IXP46X timer", | 244 | .name = "IXP46X timer", |
245 | .max_adj = 66666655, | 245 | .max_adj = 66666655, |
246 | .n_ext_ts = N_EXT_TS, | 246 | .n_ext_ts = N_EXT_TS, |
247 | .n_pins = 0, | ||
247 | .pps = 0, | 248 | .pps = 0, |
248 | .adjfreq = ptp_ixp_adjfreq, | 249 | .adjfreq = ptp_ixp_adjfreq, |
249 | .adjtime = ptp_ixp_adjtime, | 250 | .adjtime = ptp_ixp_adjtime, |
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index 71a2559278d7..90a106308c4f 100644 --- a/drivers/ptp/ptp_pch.c +++ b/drivers/ptp/ptp_pch.c | |||
@@ -514,6 +514,7 @@ static struct ptp_clock_info ptp_pch_caps = { | |||
514 | .name = "PCH timer", | 514 | .name = "PCH timer", |
515 | .max_adj = 50000000, | 515 | .max_adj = 50000000, |
516 | .n_ext_ts = N_EXT_TS, | 516 | .n_ext_ts = N_EXT_TS, |
517 | .n_pins = 0, | ||
517 | .pps = 0, | 518 | .pps = 0, |
518 | .adjfreq = ptp_pch_adjfreq, | 519 | .adjfreq = ptp_pch_adjfreq, |
519 | .adjtime = ptp_pch_adjtime, | 520 | .adjtime = ptp_pch_adjtime, |