[4/7] arm: juno: Enable DM_ETH

Message ID 20200611110321.9574-5-andre.przywara@arm.com
State Accepted
Commit cc696e7caec612c1e334db8cd729e0045662bf00
Headers show
Series
  • arm: Juno board updates and PCIe/SATA enablement
Related show

Commit Message

Andre Przywara June 11, 2020, 11:03 a.m.
The smc911X driver is now DM enabled, so we can switch the Juno board
over to use DM_ETH for the on-board Fast Ethernet device.
Works out of the box by using the DT.

Signed-off-by: Andre Przywara <andre.przywara at arm.com>
---
 arch/arm/Kconfig                     | 2 +-
 board/armltd/vexpress64/vexpress64.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Linus Walleij June 20, 2020, 8:26 p.m. | #1
On Thu, Jun 11, 2020 at 1:04 PM Andre Przywara <andre.przywara at arm.com> wrote:

> The smc911X driver is now DM enabled, so we can switch the Juno board
> over to use DM_ETH for the on-board Fast Ethernet device.
> Works out of the box by using the DT.
>
> Signed-off-by: Andre Przywara <andre.przywara at arm.com>

Reviewed-by: Linus Walleij <linus.walleij at linaro.org>

Yours,
Linus Walleij

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 21df1c415f..09a819c5fa 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1169,7 +1169,7 @@  config TARGET_VEXPRESS64_JUNO
 	select DM_SERIAL
 	select ARM_PSCI_FW
 	select PSCI_RESET
-	select DM
+	select DM_ETH
 	select BLK
 	select USB
 	select DM_USB
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index fbfa7a18f1..5932a4a0c7 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -152,11 +152,13 @@  void reset_cpu(ulong addr)
 int board_eth_init(bd_t *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
 #endif
 	return rc;
 }