LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 1/2] Blackfin EMAC driver: finish removing remnants of old BF537_PORT_H option
@ 2008-03-27 1:21 Bryan Wu
2008-03-29 1:47 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Bryan Wu @ 2008-03-27 1:21 UTC (permalink / raw)
To: jeff, netdev, linux-kernel; +Cc: Mike Frysinger, Bryan Wu
From: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
arch/blackfin/mach-bf537/head.S | 12 ------------
drivers/net/Kconfig | 2 +-
2 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index 3014fe8..ac85fdf 100644
--- a/arch/blackfin/mach-bf537/head.S
+++ b/arch/blackfin/mach-bf537/head.S
@@ -180,18 +180,6 @@ ENTRY(__start)
SSYNC;
#endif
-#ifdef CONFIG_BF537_PORT_H
- p0.h = hi(PORTH_FER);
- p0.l = lo(PORTH_FER);
- R0.L = W[P0]; /* Read */
- SSYNC;
- R0 = 0x0000;
- W[P0] = R0.L; /* Write */
- SSYNC;
- W[P0] = R0.L; /* Disable peripheral function of PORTH */
- SSYNC;
-#endif
-
/* Initialise UART - when booting from u-boot, the UART is not disabled
* so if we dont initalize here, our serial console gets hosed */
p0.h = hi(UART_LCR);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fe7b5ec..c52e9d8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -820,7 +820,7 @@ config ULTRA32
config BFIN_MAC
tristate "Blackfin 527/536/537 on-chip mac support"
- depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
+ depends on NET_ETHERNET && (BF527 || BF537 || BF536)
select CRC32
select MII
select PHYLIB
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] Blackfin EMAC driver: finish removing remnants of old BF537_PORT_H option
2008-03-27 1:21 [PATCH 1/2] Blackfin EMAC driver: finish removing remnants of old BF537_PORT_H option Bryan Wu
@ 2008-03-29 1:47 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-03-29 1:47 UTC (permalink / raw)
To: Bryan Wu; +Cc: netdev, linux-kernel, Mike Frysinger
Bryan Wu wrote:
> From: Mike Frysinger <vapier.adi@gmail.com>
>
> Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> ---
> arch/blackfin/mach-bf537/head.S | 12 ------------
> drivers/net/Kconfig | 2 +-
> 2 files changed, 1 insertions(+), 13 deletions(-)
ACK
please send via blackfin arch tree to Linus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-29 1:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-27 1:21 [PATCH 1/2] Blackfin EMAC driver: finish removing remnants of old BF537_PORT_H option Bryan Wu
2008-03-29 1:47 ` Jeff Garzik
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).