mx6sabre_common: Remove FEC related settings
PATCH 1/4 mx6sabre_common: Remove FEC related settings
From: Fabio Estevam <[email protected]>
In preparation for converting to DM_ETH and moving the FEC symbols to Kconfig we need to move the FEC definitions to mx6sabreauto.h and mx6sabresd.h to avoid build breakage during the conversion.
--- include/configs/mx6sabre_common.h | 8 -------- include/configs/mx6sabreauto.h | 8 ++++++++ include/configs/mx6sabresd.h | 9 +++++++++ 3 files changed, 17 insertions(+), 8 deletions(-)
include/configs/mx6sabre_common.h +0 -8
@@ -20,14 +20,6 @@/* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#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 -#ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ "emmcdev=2\0" \
include/configs/mx6sabreauto.h +8 -0
@@ -75,4 +75,12 @@#define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#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 +#endif /* __MX6SABREAUTO_CONFIG_H */
include/configs/mx6sabresd.h +9 -0
@@ -62,4 +62,13 @@#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ #endif +#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 + +#endif /* __MX6SABRESD_CONFIG_H */
Signature · 1 line
2.17.1
PATCH 2/4 mx6sabresd: Convert PCI to driver model
Convert imx6sabresd PCI to driver model to fix the following warning:
===================== WARNING ====================== This board does not use CONFIG_DM_PCI Please update the board to use CONFIG_DM_PCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================
After the conversion the following commands were used for testing:
=> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
=> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x8086 0x08b1 Network controller 0x80
--- board/freescale/mx6sabresd/mx6sabresd.c | 11 ----------- configs/mx6sabresd_defconfig | 1 + 2 files changed, 1 insertion(+), 11 deletions(-)
board/freescale/mx6sabresd/mx6sabresd.c +0 -11
@@ -231,16 +231,6 @@ static void setup_spi(void)SETUP_IOMUX_PADS (ecspi1_pads); } -iomux_v3_cfg_t const pcie_pads[] = { -IOMUX_PADS (PAD_EIM_D19__GPIO3_IO19 |MUX_PAD_CTRL (NO_PAD_CTRL )),/* POWER */ -IOMUX_PADS (PAD_GPIO_17__GPIO7_IO12 |MUX_PAD_CTRL (NO_PAD_CTRL )),/* RESET */ -}; - -static void setup_pcie (void ) -{ -SETUP_IOMUX_PADS (pcie_pads); -} -iomux_v3_cfg_t const di0_pads[] = {IOMUX_PADS (PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK ),/* DISP0_CLK */ IOMUX_PADS (PAD_DI0_PIN2__IPU1_DI0_PIN02 ),/* DISP0_HSYNC */
@@ -508,7 +498,6 @@ int overwrite_console(void)int board_eth_init (bd_t *bis) {setup_iomux_enet (); -setup_pcie ();return cpu_eth_init (bis); }
configs/mx6sabresd_defconfig +1 -0
@@ -83,6 +83,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_DM_PCI=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_REGULATOR=y
Signature · 1 line
2.17.1
PATCH 2/4 mx6sabresd: Convert PCI to driver model
Quoted 21 lines · Alifer Moraes
Convert imx6sabresd PCI to driver model to fix the following warning:
===================== WARNING ====================== This board does not use
CONFIG_DM_PCIPlease update the board to useCONFIG_DM_PCIbefore the v2019.07 release. Failure to update by the deadline may result in board removal. Seedoc/driver-model/MIGRATION.txtfor more info.
====================================================After the conversion the following commands were used for testing:
=> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
=> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.000x80860x08b1Network controller0x80
Quoted 1 line
Signed-off-by Alifer Moraes <[email protected]>
PATCH 2/4 mx6sabresd: Convert PCI to driver model
In reply to Alifer MoraesQuoted 49 lines
Convert imx6sabresd PCI to driver model to fix the following warning:
===================== WARNING ======================
This board does not useCONFIG_DM_PCIPlease update
the board to useCONFIG_DM_PCIbefore the v2019.07 release. Failure to update by the deadline may result in board removal. Seedoc/driver-model/MIGRATION.txtfor more info.
====================================================
After the conversion the following commands were used for testing:
=> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
=> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-ClassReviewed-by Fabio Estevam <[email protected]>board/freescale/mx6sabresd/mx6sabresd.c +0
-11@@ -231,16 +231,6 @@ static void setup_spi(void)SETUP_IOMUX_PADS (ecspi1_pads); } -iomux_v3_cfg_t const pcie_pads[] = { -IOMUX_PADS (PAD_EIM_D19__GPIO3_IO19 |MUX_PAD_CTRL (NO_PAD_CTRL )),/* POWER */ -IOMUX_PADS (PAD_GPIO_17__GPIO7_IO12 |MUX_PAD_CTRL (NO_PAD_CTRL )),/* RESET */ -}; - -static void setup_pcie (void ) -{ -SETUP_IOMUX_PADS (pcie_pads); -} -iomux_v3_cfg_t const di0_pads[] = {IOMUX_PADS (PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK ),/* DISP0_CLK */ IOMUX_PADS (PAD_DI0_PIN2__IPU1_DI0_PIN02 ),/* DISP0_HSYNC */ @@ -508,7 +498,6 @@ int overwrite_console(void)int board_eth_init (bd_t *bis) {setup_iomux_enet (); -setup_pcie ();return cpu_eth_init (bis); }configs/mx6sabresd_defconfig +0
-0
configs/mx6sabresd_defconfig CONFIG_SPI_FLASH_STMICRO=y · line 89
Quoted 7 lines
configs/mx6sabresd_defconfig +1
-0@@ -83,6 +83,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_DM_PCI=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_REGULATOR=y
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/4 mx6sabresd: Convert ethernet to driver model
In reply to Alifer MoraesConvert imx6sabresd ethernet to driver model to fix the following warning:
===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info.
====================================================
--- board/freescale/mx6sabresd/mx6sabresd.c | 29 ------------------------- configs/mx6sabresd_defconfig | 5 +++++ include/configs/mx6sabresd.h | 9 -------- 3 files changed, 5 insertions(+), 38 deletions(-)
board/freescale/mx6sabresd/mx6sabresd.c +0 -29
@@ -21,7 +21,6 @@#include <mmc.h> #include <fsl_esdhc_imx.h> #include <miiphy.h> -#include <netdev.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> #include <asm/io.h>
@@ -44,9 +43,6 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
@@ -73,31 +69,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { IOMUX_PADS(PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), }; -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_ENET_CRS_DV__GPIO1_IO25 |MUX_PAD_CTRL (NO_PAD_CTRL )), -}; - -static void setup_iomux_enet (void ) -{ -SETUP_IOMUX_PADS (enet_pads); -} -static iomux_v3_cfg_t const usdhc2_pads[] = {IOMUX_PADS (PAD_SD2_CLK__SD2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL )),IOMUX_PADS (PAD_SD2_CMD__SD2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL )),
configs/mx6sabresd_defconfig +5 -0
@@ -81,6 +81,11 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ATHEROS=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y +CONFIG_FEC_MXC=y +CONFIG_RGMII=y CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_PCI=y
include/configs/mx6sabresd.h +0 -9
@@ -62,13 +62,4 @@#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ #endif -#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 - -#endif /* __MX6SABRESD_CONFIG_H */
Signature · 1 line
2.17.1
PATCH 3/4 mx6sabresd: Convert ethernet to driver model
Quoted 11 lines · Alifer Moraes
Convert imx6sabresd ethernet to driver model to fix the following warning:
===================== WARNING ====================== This board does not use
CONFIG_DM_ETH(Driver Model for Ethernet drivers). Please update the board to useCONFIG_DM_ETHbefore the v2020.07 release. Failure to update by the deadline may result in board removal. Seedoc/driver-model/migration.rstfor more info.
====================================================Signed-off-by Alifer Moraes <[email protected]>
Patch is fine, but I get some warning after merging. Can you fix them and repost, please ? Thanks !
+ setup_iomux_enet(); + ^~~~~~~~~~~~~~~~ + return cpu_eth_init(bis);
+ ^~~~~~~~~~~~
w+board/freescale/mx6sabresd/mx6sabresd.c:471:2: warning: implicit declaration of function ‘setup_iomux_enet’ [-Wimplicit-function-declaration] w+board/freescale/mx6sabresd/mx6sabresd.c:473:9: warning: implicit declaration of function ‘cpu_eth_init’ [-Wimplicit-function-declaration]
Best regards,
Stefano
Quoted 95 lines
--- board/freescale/mx6sabresd/mx6sabresd.c | 29 ------------------------- configs/mx6sabresd_defconfig | 5 +++++ include/configs/mx6sabresd.h | 9 -------- 3 files changed, 5 insertions(+), 38 deletions(-)board/freescale/mx6sabresd/mx6sabresd.c +0
-29@@ -21,7 +21,6 @@#include <mmc.h> #include <fsl_esdhc_imx.h> #include <miiphy.h> -#include <netdev.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> #include <asm/io.h> @@ -44,9 +43,6 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)@@ -73,31 +69,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { IOMUX_PADS(PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), }; -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_ENET_CRS_DV__GPIO1_IO25 |MUX_PAD_CTRL (NO_PAD_CTRL )), -}; - -static void setup_iomux_enet (void ) -{ -SETUP_IOMUX_PADS (enet_pads); -} -static iomux_v3_cfg_t const usdhc2_pads[] = {IOMUX_PADS (PAD_SD2_CLK__SD2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL )),IOMUX_PADS (PAD_SD2_CMD__SD2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL )),configs/mx6sabresd_defconfig +5
-0@@ -81,6 +81,11 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ATHEROS=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y +CONFIG_FEC_MXC=y +CONFIG_RGMII=y CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_PCI=yinclude/configs/mx6sabresd.h +0
-9@@ -62,13 +62,4 @@#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ #endif -#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 - -#endif /* __MX6SABRESD_CONFIG_H */
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/4 mx6sabreauto: Convert to DM_ETH
In reply to Alifer MoraesFrom: Pedro Jardim <[email protected]>
This fixes the following warning:
===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info.
====================================================
--- board/freescale/mx6sabreauto/mx6sabreauto.c | 42 ------------- configs/mx6sabreauto_defconfig | 8 +++ include/configs/mx6sabreauto.h | 7 --- 3 files changed, 8 insertions(+), 49 deletions(-)
board/freescale/mx6sabreauto/mx6sabreauto.c +0 -42
@@ -22,7 +22,6 @@#include <mmc.h> #include <fsl_esdhc_imx.h> #include <miiphy.h> -#include <netdev.h> #include <asm/arch/sys_proto.h> #include <i2c.h> #include <input.h>
@@ -76,23 +75,6 @@ static iomux_v3_cfg_t const uart4_pads[] = { IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), }; -static iomux_v3_cfg_t const enet_pads[] = { -IOMUX_PADS (PAD_KEY_COL1__ENET_MDIO |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_KEY_COL2__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 )), -};/* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */ static struct i2c_pads_info mx6q_i2c_pad_info1 = {
@@ -259,10 +241,6 @@ static void setup_iomux_eimnor(void) }#endif -static void setup_iomux_enet (void ) -{ -SETUP_IOMUX_PADS (enet_pads); -}static iomux_v3_cfg_t const usdhc3_pads[] = {IOMUX_PADS (PAD_SD3_CLK__SD3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL )),
@@ -340,26 +318,6 @@ static void setup_gpmi_nand(void) }#endif -static void setup_fec (void ) -{ -if (is_mx6dqp ()) { -/* -* select ENET MAC0 TX clock from PLL -*/ -imx_iomux_set_gpr_register (5 ,9 ,1 ,1 ); -enable_fec_anatop_clock (0 ,ENET_125MHZ ); - } - -setup_iomux_enet (); -} - -int board_eth_init (bd_t *bis) -{ -setup_fec (); - -return cpu_eth_init (bis); -} -u32 get_board_rev (void ) {int rev =nxp_board_rev ();
configs/mx6sabreauto_defconfig +5 -0
@@ -96,3 +96,11 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_BPP16=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_FEC_MXC=y +CONFIG_PHY_ATHEROS=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y +CONFIG_RGMII=y
include/configs/mx6sabreauto.h +0 -7
@@ -75,12 +75,5 @@#define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 -#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 #endif /* __MX6SABREAUTO_CONFIG_H */
Signature · 1 line
2.17.1
PATCH 4/4 mx6sabreauto: Convert to DM_ETH
Quoted 13 lines · Alifer Moraes
From: Pedro Jardim <[email protected]>
This fixes the following warning:
===================== WARNING ====================== This board does not use
CONFIG_DM_ETH(Driver Model for Ethernet drivers). Please update the board to useCONFIG_DM_ETHbefore the v2020.07 release. Failure to update by the deadline may result in board removal. Seedoc/driver-model/migration.rstfor more info.
====================================================
Quoted 2 lines
Signed-off-by Pedro Jardim <[email protected]>Signed-off-by Alifer Moraes <[email protected]>
PATCH 4/4 mx6sabreauto: Convert to DM_ETH
In reply to Alifer MoraesQuoted 12 lines · Alifer Moraes
From: Pedro Jardim <[email protected]>
This fixes the following warning:
===================== WARNING ====================== This board does not use
CONFIG_DM_ETH(Driver Model for Ethernet drivers). Please update the board to useCONFIG_DM_ETHbefore the v2020.07 release. Failure to update by the deadline may result in board removal. Seedoc/driver-model/migration.rstfor more info.
====================================================
Quoted 3 lines
Signed-off-by Pedro Jardim <[email protected]>Signed-off-by Alifer Moraes <[email protected]>---
This causes warnings, too. Please fix them, thanks !
Best regards,
Stefano
Quoted 110 lines
board/freescale/mx6sabreauto/mx6sabreauto.c | 42 ------------- configs/mx6sabreauto_defconfig | 8 +++ include/configs/mx6sabreauto.h | 7 --- 3 files changed, 8 insertions(+), 49 deletions(-)board/freescale/mx6sabreauto/mx6sabreauto.c +0
-42@@ -22,7 +22,6 @@#include <mmc.h> #include <fsl_esdhc_imx.h> #include <miiphy.h> -#include <netdev.h> #include <asm/arch/sys_proto.h> #include <i2c.h> #include <input.h> @@ -76,23 +75,6 @@ static iomux_v3_cfg_t const uart4_pads[] = { IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), }; -static iomux_v3_cfg_t const enet_pads[] = { -IOMUX_PADS (PAD_KEY_COL1__ENET_MDIO |MUX_PAD_CTRL (ENET_PAD_CTRL )), -IOMUX_PADS (PAD_KEY_COL2__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 )), -};/* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */ static struct i2c_pads_info mx6q_i2c_pad_info1 = {@@ -259,10 +241,6 @@ static void setup_iomux_eimnor(void) }#endif -static void setup_iomux_enet (void ) -{ -SETUP_IOMUX_PADS (enet_pads); -}static iomux_v3_cfg_t const usdhc3_pads[] = {IOMUX_PADS (PAD_SD3_CLK__SD3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL )),@@ -340,26 +318,6 @@ static void setup_gpmi_nand(void) }#endif -static void setup_fec (void ) -{ -if (is_mx6dqp ()) { -/* -* select ENET MAC0 TX clock from PLL -*/ -imx_iomux_set_gpr_register (5 ,9 ,1 ,1 ); -enable_fec_anatop_clock (0 ,ENET_125MHZ ); - } - -setup_iomux_enet (); -} - -int board_eth_init (bd_t *bis) -{ -setup_fec (); - -return cpu_eth_init (bis); -} -u32 get_board_rev (void ) {int rev =nxp_board_rev ();configs/mx6sabreauto_defconfig +5
-0@@ -96,3 +96,11 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_BPP16=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y +CONFIG_FEC_MXC=y +CONFIG_PHY_ATHEROS=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y +CONFIG_RGMII=yinclude/configs/mx6sabreauto.h +0
-7@@ -75,12 +75,5 @@#define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 -#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 #endif /* __MX6SABREAUTO_CONFIG_H */
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/4 mx6sabre_common: Remove FEC related settings
In reply to Alifer MoraesQuoted 6 lines
From: Fabio Estevam <[email protected]>
In preparation for converting toDM_ETHand moving the FEC symbols toKconfigwe need to move the FEC definitions tomx6sabreauto.handmx6sabresd.hto avoid build breakage during the conversion.Signed-off-by Fabio Estevam <[email protected]>Signed-off-by Alifer Moraes <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================