| Message ID | 20200628170031.441930-6-simon.guinot@sequanux.org |
|---|---|
| State | Accepted |
| Commit | 21b1c75f9d2387b7cff88b38110a53e350d06b56 |
| Headers | show |
| Series | Convert LaCie boards to use DM drivers | expand |
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 at sequanux.org> Reviewed-by: Stefan Roese <sr at 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
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
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 at 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(-)