net: fec: forbid FEC_PTP on SoCs that do not support
authorShawn Guo <shawn.guo@linaro.org>
Tue, 18 Dec 2012 03:06:44 +0000 (03:06 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Dec 2012 00:26:18 +0000 (16:26 -0800)
Beside imx6q, the kernel built from imx_v6_v7_defconfig is also
supposed to be running on other IMX SoCs that do not have the PTP
block.  Before fec driver gets fixed to run-time detect target hardware
rather than conditional compiling with #ifdef CONFIG_FEC_PTP, let's
give it a quick fix in Kconfig to forbid FEC_PTP on those IMX SoCs that
do not support PTP.

Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/Kconfig

index 5ba6e1cbd346723f069074016ce06b2bb82a223c..ec490d741fc00dbd895de8869340af41fe0b15ce 100644 (file)
@@ -94,9 +94,8 @@ config GIANFAR
 
 config FEC_PTP
        bool "PTP Hardware Clock (PHC)"
-       depends on FEC && ARCH_MXC
+       depends on FEC && ARCH_MXC && !SOC_IMX25 && !SOC_IMX27 && !SOC_IMX35 && !SOC_IMX5
        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.