Skip to contentSkip to conversation

Finish migration to DM_ETH

PATCH In review Tom Rini 7 participants 66 messages Aug 2, 2022 – Sep 28, 2022

Subsystems (12)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

cover Finish migration to DM_ETH

As I've noted before, with v2022.07 being released, we have gone 2 years past the DM_ETH migration deadline. What this series does is a few things:
- Remove some boards that either lack DM migration at all, or lack OF_CONTROL. DM migration has had an explicit deadline, and OF_CONTROL an implict one.
- Remove some un-migrated ethernet drivers. I had reached out in private to some people about this and they had hoped to have done the conversion by now. Unfortunately, here we now are.
- Perform some minor forceful migrations on boards. These boards use OF_CONTROL and drivers which use DM_ETH, so I am hopeful that just removing or guarding the code here is fine and works.
- Disable networkgin on some other boards. Unlike boards in the above case, it looks like the board code itself needs some updates, as was done on the platforms that have already been migrated.
- Finally, select DM_ETH for all NETDEVICES and update dependencies.

This series depends on
https://patchwork.ozlabs.org/project/uboot/patch/8ae444f17dc5db69a1da809875a16462049857c7.1652363162.git.christophe.leroy@csgroup.eu/
being applied and in practical terms depennds on my current outstanding Kconfig migrations as well.

Signature · 1 line
Tom
author
#1 lore raw

PATCH 1/21 Convert CONFIG_SYS_FDT_PAD to Kconfig

This converts the following to Kconfig:
CONFIG_SYS_FDT_PAD

---
 boot/image-fdt.c                 |  4 ----
 include/configs/P2041RDB.h       |  1 -
 include/configs/T102xRDB.h       |  2 --
 include/configs/T104xRDB.h       |  2 --
 include/configs/T208xQDS.h       |  2 --
 include/configs/T208xRDB.h       |  2 --
 include/configs/T4240RDB.h       |  2 --
 include/configs/corenet_ds.h     |  1 -
 include/configs/kmcent2.h        |  2 --
 include/configs/ls1043a_common.h |  2 --
 include/configs/ls1046a_common.h |  1 -
 lib/Kconfig                      | 10 ++++++++++
 12 files changed, 10 insertions(+), 21 deletions(-)
boot/image-fdt.c +0 -4
index 9db2cee99423..7a80fe0dfdeb 100644
@@ -23,10 +23,6 @@
 #include <asm/io.h>
 #include <tee/optee.h>
 
-#ifndef CONFIG_SYS_FDT_PAD
-#define CONFIG_SYS_FDT_PAD 0x3000
-#endif
-
 /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
 #define FDT_RAMDISK_OVERHEAD	0x80
 
include/configs/P2041RDB.h +0 -1
index 1ba48e587215..11a3db590259 100644
@@ -299,7 +299,6 @@
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR	0x2
include/configs/T102xRDB.h +0 -2
index f5e07a929fc5..a5461d7fc685 100644
@@ -413,8 +413,6 @@
 #define CONFIG_SYS_QMAN_SWP_ISDR_REG	0xE08
 
 #define CONFIG_SYS_DPAA_FMAN
-
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
include/configs/T104xRDB.h +0 -2
index 7983a71953d4..560083c5b315 100644
@@ -388,8 +388,6 @@
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_FMAN_ENET
include/configs/T208xQDS.h +0 -2
index 9d43d87338a9..fc068c94a9ea 100644
@@ -411,8 +411,6 @@
 #define CONFIG_SYS_DPAA_DCE
 #define CONFIG_SYS_DPAA_RMAN		/* RMan */
 #define CONFIG_SYS_INTERLAKEN
-
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
include/configs/T208xRDB.h +0 -2
index 9a9920a88055..056e2d1925ba 100644
@@ -365,8 +365,6 @@
 #define CONFIG_SYS_DPAA_DCE
 #define CONFIG_SYS_DPAA_RMAN		/* RMan */
 #define CONFIG_SYS_INTERLAKEN
-
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
include/configs/T4240RDB.h +0 -2
index 4280c2df1fab..bba82f1e0cd3 100644
@@ -368,8 +368,6 @@
 #define CONFIG_SYS_DPAA_DCE
 #define CONFIG_SYS_DPAA_RMAN
 #define CONFIG_SYS_INTERLAKEN
-
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
include/configs/corenet_ds.h +0 -1
index 5f3fd89c21bb..7e65b2b6aa22 100644
@@ -293,7 +293,6 @@
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR	0x1c
include/configs/kmcent2.h +0 -2
index 589ba615dd6d..0d470c4b4a13 100644
@@ -385,8 +385,6 @@ int get_scl(void);
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
 
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
-
 /* Qman / Bman */
 /* RGMII (FM1@DTESC5) is local managemant interface */
 #define CONFIG_SYS_RGMII2_PHY_ADDR             0x11
include/configs/ls1043a_common.h +0 -2
index 43f30fd70f71..1fb1d05eba36 100644
@@ -114,8 +114,6 @@
 #define CONFIG_SYS_DPAA_FMAN
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_FM_MURAM_SIZE	0x60000
-
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif
 #endif
 
include/configs/ls1046a_common.h +0 -1
index 2e48ea0f8aad..e5fb111f1b88 100644
@@ -87,7 +87,6 @@
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_FM_MURAM_SIZE	0x60000
 #endif
-#define CONFIG_SYS_FDT_PAD		(0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif
 
 /* Miscellaneous configurable options */
lib/Kconfig +10 -0
index 7dd777b56a79..074801278598 100644
@@ -743,6 +743,16 @@ config OF_LIBFDT_OVERLAY
 	help
 	  This enables the FDT library (libfdt) overlay support.
 
+config SYS_FDT_PAD
+	hex "Maximum size of the FDT memory area passeed to the OS"
+	depends on OF_LIBFDT
+	default 0x13000 if FMAN_ENET || QE || U_QE
+	default 0x3000
+	help
+	  During OS boot, we allocate a region of memory within the bootmap
+	  for the FDT. This is the size that we will expand the FDT that we
+	  are using will be extended to be, in bytes.
+
 config SPL_OF_LIBFDT
 	bool "Enable the FDT library for SPL"
 	depends on SPL_LIBGENERIC_SUPPORT
Signature · 1 line
2.25.1
Reviewed-by on v1 1/21
#2 lore raw

Re: [PATCH 01/21] Convert CONFIG_SYS_FDT_PAD to Kconfig

Quoted 5 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_FDT_PAD

Quoted 15 lines
---
 boot/image-fdt.c                 |  4 ----
 include/configs/P2041RDB.h       |  1 -
 include/configs/T102xRDB.h       |  2 --
 include/configs/T104xRDB.h       |  2 --
 include/configs/T208xQDS.h       |  2 --
 include/configs/T208xRDB.h       |  2 --
 include/configs/T4240RDB.h       |  2 --
 include/configs/corenet_ds.h     |  1 -
 include/configs/kmcent2.h        |  2 --
 include/configs/ls1043a_common.h |  2 --
 include/configs/ls1046a_common.h |  1 -
 lib/Kconfig                      | 10 ++++++++++
 12 files changed, 10 insertions(+), 21 deletions(-)
author
#4 lore raw

PATCH 2/21 ppc: Remove ids8313 board

In reply to Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Heiko Schocher <[email protected]>
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   7 -
 board/ids/ids8313/Kconfig        |  12 --
 board/ids/ids8313/MAINTAINERS    |   6 -
 board/ids/ids8313/Makefile       |   9 --
 board/ids/ids8313/ids8313.c      | 216 ----------------------------
 configs/ids8313_defconfig        | 216 ----------------------------
 include/configs/ids8313.h        | 237 -------------------------------
 7 files changed, 703 deletions(-)
 delete mode 100644 board/ids/ids8313/Kconfig
 delete mode 100644 board/ids/ids8313/MAINTAINERS
 delete mode 100644 board/ids/ids8313/Makefile
 delete mode 100644 board/ids/ids8313/ids8313.c
 delete mode 100644 configs/ids8313_defconfig
 delete mode 100644 include/configs/ids8313.h
arch/powerpc/cpu/mpc83xx/Kconfig +0 -7
index 9a31604ba3e6..9d24f029b397 100644
@@ -26,12 +26,6 @@ config TARGET_MPC837XERDB
 	select BOARD_EARLY_INIT_F
 	select SYS_83XX_DDR_USES_CS0
 
-config TARGET_IDS8313
-	bool "Support ids8313"
-	select ARCH_MPC8313
-	select DM
-	imply CMD_DM
-
 config TARGET_KMETER1
 	bool "Support kmeter1"
 	select VENDOR_KM
@@ -212,7 +206,6 @@ config FSL_ELBC
 	bool
 
 source "board/freescale/mpc837xerdb/Kconfig"
-source "board/ids/ids8313/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
 endmenu
board/ids/ids8313/Kconfig deleted +0 -12
deleted file mode 100644
index d165b4be7a12..000000000000
@@ -1,12 +0,0 @@
-if TARGET_IDS8313
-
-config SYS_BOARD
-	default "ids8313"
-
-config SYS_VENDOR
-	default "ids"
-
-config SYS_CONFIG_NAME
-	default "ids8313"
-
-endif
board/ids/ids8313/MAINTAINERS deleted +0 -6
deleted file mode 100644
index c5b2f9ed0a3a..000000000000
@@ -1,6 +0,0 @@
-IDS8313 BOARD
-M:	Heiko Schocher <[email protected]>
-S:	Maintained
-F:	board/ids/ids8313/
-F:	include/configs/ids8313.h
-F:	configs/ids8313_defconfig
board/ids/ids8313/Makefile deleted +0 -9
deleted file mode 100644
index 91e4ad6f124a..000000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-#
-# (C) Copyright 2013
-# Heiko Schocher, DENX Software Engineering, <[email protected]>
-
-obj-y	= ids8313.o
board/ids/ids8313/ids8313.c deleted +0 -216

216 lines not on this page · raw message

configs/ids8313_defconfig deleted +0 -216

216 lines not on this page · raw message

include/configs/ids8313.h deleted +0 -237

237 lines not on this page · raw message

Signature · 1 line
2.25.1
Acked-by on v1 2/21
#5 lore raw

Re: [PATCH 02/21] ppc: Remove ids8313 board

Hello Tom,

Quoted 5 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Heiko Schocher <[email protected]>
Quoted 15 lines
---
 arch/powerpc/cpu/mpc83xx/Kconfig |   7 -
 board/ids/ids8313/Kconfig        |  12 --
 board/ids/ids8313/MAINTAINERS    |   6 -
 board/ids/ids8313/Makefile       |   9 --
 board/ids/ids8313/ids8313.c      | 216 ----------------------------
 configs/ids8313_defconfig        | 216 ----------------------------
 include/configs/ids8313.h        | 237 -------------------------------
 7 files changed, 703 deletions(-)
 delete mode 100644 board/ids/ids8313/Kconfig
 delete mode 100644 board/ids/ids8313/MAINTAINERS
 delete mode 100644 board/ids/ids8313/Makefile
 delete mode 100644 board/ids/ids8313/ids8313.c
 delete mode 100644 configs/ids8313_defconfig
 delete mode 100644 include/configs/ids8313.h

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
author
#7 lore raw

PATCH 3/21 arm: Remove snapper9260 board

In reply to Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

---
 arch/arm/mach-at91/Kconfig                |  10 --
 board/bluewater/snapper9260/Kconfig       |  12 --
 board/bluewater/snapper9260/MAINTAINERS   |   7 -
 board/bluewater/snapper9260/Makefile      |   9 --
 board/bluewater/snapper9260/snapper9260.c | 154 ----------------------
 configs/snapper9260_defconfig             |  58 --------
 configs/snapper9g20_defconfig             |  57 --------
 include/configs/snapper9260.h             |  80 -----------
 8 files changed, 387 deletions(-)
 delete mode 100644 board/bluewater/snapper9260/Kconfig
 delete mode 100644 board/bluewater/snapper9260/MAINTAINERS
 delete mode 100644 board/bluewater/snapper9260/Makefile
 delete mode 100644 board/bluewater/snapper9260/snapper9260.c
 delete mode 100644 configs/snapper9260_defconfig
 delete mode 100644 configs/snapper9g20_defconfig
 delete mode 100644 include/configs/snapper9260.h
arch/arm/mach-at91/Kconfig +0 -10
index 11bfd5afe745..094c9891f648 100644
@@ -79,15 +79,6 @@ config TARGET_ETHERNUT5
 	bool "Ethernut5 board"
 	select AT91SAM9XE
 
-config TARGET_SNAPPER9260
-	bool "Support snapper9260"
-	select AT91SAM9260
-	select AT91_WANTS_COMMON_PHY
-	select DM
-	select DM_GPIO
-	select DM_SERIAL
-	imply CMD_DM
-
 config TARGET_GURNARD
 	bool "Support gurnard"
 	select AT91SAM9G45
@@ -364,7 +355,6 @@ source "board/atmel/sama5d3xek/Kconfig"
 source "board/atmel/sama5d4_xplained/Kconfig"
 source "board/atmel/sama5d4ek/Kconfig"
 source "board/bluewater/gurnard/Kconfig"
-source "board/bluewater/snapper9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
 source "board/egnite/ethernut5/Kconfig"
 source "board/esd/meesc/Kconfig"
board/bluewater/snapper9260/Kconfig deleted +0 -12
deleted file mode 100644
index b8e9cbc58559..000000000000
@@ -1,12 +0,0 @@
-if TARGET_SNAPPER9260
-
-config SYS_BOARD
-	default "snapper9260"
-
-config SYS_VENDOR
-	default "bluewater"
-
-config SYS_CONFIG_NAME
-	default "snapper9260"
-
-endif
board/bluewater/snapper9260/MAINTAINERS deleted +0 -7
deleted file mode 100644
index 1f8f4d6988f5..000000000000
@@ -1,7 +0,0 @@
-SNAPPER9260 BOARD
-M:	Simon Glass <[email protected]>
-S:	Maintained
-F:	board/bluewater/snapper9260/
-F:	include/configs/snapper9260.h
-F:	configs/snapper9260_defconfig
-F:	configs/snapper9g20_defconfig
board/bluewater/snapper9260/Makefile deleted +0 -9
deleted file mode 100644
index 842abf4eeeb5..000000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2003-2008
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-#
-# (C) Copyright 2011 Bluewater Systems
-# Ryan Mallon <[email protected]>
-
-obj-y	+= snapper9260.o
board/bluewater/snapper9260/snapper9260.c deleted +0 -154

154 lines not on this page · raw message

configs/snapper9260_defconfig deleted +0 -58

58 lines not on this page · raw message

configs/snapper9g20_defconfig deleted +0 -57

57 lines not on this page · raw message

include/configs/snapper9260.h deleted +0 -80

80 lines not on this page · raw message

Signature · 1 line
2.25.1
Reviewed-by on v1 3/21
#8 lore raw

Re: [PATCH 03/21] arm: Remove snapper9260 board

Quoted 15 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

---
 arch/arm/mach-at91/Kconfig                |  10 --
 board/bluewater/snapper9260/Kconfig       |  12 --
 board/bluewater/snapper9260/MAINTAINERS   |   7 -
 board/bluewater/snapper9260/Makefile      |   9 --
 board/bluewater/snapper9260/snapper9260.c | 154 ----------------------
 configs/snapper9260_defconfig             |  58 --------
 configs/snapper9g20_defconfig             |  57 --------
 include/configs/snapper9260.h             |  80 -----------
Quoted 9 lines
 8 files changed, 387 deletions(-)
 delete mode 100644 board/bluewater/snapper9260/Kconfig
 delete mode 100644 board/bluewater/snapper9260/MAINTAINERS
 delete mode 100644 board/bluewater/snapper9260/Makefile
 delete mode 100644 board/bluewater/snapper9260/snapper9260.c
 delete mode 100644 configs/snapper9260_defconfig
 delete mode 100644 configs/snapper9g20_defconfig
 delete mode 100644 include/configs/snapper9260.h
author
#10 lore raw

PATCH 4/21 arm: Remove mx28evk board

In reply to Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Fabio Estevam <[email protected]>
---
 arch/arm/dts/Makefile                   |   1 -
 arch/arm/dts/imx28-evk.dts              | 360 ------------------------
 arch/arm/mach-imx/mxs/Kconfig           |   5 -
 board/freescale/mx28evk/Kconfig         |  15 -
 board/freescale/mx28evk/MAINTAINERS     |  10 -
 board/freescale/mx28evk/Makefile        |  10 -
 board/freescale/mx28evk/README          |  62 ----
 board/freescale/mx28evk/iomux.c         | 205 --------------
 board/freescale/mx28evk/mx28evk.c       |  74 -----
 configs/mx28evk_auart_console_defconfig |  59 ----
 configs/mx28evk_defconfig               |  68 -----
 configs/mx28evk_nand_defconfig          |  62 ----
 configs/mx28evk_spi_defconfig           |  57 ----
 include/configs/mx28evk.h               | 183 ------------
 14 files changed, 1171 deletions(-)
 delete mode 100644 arch/arm/dts/imx28-evk.dts
 delete mode 100644 board/freescale/mx28evk/Kconfig
 delete mode 100644 board/freescale/mx28evk/MAINTAINERS
 delete mode 100644 board/freescale/mx28evk/Makefile
 delete mode 100644 board/freescale/mx28evk/README
 delete mode 100644 board/freescale/mx28evk/iomux.c
 delete mode 100644 board/freescale/mx28evk/mx28evk.c
 delete mode 100644 configs/mx28evk_auart_console_defconfig
 delete mode 100644 configs/mx28evk_defconfig
 delete mode 100644 configs/mx28evk_nand_defconfig
 delete mode 100644 configs/mx28evk_spi_defconfig
 delete mode 100644 include/configs/mx28evk.h
arch/arm/dts/Makefile +0 -1
index ceaa39e4b4d6..5c1a61a01c2f 100644
@@ -741,7 +741,6 @@ dtb-$(CONFIG_TARGET_MX23_OLINUXINO) += \
 	imx23-olinuxino.dtb
 
 dtb-$(CONFIG_MX28) += \
-	imx28-evk.dtb \
 	imx28-xea.dtb
 
 dtb-$(CONFIG_MX51) += \
arch/arm/dts/imx28-evk.dts deleted +0 -360

360 lines not on this page · raw message

arch/arm/mach-imx/mxs/Kconfig +0 -5
index b2026a3758a5..60518a7957ed 100644
@@ -39,10 +39,6 @@ choice
 	prompt "MX28 board select"
 	optional
 
-config TARGET_MX28EVK
-	bool "Support mx28evk"
-	select BOARD_EARLY_INIT_F
-
 config TARGET_XEA
 	bool "Support XEA"
 
@@ -51,7 +47,6 @@ endchoice
 config SYS_SOC
 	default "mxs"
 
-source "board/freescale/mx28evk/Kconfig"
 source "board/liebherr/xea/Kconfig"
 
 endif
board/freescale/mx28evk/Kconfig deleted +0 -15
deleted file mode 100644
index 39777bd70fae..000000000000
@@ -1,15 +0,0 @@
-if TARGET_MX28EVK
-
-config SYS_BOARD
-	default "mx28evk"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "mx28evk"
-
-endif
board/freescale/mx28evk/MAINTAINERS deleted +0 -10
deleted file mode 100644
index c565010ccf6b..000000000000
@@ -1,10 +0,0 @@
-MX28EVK BOARD
-M:	Fabio Estevam <[email protected]>
-S:	Maintained
-F:	board/freescale/mx28evk/
-F:	arch/arm/dts/imx28-evk.dts
-F:	include/configs/mx28evk.h
-F:	configs/mx28evk_defconfig
-F:	configs/mx28evk_auart_console_defconfig
-F:	configs/mx28evk_nand_defconfig
-F:	configs/mx28evk_spi_defconfig
board/freescale/mx28evk/Makefile deleted +0 -10
deleted file mode 100644
index 057760433da9..000000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-ifndef	CONFIG_SPL_BUILD
-obj-y	:= mx28evk.o
-else
-obj-y	:= iomux.o
-endif
board/freescale/mx28evk/README deleted +0 -62

62 lines not on this page · raw message

board/freescale/mx28evk/iomux.c deleted +0 -205

205 lines not on this page · raw message

board/freescale/mx28evk/mx28evk.c deleted +0 -74

74 lines not on this page · raw message

configs/mx28evk_auart_console_defconfig deleted +0 -59

59 lines not on this page · raw message

configs/mx28evk_defconfig deleted +0 -68

68 lines not on this page · raw message

configs/mx28evk_nand_defconfig deleted +0 -62

62 lines not on this page · raw message

configs/mx28evk_spi_defconfig deleted +0 -57

57 lines not on this page · raw message

include/configs/mx28evk.h deleted +0 -183

183 lines not on this page · raw message

Signature · 1 line
2.25.1
reviewer
#11 lore raw

Re: [PATCH 04/21] arm: Remove mx28evk board

Quoted 3 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

This is not correct.

The only missing DM migration is the DM_SERIAL one, which is due on v2023.04.

So NACK to this patch.

reviewer
#12 lore raw

Re: [PATCH 04/21] arm: Remove mx28evk board

Quoted 11 lines · Fabio Estevam
Quoted 3 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

This is not correct.

The only missing DM migration is the DM_SERIAL one, which is due on v2023.04.

So NACK to this patch.

It is OK to remove all mx28evk defconfigs, except the mx28evk_defconfig.

author
#13 lore raw

Re: [PATCH 04/21] arm: Remove mx28evk board

Quoted 7 lines · Fabio Estevam
Quoted 6 lines · Fabio Estevam
Quoted 3 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Quoted 7 lines
Quoted 5 lines

This is not correct.

The only missing DM migration is the DM_SERIAL one, which is due on v2023.04.

So NACK to this patch.

It is OK to remove all mx28evk defconfigs, except the mx28evk_defconfig.

I feel like I asked someone to do that before, and they're still there. Can you please then? Thanks.

Signature · 1 line
Tom
author
#14 lore raw

PATCH 5/21 arm: Remove edminiv2 board

In reply to Tom Rini

This board is not converted to use CONFIG_DM, well passed the migration deadline. Remove it.

Cc Simon Guinot <[email protected]>

---
This is also the last orion5x board, if you don't wish to migrate this platform I'll follow-up with a larger removal patch.

---
 arch/arm/mach-orion5x/Kconfig    |  13 ---
 board/LaCie/edminiv2/Kconfig     |  12 ---
 board/LaCie/edminiv2/MAINTAINERS |   6 --
 board/LaCie/edminiv2/Makefile    |  10 ---
 board/LaCie/edminiv2/edminiv2.c  |  57 -------------
 configs/edminiv2_defconfig       |  72 -----------------
 include/configs/edminiv2.h       | 134 -------------------------------
 7 files changed, 304 deletions(-)
 delete mode 100644 board/LaCie/edminiv2/Kconfig
 delete mode 100644 board/LaCie/edminiv2/MAINTAINERS
 delete mode 100644 board/LaCie/edminiv2/Makefile
 delete mode 100644 board/LaCie/edminiv2/edminiv2.c
 delete mode 100644 configs/edminiv2_defconfig
 delete mode 100644 include/configs/edminiv2.h
arch/arm/mach-orion5x/Kconfig +0 -13
index b8b45a048ca3..e677211b2e91 100644
@@ -6,21 +6,8 @@ config 88F5182
 config FEROCEON
 	bool
 
-choice
-	prompt "Marvell Orion board select"
-	optional
-
-config TARGET_EDMINIV2
-	bool "LaCie Ethernet Disk mini V2"
-	select 88F5182
-	select FEROCEON
-	select SUPPORT_SPL
-
-endchoice
-
 config SYS_SOC
 	default "orion5x"
 
-source "board/LaCie/edminiv2/Kconfig"
 
 endif
board/LaCie/edminiv2/Kconfig deleted +0 -12
deleted file mode 100644
index ac3fe3fbcb3e..000000000000
@@ -1,12 +0,0 @@
-if TARGET_EDMINIV2
-
-config SYS_BOARD
-	default "edminiv2"
-
-config SYS_VENDOR
-	default "LaCie"
-
-config SYS_CONFIG_NAME
-	default "edminiv2"
-
-endif
board/LaCie/edminiv2/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 055afd0e766f..000000000000
@@ -1,6 +0,0 @@
-EDMINIV2 BOARD
-M:	Simon Guinot <[email protected]>
-S:	Maintained
-F:	board/LaCie/edminiv2/
-F:	include/configs/edminiv2.h
-F:	configs/edminiv2_defconfig
board/LaCie/edminiv2/Makefile deleted +0 -10
deleted file mode 100644
index 5252c2b0e60e..000000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2010 Albert ARIBAUD <[email protected]>
-#
-# Based on original Kirkwood support which is
-# (C) Copyright 2009
-# Marvell Semiconductor <www.marvell.com>
-# Written-by: Prafulla Wadaskar <[email protected]>
-
-obj-y	:= edminiv2.o ../common/common.o
board/LaCie/edminiv2/edminiv2.c deleted +0 -57

57 lines not on this page · raw message

configs/edminiv2_defconfig deleted +0 -72

72 lines not on this page · raw message

include/configs/edminiv2.h deleted +0 -134

134 lines not on this page · raw message

Signature · 1 line
2.25.1
Reviewed-by on v1 5/21
#15 lore raw

Re: [PATCH 05/21] arm: Remove edminiv2 board

Quoted 9 lines · Tom Rini

This board is not converted to use CONFIG_DM, well passed the migration deadline. Remove it.

Cc Simon Guinot <[email protected]>

---
This is also the last orion5x board, if you don't wish to migrate this platform I'll follow-up with a larger removal patch.

Quoted 15 lines
---
 arch/arm/mach-orion5x/Kconfig    |  13 ---
 board/LaCie/edminiv2/Kconfig     |  12 ---
 board/LaCie/edminiv2/MAINTAINERS |   6 --
 board/LaCie/edminiv2/Makefile    |  10 ---
 board/LaCie/edminiv2/edminiv2.c  |  57 -------------
 configs/edminiv2_defconfig       |  72 -----------------
 include/configs/edminiv2.h       | 134 -------------------------------
 7 files changed, 304 deletions(-)
 delete mode 100644 board/LaCie/edminiv2/Kconfig
 delete mode 100644 board/LaCie/edminiv2/MAINTAINERS
 delete mode 100644 board/LaCie/edminiv2/Makefile
 delete mode 100644 board/LaCie/edminiv2/edminiv2.c
 delete mode 100644 configs/edminiv2_defconfig
 delete mode 100644 include/configs/edminiv2.h

This is getting in the way of BLK tidy-ups too.

author
#17 lore raw

PATCH 6/21 arm: Remove cm_t335 board

In reply to Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Igor Grinberg <[email protected]>
Cc Nikita Kiryanov <[email protected]>
Cc Uri Mashiach <[email protected]>
---
 arch/arm/mach-omap2/Kconfig        |   1 -
 arch/arm/mach-omap2/am33xx/Kconfig |   7 --
 board/compulab/cm_t335/Kconfig     |  15 ---
 board/compulab/cm_t335/MAINTAINERS |   6 --
 board/compulab/cm_t335/Makefile    |   8 --
 board/compulab/cm_t335/cm_t335.c   | 166 -----------------------------
 board/compulab/cm_t335/mux.c       | 116 --------------------
 board/compulab/cm_t335/spl.c       | 116 --------------------
 board/compulab/cm_t335/u-boot.lds  | 110 -------------------
 configs/cm_t335_defconfig          |  83 ---------------
 include/configs/cm_t335.h          |  98 -----------------
 11 files changed, 726 deletions(-)
 delete mode 100644 board/compulab/cm_t335/Kconfig
 delete mode 100644 board/compulab/cm_t335/MAINTAINERS
 delete mode 100644 board/compulab/cm_t335/Makefile
 delete mode 100644 board/compulab/cm_t335/cm_t335.c
 delete mode 100644 board/compulab/cm_t335/mux.c
 delete mode 100644 board/compulab/cm_t335/spl.c
 delete mode 100644 board/compulab/cm_t335/u-boot.lds
 delete mode 100644 configs/cm_t335_defconfig
 delete mode 100644 include/configs/cm_t335.h
arch/arm/mach-omap2/Kconfig +0 -1
index fa4104747673..914d43b04965 100644
@@ -207,7 +207,6 @@ source "board/siemens/rut/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/ti/am335x/Kconfig"
-source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/phytec/phycore_am335x_r2/Kconfig"
 
arch/arm/mach-omap2/am33xx/Kconfig +0 -7
index bd6b08655260..987ab367ece3 100644
@@ -125,13 +125,6 @@ config TARGET_CHILIBOARD
 	select DM_SERIAL
 	imply CMD_DM
 
-config TARGET_CM_T335
-	bool "Support cm_t335"
-	select DM
-	select DM_GPIO
-	select DM_SERIAL
-	imply CMD_DM
-
 config TARGET_DRACO
 	bool "Support draco"
 	select BOARD_LATE_INIT
board/compulab/cm_t335/Kconfig deleted +0 -15
deleted file mode 100644
index 683efde76443..000000000000
@@ -1,15 +0,0 @@
-if TARGET_CM_T335
-
-config SYS_BOARD
-	default "cm_t335"
-
-config SYS_VENDOR
-	default "compulab"
-
-config SYS_SOC
-	default "am33xx"
-
-config SYS_CONFIG_NAME
-	default "cm_t335"
-
-endif
board/compulab/cm_t335/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 5fb922c68b02..000000000000
@@ -1,6 +0,0 @@
-CM_T335 BOARD
-M:	Igor Grinberg <[email protected]>
-S:	Maintained
-F:	board/compulab/cm_t335/
-F:	include/configs/cm_t335.h
-F:	configs/cm_t335_defconfig
board/compulab/cm_t335/Makefile deleted +0 -8
deleted file mode 100644
index 34f671311865..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2013 Compulab Ltd - http://compulab.co.il/
-#
-# Author: Ilya Ledvich <[email protected]>
-
-obj-y	+= cm_t335.o
-obj-$(CONFIG_SPL_BUILD) += mux.o spl.o
board/compulab/cm_t335/cm_t335.c deleted +0 -166

166 lines not on this page · raw message

board/compulab/cm_t335/mux.c deleted +0 -116

116 lines not on this page · raw message

board/compulab/cm_t335/spl.c deleted +0 -116

116 lines not on this page · raw message

board/compulab/cm_t335/u-boot.lds deleted +0 -110

110 lines not on this page · raw message

configs/cm_t335_defconfig deleted +0 -83

83 lines not on this page · raw message

include/configs/cm_t335.h deleted +0 -98

98 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#19 lore raw

PATCH 7/21 arm: Remove armadillo-800eva board

In reply to Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Nobuhiro Iwamatsu <[email protected]>
---
 arch/arm/mach-rmobile/Kconfig.32              |   4 -
 board/atmark-techno/armadillo-800eva/Kconfig  |  12 -
 .../armadillo-800eva/MAINTAINERS              |   6 -
 board/atmark-techno/armadillo-800eva/Makefile |   5 -
 .../armadillo-800eva/armadillo-800eva.c       | 327 ------------------
 configs/armadillo-800eva_defconfig            |  54 ---
 include/configs/armadillo-800eva.h            |  61 ----
 7 files changed, 469 deletions(-)
 delete mode 100644 board/atmark-techno/armadillo-800eva/Kconfig
 delete mode 100644 board/atmark-techno/armadillo-800eva/MAINTAINERS
 delete mode 100644 board/atmark-techno/armadillo-800eva/Makefile
 delete mode 100644 board/atmark-techno/armadillo-800eva/armadillo-800eva.c
 delete mode 100644 configs/armadillo-800eva_defconfig
 delete mode 100644 include/configs/armadillo-800eva.h
arch/arm/mach-rmobile/Kconfig.32 +0 -4
index ea98bb00f3ba..27db7940e370 100644
@@ -50,9 +50,6 @@ choice
 	prompt "Renesas ARM SoCs board select"
 	optional
 
-config TARGET_ARMADILLO_800EVA
-	bool "armadillo 800 eva board"
-
 config TARGET_BLANCHE
 	bool "Blanche board"
 	select DM
@@ -156,7 +153,6 @@ config QOS_PRI_GFX
 
 endchoice
 
-source "board/atmark-techno/armadillo-800eva/Kconfig"
 source "board/renesas/blanche/Kconfig"
 source "board/renesas/gose/Kconfig"
 source "board/renesas/koelsch/Kconfig"
board/atmark-techno/armadillo-800eva/Kconfig deleted +0 -12
deleted file mode 100644
index cd37dd4861dd..000000000000
@@ -1,12 +0,0 @@
-if TARGET_ARMADILLO_800EVA
-
-config SYS_BOARD
-	default "armadillo-800eva"
-
-config SYS_VENDOR
-	default "atmark-techno"
-
-config SYS_CONFIG_NAME
-	default "armadillo-800eva"
-
-endif
board/atmark-techno/armadillo-800eva/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 6f547d82ecb0..000000000000
@@ -1,6 +0,0 @@
-ARMADILLO-800EVA BOARD
-M:	Nobuhiro Iwamatsu <[email protected]>
-S:	Maintained
-F:	board/atmark-techno/armadillo-800eva/
-F:	include/configs/armadillo-800eva.h
-F:	configs/armadillo-800eva_defconfig
board/atmark-techno/armadillo-800eva/Makefile deleted +0 -5
deleted file mode 100644
index 7e01cb6794a0..000000000000
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Copyright (C) 2012  Nobuhiro Iwamatsu <[email protected]>
-
-obj-y	+= armadillo-800eva.o
board/atmark-techno/armadillo-800eva/armadillo-800eva.c deleted +0 -327

327 lines not on this page · raw message

configs/armadillo-800eva_defconfig deleted +0 -54

54 lines not on this page · raw message

include/configs/armadillo-800eva.h deleted +0 -61

61 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#20 lore raw

Re: [PATCH 07/21] arm: Remove armadillo-800eva board

Quoted 5 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Nobuhiro Iwamatsu <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#21 lore raw

PATCH 8/21 arm: Remove kzm9g board

In reply to Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Nobuhiro Iwamatsu <[email protected]>
Cc Tetsuyuki Kobayashi <[email protected]>
---
 arch/arm/mach-rmobile/Kconfig.32 |   4 -
 board/kmc/kzm9g/Kconfig          |  12 -
 board/kmc/kzm9g/MAINTAINERS      |   7 -
 board/kmc/kzm9g/Makefile         |   6 -
 board/kmc/kzm9g/kzm9g.c          | 373 -------------------------------
 configs/kzm9g_defconfig          |  47 ----
 include/configs/kzm9g.h          |  57 -----
 7 files changed, 506 deletions(-)
 delete mode 100644 board/kmc/kzm9g/Kconfig
 delete mode 100644 board/kmc/kzm9g/MAINTAINERS
 delete mode 100644 board/kmc/kzm9g/Makefile
 delete mode 100644 board/kmc/kzm9g/kzm9g.c
 delete mode 100644 configs/kzm9g_defconfig
 delete mode 100644 include/configs/kzm9g.h
arch/arm/mach-rmobile/Kconfig.32 +0 -4
index 27db7940e370..a07eff71dfe7 100644
@@ -83,9 +83,6 @@ config TARGET_LAGER
 	select SPL_USE_TINY_PRINTF
 	imply CMD_DM
 
-config TARGET_KZM9G
-	bool "KZM9D board"
-
 config TARGET_ALT
 	bool "Alt board"
 	select DM
@@ -157,7 +154,6 @@ source "board/renesas/blanche/Kconfig"
 source "board/renesas/gose/Kconfig"
 source "board/renesas/koelsch/Kconfig"
 source "board/renesas/lager/Kconfig"
-source "board/kmc/kzm9g/Kconfig"
 source "board/renesas/alt/Kconfig"
 source "board/renesas/silk/Kconfig"
 source "board/renesas/porter/Kconfig"
board/kmc/kzm9g/Kconfig deleted +0 -12
deleted file mode 100644
index f163efd9892b..000000000000
@@ -1,12 +0,0 @@
-if TARGET_KZM9G
-
-config SYS_BOARD
-	default "kzm9g"
-
-config SYS_VENDOR
-	default "kmc"
-
-config SYS_CONFIG_NAME
-	default "kzm9g"
-
-endif
board/kmc/kzm9g/MAINTAINERS deleted +0 -7
deleted file mode 100644
index 411efd1e31e0..000000000000
@@ -1,7 +0,0 @@
-KZM9G BOARD
-M:	Nobuhiro Iwamatsu <[email protected]>
-M:	Tetsuyuki Kobayashi <[email protected]>
-S:	Maintained
-F:	board/kmc/kzm9g/
-F:	include/configs/kzm9g.h
-F:	configs/kzm9g_defconfig
board/kmc/kzm9g/Makefile deleted +0 -6
deleted file mode 100644
index aebe9f3546ef..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2012 Nobuhiro Iwamatsu <[email protected]>
-# (C) Copyright 2012 Renesas Solutions Corp.
-
-obj-y	:= kzm9g.o
board/kmc/kzm9g/kzm9g.c deleted +0 -373

373 lines not on this page · raw message

configs/kzm9g_defconfig deleted +0 -47

47 lines not on this page · raw message

include/configs/kzm9g.h deleted +0 -57

57 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#22 lore raw

Re: [PATCH 08/21] arm: Remove kzm9g board

Quoted 6 lines · Tom Rini

This board is behind on several mandatory DM migrations and is missing OF_CONTROL support that makes other conversions impossible. Remove it.

Cc Nobuhiro Iwamatsu <[email protected]>
Cc Tetsuyuki Kobayashi <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#23 lore raw

PATCH 9/21 net: Remove smc91111 ethernet driver

In reply to Tom Rini

This driver has not been converted to DM_ETH. The migration deadline passed 2 years ago.

Cc Linus Walleij <[email protected]>
Cc David Feng <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Andre Przywara <[email protected]>
---
 README                                |   14 -
 board/armltd/integrator/integrator.c  |    3 -
 board/armltd/vexpress64/vexpress64.c  |    3 -
 drivers/net/Makefile                  |    1 -
 drivers/net/smc91111.c                | 1307 -------------------------
 drivers/net/smc91111.h                |  632 ------------
 examples/standalone/Makefile          |    1 -
 examples/standalone/smc91111_eeprom.c |  372 -------
 include/configs/integratorcp.h        |    8 -
 include/configs/vexpress_aemv8.h      |    6 -
 10 files changed, 2347 deletions(-)
 delete mode 100644 drivers/net/smc91111.c
 delete mode 100644 drivers/net/smc91111.h
 delete mode 100644 examples/standalone/smc91111_eeprom.c
README +0 -14
index a6c306149c73..98185af62463 100644
@@ -565,20 +565,6 @@ The following options need to be configured:
 			CONFIG_LAN91C96_USE_32_BIT
 			Define this to enable 32 bit addressing
 
-		CONFIG_SMC91111
-		Support for SMSC's LAN91C111 chip
-
-			CONFIG_SMC91111_BASE
-			Define this to hold the physical address
-			of the device (I/O space)
-
-			CONFIG_SMC_USE_32_BIT
-			Define this if data bus is 32 bits
-
-			CONFIG_SMC_USE_IOFUNCS
-			Define this to use i/o functions instead of macros
-			(some hardware wont work with macros)
-
 			CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT
 			Define this if you have more then 3 PHYs.
 
board/armltd/integrator/integrator.c +0 -3
index e734ceae8890..4959a7fd6dcf 100644
@@ -179,9 +179,6 @@ extern void dram_query(void);
 int board_eth_init(struct bd_info *bis)
 {
 	int rc = 0;
-#ifdef CONFIG_SMC91111
-	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
 	return rc;
 }
 #endif
board/armltd/vexpress64/vexpress64.c +0 -3
index 709ebf3fb085..05a7a25c32ec 100644
@@ -200,9 +200,6 @@ int board_eth_init(struct bd_info *bis)
 {
 	int rc = 0;
 #ifndef CONFIG_DM_ETH
-#ifdef CONFIG_SMC91111
-	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
 #ifdef CONFIG_SMC911X
 	rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
 #endif
drivers/net/Makefile +0 -1
index 9536af11946f..ac9818107e7e 100644
@@ -78,7 +78,6 @@ obj-$(CONFIG_RTL8139) += rtl8139.o
 obj-$(CONFIG_RTL8169) += rtl8169.o
 obj-$(CONFIG_SH_ETHER) += sh_eth.o
 obj-$(CONFIG_SJA1105) += sja1105.o
-obj-$(CONFIG_SMC91111) += smc91111.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_SNI_AVE) += sni_ave.o
 obj-$(CONFIG_SNI_NETSEC) += sni_netsec.o
drivers/net/smc91111.c deleted +0 -1307

1,307 lines not on this page · raw message

drivers/net/smc91111.h deleted +0 -632

632 lines not on this page · raw message

examples/standalone/Makefile +0 -1
index d4be0c7350dc..5b48a9d43c62 100644
@@ -4,7 +4,6 @@
 # Wolfgang Denk, DENX Software Engineering, [email protected].
 
 extra-y        := hello_world
-extra-$(CONFIG_SMC91111)           += smc91111_eeprom
 extra-$(CONFIG_SPI_FLASH_ATMEL)    += atmel_df_pow2
 extra-$(CONFIG_PPC)                += sched
 
examples/standalone/smc91111_eeprom.c deleted +0 -372

372 lines not on this page · raw message

include/configs/integratorcp.h +0 -8
index 2752152f68ee..7b9a5b1c5415 100644
@@ -19,14 +19,6 @@
 /* Integrator CP-specific configuration */
 #define CONFIG_SYS_HZ_CLOCK		1000000	/* Timer 1 is clocked at 1Mhz */
 
-/*
- * Hardware drivers
- */
-#define CONFIG_SMC91111
-#define CONFIG_SMC_USE_32_BIT
-#define CONFIG_SMC91111_BASE    0xC8000000
-#undef CONFIG_SMC91111_EXT_PHY
-
 #define CONFIG_SERVERIP 192.168.1.100
 #define CONFIG_IPADDR 192.168.1.104
 
include/configs/vexpress_aemv8.h +0 -6
index 077428f50040..0c11b6b3331e 100644
@@ -84,12 +84,6 @@
 #endif
 #endif /* !CONFIG_GICV3 */
 
-#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH)
-/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */
-#define CONFIG_SMC91111			1
-#define CONFIG_SMC91111_BASE		(V2M_PA_BASE + 0x01A000000)
-#endif
-
 /* PL011 Serial Configuration */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define CONFIG_PL011_CLOCK		7372800
Signature · 1 line
2.25.1
Acked-by on v1 9/21
#24 lore raw

Re: [PATCH 09/21] net: Remove smc91111 ethernet driver

Quoted 2,468 lines · Tom Rini

This driver has not been converted to DM_ETH. The migration deadline passed 2 years ago.

Cc Linus Walleij <[email protected]>
Cc David Feng <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Andre Przywara <[email protected]>
---
 README                                |   14 -
 board/armltd/integrator/integrator.c  |    3 -
 board/armltd/vexpress64/vexpress64.c  |    3 -
 drivers/net/Makefile                  |    1 -
 drivers/net/smc91111.c                | 1307 -------------------------
 drivers/net/smc91111.h                |  632 ------------
 examples/standalone/Makefile          |    1 -
 examples/standalone/smc91111_eeprom.c |  372 -------
 include/configs/integratorcp.h        |    8 -
 include/configs/vexpress_aemv8.h      |    6 -
 10 files changed, 2347 deletions(-)
 delete mode 100644 drivers/net/smc91111.c
 delete mode 100644 drivers/net/smc91111.h
 delete mode 100644 examples/standalone/smc91111_eeprom.c
README +0 -14
index a6c306149c73..98185af62463 100644
@@ -565,20 +565,6 @@ The following options need to be configured:
                        CONFIG_LAN91C96_USE_32_BIT
                        Define this to enable 32 bit addressing
 
-               CONFIG_SMC91111
-               Support for SMSC's LAN91C111 chip
-
-                       CONFIG_SMC91111_BASE
-                       Define this to hold the physical address
-                       of the device (I/O space)
-
-                       CONFIG_SMC_USE_32_BIT
-                       Define this if data bus is 32 bits
-
-                       CONFIG_SMC_USE_IOFUNCS
-                       Define this to use i/o functions instead of macros
-                       (some hardware wont work with macros)
-
                        CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT
                        Define this if you have more then 3 PHYs.
 
board/armltd/integrator/integrator.c +0 -3
index e734ceae8890..4959a7fd6dcf 100644
@@ -179,9 +179,6 @@ extern void dram_query(void);
 int board_eth_init(struct bd_info *bis)
 {
        int rc = 0;
-#ifdef CONFIG_SMC91111
-       rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
        return rc;
 }
 #endif
board/armltd/vexpress64/vexpress64.c +0 -3
index 709ebf3fb085..05a7a25c32ec 100644
@@ -200,9 +200,6 @@ int board_eth_init(struct bd_info *bis)
 {
        int rc = 0;
 #ifndef CONFIG_DM_ETH
-#ifdef CONFIG_SMC91111
-       rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
 #ifdef CONFIG_SMC911X
        rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
 #endif
drivers/net/Makefile +0 -1
index 9536af11946f..ac9818107e7e 100644
@@ -78,7 +78,6 @@ obj-$(CONFIG_RTL8139) += rtl8139.o
 obj-$(CONFIG_RTL8169) += rtl8169.o
 obj-$(CONFIG_SH_ETHER) += sh_eth.o
 obj-$(CONFIG_SJA1105) += sja1105.o
-obj-$(CONFIG_SMC91111) += smc91111.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_SNI_AVE) += sni_ave.o
 obj-$(CONFIG_SNI_NETSEC) += sni_netsec.o
drivers/net/smc91111.c deleted +0 -1307
deleted file mode 100644
index 61d7f3df69ee..000000000000
@@ -1,1307 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*------------------------------------------------------------------------
- . smc91111.c
- . This is a driver for SMSC's 91C111 single-chip Ethernet device.
- .
- . (C) Copyright 2002
- . Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- . Rolf Offermanns <[email protected]>
- .
- . Copyright (C) 2001 Standard Microsystems Corporation (SMSC)
- .      Developed by Simple Network Magic Corporation (SNMC)
- . Copyright (C) 1996 by Erik Stahlman (ES)
- .
- .
- . Information contained in this file was obtained from the LAN91C111
- . manual from SMC.  To get a copy, if you really want one, you can find
- . information under www.smsc.com.
- .
- .
- . "Features" of the SMC chip:
- .   Integrated PHY/MAC for 10/100BaseT Operation
- .   Supports internal and external MII
- .   Integrated 8K packet memory
- .   EEPROM interface for configuration
- .
- . Arguments:
- .     io      = for the base address
- .     irq     = for the IRQ
- .
- . author:
- .     Erik Stahlman                           ( [email protected] )
- .     Daris A Nevil                           ( [email protected] )
- .
- .
- . Hardware multicast code from Peter Cammaert ( [email protected] )
- .
- . Sources:
- .    o          SMSC LAN91C111 databook (www.smsc.com)
- .    o          smc9194.c by Erik Stahlman
- .    o          skeleton.c by Donald Becker ( [email protected] )
- .
- . History:
- .     06/19/03  Richard Woodruff Made u-boot environment aware and added mac addr checks.
- .     10/17/01  Marco Hasewinkel Modify for DNP/1110
- .     07/25/01  Woojung Huh      Modify for ADS Bitsy
- .     04/25/01  Daris A Nevil    Initial public release through SMSC
- .     03/16/01  Daris A Nevil    Modified smc9194.c for use with LAN91C111
- ----------------------------------------------------------------------------*/
-
-#include <common.h>
-#include <command.h>
-#include <config.h>
-#include <malloc.h>
-#include <linux/delay.h>
-#include "smc91111.h"
-#include <net.h>
-
-/* Use power-down feature of the chip */
-#define POWER_DOWN     0
-
-#define NO_AUTOPROBE
-
-#define SMC_DEBUG 0
-
-#if SMC_DEBUG > 1
-static const char version[] =
-       "smc91111.c:v1.0 04/25/01 by Daris A Nevil ([email protected])\n";
-#endif
-
-/* Autonegotiation timeout in seconds */
-#ifndef CONFIG_SMC_AUTONEG_TIMEOUT
-#define CONFIG_SMC_AUTONEG_TIMEOUT 10
-#endif
-
-/*------------------------------------------------------------------------
- .
- . Configuration options, for the experienced user to change.
- .
- -------------------------------------------------------------------------*/
-
-/*
- . Wait time for memory to be free.  This probably shouldn't be
- . tuned that much, as waiting for this means nothing else happens
- . in the system
-*/
-#define MEMORY_WAIT_TIME 16
-
-
-#if (SMC_DEBUG > 2 )
-#define PRINTK3(args...) printf(args)
-#else
-#define PRINTK3(args...)
-#endif
-
-#if SMC_DEBUG > 1
-#define PRINTK2(args...) printf(args)
-#else
-#define PRINTK2(args...)
-#endif
-
-#ifdef SMC_DEBUG
-#define PRINTK(args...) printf(args)
-#else
-#define PRINTK(args...)
-#endif
-
-
-/*------------------------------------------------------------------------
- .
- . The internal workings of the driver.         If you are changing anything
- . here with the SMC stuff, you should have the datasheet and know
- . what you are doing.
- .
- -------------------------------------------------------------------------*/
-
-/* Memory sizing constant */
-#define LAN91C111_MEMORY_MULTIPLIER    (1024*2)
-
-#ifndef CONFIG_SMC91111_BASE
-#error "SMC91111 Base address must be passed to initialization funciton"
-/* #define CONFIG_SMC91111_BASE 0x20000300 */
-#endif
-
-#define SMC_DEV_NAME "SMC91111"
-#define SMC_PHY_ADDR 0x0000
-#define SMC_ALLOC_MAX_TRY 5
-#define SMC_TX_TIMEOUT 30
-
-#define SMC_PHY_CLOCK_DELAY 1000
-
-#define ETH_ZLEN 60
-
-#ifdef CONFIG_SMC_USE_32_BIT
-#define USE_32_BIT  1
-#else
-#undef USE_32_BIT
-#endif
-
-#ifdef SHARED_RESOURCES
-extern void swap_to(int device_id);
-#else
-# define swap_to(x)
-#endif
-
-#ifndef CONFIG_SMC91111_EXT_PHY
-static void smc_phy_configure(struct eth_device *dev);
-#endif /* !CONFIG_SMC91111_EXT_PHY */
-
-/*
- ------------------------------------------------------------
- .
- . Internal routines
- .
- ------------------------------------------------------------
-*/
-
-#ifdef CONFIG_SMC_USE_IOFUNCS
-/*
- * input and output functions
- *
- * Implemented due to inx,outx macros accessing the device improperly
- * and putting the device into an unkown state.
- *
- * For instance, on Sharp LPD7A400 SDK, affects were chip memory
- * could not be free'd (hence the alloc failures), duplicate packets,
- * packets being corrupt (shifted) on the wire, etc.  Switching to the
- * inx,outx functions fixed this problem.
- */
-
-static inline word SMC_inw(struct eth_device *dev, dword offset)
-{
-       word v;
-       v = *((volatile word*)(dev->iobase + offset));
-       barrier(); *(volatile u32*)(0xc0000000);
-       return v;
-}
-
-static inline void SMC_outw(struct eth_device *dev, word value, dword offset)
-{
-       *((volatile word*)(dev->iobase + offset)) = value;
-       barrier(); *(volatile u32*)(0xc0000000);
-}
-
-static inline byte SMC_inb(struct eth_device *dev, dword offset)
-{
-       word  _w;
-
-       _w = SMC_inw(dev, offset & ~((dword)1));
-       return (offset & 1) ? (byte)(_w >> 8) : (byte)(_w);
-}
-
-static inline void SMC_outb(struct eth_device *dev, byte value, dword offset)
-{
-       word  _w;
-
-       _w = SMC_inw(dev, offset & ~((dword)1));
-       if (offset & 1)
-               *((volatile word*)(dev->iobase + (offset & ~((dword)1)))) =
-                       (value<<8) | (_w & 0x00ff);
-       else
-               *((volatile word*)(dev->iobase + offset)) =
-                       value | (_w & 0xff00);
-}
-
-static inline void SMC_insw(struct eth_device *dev, dword offset,
-       volatile uchar* buf, dword len)
-{
-       volatile word *p = (volatile word *)buf;
-
-       while (len-- > 0) {
-               *p++ = SMC_inw(dev, offset);
-               barrier();
-               *((volatile u32*)(0xc0000000));
-       }
-}
-
-static inline void SMC_outsw(struct eth_device *dev, dword offset,
-       uchar* buf, dword len)
-{
-       volatile word *p = (volatile word *)buf;
-
-       while (len-- > 0) {
-               SMC_outw(dev, *p++, offset);
-               barrier();
-               *(volatile u32*)(0xc0000000);
-       }
-}
-#endif  /* CONFIG_SMC_USE_IOFUNCS */
-
-/*
- . A rather simple routine to print out a packet for debugging purposes.
-*/
-#if SMC_DEBUG > 2
-static void print_packet( byte *, int );
-#endif
-
-#define tx_done(dev) 1
-
-static int poll4int (struct eth_device *dev, byte mask, int timeout)
-{
-       int tmo = get_timer (0) + timeout * CONFIG_SYS_HZ;
-       int is_timeout = 0;
-       word old_bank = SMC_inw (dev, BSR_REG);
-
-       PRINTK2 ("Polling...\n");
-       SMC_SELECT_BANK (dev, 2);
-       while ((SMC_inw (dev, SMC91111_INT_REG) & mask) == 0) {
-               if (get_timer (0) >= tmo) {
-                       is_timeout = 1;
-                       break;
-               }
-       }
-
-       /* restore old bank selection */
-       SMC_SELECT_BANK (dev, old_bank);
-
-       if (is_timeout)
-               return 1;
-       else
-               return 0;
-}
-
-/* Only one release command at a time, please */
-static inline void smc_wait_mmu_release_complete (struct eth_device *dev)
-{
-       int count = 0;
-
-       /* assume bank 2 selected */
-       while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) {
-               udelay(1);      /* Wait until not busy */
-               if (++count > 200)
-                       break;
-       }
-}
-
-/*
- . Function: smc_reset( void )
- . Purpose:
- .     This sets the SMC91111 chip to its normal state, hopefully from whatever
- .     mess that any other DOS driver has put it in.
- .
- . Maybe I should reset more registers to defaults in here?  SOFTRST  should
- . do that for me.
- .
- . Method:
- .     1.  send a SOFT RESET
- .     2.  wait for it to finish
- .     3.  enable autorelease mode
- .     4.  reset the memory management unit
- .     5.  clear all interrupts
- .
-*/
-static void smc_reset (struct eth_device *dev)
-{
-       PRINTK2 ("%s: smc_reset\n", SMC_DEV_NAME);
-
-       /* This resets the registers mostly to defaults, but doesn't
-          affect EEPROM.  That seems unnecessary */
-       SMC_SELECT_BANK (dev, 0);
-       SMC_outw (dev, RCR_SOFTRST, RCR_REG);
-
-       /* Setup the Configuration Register */
-       /* This is necessary because the CONFIG_REG is not affected */
-       /* by a soft reset */
-
-       SMC_SELECT_BANK (dev, 1);
-#if defined(CONFIG_SMC91111_EXT_PHY)
-       SMC_outw (dev, CONFIG_DEFAULT | CONFIG_EXT_PHY, CONFIG_REG);
-#else
-       SMC_outw (dev, CONFIG_DEFAULT, CONFIG_REG);
-#endif
-
-
-       /* Release from possible power-down state */
-       /* Configuration register is not affected by Soft Reset */
-       SMC_outw (dev, SMC_inw (dev, CONFIG_REG) | CONFIG_EPH_POWER_EN,
-               CONFIG_REG);
-
-       SMC_SELECT_BANK (dev, 0);
-
-       /* this should pause enough for the chip to be happy */
-       udelay(10);
-
-       /* Disable transmit and receive functionality */
-       SMC_outw (dev, RCR_CLEAR, RCR_REG);
-       SMC_outw (dev, TCR_CLEAR, TCR_REG);
-
-       /* set the control register */
-       SMC_SELECT_BANK (dev, 1);
-       SMC_outw (dev, CTL_DEFAULT, CTL_REG);
-
-       /* Reset the MMU */
-       SMC_SELECT_BANK (dev, 2);
-       smc_wait_mmu_release_complete (dev);
-       SMC_outw (dev, MC_RESET, MMU_CMD_REG);
-       while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY)
-               udelay(1);      /* Wait until not busy */
-
-       /* Note:  It doesn't seem that waiting for the MMU busy is needed here,
-          but this is a place where future chipsets _COULD_ break.  Be wary
-          of issuing another MMU command right after this */
-
-       /* Disable all interrupts */
-       SMC_outb (dev, 0, IM_REG);
-}
-
-/*
- . Function: smc_enable
- . Purpose: let the chip talk to the outside work
- . Method:
- .     1.  Enable the transmitter
- .     2.  Enable the receiver
- .     3.  Enable interrupts
-*/
-static void smc_enable(struct eth_device *dev)
-{
-       PRINTK2("%s: smc_enable\n", SMC_DEV_NAME);
-       SMC_SELECT_BANK( dev, 0 );
-       /* see the header file for options in TCR/RCR DEFAULT*/
-       SMC_outw( dev, TCR_DEFAULT, TCR_REG );
-       SMC_outw( dev, RCR_DEFAULT, RCR_REG );
-
-       /* clear MII_DIS */
-/*     smc_write_phy_register(PHY_CNTL_REG, 0x0000); */
-}
-
-/*
- . Function: smc_halt
- . Purpose:  closes down the SMC91xxx chip.
- . Method:
- .     1. zero the interrupt mask
- .     2. clear the enable receive flag
- .     3. clear the enable xmit flags
- .
- . TODO:
- .   (1) maybe utilize power down mode.
- .     Why not yet?  Because while the chip will go into power down mode,
- .     the manual says that it will wake up in response to any I/O requests
- .     in the register space.   Empirical results do not show this working.
-*/
-static void smc_halt(struct eth_device *dev)
-{
-       PRINTK2("%s: smc_halt\n", SMC_DEV_NAME);
-
-       /* no more interrupts for me */
-       SMC_SELECT_BANK( dev, 2 );
-       SMC_outb( dev, 0, IM_REG );
-
-       /* and tell the card to stay away from that nasty outside world */
-       SMC_SELECT_BANK( dev, 0 );
-       SMC_outb( dev, RCR_CLEAR, RCR_REG );
-       SMC_outb( dev, TCR_CLEAR, TCR_REG );
-
-       swap_to(FLASH);
-}
-
-
-/*
- . Function:  smc_send(struct net_device * )
- . Purpose:
- .     This sends the actual packet to the SMC9xxx chip.
- .
- . Algorithm:
- .     First, see if a saved_skb is available.
- .             ( this should NOT be called if there is no 'saved_skb'
- .     Now, find the packet number that the chip allocated
- .     Point the data pointers at it in memory
- .     Set the length word in the chip's memory
- .     Dump the packet to chip memory
- .     Check if a last byte is needed ( odd length packet )
- .             if so, set the control flag right
- .     Tell the card to send it
- .     Enable the transmit interrupt, so I know if it failed
- .     Free the kernel data if I actually sent it.
-*/
-static int smc_send(struct eth_device *dev, void *packet, int packet_length)
-{
-       byte packet_no;
-       byte *buf;
-       int length;
-       int numPages;
-       int try = 0;
-       int time_out;
-       byte status;
-       byte saved_pnr;
-       word saved_ptr;
-
-       /* save PTR and PNR registers before manipulation */
-       SMC_SELECT_BANK (dev, 2);
-       saved_pnr = SMC_inb( dev, PN_REG );
-       saved_ptr = SMC_inw( dev, PTR_REG );
-
-       PRINTK3 ("%s: smc_hardware_send_packet\n", SMC_DEV_NAME);
-
-       length = ETH_ZLEN < packet_length ? packet_length : ETH_ZLEN;
-
-       /* allocate memory
-        ** The MMU wants the number of pages to be the number of 256 bytes
-        ** 'pages', minus 1 ( since a packet can't ever have 0 pages :) )
-        **
-        ** The 91C111 ignores the size bits, but the code is left intact
-        ** for backwards and future compatibility.
-        **
-        ** Pkt size for allocating is data length +6 (for additional status
-        ** words, length and ctl!)
-        **
-        ** If odd size then last byte is included in this header.
-        */
-       numPages = ((length & 0xfffe) + 6);
-       numPages >>= 8;         /* Divide by 256 */
-
-       if (numPages > 7) {
-               printf ("%s: Far too big packet error. \n", SMC_DEV_NAME);
-               return 0;
-       }
-
-       /* now, try to allocate the memory */
-       SMC_SELECT_BANK (dev, 2);
-       SMC_outw (dev, MC_ALLOC | numPages, MMU_CMD_REG);
-
-       /* FIXME: the ALLOC_INT bit never gets set *
-        * so the following will always give a     *
-        * memory allocation error.                *
-        * same code works in armboot though       *
-        * -ro
-        */
-
-again:
-       try++;
-       time_out = MEMORY_WAIT_TIME;
-       do {
-               status = SMC_inb (dev, SMC91111_INT_REG);
-               if (status & IM_ALLOC_INT) {
-                       /* acknowledge the interrupt */
-                       SMC_outb (dev, IM_ALLOC_INT, SMC91111_INT_REG);
-                       break;
-               }
-       } while (--time_out);
-
-       if (!time_out) {
-               PRINTK2 ("%s: memory allocation, try %d failed ...\n",
-                        SMC_DEV_NAME, try);
-               if (try < SMC_ALLOC_MAX_TRY)
-                       goto again;
-               else
-                       return 0;
-       }
-
-       PRINTK2 ("%s: memory allocation, try %d succeeded ...\n",
-                SMC_DEV_NAME, try);
-
-       buf = (byte *) packet;
-
-       /* If I get here, I _know_ there is a packet slot waiting for me */
-       packet_no = SMC_inb (dev, AR_REG);
-       if (packet_no & AR_FAILED) {
-               /* or isn't there?  BAD CHIP! */
-               printf ("%s: Memory allocation failed. \n", SMC_DEV_NAME);
-               return 0;
-       }
-
-       /* we have a packet address, so tell the card to use it */
-       SMC_outb (dev, packet_no, PN_REG);
-
-       /* do not write new ptr value if Write data fifo not empty */
-       while ( saved_ptr & PTR_NOTEMPTY )
-               printf ("Write data fifo not empty!\n");
-
-       /* point to the beginning of the packet */
-       SMC_outw (dev, PTR_AUTOINC, PTR_REG);
-
-       PRINTK3 ("%s: Trying to xmit packet of length %x\n",
-                SMC_DEV_NAME, length);
-
-#if SMC_DEBUG > 2
-       printf ("Transmitting Packet\n");
-       print_packet (buf, length);
-#endif
-
-       /* send the packet length ( +6 for status, length and ctl byte )
-          and the status word ( set to zeros ) */
-#ifdef USE_32_BIT
-       SMC_outl (dev, (length + 6) << 16, SMC91111_DATA_REG);
-#else
-       SMC_outw (dev, 0, SMC91111_DATA_REG);
-       /* send the packet length ( +6 for status words, length, and ctl */
-       SMC_outw (dev, (length + 6), SMC91111_DATA_REG);
-#endif
-
-       /* send the actual data
-          . I _think_ it's faster to send the longs first, and then
-          . mop up by sending the last word.  It depends heavily
-          . on alignment, at least on the 486.  Maybe it would be
-          . a good idea to check which is optimal?  But that could take
-          . almost as much time as is saved?
-        */
-#ifdef USE_32_BIT
-       SMC_outsl (dev, SMC91111_DATA_REG, buf, length >> 2);
-       if (length & 0x2)
-               SMC_outw (dev, *((word *) (buf + (length & 0xFFFFFFFC))),
-                         SMC91111_DATA_REG);
-#else
-       SMC_outsw (dev, SMC91111_DATA_REG, buf, (length) >> 1);
-#endif /* USE_32_BIT */
-
-       /* Send the last byte, if there is one.   */
-       if ((length & 1) == 0) {
-               SMC_outw (dev, 0, SMC91111_DATA_REG);
-       } else {
-               SMC_outw (dev, buf[length - 1] | 0x2000, SMC91111_DATA_REG);
-       }
-
-       /* and let the chipset deal with it */
-       SMC_outw (dev, MC_ENQUEUE, MMU_CMD_REG);
-
-       /* poll for TX INT */
-       /* if (poll4int (dev, IM_TX_INT, SMC_TX_TIMEOUT)) { */
-       /* poll for TX_EMPTY INT - autorelease enabled */
-       if (poll4int(dev, IM_TX_EMPTY_INT, SMC_TX_TIMEOUT)) {
-               /* sending failed */
-               PRINTK2 ("%s: TX timeout, sending failed...\n", SMC_DEV_NAME);
-
-               /* release packet */
-               /* no need to release, MMU does that now */
-
-               /* wait for MMU getting ready (low) */
-               while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) {
-                       udelay(10);
-               }
-
-               PRINTK2 ("MMU ready\n");
-
-
-               return 0;
-       } else {
-               /* ack. int */
-               SMC_outb (dev, IM_TX_EMPTY_INT, SMC91111_INT_REG);
-               /* SMC_outb (IM_TX_INT, SMC91111_INT_REG); */
-               PRINTK2 ("%s: Sent packet of length %d \n", SMC_DEV_NAME,
-                        length);
-
-               /* release packet */
-               /* no need to release, MMU does that now */
-
-               /* wait for MMU getting ready (low) */
-               while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) {
-                       udelay(10);
-               }
-
-               PRINTK2 ("MMU ready\n");
-
-
-       }
-
-       /* restore previously saved registers */
-       SMC_outb( dev, saved_pnr, PN_REG );
-       SMC_outw( dev, saved_ptr, PTR_REG );
-
-       return length;
-}
-
-static int smc_write_hwaddr(struct eth_device *dev)
-{
-       int i;
-
-       swap_to(ETHERNET);
-       SMC_SELECT_BANK (dev, 1);
-#ifdef USE_32_BIT
-       for (i = 0; i < 6; i += 2) {
-               word address;
-
-               address = dev->enetaddr[i + 1] << 8;
-               address |= dev->enetaddr[i];
-               SMC_outw(dev, address, (ADDR0_REG + i));
-       }
-#else
-       for (i = 0; i < 6; i++)
-               SMC_outb(dev, dev->enetaddr[i], (ADDR0_REG + i));
-#endif
-       swap_to(FLASH);
-       return 0;
-}
-
-/*
- * Open and Initialize the board
- *
- * Set up everything, reset the card, etc ..
- *
- */
-static int smc_init(struct eth_device *dev, struct bd_info *bd)
-{
-       swap_to(ETHERNET);
-
-       PRINTK2 ("%s: smc_init\n", SMC_DEV_NAME);
-
-       /* reset the hardware */
-       smc_reset (dev);
-       smc_enable (dev);
-
-       /* Configure the PHY */
-#ifndef CONFIG_SMC91111_EXT_PHY
-       smc_phy_configure (dev);
-#endif
-
-       /* conservative setting (10Mbps, HalfDuplex, no AutoNeg.) */
-/*     SMC_SELECT_BANK(dev, 0); */
-/*     SMC_outw(dev, 0, RPC_REG); */
-
-       printf(SMC_DEV_NAME ": MAC %pM\n", dev->enetaddr);
-
-       return 0;
-}
-
-/*-------------------------------------------------------------
- .
- . smc_rcv -  receive a packet from the card
- .
- . There is ( at least ) a packet waiting to be read from
- . chip-memory.
- .
- . o Read the status
- . o If an error, record it
- . o otherwise, read in the packet
- --------------------------------------------------------------
-*/
-static int smc_rcv(struct eth_device *dev)
-{
-       int     packet_number;
-       word    status;
-       word    packet_length;
-       int     is_error = 0;
-#ifdef USE_32_BIT
-       dword stat_len;
-#endif
-       byte saved_pnr;
-       word saved_ptr;
-
-       SMC_SELECT_BANK(dev, 2);
-       /* save PTR and PTR registers */
-       saved_pnr = SMC_inb( dev, PN_REG );
-       saved_ptr = SMC_inw( dev, PTR_REG );
-
-       packet_number = SMC_inw( dev, RXFIFO_REG );
-
-       if ( packet_number & RXFIFO_REMPTY ) {
-
-               return 0;
-       }
-
-       PRINTK3("%s: smc_rcv\n", SMC_DEV_NAME);
-       /*  start reading from the start of the packet */
-       SMC_outw( dev, PTR_READ | PTR_RCV | PTR_AUTOINC, PTR_REG );
-
-       /* First two words are status and packet_length */
-#ifdef USE_32_BIT
-       stat_len = SMC_inl(dev, SMC91111_DATA_REG);
-       status = stat_len & 0xffff;
-       packet_length = stat_len >> 16;
-#else
-       status          = SMC_inw( dev, SMC91111_DATA_REG );
-       packet_length   = SMC_inw( dev, SMC91111_DATA_REG );
-#endif
-
-       packet_length &= 0x07ff;  /* mask off top bits */
-
-       PRINTK2("RCV: STATUS %4x LENGTH %4x\n", status, packet_length );
-
-       if ( !(status & RS_ERRORS ) ){
-               /* Adjust for having already read the first two words */
-               packet_length -= 4; /*4; */
-
-
-               /* set odd length for bug in LAN91C111, */
-               /* which never sets RS_ODDFRAME */
-               /* TODO ? */
-
-
-#ifdef USE_32_BIT
-               PRINTK3(" Reading %d dwords (and %d bytes)\n",
-                       packet_length >> 2, packet_length & 3 );
-               /* QUESTION:  Like in the TX routine, do I want
-                  to send the DWORDs or the bytes first, or some
-                  mixture.  A mixture might improve already slow PIO
-                  performance  */
-               SMC_insl(dev, SMC91111_DATA_REG, net_rx_packets[0],
-                        packet_length >> 2);
-               /* read the left over bytes */
-               if (packet_length & 3) {
-                       int i;
-
-                       byte *tail = (byte *)(net_rx_packets[0] +
-                               (packet_length & ~3));
-                       dword leftover = SMC_inl(dev, SMC91111_DATA_REG);
-                       for (i=0; i<(packet_length & 3); i++)
-                               *tail++ = (byte) (leftover >> (8*i)) & 0xff;
-               }
-#else
-               PRINTK3(" Reading %d words and %d byte(s)\n",
-                       (packet_length >> 1 ), packet_length & 1 );
-               SMC_insw(dev, SMC91111_DATA_REG , net_rx_packets[0],
-                        packet_length >> 1);
-
-#endif /* USE_32_BIT */
-
-#if    SMC_DEBUG > 2
-               printf("Receiving Packet\n");
-               print_packet(net_rx_packets[0], packet_length);
-#endif
-       } else {
-               /* error ... */
-               /* TODO ? */
-               is_error = 1;
-       }
-
-       while ( SMC_inw( dev, MMU_CMD_REG ) & MC_BUSY )
-               udelay(1); /* Wait until not busy */
-
-       /*  error or good, tell the card to get rid of this packet */
-       SMC_outw( dev, MC_RELEASE, MMU_CMD_REG );
-
-       while ( SMC_inw( dev, MMU_CMD_REG ) & MC_BUSY )
-               udelay(1); /* Wait until not busy */
-
-       /* restore saved registers */
-       SMC_outb( dev, saved_pnr, PN_REG );
-       SMC_outw( dev, saved_ptr, PTR_REG );
-
-       if (!is_error) {
-               /* Pass the packet up to the protocol layers. */
-               net_process_received_packet(net_rx_packets[0], packet_length);
-               return packet_length;
-       } else {
-               return 0;
-       }
-
-}
-
-
-#if 0
-/*------------------------------------------------------------
- . Modify a bit in the LAN91C111 register set
- .-------------------------------------------------------------*/
-static word smc_modify_regbit(struct eth_device *dev, int bank, int ioaddr, int reg,
-       unsigned int bit, int val)
-{
-       word regval;
-
-       SMC_SELECT_BANK( dev, bank );
-
-       regval = SMC_inw( dev, reg );
-       if (val)
-               regval |= bit;
-       else
-               regval &= ~bit;
-
-       SMC_outw( dev, regval, 0 );
-       return(regval);
-}
-
-
-/*------------------------------------------------------------
- . Retrieve a bit in the LAN91C111 register set
- .-------------------------------------------------------------*/
-static int smc_get_regbit(struct eth_device *dev, int bank, int ioaddr, int reg, unsigned int bit)
-{
-       SMC_SELECT_BANK( dev, bank );
-       if ( SMC_inw( dev, reg ) & bit)
-               return(1);
-       else
-               return(0);
-}
-
-
-/*------------------------------------------------------------
- . Modify a LAN91C111 register (word access only)
- .-------------------------------------------------------------*/
-static void smc_modify_reg(struct eth_device *dev, int bank, int ioaddr, int reg, word val)
-{
-       SMC_SELECT_BANK( dev, bank );
-       SMC_outw( dev, val, reg );
-}
-
-
-/*------------------------------------------------------------
- . Retrieve a LAN91C111 register (word access only)
- .-------------------------------------------------------------*/
-static int smc_get_reg(struct eth_device *dev, int bank, int ioaddr, int reg)
-{
-       SMC_SELECT_BANK( dev, bank );
-       return(SMC_inw( dev, reg ));
-}
-
-#endif /* 0 */
-
-/*---PHY CONTROL AND CONFIGURATION----------------------------------------- */
-
-#if (SMC_DEBUG > 2 )
-
-/*------------------------------------------------------------
- . Debugging function for viewing MII Management serial bitstream
- .-------------------------------------------------------------*/
-static void smc_dump_mii_stream (byte * bits, int size)
-{
-       int i;
-
-       printf ("BIT#:");
-       for (i = 0; i < size; ++i) {
-               printf ("%d", i % 10);
-       }
-
-       printf ("\nMDOE:");
-       for (i = 0; i < size; ++i) {
-               if (bits[i] & MII_MDOE)
-                       printf ("1");
-               else
-                       printf ("0");
-       }
-
-       printf ("\nMDO :");
-       for (i = 0; i < size; ++i) {
-               if (bits[i] & MII_MDO)
-                       printf ("1");
-               else
-                       printf ("0");
-       }
-
-       printf ("\nMDI :");
-       for (i = 0; i < size; ++i) {
-               if (bits[i] & MII_MDI)
-                       printf ("1");
-               else
-                       printf ("0");
-       }
-
-       printf ("\n");
-}
-#endif
-
-/*------------------------------------------------------------
- . Reads a register from the MII Management serial interface
- .-------------------------------------------------------------*/
-#ifndef CONFIG_SMC91111_EXT_PHY
-static word smc_read_phy_register (struct eth_device *dev, byte phyreg)
-{
-       int oldBank;
-       int i;
-       byte mask;
-       word mii_reg;
-       byte bits[64];
-       int clk_idx = 0;
-       int input_idx;
-       word phydata;
-       byte phyaddr = SMC_PHY_ADDR;
-
-       /* 32 consecutive ones on MDO to establish sync */
-       for (i = 0; i < 32; ++i)
-               bits[clk_idx++] = MII_MDOE | MII_MDO;
-
-       /* Start code <01> */
-       bits[clk_idx++] = MII_MDOE;
-       bits[clk_idx++] = MII_MDOE | MII_MDO;
-
-       /* Read command <10> */
-       bits[clk_idx++] = MII_MDOE | MII_MDO;
-       bits[clk_idx++] = MII_MDOE;
-
-       /* Output the PHY address, msb first */
-       mask = (byte) 0x10;
-       for (i = 0; i < 5; ++i) {
-               if (phyaddr & mask)
-                       bits[clk_idx++] = MII_MDOE | MII_MDO;
-               else
-                       bits[clk_idx++] = MII_MDOE;
-
-               /* Shift to next lowest bit */
-               mask >>= 1;
-       }
-
-       /* Output the phy register number, msb first */
-       mask = (byte) 0x10;
-       for (i = 0; i < 5; ++i) {
-               if (phyreg & mask)
-                       bits[clk_idx++] = MII_MDOE | MII_MDO;
-               else
-                       bits[clk_idx++] = MII_MDOE;
-
-               /* Shift to next lowest bit */
-               mask >>= 1;
-       }
-
-       /* Tristate and turnaround (2 bit times) */
-       bits[clk_idx++] = 0;
-       /*bits[clk_idx++] = 0; */
-
-       /* Input starts at this bit time */
-       input_idx = clk_idx;
-
-       /* Will input 16 bits */
-       for (i = 0; i < 16; ++i)
-               bits[clk_idx++] = 0;
-
-       /* Final clock bit */
-       bits[clk_idx++] = 0;
-
-       /* Save the current bank */
-       oldBank = SMC_inw (dev, BANK_SELECT);
-
-       /* Select bank 3 */
-       SMC_SELECT_BANK (dev, 3);
-
-       /* Get the current MII register value */
-       mii_reg = SMC_inw (dev, MII_REG);
-
-       /* Turn off all MII Interface bits */
-       mii_reg &= ~(MII_MDOE | MII_MCLK | MII_MDI | MII_MDO);
-
-       /* Clock all 64 cycles */
-       for (i = 0; i < sizeof bits; ++i) {
-               /* Clock Low - output data */
-               SMC_outw (dev, mii_reg | bits[i], MII_REG);
-               udelay(SMC_PHY_CLOCK_DELAY);
-
-
-               /* Clock Hi - input data */
-               SMC_outw (dev, mii_reg | bits[i] | MII_MCLK, MII_REG);
-               udelay(SMC_PHY_CLOCK_DELAY);
-               bits[i] |= SMC_inw (dev, MII_REG) & MII_MDI;
-       }
-
-       /* Return to idle state */
-       /* Set clock to low, data to low, and output tristated */
-       SMC_outw (dev, mii_reg, MII_REG);
-       udelay(SMC_PHY_CLOCK_DELAY);
-
-       /* Restore original bank select */
-       SMC_SELECT_BANK (dev, oldBank);
-
-       /* Recover input data */
-       phydata = 0;
-       for (i = 0; i < 16; ++i) {
-               phydata <<= 1;
-
-               if (bits[input_idx++] & MII_MDI)
-                       phydata |= 0x0001;
-       }
-
-#if (SMC_DEBUG > 2 )
-       printf ("smc_read_phy_register(): phyaddr=%x,phyreg=%x,phydata=%x\n",
-               phyaddr, phyreg, phydata);
-       smc_dump_mii_stream (bits, sizeof bits);
-#endif
-
-       return (phydata);
-}
-
-
-/*------------------------------------------------------------
- . Writes a register to the MII Management serial interface
- .-------------------------------------------------------------*/
-static void smc_write_phy_register (struct eth_device *dev, byte phyreg,
-       word phydata)
-{
-       int oldBank;
-       int i;
-       word mask;
-       word mii_reg;
-       byte bits[65];
-       int clk_idx = 0;
-       byte phyaddr = SMC_PHY_ADDR;
-
-       /* 32 consecutive ones on MDO to establish sync */
-       for (i = 0; i < 32; ++i)
-               bits[clk_idx++] = MII_MDOE | MII_MDO;
-
-       /* Start code <01> */
-       bits[clk_idx++] = MII_MDOE;
-       bits[clk_idx++] = MII_MDOE | MII_MDO;
-
-       /* Write command <01> */
-       bits[clk_idx++] = MII_MDOE;
-       bits[clk_idx++] = MII_MDOE | MII_MDO;
-
-       /* Output the PHY address, msb first */
-       mask = (byte) 0x10;
-       for (i = 0; i < 5; ++i) {
-               if (phyaddr & mask)
-                       bits[clk_idx++] = MII_MDOE | MII_MDO;
-               else
-                       bits[clk_idx++] = MII_MDOE;
-
-               /* Shift to next lowest bit */
-               mask >>= 1;
-       }
-
-       /* Output the phy register number, msb first */
-       mask = (byte) 0x10;
-       for (i = 0; i < 5; ++i) {
-               if (phyreg & mask)
-                       bits[clk_idx++] = MII_MDOE | MII_MDO;
-               else
-                       bits[clk_idx++] = MII_MDOE;
-
-               /* Shift to next lowest bit */
-               mask >>= 1;
-       }
-
-       /* Tristate and turnaround (2 bit times) */
-       bits[clk_idx++] = 0;
-       bits[clk_idx++] = 0;
-
-       /* Write out 16 bits of data, msb first */
-       mask = 0x8000;
-       for (i = 0; i < 16; ++i) {
-               if (phydata & mask)
-                       bits[clk_idx++] = MII_MDOE | MII_MDO;
-               else
-                       bits[clk_idx++] = MII_MDOE;
-
-               /* Shift to next lowest bit */
-               mask >>= 1;
-       }
-
-       /* Final clock bit (tristate) */
-       bits[clk_idx++] = 0;
-
-       /* Save the current bank */
-       oldBank = SMC_inw (dev, BANK_SELECT);
-
-       /* Select bank 3 */
-       SMC_SELECT_BANK (dev, 3);
-
-       /* Get the current MII register value */
-       mii_reg = SMC_inw (dev, MII_REG);
-
-       /* Turn off all MII Interface bits */
-       mii_reg &= ~(MII_MDOE | MII_MCLK | MII_MDI | MII_MDO);
-
-       /* Clock all cycles */
-       for (i = 0; i < sizeof bits; ++i) {
-               /* Clock Low - output data */
-               SMC_outw (dev, mii_reg | bits[i], MII_REG);
-               udelay(SMC_PHY_CLOCK_DELAY);
-
-
-               /* Clock Hi - input data */
-               SMC_outw (dev, mii_reg | bits[i] | MII_MCLK, MII_REG);
-               udelay(SMC_PHY_CLOCK_DELAY);
-               bits[i] |= SMC_inw (dev, MII_REG) & MII_MDI;
-       }
-
-       /* Return to idle state */
-       /* Set clock to low, data to low, and output tristated */
-       SMC_outw (dev, mii_reg, MII_REG);
-       udelay(SMC_PHY_CLOCK_DELAY);
-
-       /* Restore original bank select */
-       SMC_SELECT_BANK (dev, oldBank);
-
-#if (SMC_DEBUG > 2 )
-       printf ("smc_write_phy_register(): phyaddr=%x,phyreg=%x,phydata=%x\n",
-               phyaddr, phyreg, phydata);
-       smc_dump_mii_stream (bits, sizeof bits);
-#endif
-}
-#endif /* !CONFIG_SMC91111_EXT_PHY */
-
-
-/*------------------------------------------------------------
- . Configures the specified PHY using Autonegotiation. Calls
- . smc_phy_fixed() if the user has requested a certain config.
- .-------------------------------------------------------------*/
-#ifndef CONFIG_SMC91111_EXT_PHY
-static void smc_phy_configure (struct eth_device *dev)
-{
-       int timeout;
-       word my_phy_caps;       /* My PHY capabilities */
-       word my_ad_caps;        /* My Advertised capabilities */
-       word status = 0;        /*;my status = 0 */
-
-       PRINTK3 ("%s: smc_program_phy()\n", SMC_DEV_NAME);
-
-       /* Reset the PHY, setting all other bits to zero */
-       smc_write_phy_register (dev, PHY_CNTL_REG, PHY_CNTL_RST);
-
-       /* Wait for the reset to complete, or time out */
-       timeout = 6;            /* Wait up to 3 seconds */
-       while (timeout--) {
-               if (!(smc_read_phy_register (dev, PHY_CNTL_REG)
-                     & PHY_CNTL_RST)) {
-                       /* reset complete */
-                       break;
-               }
-
-               mdelay(500);    /* wait 500 millisecs */
-       }
-
-       if (timeout < 1) {
-               printf ("%s:PHY reset timed out\n", SMC_DEV_NAME);
-               goto smc_phy_configure_exit;
-       }
-
-       /* Read PHY Register 18, Status Output */
-       /* lp->lastPhy18 = smc_read_phy_register(PHY_INT_REG); */
-
-       /* Enable PHY Interrupts (for register 18) */
-       /* Interrupts listed here are disabled */
-       smc_write_phy_register (dev, PHY_MASK_REG, 0xffff);
-
-       /* Configure the Receive/Phy Control register */
-       SMC_SELECT_BANK (dev, 0);
-       SMC_outw (dev, RPC_DEFAULT, RPC_REG);
-
-       /* Copy our capabilities from PHY_STAT_REG to PHY_AD_REG */
-       my_phy_caps = smc_read_phy_register (dev, PHY_STAT_REG);
-       my_ad_caps = PHY_AD_CSMA;       /* I am CSMA capable */
-
-       if (my_phy_caps & PHY_STAT_CAP_T4)
-               my_ad_caps |= PHY_AD_T4;
-
-       if (my_phy_caps & PHY_STAT_CAP_TXF)
-               my_ad_caps |= PHY_AD_TX_FDX;
-
-       if (my_phy_caps & PHY_STAT_CAP_TXH)
-               my_ad_caps |= PHY_AD_TX_HDX;
-
-       if (my_phy_caps & PHY_STAT_CAP_TF)
-               my_ad_caps |= PHY_AD_10_FDX;
-
-       if (my_phy_caps & PHY_STAT_CAP_TH)
-               my_ad_caps |= PHY_AD_10_HDX;
-
-       /* Update our Auto-Neg Advertisement Register */
-       smc_write_phy_register (dev, PHY_AD_REG, my_ad_caps);
-
-       /* Read the register back.  Without this, it appears that when */
-       /* auto-negotiation is restarted, sometimes it isn't ready and */
-       /* the link does not come up. */
-       smc_read_phy_register(dev, PHY_AD_REG);
-
-       PRINTK2 ("%s: phy caps=%x\n", SMC_DEV_NAME, my_phy_caps);
-       PRINTK2 ("%s: phy advertised caps=%x\n", SMC_DEV_NAME, my_ad_caps);
-
-       /* Restart auto-negotiation process in order to advertise my caps */
-       smc_write_phy_register (dev, PHY_CNTL_REG,
-                               PHY_CNTL_ANEG_EN | PHY_CNTL_ANEG_RST);
-
-       /* Wait for the auto-negotiation to complete.  This may take from */
-       /* 2 to 3 seconds. */
-       /* Wait for the reset to complete, or time out */
-       timeout = CONFIG_SMC_AUTONEG_TIMEOUT * 2;
-       while (timeout--) {
-
-               status = smc_read_phy_register (dev, PHY_STAT_REG);
-               if (status & PHY_STAT_ANEG_ACK) {
-                       /* auto-negotiate complete */
-                       break;
-               }
-
-               mdelay(500);    /* wait 500 millisecs */
-
-               /* Restart auto-negotiation if remote fault */
-               if (status & PHY_STAT_REM_FLT) {
-                       printf ("%s: PHY remote fault detected\n",
-                               SMC_DEV_NAME);
-
-                       /* Restart auto-negotiation */
-                       printf ("%s: PHY restarting auto-negotiation\n",
-                               SMC_DEV_NAME);
-                       smc_write_phy_register (dev, PHY_CNTL_REG,
-                                               PHY_CNTL_ANEG_EN |
-                                               PHY_CNTL_ANEG_RST |
-                                               PHY_CNTL_SPEED |
-                                               PHY_CNTL_DPLX);
-               }
-       }
-
-       if (timeout < 1) {
-               printf ("%s: PHY auto-negotiate timed out\n", SMC_DEV_NAME);
-       }
-
-       /* Fail if we detected an auto-negotiate remote fault */
-       if (status & PHY_STAT_REM_FLT) {
-               printf ("%s: PHY remote fault detected\n", SMC_DEV_NAME);
-       }
-
-       /* Re-Configure the Receive/Phy Control register */
-       SMC_outw (dev, RPC_DEFAULT, RPC_REG);
-
-smc_phy_configure_exit:        ;
-
-}
-#endif /* !CONFIG_SMC91111_EXT_PHY */
-
-
-#if SMC_DEBUG > 2
-static void print_packet( byte * buf, int length )
-{
-       int i;
-       int remainder;
-       int lines;
-
-       printf("Packet of length %d \n", length );
-
-#if SMC_DEBUG > 3
-       lines = length / 16;
-       remainder = length % 16;
-
-       for ( i = 0; i < lines ; i ++ ) {
-               int cur;
-
-               for ( cur = 0; cur < 8; cur ++ ) {
-                       byte a, b;
-
-                       a = *(buf ++ );
-                       b = *(buf ++ );
-                       printf("%02x%02x ", a, b );
-               }
-               printf("\n");
-       }
-       for ( i = 0; i < remainder/2 ; i++ ) {
-               byte a, b;
-
-               a = *(buf ++ );
-               b = *(buf ++ );
-               printf("%02x%02x ", a, b );
-       }
-       printf("\n");
-#endif
-}
-#endif
-
-int smc91111_initialize(u8 dev_num, phys_addr_t base_addr)
-{
-       struct smc91111_priv *priv;
-       struct eth_device *dev;
-       int i;
-
-       priv = malloc(sizeof(*priv));
-       if (!priv)
-               return 0;
-       dev = malloc(sizeof(*dev));
-       if (!dev) {
-               free(priv);
-               return 0;
-       }
-
-       memset(dev, 0, sizeof(*dev));
-       priv->dev_num = dev_num;
-       dev->priv = priv;
-       dev->iobase = base_addr;
-
-       swap_to(ETHERNET);
-       SMC_SELECT_BANK(dev, 1);
-       for (i = 0; i < 6; ++i)
-               dev->enetaddr[i] = SMC_inb(dev, (ADDR0_REG + i));
-       swap_to(FLASH);
-
-       dev->init = smc_init;
-       dev->halt = smc_halt;
-       dev->send = smc_send;
-       dev->recv = smc_rcv;
-       dev->write_hwaddr = smc_write_hwaddr;
-       sprintf(dev->name, "%s-%hu", SMC_DEV_NAME, dev_num);
-
-       eth_register(dev);
-       return 0;
-}
drivers/net/smc91111.h deleted +0 -632
deleted file mode 100644
index f2ba34474598..000000000000
@@ -1,632 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*------------------------------------------------------------------------
- . smc91111.h - macros for the LAN91C111 Ethernet Driver
- .
- . (C) Copyright 2002
- . Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- . Rolf Offermanns <[email protected]>
- . Copyright (C) 2001 Standard Microsystems Corporation (SMSC)
- .       Developed by Simple Network Magic Corporation (SNMC)
- . Copyright (C) 1996 by Erik Stahlman (ES)
- .
- . This file contains register information and access macros for
- . the LAN91C111 single chip ethernet controller.  It is a modified
- . version of the smc9194.h file.
- .
- . Information contained in this file was obtained from the LAN91C111
- . manual from SMC.  To get a copy, if you really want one, you can find
- . information under www.smsc.com.
- .
- . Authors
- .     Erik Stahlman                           ( [email protected] )
- .     Daris A Nevil                           ( [email protected] )
- .
- . History
- . 03/16/01            Daris A Nevil   Modified for use with LAN91C111 device
- .
- ---------------------------------------------------------------------------*/
-#ifndef _SMC91111_H_
-#define _SMC91111_H_
-
-#include <asm/types.h>
-#include <config.h>
-#include <net.h>
-
-/*
- * This function may be called by the board specific initialisation code
- * in order to override the default mac address.
- */
-
-void smc_set_mac_addr (const unsigned char *addr);
-
-
-/* I want some simple types */
-
-typedef unsigned char                  byte;
-typedef unsigned short                 word;
-typedef unsigned long int              dword;
-
-struct smc91111_priv{
-       u8 dev_num;
-};
-
-/*
- . DEBUGGING LEVELS
- .
- . 0 for normal operation
- . 1 for slightly more details
- . >2 for various levels of increasingly useless information
- .    2 for interrupt tracking, status flags
- .    3 for packet info
- .    4 for complete packet dumps
-*/
-/*#define SMC_DEBUG 0 */
-
-/* Because of bank switching, the LAN91xxx uses only 16 I/O ports */
-
-#define        SMC_IO_EXTENT   16
-
-#if defined(CONFIG_MS7206SE)
-#define SWAB7206(x) ({ word __x = x; ((__x << 8)|(__x >> 8)); })
-#define SMC_inw(a, r) *((volatile word*)((a)->iobase + (r)))
-#define SMC_inb(a, r) (*((volatile byte*)((a)->iobase + ((r) ^ 0x01))))
-#define SMC_insw(a, r, b, l) \
-       do { \
-               int __i; \
-               word *__b2 = (word *)(b);                 \
-               for (__i = 0; __i < (l); __i++) { \
-                       *__b2++ = SWAB7206(SMC_inw(a, r));      \
-               } \
-       } while (0)
-#define        SMC_outw(a, d, r)       (*((volatile word *)((a)->iobase+(r))) = d)
-#define        SMC_outb(a, d, r)       ({      word __d = (byte)(d);  \
-                               word __w = SMC_inw((a), ((r)&(~1)));    \
-                               if (((r) & 1)) \
-                                       __w = (__w & 0x00ff) | (__d << 8); \
-                               else \
-                                       __w = (__w & 0xff00) | (__d); \
-                               SMC_outw((a), __w, ((r)&(~1)));       \
-                       })
-#define SMC_outsw(a, r, b, l) \
-       do { \
-               int __i; \
-               word *__b2 = (word *)(b);                 \
-               for (__i = 0; __i < (l); __i++) { \
-                       SMC_outw(a, SWAB7206(*__b2), r);          \
-                       __b2++; \
-               } \
-       } while (0)
-#else
-
-#ifndef CONFIG_SMC_USE_IOFUNCS /* these macros don't work on some boards */
-/*
- * We have only 16 Bit PCMCIA access on Socket 0
- */
-
-#if CONFIG_ARM64
-#define        SMC_inw(a, r)   (*((volatile word*)((a)->iobase+((dword)(r)))))
-#else
-#define SMC_inw(a, r)  (*((volatile word*)((a)->iobase+(r))))
-#endif
-#define  SMC_inb(a,r)  (((r)&1) ? SMC_inw((a),(r)&~1)>>8 : SMC_inw((a),(r)&0xFF))
-
-#if CONFIG_ARM64
-#define        SMC_outw(a, d, r)       \
-                       (*((volatile word*)((a)->iobase+((dword)(r)))) = d)
-#else
-#define        SMC_outw(a, d, r)       \
-                       (*((volatile word*)((a)->iobase+(r))) = d)
-#endif
-#define        SMC_outb(a,d,r) ({      word __d = (byte)(d);  \
-                               word __w = SMC_inw((a),(r)&~1);  \
-                               __w &= ((r)&1) ? 0x00FF : 0xFF00;  \
-                               __w |= ((r)&1) ? __d<<8 : __d;  \
-                               SMC_outw((a),__w,(r)&~1);  \
-                       })
-#if 0
-#define        SMC_outsw(a,r,b,l)      outsw((a)->iobase+(r), (b), (l))
-#else
-#define SMC_outsw(a,r,b,l)     ({      int __i; \
-                                       word *__b2; \
-                                       __b2 = (word *) b; \
-                                       for (__i = 0; __i < l; __i++) { \
-                                           SMC_outw((a), *(__b2 + __i), r); \
-                                       } \
-                               })
-#endif
-
-#if 0
-#define        SMC_insw(a,r,b,l)       insw((a)->iobase+(r), (b), (l))
-#else
-#define SMC_insw(a,r,b,l)      ({      int __i ;  \
-                                       word *__b2;  \
-                                       __b2 = (word *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inw((a),(r));  \
-                                         SMC_inw((a),0);  \
-                                       };  \
-                               })
-#endif
-
-#endif  /* CONFIG_SMC_USE_IOFUNCS */
-
-#if defined(CONFIG_SMC_USE_32_BIT)
-
-#ifdef CONFIG_XSENGINE
-#define        SMC_inl(a,r)    (*((volatile dword *)((a)->iobase+(r<<1))))
-#else
-#define        SMC_inl(a,r)    (*((volatile dword *)((a)->iobase+(r))))
-#endif
-
-#define SMC_insl(a,r,b,l)      ({      int __i ;  \
-                                       dword *__b2;  \
-                                       __b2 = (dword *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inl((a),(r));  \
-                                         SMC_inl((a),0);  \
-                                       };  \
-                               })
-
-#ifdef CONFIG_XSENGINE
-#define        SMC_outl(a,d,r) (*((volatile dword *)((a)->iobase+(r<<1))) = d)
-#else
-#define        SMC_outl(a,d,r) (*((volatile dword *)((a)->iobase+(r))) = d)
-#endif
-#define SMC_outsl(a,r,b,l)     ({      int __i; \
-                                       dword *__b2; \
-                                       __b2 = (dword *) b; \
-                                       for (__i = 0; __i < l; __i++) { \
-                                           SMC_outl((a), *(__b2 + __i), r); \
-                                       } \
-                               })
-
-#endif /* CONFIG_SMC_USE_32_BIT */
-
-#endif
-
-/*---------------------------------------------------------------
- .
- . A description of the SMSC registers is probably in order here,
- . although for details, the SMC datasheet is invaluable.
- .
- . Basically, the chip has 4 banks of registers ( 0 to 3 ), which
- . are accessed by writing a number into the BANK_SELECT register
- . ( I also use a SMC_SELECT_BANK macro for this ).
- .
- . The banks are configured so that for most purposes, bank 2 is all
- . that is needed for simple run time tasks.
- -----------------------------------------------------------------------*/
-
-/*
- . Bank Select Register:
- .
- .             yyyy yyyy 0000 00xx
- .             xx              = bank number
- .             yyyy yyyy       = 0x33, for identification purposes.
-*/
-#define        BANK_SELECT             14
-
-/* Transmit Control Register */
-/* BANK 0  */
-#define        TCR_REG         0x0000  /* transmit control register */
-#define TCR_ENABLE     0x0001  /* When 1 we can transmit */
-#define TCR_LOOP       0x0002  /* Controls output pin LBK */
-#define TCR_FORCOL     0x0004  /* When 1 will force a collision */
-#define TCR_PAD_EN     0x0080  /* When 1 will pad tx frames < 64 bytes w/0 */
-#define TCR_NOCRC      0x0100  /* When 1 will not append CRC to tx frames */
-#define TCR_MON_CSN    0x0400  /* When 1 tx monitors carrier */
-#define TCR_FDUPLX     0x0800  /* When 1 enables full duplex operation */
-#define TCR_STP_SQET   0x1000  /* When 1 stops tx if Signal Quality Error */
-#define        TCR_EPH_LOOP    0x2000  /* When 1 enables EPH block loopback */
-#define        TCR_SWFDUP      0x8000  /* When 1 enables Switched Full Duplex mode */
-
-#define        TCR_CLEAR       0       /* do NOTHING */
-/* the default settings for the TCR register : */
-/* QUESTION: do I want to enable padding of short packets ? */
-#define        TCR_DEFAULT     TCR_ENABLE
-
-
-/* EPH Status Register */
-/* BANK 0  */
-#define EPH_STATUS_REG 0x0002
-#define ES_TX_SUC      0x0001  /* Last TX was successful */
-#define ES_SNGL_COL    0x0002  /* Single collision detected for last tx */
-#define ES_MUL_COL     0x0004  /* Multiple collisions detected for last tx */
-#define ES_LTX_MULT    0x0008  /* Last tx was a multicast */
-#define ES_16COL       0x0010  /* 16 Collisions Reached */
-#define ES_SQET                0x0020  /* Signal Quality Error Test */
-#define ES_LTXBRD      0x0040  /* Last tx was a broadcast */
-#define ES_TXDEFR      0x0080  /* Transmit Deferred */
-#define ES_LATCOL      0x0200  /* Late collision detected on last tx */
-#define ES_LOSTCARR    0x0400  /* Lost Carrier Sense */
-#define ES_EXC_DEF     0x0800  /* Excessive Deferral */
-#define ES_CTR_ROL     0x1000  /* Counter Roll Over indication */
-#define ES_LINK_OK     0x4000  /* Driven by inverted value of nLNK pin */
-#define ES_TXUNRN      0x8000  /* Tx Underrun */
-
-
-/* Receive Control Register */
-/* BANK 0  */
-#define        RCR_REG         0x0004
-#define        RCR_RX_ABORT    0x0001  /* Set if a rx frame was aborted */
-#define        RCR_PRMS        0x0002  /* Enable promiscuous mode */
-#define        RCR_ALMUL       0x0004  /* When set accepts all multicast frames */
-#define RCR_RXEN       0x0100  /* IFF this is set, we can receive packets */
-#define        RCR_STRIP_CRC   0x0200  /* When set strips CRC from rx packets */
-#define        RCR_ABORT_ENB   0x0200  /* When set will abort rx on collision */
-#define        RCR_FILT_CAR    0x0400  /* When set filters leading 12 bit s of carrier */
-#define RCR_SOFTRST    0x8000  /* resets the chip */
-
-/* the normal settings for the RCR register : */
-#define        RCR_DEFAULT     (RCR_STRIP_CRC | RCR_RXEN)
-#define RCR_CLEAR      0x0     /* set it to a base state */
-
-/* Counter Register */
-/* BANK 0  */
-#define        COUNTER_REG     0x0006
-
-/* Memory Information Register */
-/* BANK 0  */
-#define        MIR_REG         0x0008
-
-/* Receive/Phy Control Register */
-/* BANK 0  */
-#define        RPC_REG         0x000A
-#define        RPC_SPEED       0x2000  /* When 1 PHY is in 100Mbps mode. */
-#define        RPC_DPLX        0x1000  /* When 1 PHY is in Full-Duplex Mode */
-#define        RPC_ANEG        0x0800  /* When 1 PHY is in Auto-Negotiate Mode */
-#define        RPC_LSXA_SHFT   5       /* Bits to shift LS2A,LS1A,LS0A to lsb */
-#define        RPC_LSXB_SHFT   2       /* Bits to get LS2B,LS1B,LS0B to lsb */
-#define RPC_LED_100_10 (0x00)  /* LED = 100Mbps OR's with 10Mbps link detect */
-#define RPC_LED_RES    (0x01)  /* LED = Reserved */
-#define RPC_LED_10     (0x02)  /* LED = 10Mbps link detect */
-#define RPC_LED_FD     (0x03)  /* LED = Full Duplex Mode */
-#define RPC_LED_TX_RX  (0x04)  /* LED = TX or RX packet occurred */
-#define RPC_LED_100    (0x05)  /* LED = 100Mbps link dectect */
-#define RPC_LED_TX     (0x06)  /* LED = TX packet occurred */
-#define RPC_LED_RX     (0x07)  /* LED = RX packet occurred */
-#if defined(CONFIG_DK1C20) || defined(CONFIG_DK1S10)
-/* buggy schematic: LEDa -> yellow, LEDb --> green */
-#define RPC_DEFAULT    ( RPC_SPEED | RPC_DPLX | RPC_ANEG       \
-                       | (RPC_LED_TX_RX << RPC_LSXA_SHFT)      \
-                       | (RPC_LED_100_10 << RPC_LSXB_SHFT)     )
-#else
-/* SMSC reference design: LEDa --> green, LEDb --> yellow */
-#define RPC_DEFAULT    ( RPC_SPEED | RPC_DPLX | RPC_ANEG       \
-                       | (RPC_LED_100_10 << RPC_LSXA_SHFT)     \
-                       | (RPC_LED_TX_RX << RPC_LSXB_SHFT)      )
-#endif
-
-/* Bank 0 0x000C is reserved */
-
-/* Bank Select Register */
-/* All Banks */
-#define BSR_REG        0x000E
-
-
-/* Configuration Reg */
-/* BANK 1 */
-#define CONFIG_REG     0x0000
-#define CONFIG_EXT_PHY 0x0200  /* 1=external MII, 0=internal Phy */
-#define CONFIG_GPCNTRL 0x0400  /* Inverse value drives pin nCNTRL */
-#define CONFIG_NO_WAIT 0x1000  /* When 1 no extra wait states on ISA bus */
-#define CONFIG_EPH_POWER_EN 0x8000 /* When 0 EPH is placed into low power mode. */
-
-/* Default is powered-up, Internal Phy, Wait States, and pin nCNTRL=low */
-#define CONFIG_DEFAULT (CONFIG_EPH_POWER_EN)
-
-
-/* Base Address Register */
-/* BANK 1 */
-#define        BASE_REG        0x0002
-
-
-/* Individual Address Registers */
-/* BANK 1 */
-#define        ADDR0_REG       0x0004
-#define        ADDR1_REG       0x0006
-#define        ADDR2_REG       0x0008
-
-
-/* General Purpose Register */
-/* BANK 1 */
-#define        GP_REG          0x000A
-
-
-/* Control Register */
-/* BANK 1 */
-#define        CTL_REG         0x000C
-#define CTL_RCV_BAD    0x4000 /* When 1 bad CRC packets are received */
-#define CTL_AUTO_RELEASE 0x0800 /* When 1 tx pages are released automatically */
-#define        CTL_LE_ENABLE   0x0080 /* When 1 enables Link Error interrupt */
-#define        CTL_CR_ENABLE   0x0040 /* When 1 enables Counter Rollover interrupt */
-#define        CTL_TE_ENABLE   0x0020 /* When 1 enables Transmit Error interrupt */
-#define        CTL_EEPROM_SELECT 0x0004 /* Controls EEPROM reload & store */
-#define        CTL_RELOAD      0x0002 /* When set reads EEPROM into registers */
-#define        CTL_STORE       0x0001 /* When set stores registers into EEPROM */
-#define CTL_DEFAULT     (0x1A10) /* Autorelease enabled*/
-
-/* MMU Command Register */
-/* BANK 2 */
-#define MMU_CMD_REG    0x0000
-#define MC_BUSY                1       /* When 1 the last release has not completed */
-#define MC_NOP         (0<<5)  /* No Op */
-#define        MC_ALLOC        (1<<5)  /* OR with number of 256 byte packets */
-#define        MC_RESET        (2<<5)  /* Reset MMU to initial state */
-#define        MC_REMOVE       (3<<5)  /* Remove the current rx packet */
-#define MC_RELEASE     (4<<5)  /* Remove and release the current rx packet */
-#define MC_FREEPKT     (5<<5)  /* Release packet in PNR register */
-#define MC_ENQUEUE     (6<<5)  /* Enqueue the packet for transmit */
-#define MC_RSTTXFIFO   (7<<5)  /* Reset the TX FIFOs */
-
-
-/* Packet Number Register */
-/* BANK 2 */
-#define        PN_REG          0x0002
-
-
-/* Allocation Result Register */
-/* BANK 2 */
-#define        AR_REG          0x0003
-#define AR_FAILED      0x80    /* Alocation Failed */
-
-
-/* RX FIFO Ports Register */
-/* BANK 2 */
-#define RXFIFO_REG     0x0004  /* Must be read as a word */
-#define RXFIFO_REMPTY  0x8000  /* RX FIFO Empty */
-
-
-/* TX FIFO Ports Register */
-/* BANK 2 */
-#define TXFIFO_REG     RXFIFO_REG      /* Must be read as a word */
-#define TXFIFO_TEMPTY  0x80    /* TX FIFO Empty */
-
-
-/* Pointer Register */
-/* BANK 2 */
-#define PTR_REG                0x0006
-#define        PTR_RCV         0x8000 /* 1=Receive area, 0=Transmit area */
-#define        PTR_AUTOINC     0x4000 /* Auto increment the pointer on each access */
-#define PTR_READ       0x2000 /* When 1 the operation is a read */
-#define PTR_NOTEMPTY   0x0800 /* When 1 _do not_ write fifo DATA REG */
-
-
-/* Data Register */
-/* BANK 2 */
-#define        SMC91111_DATA_REG       0x0008
-
-
-/* Interrupt Status/Acknowledge Register */
-/* BANK 2 */
-#define        SMC91111_INT_REG        0x000C
-
-
-/* Interrupt Mask Register */
-/* BANK 2 */
-#define IM_REG         0x000D
-#define        IM_MDINT        0x80 /* PHY MI Register 18 Interrupt */
-#define        IM_ERCV_INT     0x40 /* Early Receive Interrupt */
-#define        IM_EPH_INT      0x20 /* Set by Etheret Protocol Handler section */
-#define        IM_RX_OVRN_INT  0x10 /* Set by Receiver Overruns */
-#define        IM_ALLOC_INT    0x08 /* Set when allocation request is completed */
-#define        IM_TX_EMPTY_INT 0x04 /* Set if the TX FIFO goes empty */
-#define        IM_TX_INT       0x02 /* Transmit Interrrupt */
-#define IM_RCV_INT     0x01 /* Receive Interrupt */
-
-
-/* Multicast Table Registers */
-/* BANK 3 */
-#define        MCAST_REG1      0x0000
-#define        MCAST_REG2      0x0002
-#define        MCAST_REG3      0x0004
-#define        MCAST_REG4      0x0006
-
-
-/* Management Interface Register (MII) */
-/* BANK 3 */
-#define        MII_REG         0x0008
-#define MII_MSK_CRS100 0x4000 /* Disables CRS100 detection during tx half dup */
-#define MII_MDOE       0x0008 /* MII Output Enable */
-#define MII_MCLK       0x0004 /* MII Clock, pin MDCLK */
-#define MII_MDI                0x0002 /* MII Input, pin MDI */
-#define MII_MDO                0x0001 /* MII Output, pin MDO */
-
-
-/* Revision Register */
-/* BANK 3 */
-#define        REV_REG         0x000A /* ( hi: chip id   low: rev # ) */
-
-
-/* Early RCV Register */
-/* BANK 3 */
-/* this is NOT on SMC9192 */
-#define        ERCV_REG        0x000C
-#define ERCV_RCV_DISCRD        0x0080 /* When 1 discards a packet being received */
-#define ERCV_THRESHOLD 0x001F /* ERCV Threshold Mask */
-
-/* External Register */
-/* BANK 7 */
-#define        EXT_REG         0x0000
-
-
-#define CHIP_9192      3
-#define CHIP_9194      4
-#define CHIP_9195      5
-#define CHIP_9196      6
-#define CHIP_91100     7
-#define CHIP_91100FD   8
-#define CHIP_91111FD   9
-
-#if 0
-static const char * chip_ids[ 15 ] =  {
-       NULL, NULL, NULL,
-       /* 3 */ "SMC91C90/91C92",
-       /* 4 */ "SMC91C94",
-       /* 5 */ "SMC91C95",
-       /* 6 */ "SMC91C96",
-       /* 7 */ "SMC91C100",
-       /* 8 */ "SMC91C100FD",
-       /* 9 */ "SMC91C111",
-       NULL, NULL,
-       NULL, NULL, NULL};
-#endif
-
-/*
- . Transmit status bits
-*/
-#define TS_SUCCESS 0x0001
-#define TS_LOSTCAR 0x0400
-#define TS_LATCOL  0x0200
-#define TS_16COL   0x0010
-
-/*
- . Receive status bits
-*/
-#define RS_ALGNERR     0x8000
-#define RS_BRODCAST    0x4000
-#define RS_BADCRC      0x2000
-#define RS_ODDFRAME    0x1000  /* bug: the LAN91C111 never sets this on receive */
-#define RS_TOOLONG     0x0800
-#define RS_TOOSHORT    0x0400
-#define RS_MULTICAST   0x0001
-#define RS_ERRORS      (RS_ALGNERR | RS_BADCRC | RS_TOOLONG | RS_TOOSHORT)
-
-
-/* PHY Types */
-enum {
-       PHY_LAN83C183 = 1,      /* LAN91C111 Internal PHY */
-       PHY_LAN83C180
-};
-
-
-/* PHY Register Addresses (LAN91C111 Internal PHY) */
-
-/* PHY Control Register */
-#define PHY_CNTL_REG           0x00
-#define PHY_CNTL_RST           0x8000  /* 1=PHY Reset */
-#define PHY_CNTL_LPBK          0x4000  /* 1=PHY Loopback */
-#define PHY_CNTL_SPEED         0x2000  /* 1=100Mbps, 0=10Mpbs */
-#define PHY_CNTL_ANEG_EN       0x1000 /* 1=Enable Auto negotiation */
-#define PHY_CNTL_PDN           0x0800  /* 1=PHY Power Down mode */
-#define PHY_CNTL_MII_DIS       0x0400  /* 1=MII 4 bit interface disabled */
-#define PHY_CNTL_ANEG_RST      0x0200 /* 1=Reset Auto negotiate */
-#define PHY_CNTL_DPLX          0x0100  /* 1=Full Duplex, 0=Half Duplex */
-#define PHY_CNTL_COLTST                0x0080  /* 1= MII Colision Test */
-
-/* PHY Status Register */
-#define PHY_STAT_REG           0x01
-#define PHY_STAT_CAP_T4                0x8000  /* 1=100Base-T4 capable */
-#define PHY_STAT_CAP_TXF       0x4000  /* 1=100Base-X full duplex capable */
-#define PHY_STAT_CAP_TXH       0x2000  /* 1=100Base-X half duplex capable */
-#define PHY_STAT_CAP_TF                0x1000  /* 1=10Mbps full duplex capable */
-#define PHY_STAT_CAP_TH                0x0800  /* 1=10Mbps half duplex capable */
-#define PHY_STAT_CAP_SUPR      0x0040  /* 1=recv mgmt frames with not preamble */
-#define PHY_STAT_ANEG_ACK      0x0020  /* 1=ANEG has completed */
-#define PHY_STAT_REM_FLT       0x0010  /* 1=Remote Fault detected */
-#define PHY_STAT_CAP_ANEG      0x0008  /* 1=Auto negotiate capable */
-#define PHY_STAT_LINK          0x0004  /* 1=valid link */
-#define PHY_STAT_JAB           0x0002  /* 1=10Mbps jabber condition */
-#define PHY_STAT_EXREG         0x0001  /* 1=extended registers implemented */
-
-/* PHY Identifier Registers */
-#define PHY_ID1_REG            0x02    /* PHY Identifier 1 */
-#define PHY_ID2_REG            0x03    /* PHY Identifier 2 */
-
-/* PHY Auto-Negotiation Advertisement Register */
-#define PHY_AD_REG             0x04
-#define PHY_AD_NP              0x8000  /* 1=PHY requests exchange of Next Page */
-#define PHY_AD_ACK             0x4000  /* 1=got link code word from remote */
-#define PHY_AD_RF              0x2000  /* 1=advertise remote fault */
-#define PHY_AD_T4              0x0200  /* 1=PHY is capable of 100Base-T4 */
-#define PHY_AD_TX_FDX          0x0100  /* 1=PHY is capable of 100Base-TX FDPLX */
-#define PHY_AD_TX_HDX          0x0080  /* 1=PHY is capable of 100Base-TX HDPLX */
-#define PHY_AD_10_FDX          0x0040  /* 1=PHY is capable of 10Base-T FDPLX */
-#define PHY_AD_10_HDX          0x0020  /* 1=PHY is capable of 10Base-T HDPLX */
-#define PHY_AD_CSMA            0x0001  /* 1=PHY is capable of 802.3 CMSA */
-
-/* PHY Auto-negotiation Remote End Capability Register */
-#define PHY_RMT_REG            0x05
-/* Uses same bit definitions as PHY_AD_REG */
-
-/* PHY Configuration Register 1 */
-#define PHY_CFG1_REG           0x10
-#define PHY_CFG1_LNKDIS                0x8000  /* 1=Rx Link Detect Function disabled */
-#define PHY_CFG1_XMTDIS                0x4000  /* 1=TP Transmitter Disabled */
-#define PHY_CFG1_XMTPDN                0x2000  /* 1=TP Transmitter Powered Down */
-#define PHY_CFG1_BYPSCR                0x0400  /* 1=Bypass scrambler/descrambler */
-#define PHY_CFG1_UNSCDS                0x0200  /* 1=Unscramble Idle Reception Disable */
-#define PHY_CFG1_EQLZR         0x0100  /* 1=Rx Equalizer Disabled */
-#define PHY_CFG1_CABLE         0x0080  /* 1=STP(150ohm), 0=UTP(100ohm) */
-#define PHY_CFG1_RLVL0         0x0040  /* 1=Rx Squelch level reduced by 4.5db */
-#define PHY_CFG1_TLVL_SHIFT    2       /* Transmit Output Level Adjust */
-#define PHY_CFG1_TLVL_MASK     0x003C
-#define PHY_CFG1_TRF_MASK      0x0003  /* Transmitter Rise/Fall time */
-
-
-/* PHY Configuration Register 2 */
-#define PHY_CFG2_REG           0x11
-#define PHY_CFG2_APOLDIS       0x0020  /* 1=Auto Polarity Correction disabled */
-#define PHY_CFG2_JABDIS                0x0010  /* 1=Jabber disabled */
-#define PHY_CFG2_MREG          0x0008  /* 1=Multiple register access (MII mgt) */
-#define PHY_CFG2_INTMDIO       0x0004  /* 1=Interrupt signaled with MDIO pulseo */
-
-/* PHY Status Output (and Interrupt status) Register */
-#define PHY_INT_REG            0x12    /* Status Output (Interrupt Status) */
-#define PHY_INT_INT            0x8000  /* 1=bits have changed since last read */
-#define        PHY_INT_LNKFAIL         0x4000  /* 1=Link Not detected */
-#define PHY_INT_LOSSSYNC       0x2000  /* 1=Descrambler has lost sync */
-#define PHY_INT_CWRD           0x1000  /* 1=Invalid 4B5B code detected on rx */
-#define PHY_INT_SSD            0x0800  /* 1=No Start Of Stream detected on rx */
-#define PHY_INT_ESD            0x0400  /* 1=No End Of Stream detected on rx */
-#define PHY_INT_RPOL           0x0200  /* 1=Reverse Polarity detected */
-#define PHY_INT_JAB            0x0100  /* 1=Jabber detected */
-#define PHY_INT_SPDDET         0x0080  /* 1=100Base-TX mode, 0=10Base-T mode */
-#define PHY_INT_DPLXDET                0x0040  /* 1=Device in Full Duplex */
-
-/* PHY Interrupt/Status Mask Register */
-#define PHY_MASK_REG           0x13    /* Interrupt Mask */
-/* Uses the same bit definitions as PHY_INT_REG */
-
-
-/*-------------------------------------------------------------------------
- .  I define some macros to make it easier to do somewhat common
- . or slightly complicated, repeated tasks.
- --------------------------------------------------------------------------*/
-
-/* select a register bank, 0 to 3  */
-
-#define SMC_SELECT_BANK(a,x)  { SMC_outw((a), (x), BANK_SELECT ); }
-
-/* this enables an interrupt in the interrupt mask register */
-#define SMC_ENABLE_INT(a,x) {\
-               unsigned char mask;\
-               SMC_SELECT_BANK((a),2);\
-               mask = SMC_inb((a), IM_REG );\
-               mask |= (x);\
-               SMC_outb( (a), mask, IM_REG ); \
-}
-
-/* this disables an interrupt from the interrupt mask register */
-
-#define SMC_DISABLE_INT(a,x) {\
-               unsigned char mask;\
-               SMC_SELECT_BANK(2);\
-               mask = SMC_inb( (a), IM_REG );\
-               mask &= ~(x);\
-               SMC_outb( (a), mask, IM_REG ); \
-}
-
-/*----------------------------------------------------------------------
- . Define the interrupts that I want to receive from the card
- .
- . I want:
- .  IM_EPH_INT, for nasty errors
- .  IM_RCV_INT, for happy received packets
- .  IM_RX_OVRN_INT, because I have to kick the receiver
- .  IM_MDINT, for PHY Register 18 Status Changes
- --------------------------------------------------------------------------*/
-#define SMC_INTERRUPT_MASK   (IM_EPH_INT | IM_RX_OVRN_INT | IM_RCV_INT | \
-       IM_MDINT)
-
-#endif  /* _SMC_91111_H_ */
examples/standalone/Makefile +0 -1
index d4be0c7350dc..5b48a9d43c62 100644
@@ -4,7 +4,6 @@
 # Wolfgang Denk, DENX Software Engineering, [email protected].
 
 extra-y        := hello_world
-extra-$(CONFIG_SMC91111)           += smc91111_eeprom
 extra-$(CONFIG_SPI_FLASH_ATMEL)    += atmel_df_pow2
 extra-$(CONFIG_PPC)                += sched
 
examples/standalone/smc91111_eeprom.c deleted +0 -372
deleted file mode 100644
index bf7e93064309..000000000000
@@ -1,372 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2004
- * Robin Getz [email protected]
- *
- * Heavily borrowed from the following peoples GPL'ed software:
- *  - Wolfgang Denk, DENX Software Engineering, [email protected]
- *       Das U-Boot
- *  - Ladislav Michl [email protected]
- *       A rejected patch on the U-Boot mailing list
- */
-
-#include <common.h>
-#include <exports.h>
-#include <linux/delay.h>
-#include "../drivers/net/smc91111.h"
-
-#ifndef SMC91111_EEPROM_INIT
-# define SMC91111_EEPROM_INIT()
-#endif
-
-#define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE
-#define EEPROM         0x1
-#define MAC            0x2
-#define UNKNOWN                0x4
-
-void dump_reg (struct eth_device *dev);
-void dump_eeprom (struct eth_device *dev);
-int write_eeprom_reg (struct eth_device *dev, int value, int reg);
-void copy_from_eeprom (struct eth_device *dev);
-void print_MAC (struct eth_device *dev);
-int read_eeprom_reg (struct eth_device *dev, int reg);
-void print_macaddr (struct eth_device *dev);
-
-int smc91111_eeprom(int argc, char *const argv[])
-{
-       int c, i, j, done, line, reg, value, start, what;
-       char input[50];
-
-       struct eth_device dev;
-       dev.iobase = CONFIG_SMC91111_BASE;
-
-       /* Print the ABI version */
-       app_startup (argv);
-       if (XF_VERSION != (int) get_version ()) {
-               printf ("Expects ABI version %d\n", XF_VERSION);
-               printf ("Actual U-Boot ABI version %d\n",
-                       (int) get_version ());
-               printf ("Can't run\n\n");
-               return (0);
-       }
-
-       SMC91111_EEPROM_INIT();
-
-       if ((SMC_inw (&dev, BANK_SELECT) & 0xFF00) != 0x3300) {
-               printf ("Can't find SMSC91111\n");
-               return (0);
-       }
-
-       done = 0;
-       what = UNKNOWN;
-       printf ("\n");
-       while (!done) {
-               /* print the prompt */
-               printf ("SMC91111> ");
-               line = 0;
-               i = 0;
-               start = 1;
-               while (!line) {
-                       /* Wait for a keystroke */
-                       while (!tstc ());
-
-                       c = getc ();
-                       /* Make Uppercase */
-                       if (c >= 'Z')
-                               c -= ('a' - 'A');
-                       /* printf(" |%02x| ",c); */
-
-                       switch (c) {
-                       case '\r':      /* Enter                */
-                       case '\n':
-                               input[i] = 0;
-                               puts ("\r\n");
-                               line = 1;
-                               break;
-                       case '\0':      /* nul                  */
-                               continue;
-
-                       case 0x03:      /* ^C - break           */
-                               input[0] = 0;
-                               i = 0;
-                               line = 1;
-                               done = 1;
-                               break;
-
-                       case 0x5F:
-                       case 0x08:      /* ^H  - backspace      */
-                       case 0x7F:      /* DEL - backspace      */
-                               if (i > 0) {
-                                       puts ("\b \b");
-                                       i--;
-                               }
-                               break;
-                       default:
-                               if (start) {
-                                       if ((c == 'W') || (c == 'D')
-                                           || (c == 'M') || (c == 'C')
-                                           || (c == 'P')) {
-                                               putc (c);
-                                               input[i] = c;
-                                               if (i <= 45)
-                                                       i++;
-                                               start = 0;
-                                       }
-                               } else {
-                                       if ((c >= '0' && c <= '9')
-                                           || (c >= 'A' && c <= 'F')
-                                           || (c == 'E') || (c == 'M')
-                                           || (c == ' ')) {
-                                               putc (c);
-                                               input[i] = c;
-                                               if (i <= 45)
-                                                       i++;
-                                               break;
-                                       }
-                               }
-                               break;
-                       }
-               }
-
-               for (; i < 49; i++)
-                       input[i] = 0;
-
-               switch (input[0]) {
-               case ('W'):
-                       /* Line should be w reg value */
-                       i = 0;
-                       reg = 0;
-                       value = 0;
-                       /* Skip to the next space or end) */
-                       while ((input[i] != ' ') && (input[i] != 0))
-                               i++;
-
-                       if (input[i] != 0)
-                               i++;
-
-                       /* Are we writing to EEPROM or MAC */
-                       switch (input[i]) {
-                       case ('E'):
-                               what = EEPROM;
-                               break;
-                       case ('M'):
-                               what = MAC;
-                               break;
-                       default:
-                               what = UNKNOWN;
-                               break;
-                       }
-
-                       /* skip to the next space or end */
-                       while ((input[i] != ' ') && (input[i] != 0))
-                               i++;
-                       if (input[i] != 0)
-                               i++;
-
-                       /* Find register to write into */
-                       j = 0;
-                       while ((input[i] != ' ') && (input[i] != 0)) {
-                               j = input[i] - 0x30;
-                               if (j >= 0xA) {
-                                       j -= 0x07;
-                               }
-                               reg = (reg * 0x10) + j;
-                               i++;
-                       }
-
-                       while ((input[i] != ' ') && (input[i] != 0))
-                               i++;
-
-                       if (input[i] != 0)
-                               i++;
-                       else
-                               what = UNKNOWN;
-
-                       /* Get the value to write */
-                       j = 0;
-                       while ((input[i] != ' ') && (input[i] != 0)) {
-                               j = input[i] - 0x30;
-                               if (j >= 0xA) {
-                                       j -= 0x07;
-                               }
-                               value = (value * 0x10) + j;
-                               i++;
-                       }
-
-                       switch (what) {
-                       case 1:
-                               printf ("Writing EEPROM register %02x with %04x\n", reg, value);
-                               write_eeprom_reg (&dev, value, reg);
-                               break;
-                       case 2:
-                               printf ("Writing MAC register bank %i, reg %02x with %04x\n", reg >> 4, reg & 0xE, value);
-                               SMC_SELECT_BANK (&dev, reg >> 4);
-                               SMC_outw (&dev, value, reg & 0xE);
-                               break;
-                       default:
-                               printf ("Wrong\n");
-                               break;
-                       }
-                       break;
-               case ('D'):
-                       dump_eeprom (&dev);
-                       break;
-               case ('M'):
-                       dump_reg (&dev);
-                       break;
-               case ('C'):
-                       copy_from_eeprom (&dev);
-                       break;
-               case ('P'):
-                       print_macaddr (&dev);
-                       break;
-               default:
-                       break;
-               }
-
-       }
-
-       return (0);
-}
-
-void copy_from_eeprom (struct eth_device *dev)
-{
-       int i;
-
-       SMC_SELECT_BANK (dev, 1);
-       SMC_outw (dev, (SMC_inw (dev, CTL_REG) & !CTL_EEPROM_SELECT) |
-               CTL_RELOAD, CTL_REG);
-       i = 100;
-       while ((SMC_inw (dev, CTL_REG) & CTL_RELOAD) && --i)
-               udelay(100);
-       if (i == 0) {
-               printf ("Timeout Refreshing EEPROM registers\n");
-       } else {
-               printf ("EEPROM contents copied to MAC\n");
-       }
-
-}
-
-void print_macaddr (struct eth_device *dev)
-{
-       int i, j, k, mac[6];
-
-       printf ("Current MAC Address in SMSC91111 ");
-       SMC_SELECT_BANK (dev, 1);
-       for (i = 0; i < 5; i++) {
-               printf ("%02x:", SMC_inb (dev, ADDR0_REG + i));
-       }
-
-       printf ("%02x\n", SMC_inb (dev, ADDR0_REG + 5));
-
-       i = 0;
-       for (j = 0x20; j < 0x23; j++) {
-               k = read_eeprom_reg (dev, j);
-               mac[i] = k & 0xFF;
-               i++;
-               mac[i] = k >> 8;
-               i++;
-       }
-
-       printf ("Current MAC Address in EEPROM    ");
-       for (i = 0; i < 5; i++)
-               printf ("%02x:", mac[i]);
-       printf ("%02x\n", mac[5]);
-
-}
-void dump_eeprom (struct eth_device *dev)
-{
-       int j, k;
-
-       printf ("IOS2-0    ");
-       for (j = 0; j < 8; j++) {
-               printf ("%03x     ", j);
-       }
-       printf ("\n");
-
-       for (k = 0; k < 4; k++) {
-               if (k == 0)
-                       printf ("CONFIG ");
-               if (k == 1)
-                       printf ("BASE   ");
-               if ((k == 2) || (k == 3))
-                       printf ("       ");
-               for (j = 0; j < 0x20; j += 4) {
-                       printf ("%02x:%04x ", j + k,
-                               read_eeprom_reg (dev, j + k));
-               }
-               printf ("\n");
-       }
-
-       for (j = 0x20; j < 0x40; j++) {
-               if ((j & 0x07) == 0)
-                       printf ("\n");
-               printf ("%02x:%04x ", j, read_eeprom_reg (dev, j));
-       }
-       printf ("\n");
-
-}
-
-int read_eeprom_reg (struct eth_device *dev, int reg)
-{
-       int timeout;
-
-       SMC_SELECT_BANK (dev, 2);
-       SMC_outw (dev, reg, PTR_REG);
-
-       SMC_SELECT_BANK (dev, 1);
-       SMC_outw (dev, SMC_inw (dev, CTL_REG) | CTL_EEPROM_SELECT |
-               CTL_RELOAD, CTL_REG);
-       timeout = 100;
-       while ((SMC_inw (dev, CTL_REG) & CTL_RELOAD) && --timeout)
-               udelay(100);
-       if (timeout == 0) {
-               printf ("Timeout Reading EEPROM register %02x\n", reg);
-               return 0;
-       }
-
-       return SMC_inw (dev, GP_REG);
-
-}
-
-int write_eeprom_reg (struct eth_device *dev, int value, int reg)
-{
-       int timeout;
-
-       SMC_SELECT_BANK (dev, 2);
-       SMC_outw (dev, reg, PTR_REG);
-
-       SMC_SELECT_BANK (dev, 1);
-       SMC_outw (dev, value, GP_REG);
-       SMC_outw (dev, SMC_inw (dev, CTL_REG) | CTL_EEPROM_SELECT |
-               CTL_STORE, CTL_REG);
-       timeout = 100;
-       while ((SMC_inw (dev, CTL_REG) & CTL_STORE) && --timeout)
-               udelay(100);
-       if (timeout == 0) {
-               printf ("Timeout Writing EEPROM register %02x\n", reg);
-               return 0;
-       }
-
-       return 1;
-
-}
-
-void dump_reg (struct eth_device *dev)
-{
-       int i, j;
-
-       printf ("    ");
-       for (j = 0; j < 4; j++) {
-               printf ("Bank%i ", j);
-       }
-       printf ("\n");
-       for (i = 0; i < 0xF; i += 2) {
-               printf ("%02x  ", i);
-               for (j = 0; j < 4; j++) {
-                       SMC_SELECT_BANK (dev, j);
-                       printf ("%04x  ", SMC_inw (dev, i));
-               }
-               printf ("\n");
-       }
-}
include/configs/integratorcp.h +0 -8
index 2752152f68ee..7b9a5b1c5415 100644
@@ -19,14 +19,6 @@
 /* Integrator CP-specific configuration */
 #define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer 1 is clocked at 1Mhz */
 
-/*
- * Hardware drivers
- */
-#define CONFIG_SMC91111
-#define CONFIG_SMC_USE_32_BIT
-#define CONFIG_SMC91111_BASE    0xC8000000
-#undef CONFIG_SMC91111_EXT_PHY
-
 #define CONFIG_SERVERIP 192.168.1.100
 #define CONFIG_IPADDR 192.168.1.104
 
include/configs/vexpress_aemv8.h +0 -7
index 077428f50040..0c11b6b3331e 100644
@@ -84,12 +84,6 @@
 #endif
 #endif /* !CONFIG_GICV3 */
 
-#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH)
-/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */
-#define CONFIG_SMC91111                        1
-#define CONFIG_SMC91111_BASE           (V2M_PA_BASE + 0x01A000000)
-#endif
-
 /* PL011 Serial Configuration */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define CONFIG_PL011_CLOCK             7372800
--
Quoted 2 lines

2.25.1

author
#25 lore raw

Re: [PATCH 09/21] net: Remove smc91111 ethernet driver

In reply to Tom Rini
Quoted 9 lines · Tom Rini

This driver has not been converted to DM_ETH. The migration deadline passed 2 years ago.

Cc Linus Walleij <[email protected]>
Cc David Feng <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Andre Przywara <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#26 lore raw

PATCH 10/21 net: lpc32xx_eth.c ethernet driver

In reply to Tom Rini

This driver has not been converted to DM_ETH. The migration deadline passed 2 years ago.

Cc Trevor Woerner <[email protected]>

---
Trevor, can you please also update the top-level MAINTAINERS file to list yourself for these chips if you still are interested in them? Thanks.

---
 arch/arm/include/asm/arch-lpc32xx/config.h |   3 -
 arch/arm/mach-lpc32xx/cpu.c                |   8 -
 drivers/net/Kconfig                        |   5 -
 drivers/net/Makefile                       |   1 -
 drivers/net/lpc32xx_eth.c                  | 651 ---------------------
 5 files changed, 668 deletions(-)
 delete mode 100644 drivers/net/lpc32xx_eth.c
arch/arm/include/asm/arch-lpc32xx/config.h +0 -3
index 32d68cbeb81a..dc414c7d8452 100644
@@ -26,9 +26,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 		{ 9600, 19200, 38400, 57600, 115200, 230400, 460800 }
 
-/* Ethernet */
-#define LPC32XX_ETH_BASE ETHERNET_BASE
-
 /* NAND */
 #if defined(CONFIG_NAND_LPC32XX_SLC)
 #define NAND_LARGE_BLOCK_PAGE_SIZE	0x800
arch/arm/mach-lpc32xx/cpu.c +0 -8
index c2586d092956..a97f9a1958ab 100644
@@ -59,11 +59,3 @@ int print_cpuinfo(void)
 	return 0;
 }
 #endif
-
-#ifdef CONFIG_LPC32XX_ETH
-int cpu_eth_init(struct bd_info *bis)
-{
-	lpc32xx_eth_initialize(bis);
-	return 0;
-}
-#endif
drivers/net/Kconfig +0 -5
index 2fb9aacc208b..76d8057b98fd 100644
@@ -455,11 +455,6 @@ config KSZ9477
 	  This driver implements a DSA switch driver for the KSZ9477 family
 	  of GbE switches using the I2C interface.
 
-config LPC32XX_ETH
-	bool "LPC32xx Ethernet MAC interface driver"
-	depends on ARCH_LPC32XX
-	default y
-
 config MVGBE
 	bool "Marvell Orion5x/Kirkwood network interface support"
 	depends on ARCH_KIRKWOOD || ARCH_ORION5X
drivers/net/Makefile +0 -1
index ac9818107e7e..ecc1dc8bb489 100644
@@ -47,7 +47,6 @@ obj-$(CONFIG_GMAC_ROCKCHIP) += gmac_rockchip.o
 obj-$(CONFIG_HIGMACV300_ETH) += higmacv300.o
 obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
 obj-$(CONFIG_KSZ9477) += ksz9477.o
-obj-$(CONFIG_LPC32XX_ETH) += lpc32xx_eth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
drivers/net/lpc32xx_eth.c deleted +0 -651

651 lines not on this page · raw message

Signature · 1 line
2.25.1
Acked-by on v1 10/21
#27 lore raw

Re: [PATCH 10/21] net: lpc32xx_eth.c ethernet driver

Quoted 735 lines · Tom Rini

This driver has not been converted to DM_ETH. The migration deadline passed 2 years ago.

Cc Trevor Woerner <[email protected]>

---
Trevor, can you please also update the top-level MAINTAINERS file to list yourself for these chips if you still are interested in them? Thanks.

---
 arch/arm/include/asm/arch-lpc32xx/config.h |   3 -
 arch/arm/mach-lpc32xx/cpu.c                |   8 -
 drivers/net/Kconfig                        |   5 -
 drivers/net/Makefile                       |   1 -
 drivers/net/lpc32xx_eth.c                  | 651 ---------------------
 5 files changed, 668 deletions(-)
 delete mode 100644 drivers/net/lpc32xx_eth.c
arch/arm/include/asm/arch-lpc32xx/config.h +0 -3
index 32d68cbeb81a..dc414c7d8452 100644
@@ -26,9 +26,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      \
                { 9600, 19200, 38400, 57600, 115200, 230400, 460800 }
 
-/* Ethernet */
-#define LPC32XX_ETH_BASE ETHERNET_BASE
-
 /* NAND */
 #if defined(CONFIG_NAND_LPC32XX_SLC)
 #define NAND_LARGE_BLOCK_PAGE_SIZE     0x800
arch/arm/mach-lpc32xx/cpu.c +0 -8
index c2586d092956..a97f9a1958ab 100644
@@ -59,11 +59,3 @@ int print_cpuinfo(void)
        return 0;
 }
 #endif
-
-#ifdef CONFIG_LPC32XX_ETH
-int cpu_eth_init(struct bd_info *bis)
-{
-       lpc32xx_eth_initialize(bis);
-       return 0;
-}
-#endif
drivers/net/Kconfig +0 -5
index 2fb9aacc208b..76d8057b98fd 100644
@@ -455,11 +455,6 @@ config KSZ9477
          This driver implements a DSA switch driver for the KSZ9477 family
          of GbE switches using the I2C interface.
 
-config LPC32XX_ETH
-       bool "LPC32xx Ethernet MAC interface driver"
-       depends on ARCH_LPC32XX
-       default y
-
 config MVGBE
        bool "Marvell Orion5x/Kirkwood network interface support"
        depends on ARCH_KIRKWOOD || ARCH_ORION5X
drivers/net/Makefile +0 -1
index ac9818107e7e..ecc1dc8bb489 100644
@@ -47,7 +47,6 @@ obj-$(CONFIG_GMAC_ROCKCHIP) += gmac_rockchip.o
 obj-$(CONFIG_HIGMACV300_ETH) += higmacv300.o
 obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
 obj-$(CONFIG_KSZ9477) += ksz9477.o
-obj-$(CONFIG_LPC32XX_ETH) += lpc32xx_eth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
drivers/net/lpc32xx_eth.c deleted +0 -652
deleted file mode 100644
index 1a5734343935..000000000000
@@ -1,651 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * LPC32xx Ethernet MAC interface driver
- *
- * (C) Copyright 2014  DENX Software Engineering GmbH
- * Written-by: Albert ARIBAUD - 3ADEV <[email protected]>
- */
-
-#include <common.h>
-#include <log.h>
-#include <net.h>
-#include <malloc.h>
-#include <miiphy.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <asm/types.h>
-#include <asm/system.h>
-#include <asm/byteorder.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/config.h>
-
-/*
- * Notes:
- *
- * 1. Unless specified otherwise, all references to tables or paragraphs
- *    are to UM10326, "LPC32x0 and LPC32x0/01 User manual".
- *
- * 2. Only bitfield masks/values which are actually used by the driver
- *    are defined.
- */
-
-/* a single RX descriptor. The controller has an array of these */
-struct lpc32xx_eth_rxdesc {
-       u32 packet;             /* Receive packet pointer */
-       u32 control;            /* Descriptor command status */
-};
-
-#define LPC32XX_ETH_RX_DESC_SIZE (sizeof(struct lpc32xx_eth_rxdesc))
-
-/* RX control bitfields/masks (see Table 330) */
-#define LPC32XX_ETH_RX_CTRL_SIZE_MASK 0x000007FF
-#define LPC32XX_ETH_RX_CTRL_UNUSED    0x7FFFF800
-#define LPC32XX_ETH_RX_CTRL_INTERRUPT 0x80000000
-
-/* a single RX status. The controller has an array of these */
-struct lpc32xx_eth_rxstat {
-       u32 statusinfo;         /* Transmit Descriptor status */
-       u32 statushashcrc;      /* Transmit Descriptor CRCs */
-};
-
-#define LPC32XX_ETH_RX_STAT_SIZE (sizeof(struct lpc32xx_eth_rxstat))
-
-/* RX statusinfo bitfields/masks (see Table 333) */
-#define RX_STAT_RXSIZE 0x000007FF
-/* Helper: OR of all errors except RANGE */
-#define RX_STAT_ERRORS 0x1B800000
-
-/* a single TX descriptor. The controller has an array of these */
-struct lpc32xx_eth_txdesc {
-       u32 packet;             /* Transmit packet pointer */
-       u32 control;            /* Descriptor control */
-};
-
-#define LPC32XX_ETH_TX_DESC_SIZE (sizeof(struct lpc32xx_eth_txdesc))
-
-/* TX control bitfields/masks (see Table 335) */
-#define TX_CTRL_TXSIZE    0x000007FF
-#define TX_CTRL_LAST      0x40000000
-
-/* a single TX status. The controller has an array of these */
-struct lpc32xx_eth_txstat {
-       u32 statusinfo;         /* Transmit Descriptor status */
-};
-
-#define LPC32XX_ETH_TX_STAT_SIZE (sizeof(struct lpc32xx_eth_txstat))
-
-/* Ethernet MAC interface registers (see Table 283) */
-struct lpc32xx_eth_registers {
-       /* MAC registers - 0x3106_0000 to 0x3106_01FC */
-       u32 mac1;               /* MAC configuration register 1 */
-       u32 mac2;               /* MAC configuration register 2 */
-       u32 ipgt;               /* Back-to-back Inter-Packet Gap reg. */
-       u32 ipgr;               /* Non-back-to-back IPG register */
-       u32 clrt;               /* Collision Window / Retry register */
-       u32 maxf;               /* Maximum Frame register */
-       u32 supp;               /* Phy Support register */
-       u32 test;
-       u32 mcfg;               /* MII management configuration reg. */
-       u32 mcmd;               /* MII management command register */
-       u32 madr;               /* MII management address register */
-       u32 mwtd;               /* MII management wite data register */
-       u32 mrdd;               /* MII management read data register */
-       u32 mind;               /* MII management indicators register */
-       u32 reserved1[2];
-       u32 sa0;                /* Station address register 0 */
-       u32 sa1;                /* Station address register 1 */
-       u32 sa2;                /* Station address register 2 */
-       u32 reserved2[45];
-       /* Control registers */
-       u32 command;
-       u32 status;
-       u32 rxdescriptor;
-       u32 rxstatus;
-       u32 rxdescriptornumber; /* actually, number MINUS ONE */
-       u32 rxproduceindex;     /* head of rx desc fifo */
-       u32 rxconsumeindex;     /* tail of rx desc fifo */
-       u32 txdescriptor;
-       u32 txstatus;
-       u32 txdescriptornumber; /* actually, number MINUS ONE */
-       u32 txproduceindex;     /* head of rx desc fifo */
-       u32 txconsumeindex;     /* tail of rx desc fifo */
-       u32 reserved3[10];
-       u32 tsv0;               /* Transmit status vector register 0 */
-       u32 tsv1;               /* Transmit status vector register 1 */
-       u32 rsv;                /* Receive status vector register */
-       u32 reserved4[3];
-       u32 flowcontrolcounter;
-       u32 flowcontrolstatus;
-       u32 reserved5[34];
-       /* RX filter registers - 0x3106_0200 to 0x3106_0FDC */
-       u32 rxfilterctrl;
-       u32 rxfilterwolstatus;
-       u32 rxfilterwolclear;
-       u32 reserved6;
-       u32 hashfilterl;
-       u32 hashfilterh;
-       u32 reserved7[882];
-       /* Module control registers - 0x3106_0FE0 to 0x3106_0FF8 */
-       u32 intstatus;          /* Interrupt status register */
-       u32 intenable;
-       u32 intclear;
-       u32 intset;
-       u32 reserved8;
-       u32 powerdown;
-       u32 reserved9;
-};
-
-/* MAC1 register bitfields/masks and offsets (see Table 283) */
-#define MAC1_RECV_ENABLE        0x00000001
-#define MAC1_PASS_ALL_RX_FRAMES 0x00000002
-#define MAC1_SOFT_RESET         0x00008000
-/* Helper: general reset */
-#define MAC1_RESETS             0x0000CF00
-
-/* MAC2 register bitfields/masks and offsets (see Table 284) */
-#define MAC2_FULL_DUPLEX    0x00000001
-#define MAC2_CRC_ENABLE     0x00000010
-#define MAC2_PAD_CRC_ENABLE 0x00000020
-
-/* SUPP register bitfields/masks and offsets (see Table 290) */
-#define SUPP_SPEED 0x00000100
-
-/* MCFG register bitfields/masks and offsets (see Table 292) */
-#define MCFG_RESET_MII_MGMT     0x00008000
-/* divide clock by 28 (see Table 293) */
-#define MCFG_CLOCK_SELECT_DIV28 0x0000001C
-
-/* MADR register bitfields/masks and offsets (see Table 295) */
-#define MADR_REG_MASK   0x0000001F
-#define MADR_PHY_MASK   0x00001F00
-#define MADR_REG_OFFSET 0
-#define MADR_PHY_OFFSET 8
-
-/* MIND register bitfields/masks (see Table 298) */
-#define MIND_BUSY      0x00000001
-
-/* COMMAND register bitfields/masks and offsets (see Table 283) */
-#define COMMAND_RXENABLE      0x00000001
-#define COMMAND_TXENABLE      0x00000002
-#define COMMAND_PASSRUNTFRAME 0x00000040
-#define COMMAND_RMII          0x00000200
-#define COMMAND_FULL_DUPLEX   0x00000400
-/* Helper: general reset */
-#define COMMAND_RESETS        0x00000038
-
-/* STATUS register bitfields/masks and offsets (see Table 283) */
-#define STATUS_RXSTATUS 0x00000001
-#define STATUS_TXSTATUS 0x00000002
-
-/* RXFILTERCTRL register bitfields/masks (see Table 319) */
-#define RXFILTERCTRL_ACCEPTBROADCAST 0x00000002
-#define RXFILTERCTRL_ACCEPTPERFECT   0x00000020
-
-/* Buffers and descriptors */
-
-#define ATTRS(n) __aligned(n)
-
-#define TX_BUF_COUNT 4
-#define RX_BUF_COUNT 4
-
-struct lpc32xx_eth_buffers {
-       ATTRS(4) struct lpc32xx_eth_txdesc tx_desc[TX_BUF_COUNT];
-       ATTRS(4) struct lpc32xx_eth_txstat tx_stat[TX_BUF_COUNT];
-       ATTRS(PKTALIGN) u8 tx_buf[TX_BUF_COUNT*PKTSIZE_ALIGN];
-       ATTRS(4) struct lpc32xx_eth_rxdesc rx_desc[RX_BUF_COUNT];
-       ATTRS(8) struct lpc32xx_eth_rxstat rx_stat[RX_BUF_COUNT];
-       ATTRS(PKTALIGN) u8 rx_buf[RX_BUF_COUNT*PKTSIZE_ALIGN];
-};
-
-/* port device data struct */
-struct lpc32xx_eth_device {
-       struct eth_device dev;
-       struct lpc32xx_eth_registers *regs;
-       struct lpc32xx_eth_buffers *bufs;
-       bool phy_rmii;
-};
-
-#define LPC32XX_ETH_DEVICE_SIZE (sizeof(struct lpc32xx_eth_device))
-
-/* generic macros */
-#define to_lpc32xx_eth(_d) container_of(_d, struct lpc32xx_eth_device, dev)
-
-/* timeout for MII polling */
-#define MII_TIMEOUT 10000000
-
-/* limits for PHY and register addresses */
-#define MII_MAX_REG (MADR_REG_MASK >> MADR_REG_OFFSET)
-
-#define MII_MAX_PHY (MADR_PHY_MASK >> MADR_PHY_OFFSET)
-
-#if defined(CONFIG_PHYLIB) || defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-/*
- * mii_reg_read - miiphy_read callback function.
- *
- * Returns 16bit phy register value, or 0xffff on error
- */
-static int mii_reg_read(struct mii_dev *bus, int phy_adr, int devad,
-                       int reg_ofs)
-{
-       u16 data = 0;
-       struct eth_device *dev = eth_get_dev_by_name(bus->name);
-       struct lpc32xx_eth_device *dlpc32xx_eth = to_lpc32xx_eth(dev);
-       struct lpc32xx_eth_registers *regs = dlpc32xx_eth->regs;
-       u32 mind_reg;
-       u32 timeout;
-
-       /* check parameters */
-       if (phy_adr > MII_MAX_PHY) {
-               printf("%s:%u: Invalid PHY address %d\n",
-                      __func__, __LINE__, phy_adr);
-               return -EFAULT;
-       }
-       if (reg_ofs > MII_MAX_REG) {
-               printf("%s:%u: Invalid register offset %d\n",
-                      __func__, __LINE__, reg_ofs);
-               return -EFAULT;
-       }
-
-       /* write the phy and reg addressse into the MII address reg */
-       writel((phy_adr << MADR_PHY_OFFSET) | (reg_ofs << MADR_REG_OFFSET),
-              &regs->madr);
-
-       /* write 1 to the MII command register to cause a read */
-       writel(1, &regs->mcmd);
-
-       /* wait till the MII is not busy */
-       timeout = MII_TIMEOUT;
-       do {
-               /* read MII indicators register */
-               mind_reg = readl(&regs->mind);
-               if (--timeout == 0)
-                       break;
-       } while (mind_reg & MIND_BUSY);
-
-       /* write 0 to the MII command register to finish the read */
-       writel(0, &regs->mcmd);
-
-       if (timeout == 0) {
-               printf("%s:%u: MII busy timeout\n", __func__, __LINE__);
-               return -EFAULT;
-       }
-
-       data = (u16) readl(&regs->mrdd);
-
-       debug("%s:(adr %d, off %d) => %04x\n", __func__, phy_adr,
-             reg_ofs, data);
-
-       return data;
-}
-
-/*
- * mii_reg_write - imiiphy_write callback function.
- *
- * Returns 0 if write succeed, -EINVAL on bad parameters
- * -ETIME on timeout
- */
-static int mii_reg_write(struct mii_dev *bus, int phy_adr, int devad,
-                        int reg_ofs, u16 data)
-{
-       struct eth_device *dev = eth_get_dev_by_name(bus->name);
-       struct lpc32xx_eth_device *dlpc32xx_eth = to_lpc32xx_eth(dev);
-       struct lpc32xx_eth_registers *regs = dlpc32xx_eth->regs;
-       u32 mind_reg;
-       u32 timeout;
-
-       /* check parameters */
-       if (phy_adr > MII_MAX_PHY) {
-               printf("%s:%u: Invalid PHY address %d\n",
-                      __func__, __LINE__, phy_adr);
-               return -EFAULT;
-       }
-       if (reg_ofs > MII_MAX_REG) {
-               printf("%s:%u: Invalid register offset %d\n",
-                      __func__, __LINE__, reg_ofs);
-               return -EFAULT;
-       }
-
-       /* write the phy and reg addressse into the MII address reg */
-       writel((phy_adr << MADR_PHY_OFFSET) | (reg_ofs << MADR_REG_OFFSET),
-              &regs->madr);
-
-       /* write data to the MII write register */
-       writel(data, &regs->mwtd);
-
-       /* wait till the MII is not busy */
-       timeout = MII_TIMEOUT;
-       do {
-               /* read MII indicators register */
-               mind_reg = readl(&regs->mind);
-               if (--timeout == 0)
-                       break;
-       } while (mind_reg & MIND_BUSY);
-
-       if (timeout == 0) {
-               printf("%s:%u: MII busy timeout\n", __func__,
-                      __LINE__);
-               return -EFAULT;
-       }
-
-       /*debug("%s:(adr %d, off %d) <= %04x\n", __func__, phy_adr,
-               reg_ofs, data);*/
-
-       return 0;
-}
-#endif
-
-/*
- * Provide default Ethernet buffers base address if target did not.
- * Locate buffers in SRAM at 0x00001000 to avoid cache issues and
- * maximize throughput.
- */
-#if !defined(CONFIG_LPC32XX_ETH_BUFS_BASE)
-#define CONFIG_LPC32XX_ETH_BUFS_BASE 0x00001000
-#endif
-
-static struct lpc32xx_eth_device lpc32xx_eth = {
-       .regs = (struct lpc32xx_eth_registers *)LPC32XX_ETH_BASE,
-       .bufs = (struct lpc32xx_eth_buffers *)CONFIG_LPC32XX_ETH_BUFS_BASE,
-#if defined(CONFIG_RMII)
-       .phy_rmii = true,
-#endif
-};
-
-#define TX_TIMEOUT 10000
-
-static int lpc32xx_eth_send(struct eth_device *dev, void *dataptr, int datasize)
-{
-       struct lpc32xx_eth_device *lpc32xx_eth_device =
-               container_of(dev, struct lpc32xx_eth_device, dev);
-       struct lpc32xx_eth_registers *regs = lpc32xx_eth_device->regs;
-       struct lpc32xx_eth_buffers *bufs = lpc32xx_eth_device->bufs;
-       int timeout, tx_index;
-
-       /* time out if transmit descriptor array remains full too long */
-       timeout = TX_TIMEOUT;
-       while ((readl(&regs->status) & STATUS_TXSTATUS) &&
-              (readl(&regs->txconsumeindex)
-              == readl(&regs->txproduceindex))) {
-               if (timeout-- == 0)
-                       return -1;
-       }
-
-       /* determine next transmit packet index to use */
-       tx_index = readl(&regs->txproduceindex);
-
-       /* set up transmit packet */
-       memcpy((void *)&bufs->tx_buf[tx_index * PKTSIZE_ALIGN],
-              (void *)dataptr, datasize);
-       writel(TX_CTRL_LAST | ((datasize - 1) & TX_CTRL_TXSIZE),
-              &bufs->tx_desc[tx_index].control);
-       writel(0, &bufs->tx_stat[tx_index].statusinfo);
-
-       /* pass transmit packet to DMA engine */
-       tx_index = (tx_index + 1) % TX_BUF_COUNT;
-       writel(tx_index, &regs->txproduceindex);
-
-       /* transmission succeeded */
-       return 0;
-}
-
-#define RX_TIMEOUT 1000000
-
-static int lpc32xx_eth_recv(struct eth_device *dev)
-{
-       struct lpc32xx_eth_device *lpc32xx_eth_device =
-               container_of(dev, struct lpc32xx_eth_device, dev);
-       struct lpc32xx_eth_registers *regs = lpc32xx_eth_device->regs;
-       struct lpc32xx_eth_buffers *bufs = lpc32xx_eth_device->bufs;
-       int timeout, rx_index;
-
-       /* time out if receive descriptor array remains empty too long */
-       timeout = RX_TIMEOUT;
-       while (readl(&regs->rxproduceindex) == readl(&regs->rxconsumeindex)) {
-               if (timeout-- == 0)
-                       return -1;
-       }
-
-       /* determine next receive packet index to use */
-       rx_index = readl(&regs->rxconsumeindex);
-
-       /* if data was valid, pass it on */
-       if (!(bufs->rx_stat[rx_index].statusinfo & RX_STAT_ERRORS)) {
-               net_process_received_packet(
-                       &(bufs->rx_buf[rx_index * PKTSIZE_ALIGN]),
-                       (bufs->rx_stat[rx_index].statusinfo
-                        & RX_STAT_RXSIZE) + 1);
-       }
-
-       /* pass receive slot back to DMA engine */
-       rx_index = (rx_index + 1) % RX_BUF_COUNT;
-       writel(rx_index, &regs->rxconsumeindex);
-
-       /* reception successful */
-       return 0;
-}
-
-static int lpc32xx_eth_write_hwaddr(struct eth_device *dev)
-{
-       struct lpc32xx_eth_device *lpc32xx_eth_device =
-               container_of(dev, struct lpc32xx_eth_device, dev);
-       struct lpc32xx_eth_registers *regs = lpc32xx_eth_device->regs;
-
-       /* Save station address */
-       writel((unsigned long) (dev->enetaddr[0] |
-               (dev->enetaddr[1] << 8)), &regs->sa2);
-       writel((unsigned long) (dev->enetaddr[2] |
-               (dev->enetaddr[3] << 8)), &regs->sa1);
-       writel((unsigned long) (dev->enetaddr[4] |
-               (dev->enetaddr[5] << 8)), &regs->sa0);
-
-       return 0;
-}
-
-static int lpc32xx_eth_init(struct eth_device *dev)
-{
-       struct lpc32xx_eth_device *lpc32xx_eth_device =
-               container_of(dev, struct lpc32xx_eth_device, dev);
-       struct lpc32xx_eth_registers *regs = lpc32xx_eth_device->regs;
-       struct lpc32xx_eth_buffers *bufs = lpc32xx_eth_device->bufs;
-       int index;
-
-       /* Initial MAC initialization */
-       writel(MAC1_PASS_ALL_RX_FRAMES, &regs->mac1);
-       writel(MAC2_PAD_CRC_ENABLE | MAC2_CRC_ENABLE, &regs->mac2);
-       writel(PKTSIZE_ALIGN, &regs->maxf);
-
-       /* Retries: 15 (0xF). Collision window: 57 (0x37). */
-       writel(0x370F, &regs->clrt);
-
-       /* Set IP gap pt 2 to default 0x12 but pt 1 to non-default 0 */
-       writel(0x0012, &regs->ipgr);
-
-       /* pass runt (smaller than 64 bytes) frames */
-       if (lpc32xx_eth_device->phy_rmii)
-               writel(COMMAND_PASSRUNTFRAME | COMMAND_RMII, &regs->command);
-       else
-               writel(COMMAND_PASSRUNTFRAME, &regs->command);
-
-       /* Configure Full/Half Duplex mode */
-       if (miiphy_duplex(dev->name, CONFIG_PHY_ADDR) == FULL) {
-               setbits_le32(&regs->mac2, MAC2_FULL_DUPLEX);
-               setbits_le32(&regs->command, COMMAND_FULL_DUPLEX);
-               writel(0x15, &regs->ipgt);
-       } else {
-               writel(0x12, &regs->ipgt);
-       }
-
-       /* Configure 100MBit/10MBit mode */
-       if (miiphy_speed(dev->name, CONFIG_PHY_ADDR) == _100BASET)
-               writel(SUPP_SPEED, &regs->supp);
-       else
-               writel(0, &regs->supp);
-
-       /* Save station address */
-       writel((unsigned long) (dev->enetaddr[0] |
-               (dev->enetaddr[1] << 8)), &regs->sa2);
-       writel((unsigned long) (dev->enetaddr[2] |
-               (dev->enetaddr[3] << 8)), &regs->sa1);
-       writel((unsigned long) (dev->enetaddr[4] |
-               (dev->enetaddr[5] << 8)), &regs->sa0);
-
-       /* set up transmit buffers */
-       for (index = 0; index < TX_BUF_COUNT; index++) {
-               bufs->tx_desc[index].control = 0;
-               bufs->tx_stat[index].statusinfo = 0;
-       }
-       writel((u32)(&bufs->tx_desc), (u32 *)&regs->txdescriptor);
-       writel((u32)(&bufs->tx_stat), &regs->txstatus);
-       writel(TX_BUF_COUNT-1, &regs->txdescriptornumber);
-
-       /* set up receive buffers */
-       for (index = 0; index < RX_BUF_COUNT; index++) {
-               bufs->rx_desc[index].packet =
-                       (u32) (bufs->rx_buf+index*PKTSIZE_ALIGN);
-               bufs->rx_desc[index].control = PKTSIZE_ALIGN - 1;
-               bufs->rx_stat[index].statusinfo = 0;
-               bufs->rx_stat[index].statushashcrc = 0;
-       }
-       writel((u32)(&bufs->rx_desc), &regs->rxdescriptor);
-       writel((u32)(&bufs->rx_stat), &regs->rxstatus);
-       writel(RX_BUF_COUNT-1, &regs->rxdescriptornumber);
-
-       /* set up transmit buffers */
-       for (index = 0; index < TX_BUF_COUNT; index++)
-               bufs->tx_desc[index].packet =
-                       (u32)(bufs->tx_buf + index * PKTSIZE_ALIGN);
-
-       /* Enable broadcast and matching address packets */
-       writel(RXFILTERCTRL_ACCEPTBROADCAST |
-               RXFILTERCTRL_ACCEPTPERFECT, &regs->rxfilterctrl);
-
-       /* Clear and disable interrupts */
-       writel(0xFFFF, &regs->intclear);
-       writel(0, &regs->intenable);
-
-       /* Enable receive and transmit mode of MAC ethernet core */
-       setbits_le32(&regs->command, COMMAND_RXENABLE | COMMAND_TXENABLE);
-       setbits_le32(&regs->mac1, MAC1_RECV_ENABLE);
-
-       /*
-        * Perform a 'dummy' first send to work around Ethernet.1
-        * erratum (see ES_LPC3250 rev. 9 dated 1 June 2011).
-        * Use zeroed "index" variable as the dummy.
-        */
-
-       index = 0;
-       lpc32xx_eth_send(dev, &index, 4);
-
-       return 0;
-}
-
-static int lpc32xx_eth_halt(struct eth_device *dev)
-{
-       struct lpc32xx_eth_device *lpc32xx_eth_device =
-               container_of(dev, struct lpc32xx_eth_device, dev);
-       struct lpc32xx_eth_registers *regs = lpc32xx_eth_device->regs;
-
-       /* Reset all MAC logic */
-       writel(MAC1_RESETS, &regs->mac1);
-       writel(COMMAND_RESETS, &regs->command);
-       /* Let reset condition settle */
-       udelay(2000);
-
-       return 0;
-}
-
-#if defined(CONFIG_PHYLIB)
-int lpc32xx_eth_phylib_init(struct eth_device *dev, int phyid)
-{
-       struct lpc32xx_eth_device *lpc32xx_eth_device =
-               container_of(dev, struct lpc32xx_eth_device, dev);
-       struct mii_dev *bus;
-       struct phy_device *phydev;
-       int ret;
-
-       bus = mdio_alloc();
-       if (!bus) {
-               printf("mdio_alloc failed\n");
-               return -ENOMEM;
-       }
-       bus->read = mii_reg_read;
-       bus->write = mii_reg_write;
-       strcpy(bus->name, dev->name);
-
-       ret = mdio_register(bus);
-       if (ret) {
-               printf("mdio_register failed\n");
-               free(bus);
-               return -ENOMEM;
-       }
-
-       if (lpc32xx_eth_device->phy_rmii)
-               phydev = phy_connect(bus, phyid, dev, PHY_INTERFACE_MODE_RMII);
-       else
-               phydev = phy_connect(bus, phyid, dev, PHY_INTERFACE_MODE_MII);
-
-       if (!phydev) {
-               printf("phy_connect failed\n");
-               return -ENODEV;
-       }
-
-       phy_config(phydev);
-       phy_startup(phydev);
-
-       return 0;
-}
-#endif
-
-int lpc32xx_eth_initialize(struct bd_info *bis)
-{
-       struct eth_device *dev = &lpc32xx_eth.dev;
-       struct lpc32xx_eth_registers *regs = lpc32xx_eth.regs;
-
-       /*
-        * Set RMII management clock rate. With HCLK at 104 MHz and
-        * a divider of 28, this will be 3.72 MHz.
-        */
-       writel(MCFG_RESET_MII_MGMT, &regs->mcfg);
-       writel(MCFG_CLOCK_SELECT_DIV28, &regs->mcfg);
-
-       /* Reset all MAC logic */
-       writel(MAC1_RESETS, &regs->mac1);
-       writel(COMMAND_RESETS, &regs->command);
-
-       /* wait 10 ms for the whole I/F to reset */
-       udelay(10000);
-
-       /* must be less than sizeof(dev->name) */
-       strcpy(dev->name, "eth0");
-
-       dev->init = (void *)lpc32xx_eth_init;
-       dev->halt = (void *)lpc32xx_eth_halt;
-       dev->send = (void *)lpc32xx_eth_send;
-       dev->recv = (void *)lpc32xx_eth_recv;
-       dev->write_hwaddr = (void *)lpc32xx_eth_write_hwaddr;
-
-       /* Release SOFT reset to let MII talk to PHY */
-       clrbits_le32(&regs->mac1, MAC1_SOFT_RESET);
-
-       /* register driver before talking to phy */
-       eth_register(dev);
-
-#if defined(CONFIG_PHYLIB)
-       lpc32xx_eth_phylib_init(dev, CONFIG_PHY_ADDR);
-#elif defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-       int retval;
-       struct mii_dev *mdiodev = mdio_alloc();
-       if (!mdiodev)
-               return -ENOMEM;
-       strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
-       mdiodev->read = mii_reg_read;
-       mdiodev->write = mii_reg_write;
-
-       retval = mdio_register(mdiodev);
-       if (retval < 0)
-               return retval;
-#endif
-
-       return 0;
-}
--
Quoted 2 lines

2.25.1

author
#29 lore raw

PATCH 11/21 fsl-mc: Update dependencies for DM_ETH

In reply to Tom Rini

When using DM_ETH, which should be the default now, we need to always have DM_MDIO and FSL_LS_MDIO enabled, so select them.

Cc Priyanka Jain <[email protected]>
Cc Rajesh Bhagat <[email protected]>
Cc Wasim Khan <[email protected]>
Cc Udit Agarwal <[email protected]>
Cc Ashish Kumar <[email protected]>
Cc Meenakshi Aggarwal <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
Cc Manish Tomar <[email protected]>
---
 drivers/net/fsl-mc/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/fsl-mc/Kconfig +2 -0
index ae4c35799bf7..8fc34dc26f15 100644
@@ -6,6 +6,8 @@ menuconfig FSL_MC_ENET
 	bool "NXP Management Complex"
 	depends on ARCH_LS2080A || ARCH_LS1088A || ARCH_LX2160A || ARCH_LX2162A
 	default y
+	select DM_MDIO
+	select FSL_LS_MDIO
 	select RESV_RAM
 	help
 	  Enable Management Complex (MC) network
Signature · 1 line
2.25.1
author
#30 lore raw

Re: [PATCH 11/21] fsl-mc: Update dependencies for DM_ETH

Quoted 13 lines · Tom Rini

When using DM_ETH, which should be the default now, we need to always have DM_MDIO and FSL_LS_MDIO enabled, so select them.

Cc Priyanka Jain <[email protected]>
Cc Rajesh Bhagat <[email protected]>
Cc Wasim Khan <[email protected]>
Cc Udit Agarwal <[email protected]>
Cc Ashish Kumar <[email protected]>
Cc Meenakshi Aggarwal <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
Cc Manish Tomar <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#31 lore raw

PATCH 12/21 layerscape: Disable CONFIG_FMAN_ENET on some platforms

In reply to Tom Rini

On platforms that have not migrated to enabling CONFIG_DM_ETH already, disable CONFIG_FMAN_ENET.

Cc Mingkai Hu <[email protected]>
Cc Rajesh Bhagat <[email protected]>
Cc Pramod Kumar <[email protected]>
Cc Peng Fan <[email protected]>

---
Note that board/freescale/corenet_ds/MAINTAINERS shows them all orphaned and should likely be removed.

---
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c         |  2 +-
 arch/powerpc/cpu/mpc85xx/fdt.c                  |  2 +-
 board/freescale/corenet_ds/corenet_ds.c         |  5 +----
 board/freescale/corenet_ds/eth_hydra.c          |  7 +------
 board/freescale/ls1043aqds/eth.c                | 10 ++++++----
 board/freescale/ls1043aqds/ls1043aqds.c         |  5 +----
 board/freescale/ls1046aqds/eth.c                | 10 ++++++----
 board/freescale/ls1046aqds/ls1046aqds.c         |  5 +----
 configs/P3041DS_NAND_defconfig                  |  1 -
 configs/P3041DS_SDCARD_defconfig                |  1 -
 configs/P3041DS_SPIFLASH_defconfig              |  1 -
 configs/P3041DS_defconfig                       |  1 -
 configs/P5040DS_NAND_defconfig                  |  1 -
 configs/P5040DS_SDCARD_defconfig                |  1 -
 configs/P5040DS_SPIFLASH_defconfig              |  1 -
 configs/P5040DS_defconfig                       |  1 -
 configs/ls1043aqds_defconfig                    |  1 -
 configs/ls1043aqds_lpuart_defconfig             |  1 -
 configs/ls1043aqds_nand_defconfig               |  1 -
 configs/ls1043aqds_nor_ddr3_defconfig           |  1 -
 configs/ls1043aqds_qspi_defconfig               |  1 -
 configs/ls1043aqds_sdcard_ifc_defconfig         |  1 -
 configs/ls1043aqds_sdcard_qspi_defconfig        |  1 -
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig    |  1 -
 configs/ls1043aqds_tfa_defconfig                |  1 -
 configs/ls1043ardb_SECURE_BOOT_defconfig        |  1 -
 configs/ls1043ardb_defconfig                    |  1 -
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig   |  1 -
 configs/ls1043ardb_nand_defconfig               |  1 -
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig |  1 -
 configs/ls1043ardb_sdcard_defconfig             |  1 -
 configs/ls1043ardb_tfa_defconfig                |  1 -
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig   |  1 -
 configs/ls1046afrwy_tfa_defconfig               |  1 -
 configs/ls1046aqds_SECURE_BOOT_defconfig        |  1 -
 configs/ls1046aqds_defconfig                    |  1 -
 configs/ls1046aqds_lpuart_defconfig             |  1 -
 configs/ls1046aqds_nand_defconfig               |  1 -
 configs/ls1046aqds_qspi_defconfig               |  1 -
 configs/ls1046aqds_sdcard_ifc_defconfig         |  1 -
 configs/ls1046aqds_sdcard_qspi_defconfig        |  1 -
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig    |  1 -
 configs/ls1046aqds_tfa_defconfig                |  1 -
 configs/ls1046ardb_emmc_defconfig               |  1 -
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig   |  1 -
 configs/ls1046ardb_qspi_defconfig               |  1 -
 configs/ls1046ardb_qspi_spl_defconfig           |  1 -
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig |  1 -
 configs/ls1046ardb_sdcard_defconfig             |  1 -
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig    |  1 -
 configs/ls1046ardb_tfa_defconfig                |  1 -
 51 files changed, 18 insertions(+), 71 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/fdt.c +1 -1
index 2fa7ebf16391..427de1cb339d 100644
@@ -671,7 +671,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 			       "clock-frequency", get_qman_freq(), 1);
 #endif
 
-#ifdef CONFIG_SYS_DPAA_FMAN
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_fman_firmware(blob);
 #endif
 #ifdef CONFIG_FSL_PFE
arch/powerpc/cpu/mpc85xx/fdt.c +1 -1
index c8ad6a1b01ce..3186b182d31b 100644
@@ -643,7 +643,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 	ft_fixup_qe_snum(blob);
 #endif
 
-#ifdef CONFIG_SYS_DPAA_FMAN
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_fman_firmware(blob);
 #endif
 
board/freescale/corenet_ds/corenet_ds.c +1 -4
index 3a83e65f2fe5..2a980404880e 100644
@@ -207,10 +207,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_liodn(blob);
 	fsl_fdt_fixup_dr_usb(blob, bd);
 
-#ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_DM_ETH
-	fdt_fixup_fman_ethernet(blob);
-#endif
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_board_enet(blob);
 #endif
 
board/freescale/corenet_ds/eth_hydra.c +1 -6
index a27e905ace9d..6f0ea1fe7e02 100644
@@ -315,8 +315,6 @@ static void initialize_lane_to_slot(void)
 	lane_to_slot[17] = lane_to_slot[16];
 }
 
-#endif /* #ifdef CONFIG_FMAN_ENET */
-
 /*
  * Configure the status for the virtual MDIO nodes
  *
@@ -332,7 +330,6 @@ static void initialize_lane_to_slot(void)
  */
 void fdt_fixup_board_enet(void *fdt)
 {
-#ifdef CONFIG_FMAN_ENET
 	unsigned int i;
 	int lane;
 
@@ -363,12 +360,10 @@ void fdt_fixup_board_enet(void *fdt)
 	lane = serdes_get_first_lane(XAUI_FM1);
 	if (lane >= 0)
 		fdt_status_okay_by_alias(fdt, "emi2_xgmii");
-#endif
 }
 
 int board_eth_init(struct bd_info *bis)
 {
-#ifdef CONFIG_FMAN_ENET
 	struct fsl_pq_mdio_info dtsec_mdio_info;
 	struct tgec_mdio_info tgec_mdio_info;
 	unsigned int i, slot;
@@ -520,7 +515,7 @@ int board_eth_init(struct bd_info *bis)
 			miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME));
 
 	cpu_eth_init(bis);
-#endif
 
 	return pci_eth_init(bis);
 }
+#endif
board/freescale/ls1043aqds/eth.c +6 -4
index e156ba010451..7bfbacde4fbd 100644
@@ -30,8 +30,6 @@
 #define EMI1_SLOT4	5
 #define EMI2		6
 
-static int mdio_mux[NUM_FM_PORTS];
-
 static const char * const mdio_names[] = {
 	"LS1043AQDS_MDIO_RGMII1",
 	"LS1043AQDS_MDIO_RGMII2",
@@ -43,7 +41,11 @@ static const char * const mdio_names[] = {
 };
 
 /* Map SerDes1 4 lanes to default slot, will be initialized dynamically */
+#ifdef CONFIG_FMAN_ENET
+static int mdio_mux[NUM_FM_PORTS];
+
 static u8 lane_to_slot[] = {1, 2, 3, 4};
+#endif
 
 static const char *ls1043aqds_mdio_name_for_muxval(u8 muxval)
 {
@@ -75,6 +77,7 @@ struct mii_dev *mii_dev_for_muxval(u8 muxval)
 	return bus;
 }
 
+#ifdef CONFIG_FMAN_ENET
 struct ls1043aqds_mdio {
 	u8 muxval;
 	struct mii_dev *realbus;
@@ -296,7 +299,6 @@ void fdt_fixup_board_enet(void *fdt)
 
 int board_eth_init(struct bd_info *bis)
 {
-#ifdef CONFIG_FMAN_ENET
 	int i, idx, lane, slot, interface;
 	struct memac_mdio_info dtsec_mdio_info;
 	struct memac_mdio_info tgec_mdio_info;
@@ -493,7 +495,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 
 	cpu_eth_init(bis);
-#endif /* CONFIG_FMAN_ENET */
 
 	return pci_eth_init(bis);
 }
+#endif /* CONFIG_FMAN_ENET */
board/freescale/ls1043aqds/ls1043aqds.c +1 -4
index 13359f947bb5..7ac2c1ae901d 100644
@@ -556,10 +556,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_memory_banks(blob, base, size, 2);
 	ft_cpu_setup(blob, bd);
 
-#ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_DM_ETH
-	fdt_fixup_fman_ethernet(blob);
-#endif
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_board_enet(blob);
 #endif
 
board/freescale/ls1046aqds/eth.c +6 -4
index 8233f5461ee3..13207a1a37d5 100644
@@ -27,8 +27,6 @@
 #define EMI1_SLOT2	3
 #define EMI1_SLOT4	4
 
-static int mdio_mux[NUM_FM_PORTS];
-
 static const char * const mdio_names[] = {
 	"LS1046AQDS_MDIO_RGMII1",
 	"LS1046AQDS_MDIO_RGMII2",
@@ -39,7 +37,11 @@ static const char * const mdio_names[] = {
 };
 
 /* Map SerDes 1 & 2 lanes to default slot. */
+#ifdef CONFIG_FMAN_ENET
+static int mdio_mux[NUM_FM_PORTS];
+
 static u8 lane_to_slot[] = {1, 1, 1, 1, 0, 4, 0 , 0};
+#endif
 
 static const char *ls1046aqds_mdio_name_for_muxval(u8 muxval)
 {
@@ -71,6 +73,7 @@ struct mii_dev *mii_dev_for_muxval(u8 muxval)
 	return bus;
 }
 
+#ifdef CONFIG_FMAN_ENET
 struct ls1046aqds_mdio {
 	u8 muxval;
 	struct mii_dev *realbus;
@@ -263,7 +266,6 @@ void fdt_fixup_board_enet(void *fdt)
 
 int board_eth_init(struct bd_info *bis)
 {
-#ifdef CONFIG_FMAN_ENET
 	int i, idx, lane, slot, interface;
 	struct memac_mdio_info dtsec_mdio_info;
 	struct ccsr_gur *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
@@ -423,7 +425,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 
 	cpu_eth_init(bis);
-#endif /* CONFIG_FMAN_ENET */
 
 	return pci_eth_init(bis);
 }
+#endif /* CONFIG_FMAN_ENET */
board/freescale/ls1046aqds/ls1046aqds.c +1 -4
index e5b5441e2c3f..aa6e30e6b2a6 100644
@@ -439,10 +439,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_memory_banks(blob, base, size, 2);
 	ft_cpu_setup(blob, bd);
 
-#ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_DM_ETH
-	fdt_fixup_fman_ethernet(blob);
-#endif
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_board_enet(blob);
 #endif
 
configs/P3041DS_NAND_defconfig +0 -1
index 7afb7a45ec85..d3abe684befc 100644
@@ -95,7 +95,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x100000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P3041DS_SDCARD_defconfig +0 -1
index 35e2e4f161d9..1365a7e5e16e 100644
@@ -90,7 +90,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P3041DS_SPIFLASH_defconfig +0 -1
index 2e50dc44f788..e6922bb97c2c 100644
@@ -92,7 +92,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P3041DS_defconfig +0 -1
index b494dfa82234..3ba00ffc9cef 100644
@@ -87,7 +87,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P5040DS_NAND_defconfig +0 -1
index b36f525cc19c..9fdfb77b6404 100644
@@ -95,7 +95,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x100000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P5040DS_SDCARD_defconfig +0 -1
index 4111901fc401..61897d65410f 100644
@@ -89,7 +89,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P5040DS_SPIFLASH_defconfig +0 -1
index 5d493ee89c5e..2e3a67f23944 100644
@@ -91,7 +91,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/P5040DS_defconfig +0 -1
index dbcb02765d6c..617a9e86f420 100644
@@ -86,7 +86,6 @@ CONFIG_PHY_TERANETICS=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
configs/ls1043aqds_defconfig +0 -1
index d7ff7e2970fb..ea95a68be259 100644
@@ -95,7 +95,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_lpuart_defconfig +0 -1
index 462fad1cd48f..84f65780077d 100644
@@ -95,7 +95,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_nand_defconfig +0 -1
index 63287ca533b3..1b49f53abed9 100644
@@ -125,7 +125,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_nor_ddr3_defconfig +0 -1
index fc72f4cdaf64..6a04b063aa83 100644
@@ -96,7 +96,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_qspi_defconfig +0 -1
index 30cc15a12f3d..0ef4fe3db379 100644
@@ -85,7 +85,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_sdcard_ifc_defconfig +0 -1
index 172ab723c61b..cf9fd13777c6 100644
@@ -122,7 +122,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_sdcard_qspi_defconfig +0 -1
index 447a51513fe3..cacd85e4cf5c 100644
@@ -110,7 +110,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +0 -1
index b414d400e6a1..e05746454495 100644
@@ -94,7 +94,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_tfa_defconfig +0 -1
index 9bac24a27b30..c67876b9520d 100644
@@ -103,7 +103,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043ardb_SECURE_BOOT_defconfig +0 -1
index 0a40bf0f9f99..231e7f07c5bc 100644
@@ -80,7 +80,6 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043ardb_defconfig +0 -1
index f27eadf39211..764e88fdd531 100644
@@ -83,7 +83,6 @@ CONFIG_PHY_VITESSE=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +0 -1
index da23382940f8..1a45a0030130 100644
@@ -104,7 +104,6 @@ CONFIG_PHY_VITESSE=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043ardb_nand_defconfig +0 -1
index 2be08bbb7b35..999b2101ce93 100644
@@ -111,7 +111,6 @@ CONFIG_PHY_VITESSE=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +0 -1
index d9b841df1a4e..0e55f5b40b9f 100644
@@ -104,7 +104,6 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
configs/ls1043ardb_sdcard_defconfig +0 -1
index 79feb55dfb15..dea50b3389a4 100644
@@ -108,7 +108,6 @@ CONFIG_PHY_VITESSE=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043ardb_tfa_defconfig +0 -1
index f9cb304ba1cc..08222eadd8e0 100644
@@ -85,7 +85,6 @@ CONFIG_PHY_VITESSE=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +0 -1
index 1be7002a1859..a7592886db0f 100644
@@ -63,7 +63,6 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
configs/ls1046afrwy_tfa_defconfig +0 -1
index f41434c7419b..e57d9a7907fd 100644
@@ -69,7 +69,6 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_SECURE_BOOT_defconfig +0 -1
index 3a71185b865a..7a0b786be75d 100644
@@ -93,7 +93,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_defconfig +0 -1
index 35abfb323f65..d582f61d4eee 100644
@@ -96,7 +96,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_lpuart_defconfig +0 -1
index 5316c80c83d2..9731b85b0c4d 100644
@@ -96,7 +96,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_nand_defconfig +0 -1
index 8550190d2295..bd58d3a90f74 100644
@@ -124,7 +124,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_qspi_defconfig +0 -1
index 049cf1e56f98..0dca44a8b0bd 100644
@@ -86,7 +86,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_sdcard_ifc_defconfig +0 -1
index 6cdc78da3f0f..d023f534210c 100644
@@ -124,7 +124,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_sdcard_qspi_defconfig +0 -1
index 68aae882a807..aed01d44f1c4 100644
@@ -112,7 +112,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +0 -1
index 7efa5cbebd07..e8676e2ca1ea 100644
@@ -94,7 +94,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_tfa_defconfig +0 -1
index 3846b95e71d5..8faeeb4773ea 100644
@@ -104,7 +104,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_emmc_defconfig +0 -1
index 331419844669..462f700be8aa 100644
@@ -102,7 +102,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +0 -1
index 2ea72cc2a8ad..db7ecc4f452f 100644
@@ -78,7 +78,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_qspi_defconfig +0 -1
index c6b537f3b8dd..844a4db464b7 100644
@@ -82,7 +82,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_qspi_spl_defconfig +0 -1
index 57cebf5f8b43..00adb099fff0 100644
@@ -110,7 +110,6 @@ CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +0 -1
index 6960aa9d3ffd..9528aa387299 100644
@@ -101,7 +101,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
configs/ls1046ardb_sdcard_defconfig +0 -1
index 9ca4315c83c7..49643b005020 100644
@@ -102,7 +102,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +0 -1
index e192ef48b131..186eee983427 100644
@@ -72,7 +72,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046ardb_tfa_defconfig +0 -1
index 6e5f29a708dd..038c2d4288f4 100644
@@ -78,7 +78,6 @@ CONFIG_PHY_FIXED=y
 CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
Signature · 1 line
2.25.1
author
#32 lore raw

PATCH v2 1/1 ppc: Remove corenet_ds boards

These boards have been orphaned for some time and are behind on various DM migrations. Remove them.

Cc Priyanka Jain <[email protected]>
Cc Peng Fan <[email protected]>

---
Changes in v2:
- New patch

 .azure-pipelines.yml                          |   4 +-
 arch/powerpc/cpu/mpc85xx/Kconfig              |   1 -
 board/freescale/corenet_ds/Kconfig            |  38 -
 board/freescale/corenet_ds/MAINTAINERS        |  21 -
 board/freescale/corenet_ds/Makefile           |  14 -
 board/freescale/corenet_ds/corenet_ds.c       | 218 -----
 board/freescale/corenet_ds/corenet_ds.h       |  12 -
 board/freescale/corenet_ds/ddr.c              | 287 -------
 board/freescale/corenet_ds/eth_hydra.c        | 526 ------------
 board/freescale/corenet_ds/eth_p4080.c        | 489 -----------
 board/freescale/corenet_ds/eth_superhydra.c   | 783 ------------------
 board/freescale/corenet_ds/p3041ds_ddr.c      |  11 -
 board/freescale/corenet_ds/p4080ds_ddr.c      | 346 --------
 board/freescale/corenet_ds/p5040ds_ddr.c      |  15 -
 board/freescale/corenet_ds/rcw_p3041ds.cfg    |  11 -
 board/freescale/corenet_ds/rcw_p4080ds.cfg    |  11 -
 board/freescale/corenet_ds/rcw_p5040ds.cfg    |  11 -
 .../{corenet_ds => p2041rdb}/pbi.cfg          |   0
 .../{corenet_ds => p2041rdb}/rcw_p2041rdb.cfg |   0
 configs/P2041RDB_NAND_defconfig               |   4 +-
 configs/P2041RDB_SDCARD_defconfig             |   4 +-
 configs/P2041RDB_SPIFLASH_defconfig           |   4 +-
 configs/P3041DS_NAND_defconfig                | 113 ---
 configs/P3041DS_SDCARD_defconfig              | 108 ---
 configs/P3041DS_SPIFLASH_defconfig            | 110 ---
 configs/P3041DS_defconfig                     | 105 ---
 configs/P4080DS_SDCARD_defconfig              | 105 ---
 configs/P4080DS_SPIFLASH_defconfig            | 107 ---
 configs/P4080DS_defconfig                     | 102 ---
 configs/P5040DS_NAND_defconfig                | 113 ---
 configs/P5040DS_SDCARD_defconfig              | 107 ---
 configs/P5040DS_SPIFLASH_defconfig            | 109 ---
 configs/P5040DS_defconfig                     | 104 ---
 doc/README.pblimage                           |   2 +-
 include/configs/P3041DS.h                     |  18 -
 include/configs/P4080DS.h                     |  17 -
 include/configs/P5040DS.h                     |  13 -
 37 files changed, 8 insertions(+), 4035 deletions(-)
 delete mode 100644 board/freescale/corenet_ds/Kconfig
 delete mode 100644 board/freescale/corenet_ds/MAINTAINERS
 delete mode 100644 board/freescale/corenet_ds/Makefile
 delete mode 100644 board/freescale/corenet_ds/corenet_ds.c
 delete mode 100644 board/freescale/corenet_ds/corenet_ds.h
 delete mode 100644 board/freescale/corenet_ds/ddr.c
 delete mode 100644 board/freescale/corenet_ds/eth_hydra.c
 delete mode 100644 board/freescale/corenet_ds/eth_p4080.c
 delete mode 100644 board/freescale/corenet_ds/eth_superhydra.c
 delete mode 100644 board/freescale/corenet_ds/p3041ds_ddr.c
 delete mode 100644 board/freescale/corenet_ds/p4080ds_ddr.c
 delete mode 100644 board/freescale/corenet_ds/p5040ds_ddr.c
 delete mode 100644 board/freescale/corenet_ds/rcw_p3041ds.cfg
 delete mode 100644 board/freescale/corenet_ds/rcw_p4080ds.cfg
 delete mode 100644 board/freescale/corenet_ds/rcw_p5040ds.cfg
 rename board/freescale/{corenet_ds => p2041rdb}/pbi.cfg (100%)
 rename board/freescale/{corenet_ds => p2041rdb}/rcw_p2041rdb.cfg (100%)
 delete mode 100644 configs/P3041DS_NAND_defconfig
 delete mode 100644 configs/P3041DS_SDCARD_defconfig
 delete mode 100644 configs/P3041DS_SPIFLASH_defconfig
 delete mode 100644 configs/P3041DS_defconfig
 delete mode 100644 configs/P4080DS_SDCARD_defconfig
 delete mode 100644 configs/P4080DS_SPIFLASH_defconfig
 delete mode 100644 configs/P4080DS_defconfig
 delete mode 100644 configs/P5040DS_NAND_defconfig
 delete mode 100644 configs/P5040DS_SDCARD_defconfig
 delete mode 100644 configs/P5040DS_SPIFLASH_defconfig
 delete mode 100644 configs/P5040DS_defconfig
 delete mode 100644 include/configs/P3041DS.h
 delete mode 100644 include/configs/P4080DS.h
 delete mode 100644 include/configs/P5040DS.h
.azure-pipelines.yml +1 -3
index 36ca3cb46264..3ec6b4b709fb 100644
@@ -517,9 +517,7 @@ stages:
         non_fsl_ppc:
           BUILDMAN: "powerpc -x freescale"
         mpc85xx_freescale:
-          BUILDMAN: "mpc85xx&freescale -x t208xrdb -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x bsc91*"
-        t208xrdb_corenet_ds:
-          BUILDMAN: "t208xrdb corenet_ds"
+          BUILDMAN: "mpc85xx&freescale -x t102* -x p1_p2_rdb_pc -x p1010rdb -x bsc91*"
         fsl_ppc:
           BUILDMAN: "mpc83xx&freescale"
         t102x:
arch/powerpc/cpu/mpc85xx/Kconfig +0 -1
index 8f35d3cf5ed8..277d30ac4515 100644
@@ -1444,7 +1444,6 @@ config FSL_VIA
 	bool
 
 source "board/emulation/qemu-ppce500/Kconfig"
-source "board/freescale/corenet_ds/Kconfig"
 source "board/freescale/mpc8548cds/Kconfig"
 source "board/freescale/p1010rdb/Kconfig"
 source "board/freescale/p1_p2_rdb_pc/Kconfig"
board/freescale/corenet_ds/Kconfig deleted +0 -38
deleted file mode 100644
index dbcd1afcbad1..000000000000
@@ -1,38 +0,0 @@
-if TARGET_P3041DS
-
-config SYS_BOARD
-	default "corenet_ds"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "P3041DS"
-
-endif
-
-if TARGET_P4080DS
-
-config SYS_BOARD
-	default "corenet_ds"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "P4080DS"
-
-endif
-
-if TARGET_P5040DS
-
-config SYS_BOARD
-	default "corenet_ds"
-
-config SYS_VENDOR
-	default "freescale"
-
-config SYS_CONFIG_NAME
-	default "P5040DS"
-
-endif
board/freescale/corenet_ds/MAINTAINERS deleted +0 -21
deleted file mode 100644
index f0da86a34ca3..000000000000
@@ -1,21 +0,0 @@
-CORENET_DS BOARD
-#M:	-
-S:	Maintained
-F:	board/freescale/corenet_ds/
-F:	include/configs/P3041DS.h
-F:	configs/P3041DS_defconfig
-F:	configs/P3041DS_NAND_defconfig
-F:	configs/P3041DS_SDCARD_defconfig
-F:	configs/P3041DS_SPIFLASH_defconfig
-F:	configs/P3041DS_SRIO_PCIE_BOOT_defconfig
-F:	include/configs/P4080DS.h
-F:	configs/P4080DS_defconfig
-F:	configs/P4080DS_SDCARD_defconfig
-F:	configs/P4080DS_SPIFLASH_defconfig
-F:	configs/P4080DS_SRIO_PCIE_BOOT_defconfig
-F:	include/configs/P5040DS.h
-F:	configs/P5040DS_defconfig
-F:	configs/P5040DS_NAND_defconfig
-F:	configs/P5040DS_SDCARD_defconfig
-F:	configs/P5040DS_SPIFLASH_defconfig
-F:	configs/P5040DS_SECURE_BOOT_defconfig
board/freescale/corenet_ds/Makefile deleted +0 -14
deleted file mode 100644
index 4d62fc9ce190..000000000000
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2007-2009 Freescale Semiconductor, Inc.
-# (C) Copyright 2001-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-obj-y	+= corenet_ds.o
-obj-y	+= ddr.o
-obj-$(CONFIG_TARGET_P3041DS)	+= eth_hydra.o
-obj-$(CONFIG_TARGET_P4080DS)	+= eth_p4080.o
-obj-$(CONFIG_TARGET_P5040DS)	+= eth_superhydra.o
-obj-$(CONFIG_TARGET_P3041DS)	+= p3041ds_ddr.o
-obj-$(CONFIG_TARGET_P4080DS)	+= p4080ds_ddr.o
-obj-$(CONFIG_TARGET_P5040DS)	+= p5040ds_ddr.o
board/freescale/corenet_ds/corenet_ds.c deleted +0 -218

218 lines not on this page · raw message

board/freescale/corenet_ds/corenet_ds.h deleted +0 -12
deleted file mode 100644
index 84e5c4a2de21..000000000000
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- */
-
-#ifndef __CORENET_DS_H__
-#define __CORENET_DS_H__
-
-void fdt_fixup_board_enet(void *blob);
-void pci_of_setup(void *blob, struct bd_info *bd);
-
-#endif
board/freescale/corenet_ds/ddr.c deleted +0 -287

287 lines not on this page · raw message

board/freescale/corenet_ds/eth_hydra.c deleted +0 -526

526 lines not on this page · raw message

board/freescale/corenet_ds/eth_p4080.c deleted +0 -489

489 lines not on this page · raw message

board/freescale/corenet_ds/eth_superhydra.c deleted +0 -783

783 lines not on this page · raw message

board/freescale/corenet_ds/p3041ds_ddr.c deleted +0 -11
deleted file mode 100644
index c62d85ccc0e1..000000000000
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <fsl_ddr_sdram.h>
-
-fixed_ddr_parm_t fixed_ddr_parm_0[] = {
-	{0, 0, NULL}
-};
board/freescale/corenet_ds/p4080ds_ddr.c deleted +0 -346

346 lines not on this page · raw message

board/freescale/corenet_ds/p5040ds_ddr.c deleted +0 -15
deleted file mode 100644
index 112733be781e..000000000000
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <fsl_ddr_sdram.h>
-
-fixed_ddr_parm_t fixed_ddr_parm_0[] = {
-	{0, 0, NULL}
-};
-
-fixed_ddr_parm_t fixed_ddr_parm_1[] = {
-	{0, 0, NULL}
-};
board/freescale/corenet_ds/rcw_p3041ds.cfg deleted +0 -11
deleted file mode 100644
index 8813156219fc..000000000000
@@ -1,11 +0,0 @@
-#
-# Default RCW for P3041DS.
-#
-
-#PBL preamble and RCW header
-aa55aa55 010e0100
-#64 bytes RCW data
-12600000 00000000 241C0000 00000000
-D8984A01 03002000 58000000 41000000
-00000000 00000000 00000000 10070000
-00000000 00000000 00000000 00000000
board/freescale/corenet_ds/rcw_p4080ds.cfg deleted +0 -11
deleted file mode 100644
index 6a2633959984..000000000000
@@ -1,11 +0,0 @@
-#
-# Default RCW for P4080DS.
-#
-
-#PBL preamble and RCW header
-aa55aa55 010e0100
-#64 bytes RCW data
-105a0000 00000000 1e1e181e 0000cccc
-58400000 3c3c2000 58000000 e1000000
-00000000 00000000 00000000 008b6000
-00000000 00000000 00000000 00000000
board/freescale/corenet_ds/rcw_p5040ds.cfg deleted +0 -11
deleted file mode 100644
index 82fa7417d9be..000000000000
@@ -1,11 +0,0 @@
-#
-# Default RCW for P5040DS.
-#
-
-#PBL preamble and RCW header
-aa55aa55 010e0100
-#64 bytes RCW data
-0c580000 00000000 22121200 00000000
-089c4400 00283000 58000000 61000000
-00000000 00000000 00000000 10070000
-00000000 00000000 00000000 00000000
board/freescale/p2041rdb/pbi.cfg renamed from board/freescale/corenet_ds/pbi.cfg +0 -0
similarity index 100%
rename from board/freescale/corenet_ds/pbi.cfg
rename to board/freescale/p2041rdb/pbi.cfg
board/freescale/p2041rdb/rcw_p2041rdb.cfg renamed from board/freescale/corenet_ds/rcw_p2041rdb.cfg +0 -0
similarity index 100%
rename from board/freescale/corenet_ds/rcw_p2041rdb.cfg
rename to board/freescale/p2041rdb/rcw_p2041rdb.cfg
configs/P2041RDB_NAND_defconfig +2 -2
index 0e8c2aa00bc2..cc62719a89a0 100644
@@ -21,8 +21,8 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DYNAMIC_SYS_CLK_FREQ=y
 CONFIG_RAMBOOT_PBL=y
-CONFIG_SYS_FSL_PBL_PBI="board/freescale/corenet_ds/pbi.cfg"
-CONFIG_SYS_FSL_PBL_RCW="board/freescale/corenet_ds/rcw_p2041rdb.cfg"
+CONFIG_SYS_FSL_PBL_PBI="board/freescale/p2041rdb/pbi.cfg"
+CONFIG_SYS_FSL_PBL_RCW="board/freescale/p2041rdb/rcw_p2041rdb.cfg"
 CONFIG_BOOTDELAY=10
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr"
configs/P2041RDB_SDCARD_defconfig +2 -2
index 5b9f5a44690d..b0e4bb89639e 100644
@@ -21,8 +21,8 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DYNAMIC_SYS_CLK_FREQ=y
 CONFIG_RAMBOOT_PBL=y
-CONFIG_SYS_FSL_PBL_PBI="board/freescale/corenet_ds/pbi.cfg"
-CONFIG_SYS_FSL_PBL_RCW="board/freescale/corenet_ds/rcw_p2041rdb.cfg"
+CONFIG_SYS_FSL_PBL_PBI="board/freescale/p2041rdb/pbi.cfg"
+CONFIG_SYS_FSL_PBL_RCW="board/freescale/p2041rdb/rcw_p2041rdb.cfg"
 CONFIG_BOOTDELAY=10
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr"
configs/P2041RDB_SPIFLASH_defconfig +2 -2
index 0a061610c09a..517c7d25ed93 100644
@@ -23,8 +23,8 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DYNAMIC_SYS_CLK_FREQ=y
 CONFIG_RAMBOOT_PBL=y
 CONFIG_SPIFLASH=y
-CONFIG_SYS_FSL_PBL_PBI="board/freescale/corenet_ds/pbi.cfg"
-CONFIG_SYS_FSL_PBL_RCW="board/freescale/corenet_ds/rcw_p2041rdb.cfg"
+CONFIG_SYS_FSL_PBL_PBI="board/freescale/p2041rdb/pbi.cfg"
+CONFIG_SYS_FSL_PBL_RCW="board/freescale/p2041rdb/rcw_p2041rdb.cfg"
 CONFIG_BOOTDELAY=10
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr"
configs/P3041DS_NAND_defconfig deleted +0 -113

113 lines not on this page · raw message

configs/P3041DS_SDCARD_defconfig deleted +0 -108

47 lines not on this page · raw message

configs/P3041DS_SPIFLASH_defconfig deleted +0 -110

110 lines not on this page · raw message

configs/P3041DS_defconfig deleted +0 -105

105 lines not on this page · raw message

configs/P4080DS_SDCARD_defconfig deleted +0 -105

105 lines not on this page · raw message

configs/P4080DS_SPIFLASH_defconfig deleted +0 -107

107 lines not on this page · raw message

configs/P4080DS_defconfig deleted +0 -102

102 lines not on this page · raw message

configs/P5040DS_NAND_defconfig deleted +0 -113

113 lines not on this page · raw message

configs/P5040DS_SDCARD_defconfig deleted +0 -107

107 lines not on this page · raw message

configs/P5040DS_SPIFLASH_defconfig deleted +0 -109

109 lines not on this page · raw message

configs/P5040DS_defconfig deleted +0 -104

104 lines not on this page · raw message

doc/README.pblimage +1 -1
index 7fdd26b71b2b..58202c14a285 100644

Lines of this file are not shown. View the raw message.

include/configs/P3041DS.h deleted +0 -18
deleted file mode 100644
index 42e507bac0bb..000000000000

Lines of this file are not shown. View the raw message.

include/configs/P4080DS.h deleted +0 -17
deleted file mode 100644
index fd558398e4a1..000000000000

Lines of this file are not shown. View the raw message.

include/configs/P5040DS.h deleted +0 -13
deleted file mode 100644
index c8fc879d2f88..000000000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

author
#33 lore raw

PATCH v2 1/1 layerscape: Disable CONFIG_FMAN_ENET on *aqds* platforms

The *aqds* platforms have not been migrated to be able to enable CONFIG_DM_ETH with CONFIG_FMAN_ENET. Disable CONFIG_FMAN_ENET on these platforms.

Cc Mingkai Hu <[email protected]>
Cc Rajesh Bhagat <[email protected]>
Cc Pramod Kumar <[email protected]>
Cc Peng Fan <[email protected]>

---
Changes in v2:
- Depend on patch to delete corenet_ds platforms
- Only disable on *aqds* after it was noted that the other layerscape platforms had been migrated.

---
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c      |  2 +-
 board/freescale/ls1043aqds/eth.c             | 10 ++++++----
 board/freescale/ls1043aqds/ls1043aqds.c      |  5 +----
 board/freescale/ls1046aqds/eth.c             | 10 ++++++----
 board/freescale/ls1046aqds/ls1046aqds.c      |  5 +----
 configs/ls1043aqds_defconfig                 |  1 -
 configs/ls1043aqds_lpuart_defconfig          |  1 -
 configs/ls1043aqds_nand_defconfig            |  1 -
 configs/ls1043aqds_nor_ddr3_defconfig        |  1 -
 configs/ls1043aqds_qspi_defconfig            |  1 -
 configs/ls1043aqds_sdcard_ifc_defconfig      |  1 -
 configs/ls1043aqds_sdcard_qspi_defconfig     |  1 -
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig |  1 -
 configs/ls1043aqds_tfa_defconfig             |  1 -
 configs/ls1046aqds_SECURE_BOOT_defconfig     |  1 -
 configs/ls1046aqds_defconfig                 |  1 -
 configs/ls1046aqds_lpuart_defconfig          |  1 -
 configs/ls1046aqds_nand_defconfig            |  1 -
 configs/ls1046aqds_qspi_defconfig            |  1 -
 configs/ls1046aqds_sdcard_ifc_defconfig      |  1 -
 configs/ls1046aqds_sdcard_qspi_defconfig     |  1 -
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig |  1 -
 configs/ls1046aqds_tfa_defconfig             |  1 -
 23 files changed, 15 insertions(+), 35 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/fdt.c +1 -1
index 2fa7ebf16391..427de1cb339d 100644
@@ -671,7 +671,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 			       "clock-frequency", get_qman_freq(), 1);
 #endif
 
-#ifdef CONFIG_SYS_DPAA_FMAN
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_fman_firmware(blob);
 #endif
 #ifdef CONFIG_FSL_PFE
board/freescale/ls1043aqds/eth.c +6 -4
index e156ba010451..7bfbacde4fbd 100644
@@ -30,8 +30,6 @@
 #define EMI1_SLOT4	5
 #define EMI2		6
 
-static int mdio_mux[NUM_FM_PORTS];
-
 static const char * const mdio_names[] = {
 	"LS1043AQDS_MDIO_RGMII1",
 	"LS1043AQDS_MDIO_RGMII2",
@@ -43,7 +41,11 @@ static const char * const mdio_names[] = {
 };
 
 /* Map SerDes1 4 lanes to default slot, will be initialized dynamically */
+#ifdef CONFIG_FMAN_ENET
+static int mdio_mux[NUM_FM_PORTS];
+
 static u8 lane_to_slot[] = {1, 2, 3, 4};
+#endif
 
 static const char *ls1043aqds_mdio_name_for_muxval(u8 muxval)
 {
@@ -75,6 +77,7 @@ struct mii_dev *mii_dev_for_muxval(u8 muxval)
 	return bus;
 }
 
+#ifdef CONFIG_FMAN_ENET
 struct ls1043aqds_mdio {
 	u8 muxval;
 	struct mii_dev *realbus;
@@ -296,7 +299,6 @@ void fdt_fixup_board_enet(void *fdt)
 
 int board_eth_init(struct bd_info *bis)
 {
-#ifdef CONFIG_FMAN_ENET
 	int i, idx, lane, slot, interface;
 	struct memac_mdio_info dtsec_mdio_info;
 	struct memac_mdio_info tgec_mdio_info;
@@ -493,7 +495,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 
 	cpu_eth_init(bis);
-#endif /* CONFIG_FMAN_ENET */
 
 	return pci_eth_init(bis);
 }
+#endif /* CONFIG_FMAN_ENET */
board/freescale/ls1043aqds/ls1043aqds.c +1 -4
index 13359f947bb5..7ac2c1ae901d 100644
@@ -556,10 +556,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_memory_banks(blob, base, size, 2);
 	ft_cpu_setup(blob, bd);
 
-#ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_DM_ETH
-	fdt_fixup_fman_ethernet(blob);
-#endif
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_board_enet(blob);
 #endif
 
board/freescale/ls1046aqds/eth.c +6 -4
index 8233f5461ee3..13207a1a37d5 100644
@@ -27,8 +27,6 @@
 #define EMI1_SLOT2	3
 #define EMI1_SLOT4	4
 
-static int mdio_mux[NUM_FM_PORTS];
-
 static const char * const mdio_names[] = {
 	"LS1046AQDS_MDIO_RGMII1",
 	"LS1046AQDS_MDIO_RGMII2",
@@ -39,7 +37,11 @@ static const char * const mdio_names[] = {
 };
 
 /* Map SerDes 1 & 2 lanes to default slot. */
+#ifdef CONFIG_FMAN_ENET
+static int mdio_mux[NUM_FM_PORTS];
+
 static u8 lane_to_slot[] = {1, 1, 1, 1, 0, 4, 0 , 0};
+#endif
 
 static const char *ls1046aqds_mdio_name_for_muxval(u8 muxval)
 {
@@ -71,6 +73,7 @@ struct mii_dev *mii_dev_for_muxval(u8 muxval)
 	return bus;
 }
 
+#ifdef CONFIG_FMAN_ENET
 struct ls1046aqds_mdio {
 	u8 muxval;
 	struct mii_dev *realbus;
@@ -263,7 +266,6 @@ void fdt_fixup_board_enet(void *fdt)
 
 int board_eth_init(struct bd_info *bis)
 {
-#ifdef CONFIG_FMAN_ENET
 	int i, idx, lane, slot, interface;
 	struct memac_mdio_info dtsec_mdio_info;
 	struct ccsr_gur *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
@@ -423,7 +425,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 
 	cpu_eth_init(bis);
-#endif /* CONFIG_FMAN_ENET */
 
 	return pci_eth_init(bis);
 }
+#endif /* CONFIG_FMAN_ENET */
board/freescale/ls1046aqds/ls1046aqds.c +1 -4
index e5b5441e2c3f..aa6e30e6b2a6 100644
@@ -439,10 +439,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_memory_banks(blob, base, size, 2);
 	ft_cpu_setup(blob, bd);
 
-#ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_DM_ETH
-	fdt_fixup_fman_ethernet(blob);
-#endif
+#ifdef CONFIG_FMAN_ENET
 	fdt_fixup_board_enet(blob);
 #endif
 
configs/ls1043aqds_defconfig +0 -1
index d7ff7e2970fb..ea95a68be259 100644
@@ -95,7 +95,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_lpuart_defconfig +0 -1
index 462fad1cd48f..84f65780077d 100644
@@ -95,7 +95,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_nand_defconfig +0 -1
index 63287ca533b3..1b49f53abed9 100644
@@ -125,7 +125,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_nor_ddr3_defconfig +0 -1
index fc72f4cdaf64..6a04b063aa83 100644
@@ -96,7 +96,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_qspi_defconfig +0 -1
index 30cc15a12f3d..0ef4fe3db379 100644
@@ -85,7 +85,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_sdcard_ifc_defconfig +0 -1
index 172ab723c61b..cf9fd13777c6 100644
@@ -122,7 +122,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_sdcard_qspi_defconfig +0 -1
index 447a51513fe3..cacd85e4cf5c 100644
@@ -110,7 +110,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +0 -1
index b414d400e6a1..e05746454495 100644
@@ -94,7 +94,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1043aqds_tfa_defconfig +0 -1
index 9bac24a27b30..c67876b9520d 100644
@@ -103,7 +103,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_SECURE_BOOT_defconfig +0 -1
index 3a71185b865a..7a0b786be75d 100644
@@ -93,7 +93,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_defconfig +0 -1
index 35abfb323f65..d582f61d4eee 100644
@@ -96,7 +96,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_lpuart_defconfig +0 -1
index 5316c80c83d2..9731b85b0c4d 100644
@@ -96,7 +96,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x60900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_nand_defconfig +0 -1
index 8550190d2295..bd58d3a90f74 100644
@@ -124,7 +124,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_qspi_defconfig +0 -1
index 049cf1e56f98..0dca44a8b0bd 100644
@@ -86,7 +86,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x40900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_sdcard_ifc_defconfig +0 -1
index 6cdc78da3f0f..d023f534210c 100644
@@ -124,7 +124,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_sdcard_qspi_defconfig +0 -1
index 68aae882a807..aed01d44f1c4 100644
@@ -112,7 +112,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +0 -1
index 7efa5cbebd07..e8676e2ca1ea 100644
@@ -94,7 +94,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
configs/ls1046aqds_tfa_defconfig +0 -1
index 3846b95e71d5..8faeeb4773ea 100644
@@ -104,7 +104,6 @@ CONFIG_PHYLIB_10G=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_VITESSE=y
 CONFIG_E1000=y
-CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
Signature · 1 line
2.25.1
author
#34 lore raw

Re: [PATCHv2 12b/21] layerscape: Disable CONFIG_FMAN_ENET on *aqds* platforms

Quoted 9 lines · Tom Rini

The *aqds* platforms have not been migrated to be able to enable CONFIG_DM_ETH with CONFIG_FMAN_ENET. Disable CONFIG_FMAN_ENET on these platforms.

Cc Mingkai Hu <[email protected]>
Cc Rajesh Bhagat <[email protected]>
Cc Pramod Kumar <[email protected]>
Cc Peng Fan <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#36 lore raw

PATCH 13/21 mpc8548cds: Guard old ethernet code with !DM_ETH

In reply to Tom Rini

There is some code here for the legacy non-DM_ETH case, add a guard around it.

Cc Priyanka Jain <[email protected]>
Cc Peng Fan <[email protected]>
---
 board/freescale/mpc8548cds/mpc8548cds.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
board/freescale/mpc8548cds/mpc8548cds.c +3 -1
index cfb5b0b38bbe..5cb16b5082b5 100644
@@ -168,7 +168,8 @@ void lbc_sdram_init(void)
 #endif	/* enable SDRAM init */
 }
 
-void configure_rgmii(void)
+#ifndef CONFIG_DM_ETH
+static void configure_rgmii(void)
 {
 	unsigned short temp;
 
@@ -247,3 +248,4 @@ int board_eth_init(struct bd_info *bis)
 
 	return pci_eth_init(bis);
 }
+#endif
Signature · 1 line
2.25.1
author
#38 lore raw

PATCH 14/21 net: ks8851_mll: Remove legacy non-DM_ETH code and callers

In reply to Tom Rini

As this driver has been converted to DM_ETH and the migration deadline is 2 years passed, remove the legacy code and callers.

Cc Eugen Hristev <[email protected]>
---
 board/atmel/at91sam9n12ek/at91sam9n12ek.c | 35 -----------
 drivers/net/ks8851_mll.c                  | 75 -----------------------
 2 files changed, 110 deletions(-)
board/atmel/at91sam9n12ek/at91sam9n12ek.c +0 -35
index 018fed9cc2ae..a337db4efc68 100644
@@ -135,30 +135,6 @@ void lcd_show_board_info(void)
 #endif /* CONFIG_LCD_INFO */
 #endif /* CONFIG_LCD */
 
-#ifdef CONFIG_KS8851_MLL
-void at91sam9n12ek_ks8851_hw_init(void)
-{
-	struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
-
-	writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) |
-	       AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0),
-	       &smc->cs[2].setup);
-	writel(AT91_SMC_PULSE_NWE(7) | AT91_SMC_PULSE_NCS_WR(7) |
-	       AT91_SMC_PULSE_NRD(7) | AT91_SMC_PULSE_NCS_RD(7),
-	       &smc->cs[2].pulse);
-	writel(AT91_SMC_CYCLE_NWE(9) | AT91_SMC_CYCLE_NRD(9),
-	       &smc->cs[2].cycle);
-	writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
-	       AT91_SMC_MODE_EXNW_DISABLE |
-	       AT91_SMC_MODE_BAT | AT91_SMC_MODE_DBW_16 |
-	       AT91_SMC_MODE_TDF_CYCLE(1),
-	       &smc->cs[2].mode);
-
-	/* Configure NCS2 PIN */
-	at91_pio3_set_b_periph(AT91_PIO_PORTD, 19, 0);
-}
-#endif
-
 #ifdef CONFIG_USB_ATMEL
 void at91sam9n12ek_usb_hw_init(void)
 {
@@ -193,10 +169,6 @@ int board_init(void)
 	at91_lcd_hw_init();
 #endif
 
-#ifdef CONFIG_KS8851_MLL
-	at91sam9n12ek_ks8851_hw_init();
-#endif
-
 #ifdef CONFIG_USB_ATMEL
 	at91sam9n12ek_usb_hw_init();
 #endif
@@ -204,13 +176,6 @@ int board_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_KS8851_MLL
-int board_eth_init(struct bd_info *bis)
-{
-	return ks8851_mll_initialize(0, CONFIG_KS8851_MLL_BASEADDR);
-}
-#endif
-
 int dram_init(void)
 {
 	gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
drivers/net/ks8851_mll.c +0 -75

90 lines not on this page · raw message

Signature · 1 line
2.25.1
Acked-by on v1 14/21
#39 lore raw

Re: [PATCH 14/21] net: ks8851_mll: Remove legacy non-DM_ETH code and callers

Quoted 169 lines · Tom Rini

As this driver has been converted to DM_ETH and the migration deadline is 2 years passed, remove the legacy code and callers.

Cc Eugen Hristev <[email protected]>
---
 board/atmel/at91sam9n12ek/at91sam9n12ek.c | 35 -----------
 drivers/net/ks8851_mll.c                  | 75 -----------------------
 2 files changed, 110 deletions(-)
board/atmel/at91sam9n12ek/at91sam9n12ek.c +0 -35
index 018fed9cc2ae..a337db4efc68 100644
@@ -135,30 +135,6 @@ void lcd_show_board_info(void)
 #endif /* CONFIG_LCD_INFO */
 #endif /* CONFIG_LCD */
 
-#ifdef CONFIG_KS8851_MLL
-void at91sam9n12ek_ks8851_hw_init(void)
-{
-       struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
-
-       writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) |
-              AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0),
-              &smc->cs[2].setup);
-       writel(AT91_SMC_PULSE_NWE(7) | AT91_SMC_PULSE_NCS_WR(7) |
-              AT91_SMC_PULSE_NRD(7) | AT91_SMC_PULSE_NCS_RD(7),
-              &smc->cs[2].pulse);
-       writel(AT91_SMC_CYCLE_NWE(9) | AT91_SMC_CYCLE_NRD(9),
-              &smc->cs[2].cycle);
-       writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
-              AT91_SMC_MODE_EXNW_DISABLE |
-              AT91_SMC_MODE_BAT | AT91_SMC_MODE_DBW_16 |
-              AT91_SMC_MODE_TDF_CYCLE(1),
-              &smc->cs[2].mode);
-
-       /* Configure NCS2 PIN */
-       at91_pio3_set_b_periph(AT91_PIO_PORTD, 19, 0);
-}
-#endif
-
 #ifdef CONFIG_USB_ATMEL
 void at91sam9n12ek_usb_hw_init(void)
 {
@@ -193,10 +169,6 @@ int board_init(void)
        at91_lcd_hw_init();
 #endif
 
-#ifdef CONFIG_KS8851_MLL
-       at91sam9n12ek_ks8851_hw_init();
-#endif
-
 #ifdef CONFIG_USB_ATMEL
        at91sam9n12ek_usb_hw_init();
 #endif
@@ -204,13 +176,6 @@ int board_init(void)
        return 0;
 }
 
-#ifdef CONFIG_KS8851_MLL
-int board_eth_init(struct bd_info *bis)
-{
-       return ks8851_mll_initialize(0, CONFIG_KS8851_MLL_BASEADDR);
-}
-#endif
-
 int dram_init(void)
 {
        gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
drivers/net/ks8851_mll.c +0 -76
index 9dd9b33955ae..518548e3bbcd 100644
@@ -28,9 +28,6 @@
  * @extra_byte : number of extra byte prepended rx pkt.
  */
 struct ks_net {
-#ifndef CONFIG_DM_ETH
-       struct eth_device       dev;
-#endif
        phys_addr_t             iobase;
        int                     bus_width;
        u16                     sharedbus;
@@ -505,77 +502,6 @@ static void ks8851_mll_write_hwaddr_common(struct ks_net *ks, u8 enetaddr[6])
        ks_wrreg16(ks, KS_MARL, addrl);
 }
 
-#ifndef CONFIG_DM_ETH
-static int ks8851_mll_init(struct eth_device *dev, struct bd_info *bd)
-{
-       struct ks_net *ks = container_of(dev, struct ks_net, dev);
-
-       return ks8851_mll_init_common(ks);
-}
-
-static void ks8851_mll_halt(struct eth_device *dev)
-{
-       struct ks_net *ks = container_of(dev, struct ks_net, dev);
-
-       ks8851_mll_halt_common(ks);
-}
-
-static int ks8851_mll_send(struct eth_device *dev, void *packet, int length)
-{
-       struct ks_net *ks = container_of(dev, struct ks_net, dev);
-
-       return ks8851_mll_send_common(ks, packet, length);
-}
-
-static int ks8851_mll_recv(struct eth_device *dev)
-{
-       struct ks_net *ks = container_of(dev, struct ks_net, dev);
-       int ret;
-
-       ret = ks8851_mll_recv_common(ks, net_rx_packets[0]);
-       if (ret)
-               net_process_received_packet(net_rx_packets[0], ret);
-
-       return ret;
-}
-
-static int ks8851_mll_write_hwaddr(struct eth_device *dev)
-{
-       struct ks_net *ks = container_of(dev, struct ks_net, dev);
-
-       ks8851_mll_write_hwaddr_common(ks, ks->dev.enetaddr);
-
-       return 0;
-}
-
-int ks8851_mll_initialize(u8 dev_num, int base_addr)
-{
-       struct ks_net *ks;
-
-       ks = calloc(1, sizeof(*ks));
-       if (!ks)
-               return -ENOMEM;
-
-       ks->iobase = base_addr;
-
-       /* Try to detect chip. Will fail if not present. */
-       if (ks8851_mll_detect_chip(ks)) {
-               free(ks);
-               return -1;
-       }
-
-       ks->dev.init = ks8851_mll_init;
-       ks->dev.halt = ks8851_mll_halt;
-       ks->dev.send = ks8851_mll_send;
-       ks->dev.recv = ks8851_mll_recv;
-       ks->dev.write_hwaddr = ks8851_mll_write_hwaddr;
-       sprintf(ks->dev.name, "%s-%hu", DRIVERNAME, dev_num);
-
-       eth_register(&ks->dev);
-
-       return 0;
-}
-#else  /* ifdef CONFIG_DM_ETH */
 static int ks8851_start(struct udevice *dev)
 {
        struct ks_net *ks = dev_get_priv(dev);
@@ -703,4 +629,3 @@ U_BOOT_DRIVER(ks8851) = {
        .plat_auto      = sizeof(struct eth_pdata),
        .flags          = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
--
Quoted 2 lines

2.25.1

author
#41 lore raw

PATCH 15/21 igep00x0: Disable networking

In reply to Tom Rini

This platform needs to be converted to use DM_ETH as the deadline is 2 years passed due. Disable networking support for now.

Cc Enric Balletbo i Serra <[email protected]>
---
 board/isee/igep00x0/igep00x0.c | 58 ----------------------------------
 configs/igep00x0_defconfig     |  5 +--
 2 files changed, 1 insertion(+), 62 deletions(-)
board/isee/igep00x0/igep00x0.c +0 -58
index 0932f62b9beb..6c5e6fbbcb0d 100644
@@ -88,62 +88,6 @@ int onenand_board_init(struct mtd_info *mtd)
 	return 1;
 }
 
-#if defined(CONFIG_CMD_NET)
-static void reset_net_chip(int gpio)
-{
-	if (!gpio_request(gpio, "eth nrst")) {
-		gpio_direction_output(gpio, 1);
-		udelay(1);
-		gpio_set_value(gpio, 0);
-		udelay(40);
-		gpio_set_value(gpio, 1);
-		mdelay(10);
-	}
-}
-
-/*
- * Routine: setup_net_chip
- * Description: Setting up the configuration GPMC registers specific to the
- *		Ethernet hardware.
- */
-static void setup_net_chip(void)
-{
-	struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
-	static const u32 gpmc_lan_config[] = {
-		NET_LAN9221_GPMC_CONFIG1,
-		NET_LAN9221_GPMC_CONFIG2,
-		NET_LAN9221_GPMC_CONFIG3,
-		NET_LAN9221_GPMC_CONFIG4,
-		NET_LAN9221_GPMC_CONFIG5,
-		NET_LAN9221_GPMC_CONFIG6,
-	};
-
-	enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5],
-			CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
-
-	/* Enable off mode for NWE in PADCONF_GPMC_NWE register */
-	writew(readw(&ctrl_base->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe);
-	/* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */
-	writew(readw(&ctrl_base->gpmc_noe) | 0x0E00, &ctrl_base->gpmc_noe);
-	/* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */
-	writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00,
-		&ctrl_base->gpmc_nadv_ale);
-
-	reset_net_chip(64);
-}
-
-int board_eth_init(struct bd_info *bis)
-{
-#ifdef CONFIG_SMC911X
-	return smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#else
-	return 0;
-#endif
-}
-#else
-static inline void setup_net_chip(void) {}
-#endif
-
 #ifdef CONFIG_OF_BOARD_SETUP
 static int ft_enable_by_compatible(void *blob, char *compat, int enable)
 {
@@ -234,8 +178,6 @@ int misc_init_r(void)
 					 OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ,
 					 OMAP34XX_CTRL_WKUP_CTRL);
 
-	setup_net_chip();
-
 	omap_die_id_display();
 
 	set_led();
configs/igep00x0_defconfig +1 -4
index 17c97ac27f79..25eda11dd45e 100644
@@ -67,7 +67,7 @@ CONFIG_ENV_UBI_VOLUME="config"
 CONFIG_ENV_UBI_VOLUME_REDUND="config_r"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RANDOM_ETHADDR=y
+# CONFIG_NET is not set
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
@@ -81,9 +81,6 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800
 CONFIG_SYS_NAND_OOBSIZE=0x40
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_MTD_UBI_FASTMAP=y
-CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x2C000000
-CONFIG_SMC911X_32_BIT=y
 CONFIG_CONS_INDEX=3
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
Signature · 1 line
2.25.1
author
#42 lore raw

Re: [PATCH 15/21] igep00x0: Disable networking

Quoted 5 lines · Tom Rini

This platform needs to be converted to use DM_ETH as the deadline is 2 years passed due. Disable networking support for now.

Cc Enric Balletbo i Serra <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#43 lore raw

Re: [PATCH 15/21] igep00x0: Disable networking

In reply to Tom Rini
Quoted 2 lines · Tom Rini

This platform needs to be converted to use DM_ETH as the deadline is 2 years passed due. Disable networking support for now.

Oh well, my bad. There are too many patches accumulated. Please see bellow for original version for reference (applied after this one is reverted) Alternatively I can rebase on current master, just let me know whichever way you prefer.

ladis

Quoted 108 lines
Cc Enric Balletbo i Serra <eballetbo at gmail.com>
Signed-off-by Tom Rini <trini at konsulko.com>
---
 board/isee/igep00x0/igep00x0.c | 58 ----------------------------------
 configs/igep00x0_defconfig     |  5 +--
 2 files changed, 1 insertion(+), 62 deletions(-)
board/isee/igep00x0/igep00x0.c +0 -58
index 0932f62b9beb..6c5e6fbbcb0d 100644
@@ -88,62 +88,6 @@ int onenand_board_init(struct mtd_info *mtd)
 	return 1;
 }
 
-#if defined(CONFIG_CMD_NET)
-static void reset_net_chip(int gpio)
-{
-	if (!gpio_request(gpio, "eth nrst")) {
-		gpio_direction_output(gpio, 1);
-		udelay(1);
-		gpio_set_value(gpio, 0);
-		udelay(40);
-		gpio_set_value(gpio, 1);
-		mdelay(10);
-	}
-}
-
-/*
- * Routine: setup_net_chip
- * Description: Setting up the configuration GPMC registers specific to the
- *		Ethernet hardware.
- */
-static void setup_net_chip(void)
-{
-	struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
-	static const u32 gpmc_lan_config[] = {
-		NET_LAN9221_GPMC_CONFIG1,
-		NET_LAN9221_GPMC_CONFIG2,
-		NET_LAN9221_GPMC_CONFIG3,
-		NET_LAN9221_GPMC_CONFIG4,
-		NET_LAN9221_GPMC_CONFIG5,
-		NET_LAN9221_GPMC_CONFIG6,
-	};
-
-	enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5],
-			CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
-
-	/* Enable off mode for NWE in PADCONF_GPMC_NWE register */
-	writew(readw(&ctrl_base->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe);
-	/* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */
-	writew(readw(&ctrl_base->gpmc_noe) | 0x0E00, &ctrl_base->gpmc_noe);
-	/* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */
-	writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00,
-		&ctrl_base->gpmc_nadv_ale);
-
-	reset_net_chip(64);
-}
-
-int board_eth_init(struct bd_info *bis)
-{
-#ifdef CONFIG_SMC911X
-	return smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#else
-	return 0;
-#endif
-}
-#else
-static inline void setup_net_chip(void) {}
-#endif
-
 #ifdef CONFIG_OF_BOARD_SETUP
 static int ft_enable_by_compatible(void *blob, char *compat, int enable)
 {
@@ -234,8 +178,6 @@ int misc_init_r(void)
 					 OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ,
 					 OMAP34XX_CTRL_WKUP_CTRL);
 
-	setup_net_chip();
-
 	omap_die_id_display();
 
 	set_led();
configs/igep00x0_defconfig +1 -4
index 17c97ac27f79..25eda11dd45e 100644
@@ -67,7 +67,7 @@ CONFIG_ENV_UBI_VOLUME="config"
 CONFIG_ENV_UBI_VOLUME_REDUND="config_r"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RANDOM_ETHADDR=y
+# CONFIG_NET is not set
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
@@ -81,9 +81,6 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800
 CONFIG_SYS_NAND_OOBSIZE=0x40
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_MTD_UBI_FASTMAP=y
-CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x2C000000
-CONFIG_SMC911X_32_BIT=y
 CONFIG_CONS_INDEX=3
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
Signature · 1 line
2.25.1

From: Ladislav Michl <[email protected]>
Date: Tue, 5 Apr 2022 15:47:45 +0200
Subject: [PATCH] ARM: igep00x0: convert to DM_ETH

The GPMC bus hasn't been converted, so omap3-igep0020-u-boot.dtsi needs to provide the address of the ethernet controller.

---
 arch/arm/dts/omap3-igep0020-u-boot.dtsi | 12 ++++++++++++
 board/isee/igep00x0/igep00x0.c          | 12 +-----------
 configs/igep00x0_defconfig              |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)
arch/arm/dts/omap3-igep0020-u-boot.dtsi +12 -0
index 41beaf0900..d418b6a79f 100644
@@ -9,6 +9,18 @@
 	chosen {
 		stdout-path = &uart3;
 	};
+
+	ethernet@2c000000 {
+		compatible = "smsc,lan9221","smsc,lan9115";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x2c000000 0xff>;
+		bank-width = <2>;
+		vddvario-supply = <&vddvario>;
+		vdd33a-supply = <&vdd33a>;
+		reg-io-width = <4>;
+		smsc,save-mac-address;
+	};
 };
 
 &uart1 {
board/isee/igep00x0/igep00x0.c +1 -11
index 0932f62b9b..b48acf9d9b 100644
@@ -12,7 +12,6 @@
 #include <dm.h>
 #include <ns16550.h>
 #include <twl4030.h>
-#include <netdev.h>
 #include <spl.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
@@ -119,7 +118,7 @@ static void setup_net_chip(void)
 	};
 
 	enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5],
-			CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
+			0x2C000000, GPMC_SIZE_16M);
 
 	/* Enable off mode for NWE in PADCONF_GPMC_NWE register */
 	writew(readw(&ctrl_base->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe);
@@ -131,15 +130,6 @@ static void setup_net_chip(void)
 
 	reset_net_chip(64);
 }
-
-int board_eth_init(struct bd_info *bis)
-{
-#ifdef CONFIG_SMC911X
-	return smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#else
-	return 0;
-#endif
-}
 #else
 static inline void setup_net_chip(void) {}
 #endif
configs/igep00x0_defconfig +1 -1
index f0d6ac56b6..9f895113d9 100644
@@ -70,8 +70,8 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800
 CONFIG_SYS_NAND_OOBSIZE=0x40
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_DM_ETH=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x2C000000
 CONFIG_SMC911X_32_BIT=y
 CONFIG_CONS_INDEX=3
 CONFIG_SPI=y
Signature · 1 line
2.32.0
author
#44 lore raw

PATCH 16/21 am335x_sl50: Disable SPL_NET

In reply to Tom Rini

Now that we are about to enable DM_ETH by default, disable SPL_NET as SPL_DM is not enabled currently.

Cc Enric Balletbo i Serra <[email protected]>
---
 configs/am335x_sl50_defconfig | 2 --
 1 file changed, 2 deletions(-)
configs/am335x_sl50_defconfig +0 -2
index 22f5b632d6d2..65b20550c0c6 100644
@@ -32,8 +32,6 @@ CONFIG_SPL_MTD_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y
-CONFIG_SPL_NET=y
-CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
Signature · 1 line
2.25.1
author
#45 lore raw

Re: [PATCH 16/21] am335x_sl50: Disable SPL_NET

Quoted 5 lines · Tom Rini

Now that we are about to enable DM_ETH by default, disable SPL_NET as SPL_DM is not enabled currently.

Cc Enric Balletbo i Serra <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#47 lore raw

PATCH 17/21 ls1021aqds/ls1021aiot: Remove legacy non-DM_ETH code

In reply to Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

---
 board/freescale/common/Makefile         |   1 -
 board/freescale/common/sgmii_riser.c    | 130 -----------------
 board/freescale/ls1021aiot/ls1021aiot.c |  38 -----
 board/freescale/ls1021aqds/Makefile     |   1 -
 board/freescale/ls1021aqds/eth.c        | 186 ------------------------
 include/configs/ls1021aqds.h            |   8 -
 6 files changed, 364 deletions(-)
 delete mode 100644 board/freescale/common/sgmii_riser.c
 delete mode 100644 board/freescale/ls1021aqds/eth.c
board/freescale/common/Makefile +0 -1
index 7c93d30e1d2a..377c6aa077dc 100644
@@ -41,7 +41,6 @@ obj-$(CONFIG_PQ_MDS_PIB)	+= pq-mds-pib.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_ID_EEPROM)	+= sys_eeprom.o
 endif
-obj-$(CONFIG_FSL_SGMII_RISER)	+= sgmii_riser.o
 ifndef CONFIG_RAMBOOT_PBL
 obj-$(CONFIG_FSL_FIXED_MMC_LOCATION)	+= sdhc_boot.o
 endif
board/freescale/common/sgmii_riser.c deleted +0 -130

130 lines not on this page · raw message

board/freescale/ls1021aiot/ls1021aiot.c +0 -38
index 5ab03b334041..3ed6100b7cf0 100644
@@ -109,44 +109,6 @@ int dram_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_TSEC_ENET
-int board_eth_init(struct bd_info *bis)
-{
-	struct fsl_pq_mdio_info mdio_info;
-	struct tsec_info_struct tsec_info[4];
-	int num = 0;
-
-#ifdef CONFIG_TSEC1
-	SET_STD_TSEC_INFO(tsec_info[num], 1);
-	if (is_serdes_configured(SGMII_TSEC1)) {
-		puts("eTSEC1 is in sgmii mode.\n");
-		tsec_info[num].flags |= TSEC_SGMII;
-	}
-	num++;
-#endif
-#ifdef CONFIG_TSEC2
-	SET_STD_TSEC_INFO(tsec_info[num], 2);
-	if (is_serdes_configured(SGMII_TSEC2)) {
-		puts("eTSEC2 is in sgmii mode.\n");
-		tsec_info[num].flags |= TSEC_SGMII;
-	}
-	num++;
-#endif
-	if (!num) {
-		printf("No TSECs initialized\n");
-		return 0;
-	}
-
-	mdio_info.regs = (struct tsec_mii_mng *)CONFIG_SYS_MDIO_BASE_ADDR;
-	mdio_info.name = DEFAULT_MII_NAME;
-	fsl_pq_mdio_init(bis, &mdio_info);
-
-	tsec_eth_init(bis, tsec_info, num);
-
-	return pci_eth_init(bis);
-}
-#endif
-
 int board_early_init_f(void)
 {
 	struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
board/freescale/ls1021aqds/Makefile +0 -1
index 65030342be3c..8cbf33fa0cef 100644
@@ -6,5 +6,4 @@
 
 obj-y += ls1021aqds.o
 obj-y += ddr.o
-obj-y += eth.o
 obj-$(CONFIG_ARMV7_PSCI) += psci.o
board/freescale/ls1021aqds/eth.c deleted +0 -186

186 lines not on this page · raw message

include/configs/ls1021aqds.h +0 -8
index d9a973c13fba..aaf28a346d05 100644
@@ -285,14 +285,6 @@
 #define TSEC1_PHYIDX			0
 #define TSEC2_PHYIDX			0
 #define TSEC3_PHYIDX			0
-
-#define CONFIG_FSL_SGMII_RISER		1
-#define SGMII_RISER_PHY_OFFSET		0x1b
-
-#ifdef CONFIG_FSL_SGMII_RISER
-#define CONFIG_SYS_TBIPA_VALUE		8
-#endif
-
 #endif
 
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
Signature · 1 line
2.25.1
author
#48 lore raw

Re: [PATCH 17/21] ls1021aqds/ls1021aiot: Remove legacy non-DM_ETH code

Quoted 4 lines · Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#49 lore raw

PATCH 18/21 vinco: Remove legacy non-DM_ETH code

In reply to Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

Cc Gregory CLEMENT <[email protected]>

---
The MAINTAINERS file needs to be updated as well, thanks.

---
 board/l+g/vinco/vinco.c | 3 ---
 1 file changed, 3 deletions(-)
board/l+g/vinco/vinco.c +0 -3
index 9c4c5fdc4a53..db1075a594ac 100644
@@ -204,9 +204,6 @@ int board_eth_init(struct bd_info *bis)
 
 #ifdef CONFIG_USB_GADGET_ATMEL_USBA
 	usba_udc_probe(&pdata);
-#ifdef CONFIG_USB_ETH_RNDIS
-	usb_eth_initialize(bis);
-#endif
 #endif
 
 	return rc;
Signature · 1 line
2.25.1
author
#50 lore raw

Re: [PATCH 18/21] vinco: Remove legacy non-DM_ETH code

Quoted 4 lines · Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

Cc Gregory CLEMENT <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#51 lore raw

PATCH 19/21 warp7: Remove legacy non-DM_ETH code

In reply to Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

Cc Fabio Estevam <[email protected]>
---
 board/warp7/warp7.c | 13 -------------
 1 file changed, 13 deletions(-)
board/warp7/warp7.c +0 -13
index 95b8e82dd1cc..ead52d5a490c 100644
@@ -66,19 +66,6 @@ int power_init_board(void)
 }
 #endif
 
-int board_eth_init(struct bd_info *bis)
-{
-	int ret = 0;
-
-#ifdef CONFIG_USB_ETHER
-	ret = usb_eth_initialize(bis);
-	if (ret < 0)
-		printf("Error %d registering USB ether.\n", ret);
-#endif
-
-	return ret;
-}
-
 int board_init(void)
 {
 	/* address of boot parameters */
Signature · 1 line
2.25.1
author
#52 lore raw

Re: [PATCH 19/21] warp7: Remove legacy non-DM_ETH code

Quoted 4 lines · Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

Cc Fabio Estevam <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#53 lore raw

PATCH 20/21 smdkc100: Remove legacy non-DM_ETH code

In reply to Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

---
 board/samsung/smdkc100/smdkc100.c | 9 ---------
 1 file changed, 9 deletions(-)
board/samsung/smdkc100/smdkc100.c +0 -9
index 69ed715403fb..b944e44c1ac4 100644
@@ -69,12 +69,3 @@ int checkboard(void)
 	return 0;
 }
 #endif
-
-int board_eth_init(struct bd_info *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_SMC911X
-	rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#endif
-	return rc;
-}
Signature · 1 line
2.25.1
Reviewed-by on v1 20/21
#54 lore raw

Re: [PATCH 20/21] smdkc100: Remove legacy non-DM_ETH code

Hi,

Quoted 27 lines · Tom Rini

Now that we are about to enable DM_ETH by default, remove legacy code.

---
 board/samsung/smdkc100/smdkc100.c | 9 ---------
 1 file changed, 9 deletions(-)
board/samsung/smdkc100/smdkc100.c +0 -10
index 69ed715403fb..b944e44c1ac4 100644
@@ -69,12 +69,3 @@ int checkboard(void)
        return 0;
 }
 #endif
-
-int board_eth_init(struct bd_info *bis)
-{
-       int rc = 0;
-#ifdef CONFIG_SMC911X
-       rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#endif
-       return rc;
-}
--
Quoted 3 lines

2.25.1

Signature · 2 lines
Thanks,
Minkyu Kang.
author
#56 lore raw

PATCH 21/21 net: Make DM_ETH be selected by NETDEVICE

In reply to Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)
Makefile +0 -1
index ff25f9297486..315b2a6ced08 100644
@@ -1145,7 +1145,6 @@ ifneq ($(CONFIG_DM),y)
 endif
 	$(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
 		$(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
-	$(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET))
 	$(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY))
 	$(call deprecated,CONFIG_DM_KEYBOARD,Keyboard drivers,v2022.10,$(CONFIG_KEYBOARD))
 	@# CONFIG_SYS_TIMER_RATE has brackets in it for some boards which
drivers/net/Kconfig +21 -57

313 lines not on this page · raw message

Signature · 1 line
2.25.1
Acked-by on v1 21/21
#57 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

Quoted 382 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)
Makefile +0 -1
index ff25f9297486..315b2a6ced08 100644
@@ -1145,7 +1145,6 @@ ifneq ($(CONFIG_DM),y)
 endif
        $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
                $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
-       $(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET))
        $(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY))
        $(call deprecated,CONFIG_DM_KEYBOARD,Keyboard drivers,v2022.10,$(CONFIG_KEYBOARD))
        @# CONFIG_SYS_TIMER_RATE has brackets in it for some boards which
drivers/net/Kconfig +21 -58
index 76d8057b98fd..dfdc5ad72f75 100644
@@ -7,7 +7,7 @@ config ETH
        def_bool y
 
 config DM_ETH
-       bool "Enable Driver Model for Ethernet drivers"
+       bool
        depends on DM
        help
          Enable driver model for Ethernet.
@@ -18,7 +18,7 @@ config DM_ETH
 
 config DM_MDIO
        bool "Enable Driver Model for MDIO devices"
-       depends on DM_ETH && PHYLIB
+       depends on PHYLIB
        help
          Enable driver model for MDIO devices
 
@@ -43,7 +43,7 @@ config DM_MDIO_MUX
 
 config DM_DSA
        bool "Enable Driver Model for DSA switches"
-       depends on DM_ETH && DM_MDIO
+       depends on DM_MDIO
        depends on PHY_FIXED
        help
          Enable driver model for DSA switches
@@ -94,7 +94,7 @@ config DSA_SANDBOX
 menuconfig NETDEVICES
        bool "Network device support"
        depends on NET
-       default y if DM_ETH
+       select DM_ETH
        help
          You must select Y to enable any network device support
          Generally if you have any networking support this is a given
@@ -112,7 +112,7 @@ config PHY_GIGE
 
 config AG7XXX
        bool "Atheros AG7xxx Ethernet MAC support"
-       depends on DM_ETH && ARCH_ATH79
+       depends on ARCH_ATH79
        select PHYLIB
        help
          This driver supports the Atheros AG7xxx Ethernet MAC. This MAC is
@@ -121,7 +121,6 @@ config AG7XXX
 
 config ALTERA_TSE
        bool "Altera Triple-Speed Ethernet MAC support"
-       depends on DM_ETH
        select PHYLIB
        help
          This driver supports the Altera Triple-Speed (TSE) Ethernet MAC.
@@ -154,7 +153,7 @@ config BCM_SF2_ETH_GMAC
 
 config BCM6348_ETH
        bool "BCM6348 EMAC support"
-       depends on DM_ETH && ARCH_BMIPS
+       depends on ARCH_BMIPS
        select DMA
        select DMA_CHANNELS
        select MII
@@ -164,7 +163,7 @@ config BCM6348_ETH
 
 config BCM6368_ETH
        bool "BCM6368 EMAC support"
-       depends on DM_ETH && ARCH_BMIPS
+       depends on ARCH_BMIPS
        select DMA
        select MII
        help
@@ -172,21 +171,19 @@ config BCM6368_ETH
 
 config BCMGENET
        bool "BCMGENET V5 support"
-       depends on DM_ETH
        select PHYLIB
        help
          This driver supports the BCMGENET Ethernet MAC.
 
 config CORTINA_NI_ENET
        bool "Cortina-Access Ethernet driver"
-       depends on DM_ETH && CORTINA_PLATFORM
+       depends on CORTINA_PLATFORM
        help
          This driver supports the Cortina-Access Ethernet MAC for
          all supported CAxxxx SoCs.
 
 config CALXEDA_XGMAC
        bool "Calxeda XGMAC support"
-       depends on DM_ETH
        help
          This driver supports the XGMAC in Calxeda Highbank and Midway
          machines.
@@ -198,7 +195,6 @@ config DRIVER_DM9000
 
 config DWC_ETH_QOS
        bool "Synopsys DWC Ethernet QOS device support"
-       depends on DM_ETH
        select PHYLIB
        help
          This driver supports the Synopsys Designware Ethernet QOS (Quality
@@ -273,7 +269,7 @@ config EEPRO100
          ethernet family of adapters.
 
 config ETH_SANDBOX
-       depends on DM_ETH && SANDBOX
+       depends on SANDBOX
        default y
        bool "Sandbox: Mocked Ethernet driver"
        help
@@ -283,7 +279,7 @@ config ETH_SANDBOX
          This driver is particularly useful in the test/dm/eth.c tests
 
 config ETH_SANDBOX_RAW
-       depends on DM_ETH && SANDBOX
+       depends on SANDBOX
        default y
        bool "Sandbox: Bridge to Linux Raw Sockets"
        help
@@ -303,7 +299,6 @@ config ETH_DESIGNWARE
 
 config ETH_DESIGNWARE_MESON8B
        bool "Amlogic Meson8b and later glue driver for Synopsys Designware Ethernet MAC"
-       depends on DM_ETH
        select ETH_DESIGNWARE
        help
          This provides glue layer to use Synopsys Designware Ethernet MAC
@@ -314,7 +309,7 @@ config ETH_DESIGNWARE_SOCFPGA
        select SYSCON
        select DW_ALTDESCRIPTOR
        bool "Altera SoCFPGA extras for Synopsys Designware Ethernet MAC"
-       depends on DM_ETH && ETH_DESIGNWARE
+       depends on ETH_DESIGNWARE
        help
          The Altera SoCFPGA requires additional configuration of the
          Altera system manager to correctly interface with the PHY.
@@ -322,7 +317,7 @@ config ETH_DESIGNWARE_SOCFPGA
 
 config ETH_DESIGNWARE_S700
        bool "Actins S700 glue driver for Synopsys Designware Ethernet MAC"
-       depends on DM_ETH && ETH_DESIGNWARE
+       depends on ETH_DESIGNWARE
        help
          This provides glue layer to use Synopsys Designware Ethernet MAC
          present on Actions S700 SoC.
@@ -386,7 +381,6 @@ config FTMAC100
 
 config FTGMAC100
        bool "Ftgmac100 Ethernet Support"
-       depends on DM_ETH
        select PHYLIB
        help
          This driver supports the Faraday's FTGMAC100 Gigabit SoC
@@ -414,7 +408,6 @@ config SYS_DISCOVER_PHY
 
 config MCFFEC
        bool "ColdFire Ethernet Support"
-       depends on DM_ETH
        select PHYLIB
        select SYS_DISCOVER_PHY
        help
@@ -427,7 +420,6 @@ config SYS_UNIFY_CACHE
 
 config FSLDMAFEC
         bool "ColdFire DMA Ethernet Support"
-       depends on DM_ETH
        select PHYLIB
        select SYS_DISCOVER_PHY
        help
@@ -439,15 +431,6 @@ config KS8851_MLL
        help
          The Microchip KS8851 parallel bus external ethernet interface chip.
 
-if KS8851_MLL
-if !DM_ETH
-config KS8851_MLL_BASEADDR
-       hex "Microchip KS8851-MLL Base Address"
-       help
-         Define this to hold the physical address of the device (I/O space)
-endif #DM_ETH
-endif #KS8851_MLL
-
 config KSZ9477
        bool "Microchip KSZ9477 I2C controller driver"
        depends on DM_DSA && DM_I2C
@@ -458,7 +441,7 @@ config KSZ9477
 config MVGBE
        bool "Marvell Orion5x/Kirkwood network interface support"
        depends on ARCH_KIRKWOOD || ARCH_ORION5X
-       select PHYLIB if DM_ETH
+       select PHYLIB
        help
          This driver supports the network interface units in the
          Marvell Orion5x and Kirkwood SoCs
@@ -558,7 +541,6 @@ config OCTEONTX2_CGX_INTF
 
 config PCH_GBE
        bool "Intel Platform Controller Hub EG20T GMAC driver"
-       depends on DM_ETH
        select PHYLIB
        help
          This MAC is present in Intel Platform Controller Hub EG20T. It
@@ -619,25 +601,14 @@ config SJA1105
 config SMC911X
        bool "SMSC LAN911x and LAN921x controller driver"
 
-if SMC911X
-
-if !DM_ETH
-config SMC911X_BASE
-       hex "SMC911X Base Address"
-       help
-         Define this to hold the physical address
-         of the device (I/O space)
-endif #DM_ETH
-
 config SMC911X_32_BIT
        bool "Enable SMC911X 32-bit interface"
+       depends on SMC911X
        help
          Define this if data bus is 32 bits. If your processor use a
          narrower 16 bit bus or cannot convert one 32 bit word to two 16 bit
          words, leave this to "n".
 
-endif #SMC911X
-
 config SUN7I_GMAC
        bool "Enable Allwinner GMAC Ethernet support"
        help
@@ -653,14 +624,12 @@ config SUN7I_GMAC_FORCE_TXERR
 
 config SUN4I_EMAC
        bool "Allwinner Sun4i Ethernet MAC support"
-       depends on DM_ETH
        select PHYLIB
        help
          This driver supports the Allwinner based SUN4I Ethernet MAC.
 
 config SUN8I_EMAC
         bool "Allwinner Sun8i Ethernet MAC support"
-        depends on DM_ETH
         select PHYLIB
        select PHY_GIGE
         help
@@ -682,7 +651,6 @@ config TULIP
          This driver supports DEC DC2114x Fast ethernet chips.
 
 config XILINX_AXIEMAC
-       depends on DM_ETH
        select PHYLIB
        select MII
        bool "Xilinx AXI Ethernet"
@@ -690,7 +658,7 @@ config XILINX_AXIEMAC
          This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs.
 
 config XILINX_AXIMRMAC
-       depends on DM_ETH && ARCH_VERSAL
+       depends on ARCH_VERSAL
        bool "Xilinx AXI MRMAC"
        help
          MRMAC is a high performance, low latency, adaptable Ethernet
@@ -699,7 +667,6 @@ config XILINX_AXIMRMAC
          Versal designs.
 
 config XILINX_EMACLITE
-       depends on DM_ETH
        select PHYLIB
        select MII
        bool "Xilinx Ethernetlite"
@@ -707,7 +674,6 @@ config XILINX_EMACLITE
          This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs.
 
 config ZYNQ_GEM
-       depends on DM_ETH
        select PHYLIB
        bool "Xilinx Ethernet GEM"
        help
@@ -715,7 +681,7 @@ config ZYNQ_GEM
 
 config PIC32_ETH
        bool "Microchip PIC32 Ethernet Support"
-       depends on DM_ETH && MACH_PIC32
+       depends on MACH_PIC32
        select PHYLIB
        help
          This driver implements 10/100 Mbps Ethernet and MAC layer for
@@ -723,14 +689,14 @@ config PIC32_ETH
 
 config GMAC_ROCKCHIP
        bool "Rockchip Synopsys Designware Ethernet MAC"
-       depends on DM_ETH && ETH_DESIGNWARE
+       depends on ETH_DESIGNWARE
        help
          This driver provides Rockchip SoCs network support based on the
          Synopsys Designware driver.
 
 config RENESAS_RAVB
        bool "Renesas Ethernet AVB MAC"
-       depends on DM_ETH && RCAR_GEN3
+       depends on RCAR_GEN3
        select PHYLIB
        help
          This driver implements support for the Ethernet AVB block in
@@ -748,7 +714,7 @@ config MPC8XX_FEC
 
 config SNI_AVE
        bool "Socionext AVE Ethernet support"
-       depends on DM_ETH && ARCH_UNIPHIER
+       depends on ARCH_UNIPHIER
        select PHYLIB
        select SYSCON
        select REGMAP
@@ -758,7 +724,7 @@ config SNI_AVE
 
 config SNI_NETSEC
        bool "Socionext NETSEC Ethernet support"
-       depends on DM_ETH && SYNQUACER_SPI
+       depends on SYNQUACER_SPI
        select PHYLIB
        help
          This driver implements support for the Socionext SynQuacer NETSEC
@@ -847,7 +813,6 @@ config TSEC_ENET
 
 config MEDIATEK_ETH
        bool "MediaTek Ethernet GMAC Driver"
-       depends on DM_ETH
        select PHYLIB
        select DM_GPIO
        select DM_RESET
@@ -857,7 +822,6 @@ config MEDIATEK_ETH
 
 config HIGMACV300_ETH
        bool "HiSilicon Gigabit Ethernet Controller"
-       depends on DM_ETH
        select DM_RESET
        select PHYLIB
        help
@@ -866,7 +830,7 @@ config HIGMACV300_ETH
 
 config FSL_ENETC
        bool "NXP ENETC Ethernet controller"
-       depends on DM_ETH && DM_MDIO
+       depends on DM_MDIO
        help
          This driver supports the NXP ENETC Ethernet controller found on some
          of the NXP SoCs.
--
Quoted 2 lines

2.25.1

#58 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

In reply to Tom Rini

Hi Tom,

Quoted 10 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Quoted 7 lines
Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)

With this I saw a build error on MCR3000, but perhaps you have send a removal patch for it, which I missed?

Regards,
Simon

author
#59 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

Quoted 21 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Quoted 7 lines
Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)
Quoted 2 lines

With this I saw a build error on MCR3000, but perhaps you have send a removal patch for it, which I missed?

I thought I mentioned in the cover letter that this depends on the existing migration patch for the driver in question.

Signature · 1 line
Tom
#60 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

Hi Tom,

Quoted 23 lines · Tom Rini
Quoted 21 lines · Simon Glass

Hi Tom,

Quoted 17 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)
Quoted 5 lines
Quoted 2 lines

With this I saw a build error on MCR3000, but perhaps you have send a removal patch for it, which I missed?

I thought I mentioned in the cover letter that this depends on the existing migration patch for the driver in question.

Oh, sorry. I wish patchwork would show the cover letter.

Regards,
Simon

author
#61 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

Quoted 26 lines · Simon Glass

Hi Tom,

Quoted 23 lines · Tom Rini
Quoted 21 lines · Simon Glass

Hi Tom,

Quoted 17 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

With this I saw a build error on MCR3000, but perhaps you have send a removal patch for it, which I missed?

I thought I mentioned in the cover letter that this depends on the existing migration patch for the driver in question.

Oh, sorry. I wish patchwork would show the cover letter.

It does, but not from the series link, but just "expand" from an individual patch in a series. It's how I've been copy/pasting cover letters are the merge commit message for big series, fwiw.

Signature · 1 line
Tom
#62 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

Hi Tom,

Quoted 31 lines · Tom Rini
Quoted 29 lines · Simon Glass

Hi Tom,

Quoted 26 lines · Tom Rini
Quoted 23 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Quoted 7 lines
Cc Ramon Fried <[email protected]>
Cc Simon Glass <[email protected]>
---
 Makefile            |  1 -
 drivers/net/Kconfig | 78 ++++++++++++---------------------------------
 2 files changed, 21 insertions(+), 58 deletions(-)

With this I saw a build error on MCR3000, but perhaps you have send a removal patch for it, which I missed?

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

I thought I mentioned in the cover letter that this depends on the existing migration patch for the driver in question.

Oh, sorry. I wish patchwork would show the cover letter.

It does, but not from the series link, but just "expand" from an individual patch in a series. It's how I've been copy/pasting cover letters are the merge commit message for big series, fwiw.

Oh dear, I had no idea about that. What a strange UI. Thank you for letting me know!

Regards,
Simon

author
#63 lore raw

Re: [PATCH 21/21] net: Make DM_ETH be selected by NETDEVICE

In reply to Tom Rini
Quoted 5 lines · Tom Rini

The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration.

Quoted 8 lines

This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#64 lore raw
In reply to Tom Rini
Quoted 17 lines · Tom Rini

As I've noted before, with v2022.07 being released, we have gone 2 years past the DM_ETH migration deadline. What this series does is a few things:
- Remove some boards that either lack DM migration at all, or lack OF_CONTROL. DM migration has had an explicit deadline, and OF_CONTROL an implict one.
- Remove some un-migrated ethernet drivers. I had reached out in private to some people about this and they had hoped to have done the conversion by now. Unfortunately, here we now are.
- Perform some minor forceful migrations on boards. These boards use OF_CONTROL and drivers which use DM_ETH, so I am hopeful that just removing or guarding the code here is fine and works.
- Disable networkgin on some other boards. Unlike boards in the above case, it looks like the board code itself needs some updates, as was done on the platforms that have already been migrated.
- Finally, select DM_ETH for all NETDEVICES and update dependencies.

Quoted 4 lines

This series depends on
https://patchwork.ozlabs.org/project/uboot/patch/8ae444f17dc5db69a1da809875a16462049857c7.1652363162.git.christophe.leroy@csgroup.eu/
being applied and in practical terms depennds on my current outstanding Kconfig migrations as well.

Adding back the CC list git send-email dropped...

Signature · 1 line
Tom
author
#65 lore raw
Quoted 19 lines · Tom Rini
Quoted 17 lines · Tom Rini

As I've noted before, with v2022.07 being released, we have gone 2 years past the DM_ETH migration deadline. What this series does is a few things:
- Remove some boards that either lack DM migration at all, or lack OF_CONTROL. DM migration has had an explicit deadline, and OF_CONTROL an implict one.
- Remove some un-migrated ethernet drivers. I had reached out in private to some people about this and they had hoped to have done the conversion by now. Unfortunately, here we now are.
- Perform some minor forceful migrations on boards. These boards use OF_CONTROL and drivers which use DM_ETH, so I am hopeful that just removing or guarding the code here is fine and works.
- Disable networkgin on some other boards. Unlike boards in the above case, it looks like the board code itself needs some updates, as was done on the platforms that have already been migrated.
- Finally, select DM_ETH for all NETDEVICES and update dependencies.

Quoted 6 lines
Quoted 4 lines

This series depends on
https://patchwork.ozlabs.org/project/uboot/patch/8ae444f17dc5db69a1da809875a16462049857c7.1652363162.git.christophe.leroy@csgroup.eu/
being applied and in practical terms depennds on my current outstanding Kconfig migrations as well.

Adding back the CC list git send-email dropped...

Just following up here as I got some acks/feedback on the platforms that will be loosing functionality, but not as much as I hoped. I will be applying this series soon.

Signature · 1 line
Tom