Patchwork bfin_mac: Restore hardware time-stamping dependency on BF518

login
register
mail settings
Submitter Lars-Peter Clausen
Date Jan. 10, 2013, 2:42 p.m.
Message ID <1357828948-22682-1-git-send-email-lars@metafoo.de>
Download mbox | patch
Permalink /patch/211042/
State Accepted
Delegated to: David Miller
Headers show

Comments

Lars-Peter Clausen - Jan. 10, 2013, 2:42 p.m.
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 <lars@metafoo.de>
---
 drivers/net/ethernet/adi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Richard Cochran - Jan. 10, 2013, 4:40 p.m.
On Thu, Jan 10, 2013 at 03:42:28PM +0100, Lars-Peter Clausen wrote:
> 
> 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.

Thanks a lot for fixing this.

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
David Miller - Jan. 10, 2013, 10:37 p.m.
From: Richard Cochran <richardcochran@gmail.com>
Date: Thu, 10 Jan 2013 17:40:16 +0100

> On Thu, Jan 10, 2013 at 03:42:28PM +0100, Lars-Peter Clausen wrote:
>> 
>> 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.
> 
> Thanks a lot for fixing this.
> 
> Acked-by: Richard Cochran <richardcochran@gmail.com>

Applied.
--
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

Patch

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---