| From: Richard Cochran <richardcochran@gmail.com> |
| Date: Mon, 22 Apr 2013 19:42:16 +0000 |
| Subject: gianfar: do not advertise any alarm capability. |
| |
| commit cd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd upstream. |
| |
| An early draft of the PHC patch series included an alarm in the |
| gianfar driver. During the review process, the alarm code was dropped, |
| but the capability removal was overlooked. This patch fixes the issue |
| by advertising zero alarms. |
| |
| This patch should be applied to every 3.x stable kernel. |
| |
| Signed-off-by: Richard Cochran <richardcochran@gmail.com> |
| Reported-by: Chris LaRocque <clarocq@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/freescale/gianfar_ptp.c |
| +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c |
| @@ -127,7 +127,6 @@ struct gianfar_ptp_registers { |
| |
| #define DRIVER "gianfar_ptp" |
| #define DEFAULT_CKSEL 1 |
| -#define N_ALARM 1 /* first alarm is used internally to reset fipers */ |
| #define N_EXT_TS 2 |
| #define REG_SIZE sizeof(struct gianfar_ptp_registers) |
| |
| @@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar |
| .owner = THIS_MODULE, |
| .name = "gianfar clock", |
| .max_adj = 512000, |
| - .n_alarm = N_ALARM, |
| + .n_alarm = 0, |
| .n_ext_ts = N_EXT_TS, |
| .n_per_out = 0, |
| .pps = 1, |
