imx: wandboard: convert FEC support to DM_ETH
Subsystems (2)
PATCH v2 1/1 imx: wandboard: convert FEC support to DM_ETH
Remove CONFIG_DM_ETH conversion warning to avoid board removal.
---
Changes in v2:
- drop legacy board_eth_init()
- drop IOMUX_PADS() table for enet pads, these are already in dts
arch/arm/dts/imx6qdl-wandboard.dtsi | 10 ++++++++++ board/wandboard/wandboard.c | 23 +---------------------- configs/wandboard_defconfig | 5 ++++- include/configs/wandboard.h | 8 -------- 4 files changed, 15 insertions(+), 31 deletions(-)
arch/arm/dts/imx6qdl-wandboard.dtsi +10 -0
@@ -229,11 +229,21 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii-id"; + phy-handle = <ðphy>; phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy: ethernet-phy at 1 { + reg = <1>; + }; + }; }; &spdif {
board/wandboard/wandboard.c +1 -22
@@ -71,21 +71,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { };static iomux_v3_cfg_t const enet_pads[] = { -IOMUX_PADS (PAD_ENET_MDIO__ENET_MDIO |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_ENET_MDC__ENET_MDC |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_TXC__RGMII_TXC |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_TD0__RGMII_TD0 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_TD1__RGMII_TD1 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_TD2__RGMII_TD2 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_TD3__RGMII_TD3 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_TX_CTL__RGMII_TX_CTL |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_ENET_REF_CLK__ENET_TX_CLK |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_RXC__RGMII_RXC |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_RD0__RGMII_RD0 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_RD1__RGMII_RD1 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_RD2__RGMII_RD2 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_RD3__RGMII_RD3 |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_RGMII_RX_CTL__RGMII_RX_CTL |MUX_PAD_CTRL (ENET_PAD_CTRL )),/* AR8031 PHY Reset */ IOMUX_PADS (PAD_EIM_D29__GPIO3_IO29 |MUX_PAD_CTRL (NO_PAD_CTRL )), };
@@ -358,13 +343,6 @@ static void setup_display(void) }#endif /* CONFIG_VIDEO_IPUV3 */ -int board_eth_init (bd_t *bis) -{ -setup_iomux_enet (); - -return cpu_eth_init (bis); -} -int board_early_init_f (void ) {setup_iomux_uart ();
@@ -464,6 +442,7 @@ int board_late_init(void) else env_set("board_name", "B1");#endif +setup_iomux_enet ();return 0 ; }
configs/wandboard_defconfig +4 -1
@@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_AHCI=y +CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_FIT_PRINT=y
@@ -25,7 +26,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_FS_EXT4=y
@@ -57,6 +57,9 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ATHEROS=y +CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
include/configs/wandboard.h +0 -8
@@ -40,14 +40,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -/* Ethernet Configuration */ -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHY_ATHEROS -/* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN
Signature · 1 line
2.17.1
Fabio Estevam
reviewerPATCH v2 1/1 imx: wandboard: convert FEC support to DM_ETH
Hi Anatolij,
arch/arm/dts/imx6qdl-wandboard.dtsi line 246
Quoted 8 lines · Anatolij Gustschin
arch/arm/dts/imx6qdl-wandboard.dtsi +8
-0+ mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy: ethernet-phy at 1 { + reg = <1>; + }; + };
Could you also submit the dts change to the kernel?
This way we avoid getting the U-Boot and kernel dts out of sync.
Thanks
PATCH v2 1/1 imx: wandboard: convert FEC support to DM_ETH
Hi Fabio,
On Fri, 20 Sep 2019 19:18:45 -0300
Fabio Estevam festevam at gmail.com wrote:
...
Quoted 1 line
Could you also submit the dts change to the kernel?
I've sent a patch to arm kernel ML.
Quoted 1 line
This way we avoid getting the U-Boot and kernel dts out of sync.
Agreed.
--
Anatolij