From patchwork Thu Jan 10 14:42:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 211042 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DAB0D2C032B for ; Fri, 11 Jan 2013 02:00:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696Ab3AJPAw (ORCPT ); Thu, 10 Jan 2013 10:00:52 -0500 Received: from smtp-out-052.synserver.de ([212.40.185.52]:1061 "EHLO smtp-out-052.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753513Ab3AJPAv (ORCPT ); Thu, 10 Jan 2013 10:00:51 -0500 X-Greylist: delayed 1124 seconds by postgrey-1.27 at vger.kernel.org; Thu, 10 Jan 2013 10:00:51 EST Received: (qmail 25477 invoked by uid 0); 10 Jan 2013 14:42:03 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 25211 Received: from p5491ecf9.dip.t-dialin.net (HELO lars-adi-laptop.analog.com) [84.145.236.249] by 217.119.54.77 with SMTP; 10 Jan 2013 14:42:02 -0000 From: Lars-Peter Clausen To: "David S. Miller" Cc: Richard Cochran , uclinux-dist-devel@blackfin.uclinux.org, netdev@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH] bfin_mac: Restore hardware time-stamping dependency on BF518 Date: Thu, 10 Jan 2013 15:42:28 +0100 Message-Id: <1357828948-22682-1-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 70ac618c07 ("ptp: fixup Kconfig for two PHC drivers.") removed all dependencies for the blackfin hardware time-stamping Kconfig entry. Hardware time-stamping is only available on BF518 though. Since the Kconfig entry is 'default y', just updateing your kernel source and running `make defconfig` will result in the the following build errors: drivers/net/ethernet/adi/bfin_mac.c:694: error: implicit declaration of function ‘bfin_read_EMAC_PTP_CTL’ drivers/net/ethernet/adi/bfin_mac.c:702: error: implicit declaration of function ‘bfin_write_EMAC_PTP_FV3’ drivers/net/ethernet/adi/bfin_mac.c:712: error: implicit declaration of function ‘bfin_write_EMAC_PTP_CTL’ drivers/net/ethernet/adi/bfin_mac.c:717: error: implicit declaration of function ‘bfin_write_EMAC_PTP_FOFF’ ... This patch adds back the dependency on BF518, and since it does not make sense to expose this config option when the blackfin MAC driver is not enabled also restore the dependency on BFIN_MAC. Signed-off-by: Lars-Peter Clausen Acked-by: Richard Cochran --- drivers/net/ethernet/adi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig index e49c0ef..a948160 100644 --- a/drivers/net/ethernet/adi/Kconfig +++ b/drivers/net/ethernet/adi/Kconfig @@ -61,6 +61,7 @@ config BFIN_RX_DESC_NUM config BFIN_MAC_USE_HWSTAMP bool "Use IEEE 1588 hwstamp" + depends on BFIN_MAC && BF518 select PTP_1588_CLOCK default y ---help---