瀏覽代碼

[Blackfin] arch: finish removing remnants of old BF537_PORT_H option 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>
Mike Frysinger 17 年之前
父節點
當前提交
5af29f5958
共有 2 個文件被更改,包括 1 次插入13 次删除
  1. 0 12
      arch/blackfin/mach-bf537/head.S
  2. 1 1
      drivers/net/Kconfig

+ 0 - 12
arch/blackfin/mach-bf537/head.S

@@ -180,18 +180,6 @@ ENTRY(__start)
 	SSYNC;
 	SSYNC;
 #endif
 #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
 	/* Initialise UART - when booting from u-boot, the UART is not disabled
 	 * so if we dont initalize here, our serial console gets hosed */
 	 * so if we dont initalize here, our serial console gets hosed */
 	p0.h = hi(UART_LCR);
 	p0.h = hi(UART_LCR);

+ 1 - 1
drivers/net/Kconfig

@@ -827,7 +827,7 @@ config ULTRA32
 
 
 config BFIN_MAC
 config BFIN_MAC
 	tristate "Blackfin 527/536/537 on-chip mac support"
 	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 CRC32
 	select MII
 	select MII
 	select PHYLIB
 	select PHYLIB