Skip to content

Commit

Permalink
[Blackfin] arch: finish removing remnants of old BF537_PORT_H option …
Browse files Browse the repository at this point in the history
…of Blackfin EMAC driver

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Apr 23, 2008
1 parent 7b8aa36 commit 5af29f5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
12 changes: 0 additions & 12 deletions arch/blackfin/mach-bf537/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,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
Expand Down

0 comments on commit 5af29f5

Please sign in to comment.