All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/5] Convert LaCie boards to use DM drivers
@ 2020-06-28 17:00 Simon Guinot
  2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
                   ` (4 more replies)
  0 siblings, 5 replies; 16+ messages in thread
From: Simon Guinot @ 2020-06-28 17:00 UTC (permalink / raw)
  To: u-boot

This patch series converts the following LaCie boards (Marvell
Kirkwood-based) to use DM drivers:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Changes in v2:

- Move spi0 DT aliases into per boards -u-boot.dtsi files. This files
  will be removed as soon as the spi0 aliases will be available in the
  Linux upstream dtsi files.

Simon Guinot (5):
  arm: kirkwood: add DT spi0 alias to LaCie boards
  arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
  arm: kirkwood: switch LaCie boards to sata_mv driver
  arm: kirkwood: enable DM_USB for LaCie board
  arm: kirkwood: enable DM_ETH for LaCie board

 arch/arm/dts/kirkwood-d2net-u-boot.dtsi   |  7 +++++++
 arch/arm/dts/kirkwood-is2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-net2big-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi  |  7 +++++++
 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi |  7 +++++++
 board/LaCie/net2big_v2/MAINTAINERS        |  6 ++++++
 board/LaCie/net2big_v2/net2big_v2.c       |  2 +-
 board/LaCie/netspace_v2/MAINTAINERS       | 21 ++++++++++++++-------
 board/LaCie/netspace_v2/netspace_v2.c     |  4 ++--
 configs/d2net_v2_defconfig                | 13 +++++++++----
 configs/inetspace_v2_defconfig            | 13 +++++++++----
 configs/net2big_v2_defconfig              | 13 +++++++++----
 configs/netspace_lite_v2_defconfig        | 14 ++++++++++----
 configs/netspace_max_v2_defconfig         | 14 ++++++++++----
 configs/netspace_mini_v2_defconfig        | 12 ++++++++----
 configs/netspace_v2_defconfig             | 13 +++++++++----
 include/configs/lacie_kw.h                | 19 +++++++++----------
 19 files changed, 145 insertions(+), 48 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-is2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-net2big-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi

-- 
2.27.0

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards
  2020-06-28 17:00 [PATCH v2 0/5] Convert LaCie boards to use DM drivers Simon Guinot
@ 2020-06-28 17:00 ` Simon Guinot
  2020-06-28 17:29   ` Tom Rini
                     ` (2 more replies)
  2020-06-28 17:00 ` [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH Simon Guinot
                   ` (3 subsequent siblings)
  4 siblings, 3 replies; 16+ messages in thread
From: Simon Guinot @ 2020-06-28 17:00 UTC (permalink / raw)
  To: u-boot

The spi0 alias is needed by the environment code to retrieve the SPI
flash. This patch adds some -u-boot.dtsi files, providing the spi0
aliases, for all the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Note that this -u-boot.dtsi files will be removed as soon as the spi0
aliases will be available in the upstream Linux dtsi files.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
 arch/arm/dts/kirkwood-d2net-u-boot.dtsi   |  7 +++++++
 arch/arm/dts/kirkwood-is2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-net2big-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi  |  7 +++++++
 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi |  7 +++++++
 board/LaCie/net2big_v2/MAINTAINERS        |  6 ++++++
 board/LaCie/netspace_v2/MAINTAINERS       | 21 ++++++++++++++-------
 9 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-is2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-net2big-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi

diff --git a/arch/arm/dts/kirkwood-d2net-u-boot.dtsi b/arch/arm/dts/kirkwood-d2net-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-d2net-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/arch/arm/dts/kirkwood-is2-u-boot.dtsi b/arch/arm/dts/kirkwood-is2-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-is2-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/arch/arm/dts/kirkwood-net2big-u-boot.dtsi b/arch/arm/dts/kirkwood-net2big-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-net2big-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/arch/arm/dts/kirkwood-ns2-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-ns2-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/arch/arm/dts/kirkwood-ns2max-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
new file mode 100644
index 000000000000..1f3b1854795b
--- /dev/null
+++ b/arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
diff --git a/board/LaCie/net2big_v2/MAINTAINERS b/board/LaCie/net2big_v2/MAINTAINERS
index 8fec70315f5d..7046e1b2c5c7 100644
--- a/board/LaCie/net2big_v2/MAINTAINERS
+++ b/board/LaCie/net2big_v2/MAINTAINERS
@@ -1,6 +1,12 @@
 NET2BIG_V2 BOARD
 M:	Simon Guinot <simon.guinot@sequanux.org>
 S:	Maintained
+F:	arch/arm/dts/kirkwood-d2net.dts
+F:	arch/arm/dts/kirkwood-d2net-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-d2net.dtsi
+F:	arch/arm/dts/kirkwood-net2big.dts
+F:	arch/arm/dts/kirkwood-net2big-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-netxbig.dtsi
 F:	board/LaCie/net2big_v2/
 F:	include/configs/lacie_kw.h
 F:	configs/d2net_v2_defconfig
diff --git a/board/LaCie/netspace_v2/MAINTAINERS b/board/LaCie/netspace_v2/MAINTAINERS
index 55fd50d4eb1b..1cc4f7108b6b 100644
--- a/board/LaCie/netspace_v2/MAINTAINERS
+++ b/board/LaCie/netspace_v2/MAINTAINERS
@@ -1,14 +1,21 @@
-NETSPACE_V2 BOARD
+NETSPACE_V2 BOARDS
 M:	Simon Guinot <simon.guinot@sequanux.org>
 S:	Maintained
+F:	arch/arm/dts/kirkwood-is2.dts
+F:	arch/arm/dts/kirkwood-is2-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2-common.dtsi
+F:	arch/arm/dts/kirkwood-ns2.dts
+F:	arch/arm/dts/kirkwood-ns2lite.dts
+F:	arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2max.dts
+F:	arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2mini.dts
+F:	arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2-u-boot.dtsi
 F:	board/LaCie/netspace_v2/
 F:	include/configs/lacie_kw.h
 F:	configs/inetspace_v2_defconfig
-F:	configs/netspace_max_v2_defconfig
-F:	configs/netspace_v2_defconfig
-
-NETSPACE_LITE_V2 BOARD
-#M:	-
-S:	Maintained
 F:	configs/netspace_lite_v2_defconfig
+F:	configs/netspace_max_v2_defconfig
 F:	configs/netspace_mini_v2_defconfig
+F:	configs/netspace_v2_defconfig
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
  2020-06-28 17:00 [PATCH v2 0/5] Convert LaCie boards to use DM drivers Simon Guinot
  2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
@ 2020-06-28 17:00 ` Simon Guinot
  2020-06-29  6:16   ` Stefan Roese
  2020-07-08  6:49   ` Jagan Teki
  2020-06-28 17:00 ` [PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver Simon Guinot
                   ` (2 subsequent siblings)
  4 siblings, 2 replies; 16+ messages in thread
From: Simon Guinot @ 2020-06-28 17:00 UTC (permalink / raw)
  To: u-boot

This patch converts the following Kirkwood-based LaCie boards to DM,
DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
 configs/d2net_v2_defconfig         | 6 ++++--
 configs/inetspace_v2_defconfig     | 6 ++++--
 configs/net2big_v2_defconfig       | 6 ++++--
 configs/netspace_lite_v2_defconfig | 6 ++++--
 configs/netspace_max_v2_defconfig  | 6 ++++--
 configs/netspace_mini_v2_defconfig | 6 ++++--
 configs/netspace_v2_defconfig      | 6 ++++--
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index fe3c6c47620d..0d240daf01a1 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" D2 v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="d2v2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 6144eb5fad45..2ef916fa85ba 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" IS v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 1389d3090096..9c1ed539b2a0 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" 2Big v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="2big2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index c744d2c58efc..180d1402a188 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS v2 Lite"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 8602729fcb4e..ed1a4e2d3653 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS Max v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index ba9301de4d53..884bb63f0b90 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS v2 Mini"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -37,12 +37,14 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 6ba1ef423e19..cc1af7391771 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver
  2020-06-28 17:00 [PATCH v2 0/5] Convert LaCie boards to use DM drivers Simon Guinot
  2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
  2020-06-28 17:00 ` [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH Simon Guinot
@ 2020-06-28 17:00 ` Simon Guinot
  2020-06-29  6:16   ` Stefan Roese
  2020-06-28 17:00 ` [PATCH v2 4/5] arm: kirkwood: enable DM_USB for LaCie board Simon Guinot
  2020-06-28 17:00 ` [PATCH v2 5/5] arm: kirkwood: enable DM_ETH " Simon Guinot
  4 siblings, 1 reply; 16+ messages in thread
From: Simon Guinot @ 2020-06-28 17:00 UTC (permalink / raw)
  To: u-boot

This patch switches the SATA driver from mvsata_ide to sata_mv for the
following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
 configs/d2net_v2_defconfig         |  6 +++---
 configs/inetspace_v2_defconfig     |  6 +++---
 configs/net2big_v2_defconfig       |  6 +++---
 configs/netspace_lite_v2_defconfig |  5 +++--
 configs/netspace_max_v2_defconfig  |  5 +++--
 configs/netspace_mini_v2_defconfig |  5 +++--
 configs/netspace_v2_defconfig      |  6 +++---
 include/configs/lacie_kw.h         | 19 +++++++++----------
 8 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 0d240daf01a1..5a3a1f60e308 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="d2v2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 2ef916fa85ba..6cd4348a3c1d 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 9c1ed539b2a0..e7b7be7ed506 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="2big2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 180d1402a188..9e3768ef4efd 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index ed1a4e2d3653..b06321895b20 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 884bb63f0b90..7e013b48d1a1 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -38,7 +38,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index cc1af7391771..fc09c6b22464 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 5bb0255a74d5..031bc995e3ba 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -83,18 +83,17 @@
 /*
  * SATA Driver configuration
  */
-#ifdef CONFIG_MVSATA_IDE
-#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+
+#ifdef CONFIG_SATA
+#define CONFIG_SYS_64BIT_LBA
+#define CONFIG_LBA48
 #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \
 	defined(CONFIG_NET2BIG_V2)
-#define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET
-#define CONFIG_SYS_IDE_MAXBUS           2
-#define CONFIG_SYS_IDE_MAXDEVICE        2
+#define CONFIG_SYS_SATA_MAX_DEVICE	2
 #else
-#define CONFIG_SYS_IDE_MAXBUS           1
-#define CONFIG_SYS_IDE_MAXDEVICE        1
+#define CONFIG_SYS_SATA_MAX_DEVICE	1
 #endif
-#endif /* CONFIG_MVSATA_IDE */
+#endif /* CONFIG_SATA */
 
 /*
  * Enable GPI0 support
@@ -144,8 +143,8 @@
 		"set stdin $stdin,nc; "				\
 		"set stdout $stdout,nc; "			\
 		"set stderr $stderr,nc;\0"			\
-	"diskload=ide reset && "				\
-		"ext2load ide 0:1 $loadaddr /boot/$bootfile\0"	\
+	"diskload=sata init && "				\
+		"ext2load sata 0:1 $loadaddr /boot/$bootfile\0"	\
 	"usbload=usb start && "					\
 		"fatload usb 0:1 $loadaddr /boot/$bootfile\0"
 
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH v2 4/5] arm: kirkwood: enable DM_USB for LaCie board
  2020-06-28 17:00 [PATCH v2 0/5] Convert LaCie boards to use DM drivers Simon Guinot
                   ` (2 preceding siblings ...)
  2020-06-28 17:00 ` [PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver Simon Guinot
@ 2020-06-28 17:00 ` Simon Guinot
  2020-06-29  6:17   ` Stefan Roese
  2020-06-28 17:00 ` [PATCH v2 5/5] arm: kirkwood: enable DM_ETH " Simon Guinot
  4 siblings, 1 reply; 16+ messages in thread
From: Simon Guinot @ 2020-06-28 17:00 UTC (permalink / raw)
  To: u-boot

This patch enables DM_USB and USB_STORAGE for the following
Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
 configs/d2net_v2_defconfig         | 2 ++
 configs/inetspace_v2_defconfig     | 2 ++
 configs/net2big_v2_defconfig       | 2 ++
 configs/netspace_lite_v2_defconfig | 2 ++
 configs/netspace_max_v2_defconfig  | 2 ++
 configs/netspace_v2_defconfig      | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 5a3a1f60e308..33f48e0dd94c 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -52,4 +52,6 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 6cd4348a3c1d..ca444d0aafa3 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -52,4 +52,6 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index e7b7be7ed506..4d0e50b3e0a5 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -52,4 +52,6 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 9e3768ef4efd..26ca464e0b48 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -52,5 +52,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index b06321895b20..af2d9df6ff8a 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -52,5 +52,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index fc09c6b22464..3585b7cf6318 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -52,4 +52,6 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH v2 5/5] arm: kirkwood: enable DM_ETH for LaCie board
  2020-06-28 17:00 [PATCH v2 0/5] Convert LaCie boards to use DM drivers Simon Guinot
                   ` (3 preceding siblings ...)
  2020-06-28 17:00 ` [PATCH v2 4/5] arm: kirkwood: enable DM_USB for LaCie board Simon Guinot
@ 2020-06-28 17:00 ` Simon Guinot
  2020-06-29  6:17   ` Stefan Roese
  4 siblings, 1 reply; 16+ messages in thread
From: Simon Guinot @ 2020-06-28 17:00 UTC (permalink / raw)
  To: u-boot

This patch enables DM_ETH for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
 board/LaCie/net2big_v2/net2big_v2.c   | 2 +-
 board/LaCie/netspace_v2/netspace_v2.c | 4 ++--
 configs/d2net_v2_defconfig            | 1 +
 configs/inetspace_v2_defconfig        | 1 +
 configs/net2big_v2_defconfig          | 1 +
 configs/netspace_lite_v2_defconfig    | 1 +
 configs/netspace_max_v2_defconfig     | 1 +
 configs/netspace_mini_v2_defconfig    | 1 +
 configs/netspace_v2_defconfig         | 1 +
 9 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index dbd8b5755da3..e94c9a6dce96 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -239,7 +239,7 @@ int misc_init_r(void)
 /* Configure and initialize PHY */
 void reset_phy(void)
 {
-	mv_phy_88e1116_init("egiga0", 8);
+	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
 }
 #endif
 
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 011cc563d19d..33246b201528 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -100,9 +100,9 @@ int misc_init_r(void)
 void reset_phy(void)
 {
 #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-	mv_phy_88e1318_init("egiga0", 0);
+	mv_phy_88e1318_init("ethernet-controller at 72000", 0);
 #else
-	mv_phy_88e1116_init("egiga0", 8);
+	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
 #endif
 }
 #endif
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 33f48e0dd94c..31a5d91af2b3 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index ca444d0aafa3..b5973977a5b8 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 4d0e50b3e0a5..bba85030492a 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 26ca464e0b48..bfa93dbd1c27 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index af2d9df6ff8a..d0f750369a3a 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 7e013b48d1a1..6cfaccf51dbd 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -43,6 +43,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 3585b7cf6318..1bd148f9b511 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards
  2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
@ 2020-06-28 17:29   ` Tom Rini
  2020-06-29  6:15   ` Stefan Roese
  2020-07-08  6:50   ` Jagan Teki
  2 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2020-06-28 17:29 UTC (permalink / raw)
  To: u-boot

On Sun, Jun 28, 2020 at 07:00:27PM +0200, Simon Guinot wrote:

> The spi0 alias is needed by the environment code to retrieve the SPI
> flash. This patch adds some -u-boot.dtsi files, providing the spi0
> aliases, for all the following Kirkwood-based LaCie boards:
> 
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
> 
> Note that this -u-boot.dtsi files will be removed as soon as the spi0
> aliases will be available in the upstream Linux dtsi files.
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200628/fd12dffc/attachment.sig>

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards
  2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
  2020-06-28 17:29   ` Tom Rini
@ 2020-06-29  6:15   ` Stefan Roese
  2020-07-08  6:50   ` Jagan Teki
  2 siblings, 0 replies; 16+ messages in thread
From: Stefan Roese @ 2020-06-29  6:15 UTC (permalink / raw)
  To: u-boot

On 28.06.20 19:00, Simon Guinot wrote:
> The spi0 alias is needed by the environment code to retrieve the SPI
> flash. This patch adds some -u-boot.dtsi files, providing the spi0
> aliases, for all the following Kirkwood-based LaCie boards:
> 
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
> 
> Note that this -u-boot.dtsi files will be removed as soon as the spi0
> aliases will be available in the upstream Linux dtsi files.
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   arch/arm/dts/kirkwood-d2net-u-boot.dtsi   |  7 +++++++
>   arch/arm/dts/kirkwood-is2-u-boot.dtsi     |  7 +++++++
>   arch/arm/dts/kirkwood-net2big-u-boot.dtsi |  7 +++++++
>   arch/arm/dts/kirkwood-ns2-u-boot.dtsi     |  7 +++++++
>   arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi |  7 +++++++
>   arch/arm/dts/kirkwood-ns2max-u-boot.dtsi  |  7 +++++++
>   arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi |  7 +++++++
>   board/LaCie/net2big_v2/MAINTAINERS        |  6 ++++++
>   board/LaCie/netspace_v2/MAINTAINERS       | 21 ++++++++++++++-------
>   9 files changed, 69 insertions(+), 7 deletions(-)
>   create mode 100644 arch/arm/dts/kirkwood-d2net-u-boot.dtsi
>   create mode 100644 arch/arm/dts/kirkwood-is2-u-boot.dtsi
>   create mode 100644 arch/arm/dts/kirkwood-net2big-u-boot.dtsi
>   create mode 100644 arch/arm/dts/kirkwood-ns2-u-boot.dtsi
>   create mode 100644 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
>   create mode 100644 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
>   create mode 100644 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
> 
> diff --git a/arch/arm/dts/kirkwood-d2net-u-boot.dtsi b/arch/arm/dts/kirkwood-d2net-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-d2net-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/arch/arm/dts/kirkwood-is2-u-boot.dtsi b/arch/arm/dts/kirkwood-is2-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-is2-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/arch/arm/dts/kirkwood-net2big-u-boot.dtsi b/arch/arm/dts/kirkwood-net2big-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-net2big-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/arch/arm/dts/kirkwood-ns2-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-ns2-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/arch/arm/dts/kirkwood-ns2max-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi b/arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
> new file mode 100644
> index 000000000000..1f3b1854795b
> --- /dev/null
> +++ b/arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/ {
> +	aliases {
> +		spi0 = &spi0;
> +	};
> +};
> diff --git a/board/LaCie/net2big_v2/MAINTAINERS b/board/LaCie/net2big_v2/MAINTAINERS
> index 8fec70315f5d..7046e1b2c5c7 100644
> --- a/board/LaCie/net2big_v2/MAINTAINERS
> +++ b/board/LaCie/net2big_v2/MAINTAINERS
> @@ -1,6 +1,12 @@
>   NET2BIG_V2 BOARD
>   M:	Simon Guinot <simon.guinot@sequanux.org>
>   S:	Maintained
> +F:	arch/arm/dts/kirkwood-d2net.dts
> +F:	arch/arm/dts/kirkwood-d2net-u-boot.dtsi
> +F:	arch/arm/dts/kirkwood-d2net.dtsi
> +F:	arch/arm/dts/kirkwood-net2big.dts
> +F:	arch/arm/dts/kirkwood-net2big-u-boot.dtsi
> +F:	arch/arm/dts/kirkwood-netxbig.dtsi
>   F:	board/LaCie/net2big_v2/
>   F:	include/configs/lacie_kw.h
>   F:	configs/d2net_v2_defconfig
> diff --git a/board/LaCie/netspace_v2/MAINTAINERS b/board/LaCie/netspace_v2/MAINTAINERS
> index 55fd50d4eb1b..1cc4f7108b6b 100644
> --- a/board/LaCie/netspace_v2/MAINTAINERS
> +++ b/board/LaCie/netspace_v2/MAINTAINERS
> @@ -1,14 +1,21 @@
> -NETSPACE_V2 BOARD
> +NETSPACE_V2 BOARDS
>   M:	Simon Guinot <simon.guinot@sequanux.org>
>   S:	Maintained
> +F:	arch/arm/dts/kirkwood-is2.dts
> +F:	arch/arm/dts/kirkwood-is2-u-boot.dtsi
> +F:	arch/arm/dts/kirkwood-ns2-common.dtsi
> +F:	arch/arm/dts/kirkwood-ns2.dts
> +F:	arch/arm/dts/kirkwood-ns2lite.dts
> +F:	arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
> +F:	arch/arm/dts/kirkwood-ns2max.dts
> +F:	arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
> +F:	arch/arm/dts/kirkwood-ns2mini.dts
> +F:	arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
> +F:	arch/arm/dts/kirkwood-ns2-u-boot.dtsi
>   F:	board/LaCie/netspace_v2/
>   F:	include/configs/lacie_kw.h
>   F:	configs/inetspace_v2_defconfig
> -F:	configs/netspace_max_v2_defconfig
> -F:	configs/netspace_v2_defconfig
> -
> -NETSPACE_LITE_V2 BOARD
> -#M:	-
> -S:	Maintained
>   F:	configs/netspace_lite_v2_defconfig
> +F:	configs/netspace_max_v2_defconfig
>   F:	configs/netspace_mini_v2_defconfig
> +F:	configs/netspace_v2_defconfig
> 


Viele Gr??e,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
  2020-06-28 17:00 ` [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH Simon Guinot
@ 2020-06-29  6:16   ` Stefan Roese
  2020-07-08  6:49   ` Jagan Teki
  1 sibling, 0 replies; 16+ messages in thread
From: Stefan Roese @ 2020-06-29  6:16 UTC (permalink / raw)
  To: u-boot

On 28.06.20 19:00, Simon Guinot wrote:
> This patch converts the following Kirkwood-based LaCie boards to DM,
> DM_SPI and DM_SPI_FLASH:
> 
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   configs/d2net_v2_defconfig         | 6 ++++--
>   configs/inetspace_v2_defconfig     | 6 ++++--
>   configs/net2big_v2_defconfig       | 6 ++++--
>   configs/netspace_lite_v2_defconfig | 6 ++++--
>   configs/netspace_max_v2_defconfig  | 6 ++++--
>   configs/netspace_mini_v2_defconfig | 6 ++++--
>   configs/netspace_v2_defconfig      | 6 ++++--
>   7 files changed, 28 insertions(+), 14 deletions(-)
> 
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index fe3c6c47620d..0d240daf01a1 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" D2 v2"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="d2v2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index 6144eb5fad45..2ef916fa85ba 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" IS v2"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index 1389d3090096..9c1ed539b2a0 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" 2Big v2"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="2big2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index c744d2c58efc..180d1402a188 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" NS v2 Lite"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index 8602729fcb4e..ed1a4e2d3653 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" NS Max v2"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
> index ba9301de4d53..884bb63f0b90 100644
> --- a/configs/netspace_mini_v2_defconfig
> +++ b/configs/netspace_mini_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" NS v2 Mini"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
> @@ -37,12 +37,14 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index 6ba1ef423e19..cc1af7391771 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_IDENT_STRING=" NS v2"
> +# CONFIG_SYS_MALLOC_F is not set
>   CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
>   CONFIG_BOOTDELAY=3
>   CONFIG_USE_BOOTARGS=y
> @@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> -CONFIG_CMD_SF=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
> +CONFIG_DM=y
>   CONFIG_MVSATA_IDE=y
>   # CONFIG_MMC is not set
> -CONFIG_SPI_FLASH=y
> +CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
>   CONFIG_SPI=y
> +CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> 


Viele Gr??e,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver
  2020-06-28 17:00 ` [PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver Simon Guinot
@ 2020-06-29  6:16   ` Stefan Roese
  0 siblings, 0 replies; 16+ messages in thread
From: Stefan Roese @ 2020-06-29  6:16 UTC (permalink / raw)
  To: u-boot

On 28.06.20 19:00, Simon Guinot wrote:
> This patch switches the SATA driver from mvsata_ide to sata_mv for the
> following Kirkwood-based LaCie boards:
> 
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   configs/d2net_v2_defconfig         |  6 +++---
>   configs/inetspace_v2_defconfig     |  6 +++---
>   configs/net2big_v2_defconfig       |  6 +++---
>   configs/netspace_lite_v2_defconfig |  5 +++--
>   configs/netspace_max_v2_defconfig  |  5 +++--
>   configs/netspace_mini_v2_defconfig |  5 +++--
>   configs/netspace_v2_defconfig      |  6 +++---
>   include/configs/lacie_kw.h         | 19 +++++++++----------
>   8 files changed, 30 insertions(+), 28 deletions(-)
> 
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index 0d240daf01a1..5a3a1f60e308 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="d2v2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> @@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_STORAGE=y
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index 2ef916fa85ba..6cd4348a3c1d 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> @@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_STORAGE=y
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index 9c1ed539b2a0..e7b7be7ed506 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="2big2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> @@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_STORAGE=y
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index 180d1402a188..9e3768ef4efd 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index ed1a4e2d3653..b06321895b20 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
> index 884bb63f0b90..7e013b48d1a1 100644
> --- a/configs/netspace_mini_v2_defconfig
> +++ b/configs/netspace_mini_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
> @@ -38,7 +38,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index cc1af7391771..fc09c6b22464 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="ns2> "
>   CONFIG_CMD_EEPROM=y
> -CONFIG_CMD_IDE=y
>   CONFIG_CMD_I2C=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_DHCP=y
> @@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
>   CONFIG_ENV_SPI_MAX_HZ=20000000
>   CONFIG_ENV_ADDR=0x70000
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
> +CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> @@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_STORAGE=y
> diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
> index 5bb0255a74d5..031bc995e3ba 100644
> --- a/include/configs/lacie_kw.h
> +++ b/include/configs/lacie_kw.h
> @@ -83,18 +83,17 @@
>   /*
>    * SATA Driver configuration
>    */
> -#ifdef CONFIG_MVSATA_IDE
> -#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
> +
> +#ifdef CONFIG_SATA
> +#define CONFIG_SYS_64BIT_LBA
> +#define CONFIG_LBA48
>   #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \
>   	defined(CONFIG_NET2BIG_V2)
> -#define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET
> -#define CONFIG_SYS_IDE_MAXBUS           2
> -#define CONFIG_SYS_IDE_MAXDEVICE        2
> +#define CONFIG_SYS_SATA_MAX_DEVICE	2
>   #else
> -#define CONFIG_SYS_IDE_MAXBUS           1
> -#define CONFIG_SYS_IDE_MAXDEVICE        1
> +#define CONFIG_SYS_SATA_MAX_DEVICE	1
>   #endif
> -#endif /* CONFIG_MVSATA_IDE */
> +#endif /* CONFIG_SATA */
>   
>   /*
>    * Enable GPI0 support
> @@ -144,8 +143,8 @@
>   		"set stdin $stdin,nc; "				\
>   		"set stdout $stdout,nc; "			\
>   		"set stderr $stderr,nc;\0"			\
> -	"diskload=ide reset && "				\
> -		"ext2load ide 0:1 $loadaddr /boot/$bootfile\0"	\
> +	"diskload=sata init && "				\
> +		"ext2load sata 0:1 $loadaddr /boot/$bootfile\0"	\
>   	"usbload=usb start && "					\
>   		"fatload usb 0:1 $loadaddr /boot/$bootfile\0"
>   
> 


Viele Gr??e,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 4/5] arm: kirkwood: enable DM_USB for LaCie board
  2020-06-28 17:00 ` [PATCH v2 4/5] arm: kirkwood: enable DM_USB for LaCie board Simon Guinot
@ 2020-06-29  6:17   ` Stefan Roese
  0 siblings, 0 replies; 16+ messages in thread
From: Stefan Roese @ 2020-06-29  6:17 UTC (permalink / raw)
  To: u-boot

On 28.06.20 19:00, Simon Guinot wrote:
> This patch enables DM_USB and USB_STORAGE for the following
> Kirkwood-based LaCie boards:
> 
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   configs/d2net_v2_defconfig         | 2 ++
>   configs/inetspace_v2_defconfig     | 2 ++
>   configs/net2big_v2_defconfig       | 2 ++
>   configs/netspace_lite_v2_defconfig | 2 ++
>   configs/netspace_max_v2_defconfig  | 2 ++
>   configs/netspace_v2_defconfig      | 2 ++
>   6 files changed, 12 insertions(+)
> 
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index 5a3a1f60e308..33f48e0dd94c 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -52,4 +52,6 @@ CONFIG_SPI=y
>   CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
> +CONFIG_DM_USB=y
>   CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_STORAGE=y
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index 6cd4348a3c1d..ca444d0aafa3 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -52,4 +52,6 @@ CONFIG_SPI=y
>   CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
> +CONFIG_DM_USB=y
>   CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_STORAGE=y
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index e7b7be7ed506..4d0e50b3e0a5 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -52,4 +52,6 @@ CONFIG_SPI=y
>   CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
> +CONFIG_DM_USB=y
>   CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_STORAGE=y
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index 9e3768ef4efd..26ca464e0b48 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -52,5 +52,7 @@ CONFIG_SPI=y
>   CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
> +CONFIG_DM_USB=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_STORAGE=y
> +CONFIG_USB_STORAGE=y
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index b06321895b20..af2d9df6ff8a 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -52,5 +52,7 @@ CONFIG_SPI=y
>   CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
> +CONFIG_DM_USB=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_STORAGE=y
> +CONFIG_USB_STORAGE=y
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index fc09c6b22464..3585b7cf6318 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -52,4 +52,6 @@ CONFIG_SPI=y
>   CONFIG_DM_SPI=y
>   CONFIG_KIRKWOOD_SPI=y
>   CONFIG_USB=y
> +CONFIG_DM_USB=y
>   CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_STORAGE=y
> 


Viele Gr??e,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 5/5] arm: kirkwood: enable DM_ETH for LaCie board
  2020-06-28 17:00 ` [PATCH v2 5/5] arm: kirkwood: enable DM_ETH " Simon Guinot
@ 2020-06-29  6:17   ` Stefan Roese
  0 siblings, 0 replies; 16+ messages in thread
From: Stefan Roese @ 2020-06-29  6:17 UTC (permalink / raw)
  To: u-boot

On 28.06.20 19:00, Simon Guinot wrote:
> This patch enables DM_ETH for the following Kirkwood-based LaCie boards:
> 
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   board/LaCie/net2big_v2/net2big_v2.c   | 2 +-
>   board/LaCie/netspace_v2/netspace_v2.c | 4 ++--
>   configs/d2net_v2_defconfig            | 1 +
>   configs/inetspace_v2_defconfig        | 1 +
>   configs/net2big_v2_defconfig          | 1 +
>   configs/netspace_lite_v2_defconfig    | 1 +
>   configs/netspace_max_v2_defconfig     | 1 +
>   configs/netspace_mini_v2_defconfig    | 1 +
>   configs/netspace_v2_defconfig         | 1 +
>   9 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
> index dbd8b5755da3..e94c9a6dce96 100644
> --- a/board/LaCie/net2big_v2/net2big_v2.c
> +++ b/board/LaCie/net2big_v2/net2big_v2.c
> @@ -239,7 +239,7 @@ int misc_init_r(void)
>   /* Configure and initialize PHY */
>   void reset_phy(void)
>   {
> -	mv_phy_88e1116_init("egiga0", 8);
> +	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
>   }
>   #endif
>   
> diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
> index 011cc563d19d..33246b201528 100644
> --- a/board/LaCie/netspace_v2/netspace_v2.c
> +++ b/board/LaCie/netspace_v2/netspace_v2.c
> @@ -100,9 +100,9 @@ int misc_init_r(void)
>   void reset_phy(void)
>   {
>   #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
> -	mv_phy_88e1318_init("egiga0", 0);
> +	mv_phy_88e1318_init("ethernet-controller at 72000", 0);
>   #else
> -	mv_phy_88e1116_init("egiga0", 8);
> +	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
>   #endif
>   }
>   #endif
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index 33f48e0dd94c..31a5d91af2b3 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -45,6 +45,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index ca444d0aafa3..b5973977a5b8 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -45,6 +45,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index 4d0e50b3e0a5..bba85030492a 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -45,6 +45,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index 26ca464e0b48..bfa93dbd1c27 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -45,6 +45,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index af2d9df6ff8a..d0f750369a3a 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -45,6 +45,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
> index 7e013b48d1a1..6cfaccf51dbd 100644
> --- a/configs/netspace_mini_v2_defconfig
> +++ b/configs/netspace_mini_v2_defconfig
> @@ -43,6 +43,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index 3585b7cf6318..1bd148f9b511 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -45,6 +45,7 @@ CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
>   CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_DM_ETH=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_SYS_NS16550=y
> 


Viele Gr??e,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
  2020-06-28 17:00 ` [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH Simon Guinot
  2020-06-29  6:16   ` Stefan Roese
@ 2020-07-08  6:49   ` Jagan Teki
  2020-07-08 18:46     ` Jagan Teki
  1 sibling, 1 reply; 16+ messages in thread
From: Jagan Teki @ 2020-07-08  6:49 UTC (permalink / raw)
  To: u-boot

On Sun, Jun 28, 2020 at 10:31 PM Simon Guinot <simon.guinot@sequanux.org> wrote:
>
> This patch converts the following Kirkwood-based LaCie boards to DM,
> DM_SPI and DM_SPI_FLASH:
>
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
>
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> ---

Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards
  2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
  2020-06-28 17:29   ` Tom Rini
  2020-06-29  6:15   ` Stefan Roese
@ 2020-07-08  6:50   ` Jagan Teki
  2 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2020-07-08  6:50 UTC (permalink / raw)
  To: u-boot

On Sun, Jun 28, 2020 at 10:30 PM Simon Guinot <simon.guinot@sequanux.org> wrote:
>
> The spi0 alias is needed by the environment code to retrieve the SPI
> flash. This patch adds some -u-boot.dtsi files, providing the spi0
> aliases, for all the following Kirkwood-based LaCie boards:
>
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
>
> Note that this -u-boot.dtsi files will be removed as soon as the spi0
> aliases will be available in the upstream Linux dtsi files.
>
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> ---

On Sun, Jun 28, 2020 at 10:31 PM Simon Guinot <simon.guinot@sequanux.org> wrote:
>
> This patch converts the following Kirkwood-based LaCie boards to DM,
> DM_SPI and DM_SPI_FLASH:
>
> - d2 Network v2
> - Internet Space v2
> - 2Big Network v2
> - Network Space v2
> - Network Space Lite v2
> - Network Space Max v2
> - Network Space Mini v2
>
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> ---

Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
  2020-07-08  6:49   ` Jagan Teki
@ 2020-07-08 18:46     ` Jagan Teki
  2020-07-09  4:57       ` Stefan Roese
  0 siblings, 1 reply; 16+ messages in thread
From: Jagan Teki @ 2020-07-08 18:46 UTC (permalink / raw)
  To: u-boot

On Wed, Jul 8, 2020 at 12:19 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Sun, Jun 28, 2020 at 10:31 PM Simon Guinot <simon.guinot@sequanux.org> wrote:
> >
> > This patch converts the following Kirkwood-based LaCie boards to DM,
> > DM_SPI and DM_SPI_FLASH:
> >
> > - d2 Network v2
> > - Internet Space v2
> > - 2Big Network v2
> > - Network Space v2
> > - Network Space Lite v2
> > - Network Space Max v2
> > - Network Space Mini v2
> >
> > Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> > ---
>
> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

Any chance to move this series into master, I have a dependency for
kirkwood spi driver patches.

Jagan.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
  2020-07-08 18:46     ` Jagan Teki
@ 2020-07-09  4:57       ` Stefan Roese
  0 siblings, 0 replies; 16+ messages in thread
From: Stefan Roese @ 2020-07-09  4:57 UTC (permalink / raw)
  To: u-boot

On 08.07.20 20:46, Jagan Teki wrote:
> On Wed, Jul 8, 2020 at 12:19 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>>
>> On Sun, Jun 28, 2020 at 10:31 PM Simon Guinot <simon.guinot@sequanux.org> wrote:
>>>
>>> This patch converts the following Kirkwood-based LaCie boards to DM,
>>> DM_SPI and DM_SPI_FLASH:
>>>
>>> - d2 Network v2
>>> - Internet Space v2
>>> - 2Big Network v2
>>> - Network Space v2
>>> - Network Space Lite v2
>>> - Network Space Max v2
>>> - Network Space Mini v2
>>>
>>> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
>>> ---
>>
>> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
> 
> Any chance to move this series into master, I have a dependency for
> kirkwood spi driver patches.

I'll try to take care of it today.

Thanks,
Stefan

^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-07-09  4:57 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-28 17:00 [PATCH v2 0/5] Convert LaCie boards to use DM drivers Simon Guinot
2020-06-28 17:00 ` [PATCH v2 1/5] arm: kirkwood: add DT spi0 alias to LaCie boards Simon Guinot
2020-06-28 17:29   ` Tom Rini
2020-06-29  6:15   ` Stefan Roese
2020-07-08  6:50   ` Jagan Teki
2020-06-28 17:00 ` [PATCH v2 2/5] arm: kirkwood: convert LaCie boards to DM_SPI_FLASH Simon Guinot
2020-06-29  6:16   ` Stefan Roese
2020-07-08  6:49   ` Jagan Teki
2020-07-08 18:46     ` Jagan Teki
2020-07-09  4:57       ` Stefan Roese
2020-06-28 17:00 ` [PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver Simon Guinot
2020-06-29  6:16   ` Stefan Roese
2020-06-28 17:00 ` [PATCH v2 4/5] arm: kirkwood: enable DM_USB for LaCie board Simon Guinot
2020-06-29  6:17   ` Stefan Roese
2020-06-28 17:00 ` [PATCH v2 5/5] arm: kirkwood: enable DM_ETH " Simon Guinot
2020-06-29  6:17   ` Stefan Roese

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.