* [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform
@ 2012-11-07 6:14 Frank Li
2012-11-07 8:32 ` Richard Cochran
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Frank Li @ 2012-11-07 6:14 UTC (permalink / raw)
To: lznuaa, richardcochran, shawn.guo, linux-arm-kernel, netdev,
davem, bhutchings
Cc: Frank Li
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(-)
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.
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform
2012-11-07 6:14 [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform Frank Li
@ 2012-11-07 8:32 ` Richard Cochran
2012-11-07 18:58 ` Ben Hutchings
2012-11-07 23:52 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: Richard Cochran @ 2012-11-07 8:32 UTC (permalink / raw)
To: Frank Li; +Cc: lznuaa, shawn.guo, linux-arm-kernel, netdev, davem, bhutchings
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform
2012-11-07 6:14 [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform Frank Li
2012-11-07 8:32 ` Richard Cochran
@ 2012-11-07 18:58 ` Ben Hutchings
2012-11-07 23:52 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: Ben Hutchings @ 2012-11-07 18:58 UTC (permalink / raw)
To: Frank Li; +Cc: lznuaa, richardcochran, shawn.guo, linux-arm-kernel, netdev,
davem
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.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform
2012-11-07 6:14 [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform Frank Li
2012-11-07 8:32 ` Richard Cochran
2012-11-07 18:58 ` Ben Hutchings
@ 2012-11-07 23:52 ` David Miller
2012-11-08 2:15 ` Frank Li
2 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2012-11-07 23:52 UTC (permalink / raw)
To: Frank.Li
Cc: lznuaa, richardcochran, shawn.guo, linux-arm-kernel, netdev,
bhutchings
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-08 2:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-07 6:14 [PATCH 1/2] net: fec: default select FEC_PTP at mx6 platform Frank Li
2012-11-07 8:32 ` Richard Cochran
2012-11-07 18:58 ` Ben Hutchings
2012-11-07 23:52 ` David Miller
2012-11-08 2:15 ` Frank Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).