| Message ID | 1352268883-16800-1-git-send-email-Frank.Li@freescale.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Nov 07, 2012 at 02:14:43PM +0800, Frank Li wrote: > Remove PPS. > Limit FEC_PTP option for i.MX chip only. > FEC_PTP default is on at mx6 platform. > > Signed-off-by: Frank Li <Frank.Li@freescale.com> Acked-by: Richard Cochran <richardcochran@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2012-11-07 at 14:14 +0800, Frank Li wrote: > Remove PPS. > Limit FEC_PTP option for i.MX chip only. > FEC_PTP default is on at mx6 platform. > > Signed-off-by: Frank Li <Frank.Li@freescale.com> Acked-by: Ben Hutchings <bhutchings@solarflare.com> Looks sensible, though I know nothing about the hardware dependencies. Ben. > --- > drivers/net/ethernet/freescale/Kconfig | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig > index ff3be53..5ba6e1c 100644 > --- a/drivers/net/ethernet/freescale/Kconfig > +++ b/drivers/net/ethernet/freescale/Kconfig > @@ -94,9 +94,9 @@ config GIANFAR > > config FEC_PTP > bool "PTP Hardware Clock (PHC)" > - depends on FEC > - select PPS > + depends on FEC && ARCH_MXC > select PTP_1588_CLOCK > + default y if SOC_IMX6Q > --help--- > Say Y here if you want to use PTP Hardware Clock (PHC) in the > driver. Only the basic clock operations have been implemented.
From: Frank Li <Frank.Li@freescale.com> Date: Wed, 7 Nov 2012 14:14:43 +0800 > Remove PPS. > Limit FEC_PTP option for i.MX chip only. > FEC_PTP default is on at mx6 platform. > > Signed-off-by: Frank Li <Frank.Li@freescale.com> Applied to net-next. But please be explicit about which tree your patches are for in the subject line in the future. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> > But please be explicit about which tree your patches are for in the > subject line in the future. Okay. best regards Frank Li -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig index ff3be53..5ba6e1c 100644 --- a/drivers/net/ethernet/freescale/Kconfig +++ b/drivers/net/ethernet/freescale/Kconfig @@ -94,9 +94,9 @@ config GIANFAR config FEC_PTP bool "PTP Hardware Clock (PHC)" - depends on FEC - select PPS + depends on FEC && ARCH_MXC select PTP_1588_CLOCK + default y if SOC_IMX6Q --help--- Say Y here if you want to use PTP Hardware Clock (PHC) in the driver. Only the basic clock operations have been implemented.
Remove PPS. Limit FEC_PTP option for i.MX chip only. FEC_PTP default is on at mx6 platform. Signed-off-by: Frank Li <Frank.Li@freescale.com> --- drivers/net/ethernet/freescale/Kconfig | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)