net: fec: Code Improvement/cleanups
Subsystems (4)
cover net: fec: Code Improvement/cleanups
dm code in fec_mxc has some quite few issues with mdio handling and the dm vs non-dm code in fec_mxc looks very uncomfortable to read and add new support.
This series is trying to fixe all necessary issues regarding fec_mxc, along with necessary CONFIG options are moved into defconfig.
Require enough testing to get these changes to move further.
Jagan Teki (10):
configs: Drop imx27lite-common.h
configs: Move CONFIG_FEC_MXC
net: fec: Use PHY_INTERFACE_MODE_ for xcv_type
net: fec: Add default CONFIG_FEC_MXC_PHYADDR for few boards
net: fec: Use PHY_ADDR instead of FEC_MXC_PHYADDR
net: fec_mxc: Use udevice to retrive priv, in fec_phy_init
dm: net: fec: Move enet init in fec_enet
dm: net: fec: Refactor mdio_init code
dm: net: fec: Add support for PHY reset
net: fec: Setup common eth_ops code for dm and non-dm
board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- .../freescale/mx6sxsabreauto/mx6sxsabreauto.c | 3 +- .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 3 +- board/samtec/vining_2000/vining_2000.c | 3 +- board/sks-kinkel/sksimx6/sksimx6.c | 2 +- board/technexion/pico-imx7d/pico-imx7d.c | 3 +- board/toradex/colibri_imx7/colibri_imx7.c | 3 +- board/tqc/tqma6/tqma6_mba6.c | 2 +- board/udoo/neo/neo.c | 2 +- configs/apalis_imx6_defconfig | 2 + configs/apalis_imx6_nospl_com_defconfig | 2 + configs/apalis_imx6_nospl_it_defconfig | 3 + configs/apf27_defconfig | 3 + configs/apx4devkit_defconfig | 1 + configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/cgtqmx6eval_defconfig | 2 + configs/cl-som-imx7_defconfig | 2 + configs/cm_fx6_defconfig | 1 + configs/colibri_imx6_defconfig | 2 + configs/colibri_imx6_nospl_defconfig | 2 + configs/colibri_imx7_defconfig | 1 + configs/colibri_vf_defconfig | 1 + configs/dms-ba16-1g_defconfig | 2 + configs/dms-ba16_defconfig | 2 + configs/flea3_defconfig | 2 + configs/ge_bx50v3_defconfig | 3 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + configs/liteboard_defconfig | 1 + configs/marsboard_defconfig | 2 + configs/mccmon6_nor_defconfig | 2 + configs/mccmon6_sd_defconfig | 2 + configs/mx25pdk_defconfig | 3 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/mx35pdk_defconfig | 3 + configs/mx51evk_defconfig | 3 + configs/mx53cx9020_defconfig | 2 + configs/mx53evk_defconfig | 3 + configs/mx53loco_defconfig | 3 + configs/mx53ppd_defconfig | 3 + configs/mx53smd_defconfig | 3 + configs/mx6cuboxi_defconfig | 1 + configs/mx6dlarm2_defconfig | 1 + configs/mx6dlarm2_lpddr2_defconfig | 1 + configs/mx6qarm2_defconfig | 1 + configs/mx6qarm2_lpddr2_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/mx6sabreauto_defconfig | 2 + configs/mx6sabresd_defconfig | 2 + configs/mx6slevk_defconfig | 1 + configs/mx6slevk_spinor_defconfig | 1 + configs/mx6slevk_spl_defconfig | 2 + configs/mx6sxsabreauto_defconfig | 1 + configs/mx6sxsabresd_defconfig | 2 + configs/mx6sxsabresd_spl_defconfig | 2 + configs/mx6ul_14x14_evk_defconfig | 2 + configs/mx6ul_9x9_evk_defconfig | 2 + configs/mx7dsabresd_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 2 + configs/nitrogen6dl_defconfig | 2 + configs/nitrogen6q2g_defconfig | 2 + configs/nitrogen6q_defconfig | 2 + configs/nitrogen6s1g_defconfig | 2 + configs/nitrogen6s_defconfig | 2 + configs/novena_defconfig | 2 + configs/opos6uldev_defconfig | 1 + configs/ot1200_defconfig | 2 + configs/ot1200_spl_defconfig | 2 + configs/pcm052_defconfig | 1 + configs/pcm058_defconfig | 2 + configs/pfla02_defconfig | 1 + configs/pico-imx6ul_defconfig | 2 + configs/pico-imx7d_defconfig | 2 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 2 + configs/riotboard_defconfig | 2 + configs/sc_sps_1_defconfig | 1 + configs/secomx6quq7_defconfig | 2 + configs/sksimx6_defconfig | 1 + configs/tbs2910_defconfig | 2 + configs/titanium_defconfig | 2 + configs/tqma6dl_mba6_mmc_defconfig | 2 + configs/tqma6dl_mba6_spi_defconfig | 2 + configs/tqma6q_mba6_mmc_defconfig | 2 + configs/tqma6q_mba6_spi_defconfig | 2 + configs/tqma6s_mba6_mmc_defconfig | 2 + configs/tqma6s_mba6_spi_defconfig | 2 + configs/tqma6s_wru4_mmc_defconfig | 2 + configs/ts4800_defconfig | 1 + configs/udoo_defconfig | 2 + configs/udoo_neo_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + configs/vining_2000_defconfig | 1 + configs/wandboard_defconfig | 2 + configs/woodburn_defconfig | 2 + configs/woodburn_sd_defconfig | 2 + configs/xpress_defconfig | 1 + configs/xpress_spl_defconfig | 1 + configs/zc5202_defconfig | 2 + configs/zc5601_defconfig | 2 + configs/zmx25_defconfig | 2 + doc/README.fec_mxc | 2 +- drivers/net/Kconfig | 3 +- drivers/net/fec_mxc.c | 483 ++++++++++-------- drivers/net/fec_mxc.h | 19 +- drivers/net/phy/Kconfig | 1 + include/configs/advantech_dms-ba16.h | 4 +- include/configs/apalis_imx6.h | 4 +- include/configs/apf27.h | 6 - include/configs/apx4devkit.h | 2 - include/configs/aristainetos-common.h | 2 - include/configs/aristainetos.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/aristainetos2b.h | 2 +- include/configs/bg0900.h | 1 - include/configs/cgtqmx6eval.h | 4 +- include/configs/cl-som-imx7.h | 5 +- include/configs/cm_fx6.h | 4 +- include/configs/colibri_imx6.h | 4 +- include/configs/colibri_imx7.h | 4 +- include/configs/colibri_vf.h | 4 +- include/configs/dh_imx6.h | 3 +- include/configs/display5.h | 3 +- include/configs/embestmx6boards.h | 4 +- include/configs/flea3.h | 2 - include/configs/ge_bx50v3.h | 4 +- include/configs/gw_ventana.h | 4 +- include/configs/imx27lite-common.h | 172 ------- include/configs/imx6-engicam.h | 11 - include/configs/imx6_logic.h | 2 - include/configs/imx6dl-mamoj.h | 3 - include/configs/kp_imx6q_tpc.h | 3 +- include/configs/liteboard.h | 4 +- include/configs/mccmon6.h | 4 +- include/configs/mx25pdk.h | 2 - include/configs/mx28evk.h | 1 - include/configs/mx35pdk.h | 2 - include/configs/mx51evk.h | 3 - include/configs/mx53cx9020.h | 1 - include/configs/mx53evk.h | 2 - include/configs/mx53loco.h | 2 - include/configs/mx53ppd.h | 2 - include/configs/mx53smd.h | 2 - include/configs/mx6cuboxi.h | 4 +- include/configs/mx6qarm2.h | 4 +- include/configs/mx6sabre_common.h | 4 +- include/configs/mx6slevk.h | 4 +- include/configs/mx6sxsabreauto.h | 6 +- include/configs/mx6sxsabresd.h | 5 +- include/configs/mx6ul_14x14_evk.h | 7 +- include/configs/mx7dsabresd.h | 4 +- include/configs/mxs.h | 2 +- include/configs/nitrogen6x.h | 4 +- include/configs/novena.h | 4 +- include/configs/opos6uldev.h | 3 +- include/configs/ot1200.h | 4 +- include/configs/pcm052.h | 4 +- include/configs/pcm058.h | 4 +- include/configs/pfla02.h | 3 +- include/configs/pico-imx6ul.h | 4 +- include/configs/pico-imx7d.h | 4 +- include/configs/platinum.h | 1 - include/configs/platinum_picon.h | 3 +- include/configs/platinum_titanium.h | 3 +- include/configs/sc_sps_1.h | 1 - include/configs/secomx6quq7.h | 4 +- include/configs/sksimx6.h | 3 +- include/configs/tbs2910.h | 5 +- include/configs/titanium.h | 4 +- include/configs/tqma6.h | 1 - include/configs/tqma6_mba6.h | 4 +- include/configs/tqma6_wru4.h | 3 +- include/configs/ts4800.h | 2 - include/configs/udoo.h | 4 +- include/configs/udoo_neo.h | 5 +- include/configs/vf610twr.h | 4 +- include/configs/vining_2000.h | 6 +- include/configs/wandboard.h | 4 +- include/configs/woodburn_common.h | 2 - include/configs/xpress.h | 4 +- include/configs/zc5202.h | 4 +- include/configs/zc5601.h | 4 +- include/configs/zmx25.h | 6 - include/phy.h | 4 + scripts/config_whitelist.txt | 1 - 196 files changed, 530 insertions(+), 618 deletions(-) delete mode 100644 include/configs/imx27lite-common.h
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 1/10 configs: Drop imx27lite-common.h
This file not used by any config file, hence droped.
--- include/configs/imx27lite-common.h | 172 ----------------------------- 1 file changed, 172 deletions(-) delete mode 100644 include/configs/imx27lite-common.h
include/configs/imx27lite-common.h deleted +0 -172
@@ -1,172 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2010 Heiko Schocher <[email protected]> -* -* based on: -* Copyright (C) 2009 Ilya Yanok <[email protected]> -*/ - -#ifndef __IMX27LITE_COMMON_CONFIG_H -#define __IMX27LITE_COMMON_CONFIG_H - -/* -* SoC Configuration -*/ -#define CONFIG_MX27 -#define CONFIG_MX27_CLK32 32768/* OSC32K frequency */ - -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - -/* -* Lowlevel configuration -*/ -#define SDRAM_ESDCFG_REGISTER_VAL (cas) \ - (ESDCFG_TRC(10) | \ - ESDCFG_TRCD(3) | \ - ESDCFG_TCAS(cas) | \ - ESDCFG_TRRD(1) | \ - ESDCFG_TRAS(5) | \ - ESDCFG_TWR | \ - ESDCFG_TMRD(2) | \ - ESDCFG_TRP(2) | \ - ESDCFG_TXP(3)) - -#define SDRAM_ESDCTL_REGISTER_VAL \ - (ESDCTL_PRCT(0) | \ - ESDCTL_BL | \ - ESDCTL_PWDT(0) | \ - ESDCTL_SREFR(3) | \ - ESDCTL_DSIZ_32 | \ - ESDCTL_COL10 | \ - ESDCTL_ROW13 | \ - ESDCTL_SDE) - -#define SDRAM_ALL_VAL 0xf00 - -#define SDRAM_MODE_REGISTER_VAL 0x33/* BL: 8, CAS: 3 */ -#define SDRAM_EXT_MODE_REGISTER_VAL 0x1000000 - -#define MPCTL0_VAL 0x1ef15d5 - -#define SPCTL0_VAL 0x043a1c09 - -#define CSCR_VAL 0x33f08107 - -#define PCDR0_VAL 0x120470c3 -#define PCDR1_VAL 0x03030303 -#define PCCR0_VAL 0xffffffff -#define PCCR1_VAL 0xfffffffc - -#define AIPI1_PSR0_VAL 0x20040304 -#define AIPI1_PSR1_VAL 0xdffbfcfb -#define AIPI2_PSR0_VAL 0x07ffc200 -#define AIPI2_PSR1_VAL 0xffffffff - -/* -* Memory Info -*/ -/* malloc() len */ -#define CONFIG_SYS_MALLOC_LEN (0x10000 + 512 * 1024) -/* memtest start address */ -#define CONFIG_SYS_MEMTEST_START 0xA0000000 -#define CONFIG_SYS_MEMTEST_END 0xA1000000/* 16MB RAM test */ -#define CONFIG_NR_DRAM_BANKS 1/* we have 1 bank of DRAM */ -#define PHYS_SDRAM_1 0xA0000000/* DDR Start */ -#define PHYS_SDRAM_1_SIZE 0x08000000/* DDR size 128MB */ - -/* -* Serial Driver info -*/ -#define CONFIG_MXC_UART -#define CONFIG_MXC_UART_BASE UART1_BASE - -/* -* Flash & Environment -*/ -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_CFI -/* Use buffered writes (~10x faster) */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -/* Use hardware sector protection */ -#define CONFIG_SYS_FLASH_PROTECTION 1 -#define CONFIG_SYS_MAX_FLASH_BANKS 1/* max number of flash banks */ -/* CS2 Base address */ -#define PHYS_FLASH_1 0xc0000000 -/* Flash Base for U-Boot */ -#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE / \ - CONFIG_SYS_FLASH_SECT_SZ) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_MONITOR_LEN 0x40000/* Reserve 256KiB */ -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE - -/* -* Ethernet -*/ -#define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_PHYADDR 0x1f - -/* -* MTD -*/ -#define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_DEVICE - -/* -* NAND -*/ -#define CONFIG_MXC_NAND_REGS_BASE 0xd8000000 -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0xd8000000 -#define CONFIG_JFFS2_NAND -#define CONFIG_MXC_NAND_HWECC - -/* -* U-Boot general configuration -*/ -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ -/* Boot Argument Buffer Size */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - -#define CONFIG_LOADADDR 0xa0800000/* loadaddr env var */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ - "nfsroot=${serverip}:${rootpath}\0" \ - "ramargs=setenv bootargs root=/dev/ram rw\0" \ - "addip=setenv bootargs ${bootargs} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off panic=1\0" \ - "addtty=setenv bootargs ${bootargs}" \ - " console=ttymxc0,${baudrate}\0" \ - "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ - "addmisc=setenv bootargs ${bootargs}\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ - "kernel_addr_r=a0800000\0" \ - "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ - "rootpath=/opt/eldk-4.2-arm/arm\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ - "run nfsargs addip addtty addmtd addmisc;" \ - "bootm\0" \ - "bootcmd=run net_nfs\0" \ - "load=tftp ${loadaddr} ${u-boot}\0" \ - "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize};era " __stringify(CONFIG_SYS_MONITOR_BASE)\ - " +${filesize};cp.b ${fileaddr} " \ - __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \ - "upd=run load update\0" \ - "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ - "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ - -/* additions for new relocation code, must be added to all boards */ -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ -GENERATED_GBL_DATA_SIZE ) -#endif /* __IMX27LITE_COMMON_CONFIG_H */
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 1/10 configs: Drop imx27lite-common.h
Quoted 4 lines · Jagan Teki
This file not used by any config file, hence droped.
Cc Adam Ford <[email protected]>Signed-off-by Jagan Teki <[email protected]>
PATCH 2/10 configs: Move CONFIG_FEC_MXC
In reply to Jagan Teki- Move CONFIG_FEC_MXC to defconfigs
- Add require depends on in kconfig
---
Note:
- On top of
"[PATCH] Convert CONFIG_MII et al to Kconfig"
configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 1 + configs/apf27_defconfig | 1 + configs/apx4devkit_defconfig | 1 + configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/cgtqmx6eval_defconfig | 1 + configs/cl-som-imx7_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx6_nospl_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + configs/colibri_vf_defconfig | 1 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/flea3_defconfig | 1 + configs/ge_bx50v3_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/liteboard_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mccmon6_nor_defconfig | 1 + configs/mccmon6_sd_defconfig | 1 + configs/mx25pdk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/mx35pdk_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/mx53evk_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/mx53smd_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6dlarm2_defconfig | 1 + configs/mx6dlarm2_lpddr2_defconfig | 1 + configs/mx6qarm2_defconfig | 1 + configs/mx6qarm2_lpddr2_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/mx6slevk_defconfig | 1 + configs/mx6slevk_spinor_defconfig | 1 + configs/mx6slevk_spl_defconfig | 2 ++ configs/mx6sxsabreauto_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/mx6sxsabresd_spl_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + configs/mx7dsabresd_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/pcm052_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/pico-imx6ul_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/sc_sps_1_defconfig | 1 + configs/secomx6quq7_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/titanium_defconfig | 1 + configs/tqma6dl_mba6_mmc_defconfig | 1 + configs/tqma6dl_mba6_spi_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/ts4800_defconfig | 1 + configs/udoo_defconfig | 1 + configs/udoo_neo_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + configs/vining_2000_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/woodburn_defconfig | 1 + configs/woodburn_sd_defconfig | 1 + configs/xpress_defconfig | 1 + configs/xpress_spl_defconfig | 1 + configs/zc5202_defconfig | 1 + configs/zc5601_defconfig | 1 + configs/zmx25_defconfig | 1 + drivers/net/Kconfig | 3 ++- include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/apf27.h | 1 - include/configs/apx4devkit.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/bg0900.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cl-som-imx7.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/flea3.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/liteboard.h | 1 - include/configs/mccmon6.h | 1 - include/configs/mx25pdk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 2 -- include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6qarm2.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabreauto.h | 3 --- include/configs/mx6sxsabresd.h | 2 -- include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/pcm052.h | 1 - include/configs/pcm058.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 1 - include/configs/platinum.h | 1 - include/configs/sc_sps_1.h | 1 - include/configs/secomx6quq7.h | 1 - include/configs/tbs2910.h | 2 -- include/configs/titanium.h | 1 - include/configs/tqma6.h | 1 - include/configs/ts4800.h | 1 - include/configs/udoo.h | 1 - include/configs/udoo_neo.h | 2 -- include/configs/vf610twr.h | 1 - include/configs/vining_2000.h | 2 -- include/configs/wandboard.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/xpress.h | 1 - include/configs/zc5202.h | 1 - include/configs/zc5601.h | 1 - include/configs/zmx25.h | 1 - 155 files changed, 99 insertions(+), 66 deletions(-)
configs/apalis_imx6_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/apalis_imx6_nospl_com_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/apalis_imx6_nospl_it_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/apf27_defconfig +1 -0
@@ -41,5 +41,6 @@ CONFIG_MMC_MXC=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/apx4devkit_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_NAND=y CONFIG_NAND_MXS=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_USB=y
configs/aristainetos2_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/aristainetos2b_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/aristainetos_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/bg0900_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_SPI=y
configs/cgtqmx6eval_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/cl-som-imx7_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/cm_fx6_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y
configs/colibri_imx6_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/colibri_imx6_nospl_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/colibri_imx7_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_NAND_MXS=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y
configs/colibri_vf_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y
configs/dms-ba16-1g_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/dms-ba16_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/flea3_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/ge_bx50v3_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_E1000=y CONFIG_CMD_E1000=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/gwventana_emmc_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_E1000=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_SERIAL=y
configs/gwventana_gw5904_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_MV88E61XX_CPU_PORT=5 CONFIG_MV88E61XX_PHY_PORTS=0xf CONFIG_MV88E61XX_FIXED_PORTS=0x0 CONFIG_E1000=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_SERIAL=y
configs/gwventana_nand_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_E1000=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_SERIAL=y
configs/liteboard_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/marsboard_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mccmon6_nor_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mccmon6_sd_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mx25pdk_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_FS_EXT4=y CONFIG_FS_FAT=y
configs/mx28evk_auart_console_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_SPI=y
configs/mx28evk_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_SPI=y
configs/mx28evk_nand_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_SPI=y
configs/mx28evk_spi_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_SPI=y
configs/mx35pdk_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_MXC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0xB6000000
configs/mx51evk_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mx53evk_defconfig +1 -0
@@ -14,5 +14,6 @@ CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/mx53loco_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx53ppd_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000 CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_RTC_S35392A=y CONFIG_USB=y
configs/mx53smd_defconfig +1 -0
@@ -14,5 +14,6 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/mx6cuboxi_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_THERMAL=y CONFIG_USB=y
configs/mx6dlarm2_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6dlarm2_lpddr2_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6qarm2_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6qarm2_lpddr2_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/mx6qsabrelite_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mx6sabreauto_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/mx6sabresd_defconfig +1 -0
@@ -56,6 +56,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_SPI=y
configs/mx6slevk_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
configs/mx6slevk_spinor_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
configs/mx6slevk_spl_defconfig +2 -0
@@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_FEC_MXC=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y
@@ -44,6 +45,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
configs/mx6sxsabreauto_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
configs/mx6sxsabresd_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_PINCTRL=y
configs/mx6sxsabresd_spl_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_PINCTRL=y
configs/mx6ul_14x14_evk_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_FSL_QSPI=y
configs/mx6ul_9x9_evk_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_FSL_QSPI=y
configs/mx7dsabresd_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y
configs/nitrogen6dl2g_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/nitrogen6dl_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/nitrogen6q2g_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/nitrogen6q_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/nitrogen6s1g_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/nitrogen6s_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/novena_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_USB=y
configs/ot1200_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/ot1200_spl_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/pcm052_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y
configs/pcm058_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/pico-imx6ul_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_DFU_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/pico-imx7d_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/platinum_picon_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/platinum_titanium_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/riotboard_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/sc_sps_1_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_CONS_INDEX=0 CONFIG_USB=y
configs/secomx6quq7_defconfig +1 -0
@@ -28,5 +28,6 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/tbs2910_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_THERMAL=y
configs/titanium_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/tqma6dl_mba6_mmc_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/tqma6dl_mba6_spi_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/tqma6q_mba6_mmc_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/tqma6q_mba6_spi_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/tqma6s_mba6_mmc_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/tqma6s_mba6_spi_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_PCA9551_LED=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/ts4800_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/udoo_defconfig +1 -0
@@ -38,6 +38,7 @@ CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_THERMAL=y CONFIG_OF_LIBFDT=y
configs/udoo_neo_defconfig +1 -0
@@ -28,5 +28,6 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/vf610twr_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y
configs/vf610twr_nand_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y
configs/vining_2000_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_USB=y
configs/wandboard_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_THERMAL=y CONFIG_USB=y
configs/woodburn_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/woodburn_sd_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/xpress_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/xpress_spl_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_STORAGE=y
configs/zc5202_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_SPI=y
configs/zc5601_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y
configs/zmx25_defconfig +1 -0
@@ -22,6 +22,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
drivers/net/Kconfig +2 -1
@@ -168,7 +168,8 @@ config FEC_MXC_MDIO_BASE config FEC_MXC bool "FEC Ethernet controller" - depends on MX5 || MX6 || MX7 + depends on ARCH_VF610 || MX25 || MX28 || MX5 || MX6 || MX7 || \ + TARGET_APF27 || TARGET_MX35PDK || TARGET_FLEA3 help This driver supports the 10/100 Fast Ethernet controller for NXP i.MX processors.
include/configs/advantech_dms-ba16.h +0 -1
@@ -55,7 +55,6 @@#define CONFIG_USBD_HS /* Networking Configs */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/apalis_imx6.h +0 -1
@@ -68,7 +68,6 @@#endif /* Network */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/apf27.h +0 -1
@@ -190,7 +190,6 @@/* * Ethernet (on SOC imx FEC) */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f/*
include/configs/apx4devkit.h +0 -1
@@ -51,7 +51,6 @@/* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0#define IMX_FEC_BASE MXS_ENET0_BASE
include/configs/aristainetos-common.h +0 -1
@@ -25,7 +25,6 @@/* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/bg0900.h +0 -1
@@ -17,7 +17,6 @@/* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #endif /* SPI */
include/configs/cgtqmx6eval.h +0 -1
@@ -82,7 +82,6 @@#define CONFIG_LBA48 /* Ethernet */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/cl-som-imx7.h +0 -1
@@ -24,7 +24,6 @@#define CONFIG_CSF_SIZE 0x4000/* Network */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/cm_fx6.h +0 -1
@@ -177,7 +177,6 @@#endif /* Ethernet */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_FEC_XCV_TYPE RGMII#define IMX_FEC_BASE ENET_BASE_ADDR
include/configs/colibri_imx6.h +0 -1
@@ -56,7 +56,6 @@#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ /* Network */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_ETHPRIME "FEC"
include/configs/colibri_imx7.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)/* Network */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/colibri_vf.h +0 -1
@@ -49,7 +49,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET1_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/embestmx6boards.h +0 -1
@@ -41,7 +41,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"
include/configs/flea3.h +0 -1
@@ -67,7 +67,6 @@/* * Ethernet on SOC (FEC) */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1
include/configs/ge_bx50v3.h +0 -1
@@ -64,7 +64,6 @@/* Networking Configs */ #ifdef CONFIG_NET -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/gw_ventana.h +0 -1
@@ -123,7 +123,6 @@#define CONFIG_CMD_UNZIP /* gzwrite */ /* Ethernet support */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/liteboard.h +0 -1
@@ -140,7 +140,6 @@#endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR
include/configs/mccmon6.h +0 -1
@@ -86,7 +86,6 @@#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"
include/configs/mx25pdk.h +0 -1
@@ -60,7 +60,6 @@#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Ethernet */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f#define CONFIG_ENV_OVERWRITE
include/configs/mx28evk.h +0 -1
@@ -63,7 +63,6 @@/* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_MDIO_BASE MXS_ENET0_BASE#define CONFIG_MX28_FEC_MAC_IN_OCOTP #endif
include/configs/mx35pdk.h +0 -1
@@ -83,7 +83,6 @@/* * Ethernet on SOC (FEC) */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1F
include/configs/mx51evk.h +0 -2
@@ -55,8 +55,6 @@/* * Eth Configs */ - -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1F
include/configs/mx53evk.h +0 -1
@@ -46,7 +46,6 @@/* Eth Configs */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1F
include/configs/mx53loco.h +0 -1
@@ -33,7 +33,6 @@/* Eth Configs */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1F
include/configs/mx53ppd.h +0 -1
@@ -39,7 +39,6 @@/* Eth Configs */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1F
include/configs/mx53smd.h +0 -1
@@ -39,7 +39,6 @@/* Eth Configs */ #define CONFIG_HAS_ETH1 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1F
include/configs/mx6cuboxi.h +0 -1
@@ -28,7 +28,6 @@#endif /* Ethernet Configuration */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/mx6qarm2.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR#define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/mx6sabre_common.h +0 -1
@@ -20,7 +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"
include/configs/mx6slevk.h +0 -1
@@ -32,7 +32,6 @@#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/mx6sxsabreauto.h +0 -3
@@ -126,9 +126,6 @@/* DMA stuff, needed for GPMI/MXS NAND support */ /* Network */ - -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET2_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0
include/configs/mx6sxsabresd.h +0 -2
@@ -150,8 +150,6 @@#define CONFIG_SYS_I2C_SPEED 100000/* Network */ -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1
include/configs/mx6ul_14x14_evk.h +0 -1
@@ -184,7 +184,6 @@#endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define CONFIG_FEC_ENET_DEV 1#if (CONFIG_FEC_ENET_DEV ==0 )
include/configs/mx7dsabresd.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)/* Network */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/nitrogen6x.h +0 -1
@@ -53,7 +53,6 @@#define CONFIG_LBA48 #endif -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/novena.h +0 -1
@@ -61,7 +61,6 @@/* Ethernet Configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/ot1200.h +0 -1
@@ -68,7 +68,6 @@#define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024)#endif -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE MII100#define CONFIG_ETHPRIME "FEC"
include/configs/pcm052.h +0 -1
@@ -41,7 +41,6 @@/*#define CONFIG_ESDHC_DETECT_USE_EXTERN_IRQ1*/ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/pcm058.h +0 -1
@@ -31,7 +31,6 @@#define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M)/* Ethernet */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/pico-imx6ul.h +0 -1
@@ -15,7 +15,6 @@/* Network support */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET2_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_FEC_XCV_TYPE RMII
include/configs/pico-imx7d.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR/* Network */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 1
include/configs/platinum.h +0 -1
@@ -35,7 +35,6 @@#define CONFIG_SYS_FSL_USDHC_NUM 1/* Ethernet config */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR/* USB config */
include/configs/sc_sps_1.h +0 -1
@@ -30,7 +30,6 @@/* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define CONFIG_PHY_SMSC #endif
include/configs/secomx6quq7.h +0 -1
@@ -26,7 +26,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0/* Ethernet Configuration */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/tbs2910.h +0 -2
@@ -49,8 +49,6 @@#define CONFIG_SUPPORT_EMMC_BOOT /* Ethernet */ -#define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/titanium.h +0 -1
@@ -39,7 +39,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_FEC_MXC_PHYADDR 4
include/configs/tqma6.h +0 -1
@@ -68,7 +68,6 @@#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_ARP_TIMEOUT 200UL
include/configs/ts4800.h +0 -1
@@ -57,7 +57,6 @@*/ #define CONFIG_PHY_SMSC -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/udoo.h +0 -1
@@ -32,7 +32,6 @@/* Network support */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/udoo_neo.h +0 -2
@@ -95,8 +95,6 @@#define PFUZE3000_I2C_BUS 0/* Network */ -#define CONFIG_FEC_MXC -#define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0
include/configs/vf610twr.h +0 -1
@@ -44,7 +44,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/vining_2000.h +0 -2
@@ -62,8 +62,6 @@#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08/* Network */ -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0
include/configs/wandboard.h +0 -1
@@ -56,7 +56,6 @@#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"
include/configs/woodburn_common.h +0 -1
@@ -76,7 +76,6 @@/* * Ethernet on SOC (FEC) */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1
include/configs/xpress.h +0 -1
@@ -65,7 +65,6 @@#define CONFIG_MXC_USB_FLAGS 0#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_FEC_MXC #define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0
include/configs/zc5202.h +0 -1
@@ -17,7 +17,6 @@#include "el6x_common.h" /* Ethernet */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE MII100#define CONFIG_ETHPRIME "FEC"
include/configs/zc5601.h +0 -1
@@ -18,7 +18,6 @@#include "el6x_common.h" /* Ethernet */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/zmx25.h +0 -1
@@ -43,7 +43,6 @@/* * Ethernet */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x00/*
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 3/10 net: fec: Use PHY_INTERFACE_MODE_ for xcv_type
In reply to Jagan TekiUse existing PHY_INTERFACE_MODE_ for xcv_type, this eventually
- remove CONFIG_FEC_XCV_TYPE in DM_ETH boards since the phy interface is grabbing from DT phy-mode.
- prefix PHY_INTERFACE_MODE_ for CONFIG_FEC_XCV_TYPE in non DM_ETH boards
- added MII100, SEVENWIRE PHY mode
--- drivers/net/fec_mxc.c | 18 +++++++++--------- drivers/net/fec_mxc.h | 15 +-------------- include/configs/advantech_dms-ba16.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/aristainetos.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/aristainetos2b.h | 2 +- include/configs/cgtqmx6eval.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/imx6-engicam.h | 2 -- include/configs/imx6_logic.h | 1 - include/configs/kp_imx6q_tpc.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6qarm2.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/mx7dsabresd.h | 2 +- include/configs/mxs.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/ot1200.h | 2 +- include/configs/pcm052.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pfla02.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/platinum_picon.h | 2 +- include/configs/platinum_titanium.h | 2 +- include/configs/secomx6quq7.h | 2 +- include/configs/sksimx6.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/titanium.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/xpress.h | 2 +- include/configs/zc5202.h | 2 +- include/configs/zc5601.h | 2 +- include/phy.h | 4 ++++ 58 files changed, 68 insertions(+), 80 deletions(-)
drivers/net/fec_mxc.c +9 -9
@@ -15,6 +15,7 @@#include <miiphy.h> #include <net.h> #include <netdev.h> +#include <phy.h> #include "fec_mxc.h" #include <asm/io.h>
@@ -46,7 +47,7 @@ DECLARE_GLOBAL_DATA_PTR;#endif #ifndef CONFIG_FEC_XCV_TYPE -#define CONFIG_FEC_XCV_TYPE MII100 +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100#endif /*
@@ -397,11 +398,11 @@ static void fec_reg_setup(struct fec_priv *fec)/* Start with frame length = 1518, common for all modes. */ rcntrl =PKTSIZE <<FEC_RCNTRL_MAX_FL_SHIFT ; -if (fec->xcv_type !=SEVENWIRE )/* xMII modes */ +if (fec->xcv_type !=PHY_INTERFACE_MODE_SEVENWIRE )/* xMII modes */ rcntrl |=FEC_RCNTRL_FCE |FEC_RCNTRL_MII_MODE ; -if (fec->xcv_type ==RGMII ) +if (fec->xcv_type ==PHY_INTERFACE_MODE_RGMII ) rcntrl |=FEC_RCNTRL_RGMII ; -else if (fec->xcv_type ==RMII ) +else if (fec->xcv_type ==PHY_INTERFACE_MODE_RMII ) rcntrl |=FEC_RCNTRL_RMII ;writel (rcntrl, &fec->eth->r_cntrl);
@@ -552,7 +553,7 @@ static int fec_init(struct eth_device *dev, bd_t *bd)fec_reg_setup (fec); -if (fec->xcv_type !=SEVENWIRE ) +if (fec->xcv_type !=PHY_INTERFACE_MODE_SEVENWIRE )fec_mii_setspeed (fec->bus->priv);/* Set Opcode/Pause Duration Register */
@@ -583,7 +584,7 @@ static int fec_init(struct eth_device *dev, bd_t *bd)writel ((uint32_t )addr, &fec->eth->erdsr);#ifndef CONFIG_PHYLIB -if (fec->xcv_type !=SEVENWIRE ) +if (fec->xcv_type !=PHY_INTERFACE_MODE_SEVENWIRE )miiphy_restart_aneg (dev);#endif fec_open (dev);
@@ -1233,7 +1234,7 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) mask =1 <<CONFIG_FEC_MXC_PHYADDR ;#endif - phydev =phy_find_by_mask (priv->bus, mask, priv->interface); + phydev =phy_find_by_mask (priv->bus, mask, priv->xcv_type);if (!phydev)return -ENODEV ;
@@ -1283,8 +1284,7 @@ static int fecmxc_probe(struct udevice *dev) } priv->bus = bus; - priv->xcv_type =CONFIG_FEC_XCV_TYPE ; - priv->interface = pdata->phy_interface; + priv->xcv_type = pdata->phy_interface; ret =fec_phy_init (priv, dev);if (ret) goto err_phy;
drivers/net/fec_mxc.h +1 -14
@@ -223,19 +223,10 @@ struct fec_bd {uint32_t data_pointer;/* payload's buffer address */ }; -/* Supported phy types on this platform */ -enum xceiver_type { -SEVENWIRE ,/* 7-wire */ -MII10 ,/* MII 10Mbps */ -MII100 ,/* MII 100Mbps */ -RMII ,/* RMII */ -RGMII ,/* RGMII */ -}; -/* @brief i.MX27-FEC private structure */ struct fec_priv {struct ethernet_regs *eth;/* pointer to register'S base */ -enum xceiver_type xcv_type;/* transceiver type */ +phy_interface_t xcv_type;/* transceiver type */ struct fec_bd *rbd_base;/* RBD ring */ int rbd_index;/* next receive BD to read */ struct fec_bd *tbd_base;/* TBD ring */
@@ -250,10 +241,6 @@ struct fec_priv {int phy_id;int (*mii_postcall)(int );#endif - -#ifdef CONFIG_DM_ETH -u32 interface; -#endif };void imx_get_mac_from_fuse (int dev_id,unsigned char *mac);
include/configs/advantech_dms-ba16.h +1 -1
@@ -56,7 +56,7 @@/* Networking Configs */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS
include/configs/apalis_imx6.h +1 -1
@@ -69,7 +69,7 @@/* Network */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 6#define CONFIG_IP_DEFRAG
include/configs/aristainetos.h +1 -1
@@ -19,7 +19,7 @@#define CONFIG_MXC_UART_BASE UART5_BASE#define CONSOLE_DEV "ttymxc4" -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_SF_DEFAULT_BUS 3#define CONFIG_SF_DEFAULT_CS 0
include/configs/aristainetos2.h +1 -1
@@ -18,7 +18,7 @@#define CONFIG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1" -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_SF_DEFAULT_BUS 3#define CONFIG_SF_DEFAULT_CS 1
include/configs/aristainetos2b.h +1 -1
@@ -18,7 +18,7 @@#define CONFIG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1" -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_SF_DEFAULT_BUS 0#define CONFIG_SF_DEFAULT_CS 0
include/configs/cgtqmx6eval.h +1 -1
@@ -83,7 +83,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 6#define CONFIG_PHY_ATHEROS
include/configs/cl-som-imx7.h +1 -1
@@ -24,7 +24,7 @@#define CONFIG_CSF_SIZE 0x4000/* Network */ -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/cm_fx6.h +1 -1
@@ -178,7 +178,7 @@/* Ethernet */ #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_PHY_ATHEROS #define CONFIG_ETHPRIME "FEC0"
include/configs/colibri_imx6.h +1 -1
@@ -57,7 +57,7 @@/* Network */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_IP_DEFRAG
include/configs/colibri_imx7.h +1 -1
@@ -20,7 +20,7 @@#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)/* Network */ -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/colibri_vf.h +1 -1
@@ -50,7 +50,7 @@#define CONFIG_SYS_FSL_ESDHC_NUM 1#define IMX_FEC_BASE ENET1_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_IPADDR 192.168.10.2
include/configs/dh_imx6.h +1 -1
@@ -43,7 +43,7 @@/* FEC ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL
include/configs/display5.h +1 -1
@@ -83,7 +83,7 @@/* Ethernet */ #ifdef CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0#endif
include/configs/embestmx6boards.h +1 -1
@@ -42,7 +42,7 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 4
include/configs/ge_bx50v3.h +1 -1
@@ -65,7 +65,7 @@/* Networking Configs */ #ifdef CONFIG_NET #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS
include/configs/gw_ventana.h +1 -1
@@ -124,7 +124,7 @@/* Ethernet support */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL
include/configs/imx6-engicam.h +0 -2
@@ -161,10 +161,8 @@#ifdef CONFIG_FEC_MXC # ifdef CONFIG_TARGET_MX6Q_ICORE_RQS # define CONFIG_FEC_MXC_PHYADDR 3 -# define CONFIG_FEC_XCV_TYPE RGMII# else # define CONFIG_FEC_MXC_PHYADDR 0 -# define CONFIG_FEC_XCV_TYPE RMII# endif #endif
include/configs/imx6_logic.h +0 -1
@@ -22,7 +22,6 @@#define CONFIG_MMCROOT "/dev/mmcblk1p2"/* Dev kit SD card */ /* Ethernet Configs */ -#define CONFIG_FEC_XCV_TYPE RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/kp_imx6q_tpc.h +1 -1
@@ -26,7 +26,7 @@/* FEC ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL
include/configs/liteboard.h +1 -1
@@ -144,7 +144,7 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_PHY_SMSC
include/configs/mccmon6.h +1 -1
@@ -87,7 +87,7 @@/* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 1
include/configs/mx6cuboxi.h +1 -1
@@ -29,7 +29,7 @@/* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_PHY_ATHEROS
include/configs/mx6qarm2.h +1 -1
@@ -21,7 +21,7 @@#define CONFIG_SYS_FSL_USDHC_NUM 2#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/mx6sabre_common.h +1 -1
@@ -21,7 +21,7 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 1
include/configs/mx6slevk.h +1 -1
@@ -33,7 +33,7 @@#define CONFIG_SYS_I2C_SPEED 100000#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_PHY_SMSC
include/configs/mx6sxsabreauto.h +1 -1
@@ -129,7 +129,7 @@#define IMX_FEC_BASE ENET2_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_PHY_ATHEROS
include/configs/mx6sxsabresd.h +1 -1
@@ -153,7 +153,7 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_PHY_ATHEROS
include/configs/mx6ul_14x14_evk.h +2 -2
@@ -189,11 +189,11 @@#if (CONFIG_FEC_ENET_DEV ==0 )#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x2 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#elif (CONFIG_FEC_ENET_DEV ==1 )#define IMX_FEC_BASE ENET2_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#endif #define CONFIG_ETHPRIME "FEC"#endif
include/configs/mx7dsabresd.h +1 -1
@@ -19,7 +19,7 @@#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)/* Network */ -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0
include/configs/mxs.h +1 -1
@@ -115,7 +115,7 @@#define CONFIG_ETHPRIME "FEC0"#endif #ifndef CONFIG_FEC_XCV_TYPE -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#endif #endif
include/configs/nitrogen6x.h +1 -1
@@ -54,7 +54,7 @@#endif #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 6
include/configs/novena.h +1 -1
@@ -62,7 +62,7 @@/* Ethernet Configuration */ #ifdef CONFIG_CMD_NET #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0x7#define CONFIG_ARP_TIMEOUT 200UL
include/configs/opos6uldev.h +1 -1
@@ -49,7 +49,7 @@#ifdef CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#endif
include/configs/ot1200.h +1 -1
@@ -69,7 +69,7 @@#endif #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE MII100 +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0x5#define CONFIG_PHY_SMSC
include/configs/pcm052.h +1 -1
@@ -42,7 +42,7 @@/*#define CONFIG_ESDHC_DETECT_USE_EXTERN_IRQ1*/ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_FEC_MXC_PHYADDR 0/* QSPI Configs*/
include/configs/pcm058.h +1 -1
@@ -32,7 +32,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 3
include/configs/pfla02.h +1 -1
@@ -30,7 +30,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 3
include/configs/pico-imx6ul.h +1 -1
@@ -17,7 +17,7 @@#define IMX_FEC_BASE ENET2_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M)/* Increase due to DFU */
include/configs/pico-imx7d.h +1 -1
@@ -18,7 +18,7 @@#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR/* Network */ -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 1
include/configs/platinum_picon.h +1 -1
@@ -12,7 +12,7 @@#include <configs/platinum.h> -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_HOSTNAME "picon"
include/configs/platinum_titanium.h +1 -1
@@ -15,7 +15,7 @@#include <configs/platinum.h> -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_RESET_DELAY 1000
include/configs/secomx6quq7.h +1 -1
@@ -27,7 +27,7 @@/* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 6
include/configs/sksimx6.h +1 -1
@@ -22,7 +22,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0x01
include/configs/tbs2910.h +1 -1
@@ -50,7 +50,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS
include/configs/titanium.h +1 -1
@@ -40,7 +40,7 @@#define CONFIG_SYS_FSL_USDHC_NUM 1#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_FEC_MXC_PHYADDR 4/* USB Configs */
include/configs/tqma6_mba6.h +1 -1
@@ -9,7 +9,7 @@#ifndef __CONFIG_TQMA6_MBA6_H#define __CONFIG_TQMA6_MBA6_H -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0x03
include/configs/tqma6_wru4.h +1 -1
@@ -7,7 +7,7 @@#define __CONFIG_TQMA6_WRU4_H/* Ethernet */ -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0x01#define CONFIG_PHY_SMSC
include/configs/udoo.h +1 -1
@@ -33,7 +33,7 @@/* Network support */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 6
include/configs/udoo_neo.h +1 -1
@@ -99,7 +99,7 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC0"#endif /* __CONFIG_H */
include/configs/vf610twr.h +1 -1
@@ -45,7 +45,7 @@#define CONFIG_SYS_FSL_ESDHC_NUM 1#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_FEC_MXC_PHYADDR 0/* QSPI Configs*/
include/configs/vining_2000.h +1 -1
@@ -65,7 +65,7 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_PHY_ATHEROS
include/configs/wandboard.h +1 -1
@@ -57,7 +57,7 @@/* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_PHY_ATHEROS
include/configs/xpress.h +1 -1
@@ -68,7 +68,7 @@#define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_PHY_SMSC
include/configs/zc5202.h +1 -1
@@ -18,7 +18,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE MII100 +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_MV88E6352_SWITCH
include/configs/zc5601.h +1 -1
@@ -19,7 +19,7 @@/* Ethernet */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_FEC_MXC_PHYADDR 0x10#define CONFIG_FEC_FIXED_SPEED 1000/* No autoneg, fix Gb */
include/phy.h +4 -0
@@ -50,6 +50,7 @@ typedef enum { PHY_INTERFACE_MODE_MII, + PHY_INTERFACE_MODE_MII100, PHY_INTERFACE_MODE_GMII, PHY_INTERFACE_MODE_SGMII, PHY_INTERFACE_MODE_SGMII_2500,
@@ -65,6 +66,7 @@ typedef enum {PHY_INTERFACE_MODE_XAUI ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_SFI , +PHY_INTERFACE_MODE_SEVENWIRE ,PHY_INTERFACE_MODE_INTERNAL , PHY_INTERFACE_MODE_NONE, /* Must be last */
@@ -73,6 +75,7 @@ typedef enum {static const char *phy_interface_strings[] = { [PHY_INTERFACE_MODE_MII ] ="mii" , + [PHY_INTERFACE_MODE_MII100 ] ="mii100" , [PHY_INTERFACE_MODE_GMII ] ="gmii" , [PHY_INTERFACE_MODE_SGMII ] ="sgmii" , [PHY_INTERFACE_MODE_SGMII_2500 ] ="sgmii-2500" ,
@@ -88,6 +91,7 @@ static const char *phy_interface_strings[] = { [PHY_INTERFACE_MODE_XAUI] = "xaui", [PHY_INTERFACE_MODE_RXAUI] = "rxaui", [PHY_INTERFACE_MODE_SFI] = "sfi", + [PHY_INTERFACE_MODE_SEVENWIRE] = "sevenwire", [PHY_INTERFACE_MODE_INTERNAL] = "internal", [PHY_INTERFACE_MODE_NONE] = "", };
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 3/10 net: fec: Use PHY_INTERFACE_MODE_ for xcv_type
Hi Jagan,
Quoted 68 lines · Jagan Teki
Use existing
PHY_INTERFACE_MODE_forxcv_type, this eventually
- removeCONFIG_FEC_XCV_TYPEinDM_ETHboards since the phy interface is grabbing from DT phy-mode.
- prefixPHY_INTERFACE_MODE_forCONFIG_FEC_XCV_TYPEin nonDM_ETHboards
- added MII100, SEVENWIRE PHY modeSigned-off-by Jagan Teki <[email protected]>--- drivers/net/fec_mxc.c | 18 +++++++++--------- drivers/net/fec_mxc.h | 15 +-------------- include/configs/advantech_dms-ba16.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/aristainetos.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/aristainetos2b.h | 2 +- include/configs/cgtqmx6eval.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/imx6-engicam.h | 2 -- include/configs/imx6_logic.h | 1 - include/configs/kp_imx6q_tpc.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6qarm2.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/mx7dsabresd.h | 2 +- include/configs/mxs.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/ot1200.h | 2 +- include/configs/pcm052.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pfla02.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/platinum_picon.h | 2 +- include/configs/platinum_titanium.h | 2 +- include/configs/secomx6quq7.h | 2 +- include/configs/sksimx6.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/titanium.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/xpress.h | 2 +- include/configs/zc5202.h | 2 +- include/configs/zc5601.h | 2 +- include/phy.h | 4 ++++ 58 files changed, 68 insertions(+), 80 deletions(-)
<snip>
include/phy.h
Quoted 1 line
include/phy.h +0
-0
This is no longer in phy.h. Look in include/phy_interface.h. Please rebase on master.
Thanks,
-Joe
Quoted 42 lines
index
7c3fc5ce40..d4bf21d02d100644include/phy.h +4
-1@@ -50,6 +50,7 @@ typedef enum { PHY_INTERFACE_MODE_MII, + PHY_INTERFACE_MODE_MII100, PHY_INTERFACE_MODE_GMII, PHY_INTERFACE_MODE_SGMII, PHY_INTERFACE_MODE_SGMII_2500,@@ -65,6 +66,7 @@ typedef enum {PHY_INTERFACE_MODE_XAUI ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_SFI , +PHY_INTERFACE_MODE_SEVENWIRE ,PHY_INTERFACE_MODE_INTERNAL , PHY_INTERFACE_MODE_NONE, /* Must be last */@@ -73,6 +75,7 @@ typedef enum {static const char *phy_interface_strings[] = { [PHY_INTERFACE_MODE_MII ] ="mii" , + [PHY_INTERFACE_MODE_MII100 ] ="mii100" , [PHY_INTERFACE_MODE_GMII ] ="gmii" , [PHY_INTERFACE_MODE_SGMII ] ="sgmii" , [PHY_INTERFACE_MODE_SGMII_2500 ] ="sgmii-2500" ,@@ -88,6 +91,7 @@ static const char *phy_interface_strings[] = { [PHY_INTERFACE_MODE_XAUI] = "xaui", [PHY_INTERFACE_MODE_RXAUI] = "rxaui", [PHY_INTERFACE_MODE_SFI] = "sfi", + [PHY_INTERFACE_MODE_SEVENWIRE] = "sevenwire", [PHY_INTERFACE_MODE_INTERNAL] = "internal", [PHY_INTERFACE_MODE_NONE] = "", }; --2.18.0.321.gffc6fa0e3
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 4/10 net: fec: Add default CONFIG_FEC_MXC_PHYADDR for few boards
In reply to Jagan TekiUsually PHYADDR is used while PHYLIB is defined, but boards like apx4devkit, mx6qarm2 are not using PHYLIB but they are using CONFIG_FEC_MXC_PHYADDR.
So, future patches will convert CONFIG_FEC_MXC_PHYADDR to generic CONFIG_PHY_ADDR and that will depends on PHYLIB. Handle this special case for this boards by adding default CONFIG_FEC_MXC_PHYADDR to 0 if not defined so-that it can't depends on PHYLIB local to fec_mxc. Boards which are using PHY_ADDR in future will anyway use PHYLIB.
--- drivers/net/fec_mxc.c | 4 ++++ include/configs/apx4devkit.h | 1 - include/configs/mx6qarm2.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/fec_mxc.c +4 -0
@@ -50,6 +50,10 @@ DECLARE_GLOBAL_DATA_PTR;#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100#endif +#if defined(CONFIG_TARGET_APX4DEVKIT ) || defined(CONFIG_TARGET_MX6QARM2 ) +# define CONFIG_FEC_MXC_PHY_ADDR 0 +#endif +/* * The i.MX28 operates with packets in big endian. We need to swap them before * sending and after receiving.
include/configs/apx4devkit.h +0 -1
@@ -52,7 +52,6 @@/* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET #define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define IMX_FEC_BASE MXS_ENET0_BASE#endif
include/configs/mx6qarm2.h +0 -1
@@ -22,7 +22,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 4/10 net: fec: Add default CONFIG_FEC_MXC_PHYADDR for few boards
Quoted 11 lines · Jagan Teki
Usually PHYADDR is used while PHYLIB is defined, but boards like apx4devkit, mx6qarm2 are not using PHYLIB but they are using
CONFIG_FEC_MXC_PHYADDR.So, future patches will convert
CONFIG_FEC_MXC_PHYADDRto genericCONFIG_PHY_ADDRand that will depends on PHYLIB. Handle this special case for this boards by adding defaultCONFIG_FEC_MXC_PHYADDRto 0 if not defined so-that it can't depends on PHYLIB local tofec_mxc. Boards which are usingPHY_ADDRin future will anyway use PHYLIB.
Quoted 4 lines
Cc Ye Li <[email protected]>Cc Jason Liu <[email protected]>Cc Lauri Hintsala <[email protected]>Signed-off-by Jagan Teki <[email protected]>
PATCH 5/10 net: fec: Use PHY_ADDR instead of FEC_MXC_PHYADDR
In reply to Jagan Teki- use PHY_ADDR_ENABLE and PHY_ADDR
- few boards are using FEC_MXC_PHYADDR without PHYLIB enable the same.
--- board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 3 +-- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 3 +-- board/samtec/vining_2000/vining_2000.c | 3 +-- board/sks-kinkel/sksimx6/sksimx6.c | 2 +- board/technexion/pico-imx7d/pico-imx7d.c | 3 +-- board/toradex/colibri_imx7/colibri_imx7.c | 3 +-- board/tqc/tqma6/tqma6_mba6.c | 2 +- board/udoo/neo/neo.c | 2 +- configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 2 ++ configs/apf27_defconfig | 2 ++ configs/cgtqmx6eval_defconfig | 1 + configs/cl-som-imx7_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx6_nospl_defconfig | 1 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/flea3_defconfig | 1 + configs/ge_bx50v3_defconfig | 2 ++ configs/imx6dl_mamoj_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mccmon6_nor_defconfig | 1 + configs/mccmon6_sd_defconfig | 1 + configs/mx25pdk_defconfig | 2 ++ configs/mx35pdk_defconfig | 2 ++ configs/mx51evk_defconfig | 2 ++ configs/mx53cx9020_defconfig | 2 ++ configs/mx53evk_defconfig | 2 ++ configs/mx53loco_defconfig | 2 ++ configs/mx53ppd_defconfig | 2 ++ configs/mx53smd_defconfig | 2 ++ configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/mx6sxsabresd_spl_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/opos6uldev_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/pfla02_defconfig | 1 + configs/pico-imx6ul_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/secomx6quq7_defconfig | 1 + configs/sksimx6_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/titanium_defconfig | 1 + configs/tqma6dl_mba6_mmc_defconfig | 1 + configs/tqma6dl_mba6_spi_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/udoo_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/woodburn_defconfig | 1 + configs/woodburn_sd_defconfig | 1 + configs/zc5202_defconfig | 1 + configs/zc5601_defconfig | 1 + configs/zmx25_defconfig | 1 + doc/README.fec_mxc | 2 +- drivers/net/fec_mxc.c | 15 +++++++++------ drivers/net/phy/Kconfig | 1 + include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/apf27.h | 5 ----- include/configs/aristainetos-common.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cl-som-imx7.h | 2 -- include/configs/cm_fx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/display5.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/flea3.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx6-engicam.h | 9 --------- include/configs/imx6_logic.h | 1 - include/configs/imx6dl-mamoj.h | 3 --- include/configs/kp_imx6q_tpc.h | 1 - include/configs/liteboard.h | 1 - include/configs/mccmon6.h | 1 - include/configs/mx25pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53cx9020.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 2 -- include/configs/mx7dsabresd.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/ot1200.h | 1 - include/configs/pcm052.h | 1 - include/configs/pcm058.h | 1 - include/configs/pfla02.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 1 - include/configs/platinum_picon.h | 1 - include/configs/platinum_titanium.h | 1 - include/configs/secomx6quq7.h | 1 - include/configs/sksimx6.h | 1 - include/configs/tbs2910.h | 1 - include/configs/titanium.h | 1 - include/configs/tqma6_mba6.h | 2 -- include/configs/tqma6_wru4.h | 1 - include/configs/ts4800.h | 1 - include/configs/udoo.h | 1 - include/configs/udoo_neo.h | 1 - include/configs/vf610twr.h | 1 - include/configs/vining_2000.h | 2 -- include/configs/wandboard.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/xpress.h | 1 - include/configs/zc5202.h | 1 - include/configs/zc5601.h | 1 - include/configs/zmx25.h | 5 ----- scripts/config_whitelist.txt | 1 - 144 files changed, 97 insertions(+), 110 deletions(-)
board/compulab/cl-som-imx7/cl-som-imx7.c +1 -1
@@ -210,7 +210,7 @@ int board_eth_init(bd_t *bis)gpio_set_value (CL_SOM_IMX7_ETH1_PHY_NRST ,1 );/* MAC initialization */ return fecmxc_initialize_multi (bis,CL_SOM_IMX7_FEC_DEV_ID_PRI , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); +CONFIG_PHY_ADDR ,IMX_FEC_BASE ); }/*
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +1 -2
@@ -99,8 +99,7 @@ int board_eth_init(bd_t *bis)imx_iomux_v3_setup_multiple_pads (fec2_pads,ARRAY_SIZE (fec2_pads));setup_fec (); - ret =fecmxc_initialize_multi (bis,1 , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); + ret =fecmxc_initialize_multi (bis,1 ,CONFIG_PHY_ADDR ,IMX_FEC_BASE );if (ret)printf ("FEC%d MXC: %s:failed\n" ,1 , __func__);
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +1 -1
@@ -517,7 +517,7 @@ int board_eth_init(bd_t *bis)setup_iomux_fec (CONFIG_FEC_ENET_DEV );return fecmxc_initialize_multi (bis,CONFIG_FEC_ENET_DEV , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); +CONFIG_PHY_ADDR ,IMX_FEC_BASE ); }static int setup_fec (int fec_id)
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -2
@@ -241,8 +241,7 @@ int board_eth_init(bd_t *bis)setup_iomux_fec (); - ret =fecmxc_initialize_multi (bis,0 , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); + ret =fecmxc_initialize_multi (bis,0 ,CONFIG_PHY_ADDR ,IMX_FEC_BASE );if (ret)printf ("FEC1 MXC: %s:failed\n" , __func__);
board/samtec/vining_2000/vining_2000.c +1 -2
@@ -157,8 +157,7 @@ int board_eth_init(bd_t *bis)gpio_set_value (PHY_RESET ,1 );mdelay (1 ); - ret =fecmxc_initialize_multi (bis,0 ,CONFIG_FEC_MXC_PHYADDR , -IMX_FEC_BASE ); + ret =fecmxc_initialize_multi (bis,0 ,CONFIG_PHY_ADDR ,IMX_FEC_BASE );if (ret) goto eth_fail;
board/sks-kinkel/sksimx6/sksimx6.c +1 -1
@@ -147,7 +147,7 @@ int board_eth_init(bd_t *bis)if (!bus)return -EINVAL ;/* scan phy */ - phydev =phy_find_by_mask (bus, (0xf <<CONFIG_FEC_MXC_PHYADDR ), + phydev =phy_find_by_mask (bus, (0xf <<CONFIG_PHY_ADDR ),PHY_INTERFACE_MODE_RGMII );if (!phydev) {
board/technexion/pico-imx7d/pico-imx7d.c +1 -2
@@ -167,8 +167,7 @@ int board_eth_init(bd_t *bis) {setup_iomux_fec (); -return fecmxc_initialize_multi (bis,0 , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); +return fecmxc_initialize_multi (bis,0 ,CONFIG_PHY_ADDR ,IMX_FEC_BASE ); }static int setup_fec (void )
board/toradex/colibri_imx7/colibri_imx7.c +1 -2
@@ -251,8 +251,7 @@ int board_eth_init(bd_t *bis)setup_iomux_fec (); - ret =fecmxc_initialize_multi (bis,0 , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); + ret =fecmxc_initialize_multi (bis,0 ,CONFIG_PHY_ADDR ,IMX_FEC_BASE );if (ret)printf ("FEC1 MXC: %s:failed\n" , __func__);
board/tqc/tqma6/tqma6_mba6.c +1 -1
@@ -294,7 +294,7 @@ int board_eth_init(bd_t *bis)if (!bus)return -EINVAL ;/* scan phy */ - phydev =phy_find_by_mask (bus, (0xf <<CONFIG_FEC_MXC_PHYADDR ), + phydev =phy_find_by_mask (bus, (0xf <<CONFIG_PHY_ADDR ),PHY_INTERFACE_MODE_RGMII );if (!phydev) {
board/udoo/neo/neo.c +1 -1
@@ -303,7 +303,7 @@ int board_eth_init(bd_t *bis)if (!bus)return -EINVAL ; - phydev =phy_find_by_mask (bus, (0x1 <<CONFIG_FEC_MXC_PHYADDR ), + phydev =phy_find_by_mask (bus, (0x1 <<CONFIG_PHY_ADDR ),PHY_INTERFACE_MODE_RMII );if (!phydev) {free (bus);
configs/apalis_imx6_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/apalis_imx6_nospl_com_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/apalis_imx6_nospl_it_defconfig +2 -0
@@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_PHY_ADDR=6 CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000
@@ -42,6 +43,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/apf27_defconfig +2 -0
@@ -41,6 +41,8 @@ CONFIG_MMC_MXC=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/cgtqmx6eval_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/cl-som-imx7_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHYLIB=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/colibri_imx6_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/colibri_imx6_nospl_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/dms-ba16-1g_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/dms-ba16_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/flea3_defconfig +1 -0
@@ -26,6 +26,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/ge_bx50v3_defconfig +2 -0
@@ -36,6 +36,8 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_E1000=y CONFIG_CMD_E1000=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/imx6dl_mamoj_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/imx6qdl_icore_rqs_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/marsboard_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/mccmon6_nor_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/mccmon6_sd_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/mx25pdk_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_FS_EXT4=y
configs/mx35pdk_defconfig +2 -0
@@ -29,6 +29,8 @@ CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_MXC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SMC911X=y
configs/mx51evk_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/mx53cx9020_defconfig +2 -0
@@ -24,6 +24,8 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FPGA_ALTERA=y CONFIG_FPGA_CYCLON2=y CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y
configs/mx53evk_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FSL_ESDHC=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/mx53loco_defconfig +2 -0
@@ -23,6 +23,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y
configs/mx53ppd_defconfig +2 -0
@@ -28,6 +28,8 @@ CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000 CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_RTC_S35392A=y
configs/mx53smd_defconfig +2 -0
@@ -14,6 +14,8 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_OF_LIBFDT=y
configs/mx6sabreauto_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/mx6sabresd_defconfig +1 -0
@@ -56,6 +56,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y
configs/mx6sxsabresd_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y
configs/mx6sxsabresd_spl_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y
configs/mx6ul_14x14_evk_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/mx6ul_9x9_evk_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/nitrogen6dl2g_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/nitrogen6dl_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/nitrogen6q2g_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/nitrogen6q_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/nitrogen6s1g_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/nitrogen6s_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/novena_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=7 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/opos6uldev_defconfig +1 -0
@@ -67,6 +67,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_PWRSEQ=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/ot1200_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=5 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/ot1200_spl_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/pcm058_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/pfla02_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/pico-imx6ul_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DFU_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/pico-imx7d_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y
configs/platinum_titanium_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/riotboard_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/secomx6quq7_defconfig +1 -0
@@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/sksimx6_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_PHY_MICREL_KSZ8XXX=y
configs/tbs2910_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y
configs/titanium_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=4 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6dl_mba6_mmc_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6dl_mba6_spi_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6q_mba6_mmc_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6q_mba6_spi_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6s_mba6_mmc_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6s_mba6_spi_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=3 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_PCA9551_LED=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y
configs/udoo_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=6 CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_FEC_MXC=y
configs/wandboard_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_THERMAL=y
configs/woodburn_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/woodburn_sd_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_MICREL=y CONFIG_FEC_MXC=y CONFIG_MII=y
configs/zc5202_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHYLIB=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y
configs/zc5601_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=16 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_SPI=y
configs/zmx25_defconfig +1 -0
@@ -22,6 +22,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_PHYLIB=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_USB=y
doc/README.fec_mxc +1 -1
@@ -23,7 +23,7 @@ CONFIG_PHYLIB CONFIG_FEC_MXC_NO_ANEG Relevant only if PHYLIB not used. Skips auto-negotiation restart. -CONFIG_FEC_MXC_PHYADDR +CONFIG_PHY_ADDR Optional, selects the exact phy address that should be connected and function fecmxc_initialize will try to initialize it.
drivers/net/fec_mxc.c +9 -6
@@ -51,7 +51,11 @@ DECLARE_GLOBAL_DATA_PTR;#endif #if defined(CONFIG_TARGET_APX4DEVKIT ) || defined(CONFIG_TARGET_MX6QARM2 ) -# define CONFIG_FEC_MXC_PHY_ADDR 0 +# define CONFIG_PHY_ADDR 0 +#endif + +#ifdef CONFIG_TARGET_SC_SPS_1 +# undef CONFIG_PHY_ADDR#endif /*
@@ -1184,11 +1188,10 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr)return ret; } -#ifdef CONFIG_FEC_MXC_PHYADDR +#ifdef CONFIG_PHY_ADDR int fecmxc_initialize (bd_t *bd) { -return fecmxc_initialize_multi (bd,-1 ,CONFIG_FEC_MXC_PHYADDR , -IMX_FEC_BASE ); +return fecmxc_initialize_multi (bd,-1 ,CONFIG_PHY_ADDR ,IMX_FEC_BASE ); }#endif
@@ -1234,8 +1237,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)struct phy_device *phydev;int mask =0xffffffff ; -#ifdef CONFIG_FEC_MXC_PHYADDR - mask =1 <<CONFIG_FEC_MXC_PHYADDR ; +#ifdef CONFIG_PHY_ADDR + mask =1 <<CONFIG_PHY_ADDR ;#endif phydev =phy_find_by_mask (priv->bus, mask, priv->xcv_type);
drivers/net/phy/Kconfig +1 -0
@@ -16,6 +16,7 @@ if PHYLIB config PHY_ADDR_ENABLE bool "Limit phy address" default y if ARCH_SUNXI + default y if FEC_MXC help Select this if you want to control which phy address is used
include/configs/advantech_dms-ba16.h +0 -1
@@ -58,7 +58,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS /* Serial Flash */
include/configs/apalis_imx6.h +0 -1
@@ -71,7 +71,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 6#define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 4096#define CONFIG_TFTP_TSIZE
include/configs/apf27.h +0 -5
@@ -187,11 +187,6 @@#define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -/* -* Ethernet (on SOC imx FEC) -*/ -#define CONFIG_FEC_MXC_PHYADDR 0x1f -/* * FPGA */
include/configs/aristainetos-common.h +0 -1
@@ -27,7 +27,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_SPI_FLASH_MTD #define CONFIG_SF_DEFAULT_SPEED 20000000
include/configs/cgtqmx6eval.h +0 -1
@@ -85,7 +85,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 6#define CONFIG_PHY_ATHEROS /* Command definition */
include/configs/cl-som-imx7.h +0 -2
@@ -26,9 +26,7 @@/* Network */ #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS /* ENET1 */ #define IMX_FEC_BASE ENET_IPS_BASE_ADDR
include/configs/cm_fx6.h +0 -1
@@ -177,7 +177,6 @@#endif /* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_PHY_ATHEROS
include/configs/colibri_imx6.h +0 -1
@@ -59,7 +59,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352#define CONFIG_TFTP_TSIZE
include/configs/colibri_imx7.h +0 -1
@@ -22,7 +22,6 @@/* Network */ #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352
include/configs/colibri_vf.h +0 -1
@@ -51,7 +51,6 @@#define IMX_FEC_BASE ENET1_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_IPADDR 192.168.10.2#define CONFIG_NETMASK 255.255.255.0
include/configs/dh_imx6.h +0 -1
@@ -45,7 +45,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL/* Fuses */
include/configs/display5.h +0 -1
@@ -85,7 +85,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#endif /* MMC Configs */
include/configs/embestmx6boards.h +0 -1
@@ -44,7 +44,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS
include/configs/flea3.h +0 -1
@@ -68,7 +68,6 @@* Ethernet on SOC (FEC) */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_ARP_TIMEOUT 200UL
include/configs/ge_bx50v3.h +0 -1
@@ -67,7 +67,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS #endif
include/configs/gw_ventana.h +0 -1
@@ -125,7 +125,6 @@/* Ethernet support */ #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL/* USB Configs */
include/configs/imx6-engicam.h +0 -9
@@ -157,15 +157,6 @@# define CONFIG_MTD_PARTITIONS #endif -/* Ethernet */ -#ifdef CONFIG_FEC_MXC -# ifdef CONFIG_TARGET_MX6Q_ICORE_RQS -# define CONFIG_FEC_MXC_PHYADDR 3 -# else -# define CONFIG_FEC_MXC_PHYADDR 0 -# endif -#endif -/* Falcon Mode */ #ifdef CONFIG_SPL_OS_BOOT # define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
include/configs/imx6_logic.h +0 -1
@@ -23,7 +23,6 @@/* Ethernet Configs */ #define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
include/configs/imx6dl-mamoj.h +0 -3
@@ -53,9 +53,6 @@#define CONFIG_SYS_MMC_ENV_DEV 2#define CONFIG_SUPPORT_EMMC_BOOT -/* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 1 -/* USB */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/kp_imx6q_tpc.h +0 -1
@@ -28,7 +28,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL/* Fuses */
include/configs/liteboard.h +0 -1
@@ -143,7 +143,6 @@#define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"
include/configs/mccmon6.h +0 -1
@@ -89,7 +89,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \
include/configs/mx25pdk.h +0 -1
@@ -60,7 +60,6 @@#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0x1f#define CONFIG_ENV_OVERWRITE /* ESDHC driver */
include/configs/mx35pdk.h +0 -1
@@ -84,7 +84,6 @@* Ethernet on SOC (FEC) */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1F#define CONFIG_ARP_TIMEOUT 200UL
include/configs/mx51evk.h +0 -1
@@ -56,7 +56,6 @@* Eth Configs */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* USB Configs */ #define CONFIG_USB_EHCI_MX5
include/configs/mx53cx9020.h +0 -1
@@ -38,7 +38,6 @@/* Eth Configs */ #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_ETHPRIME "FEC0" -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* USB Configs */ #define CONFIG_USB_EHCI_MX5
include/configs/mx53evk.h +0 -1
@@ -47,7 +47,6 @@/* Eth Configs */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/mx53loco.h +0 -1
@@ -34,7 +34,6 @@/* Eth Configs */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* USB Configs */ #define CONFIG_USB_EHCI_MX5
include/configs/mx53ppd.h +0 -1
@@ -40,7 +40,6 @@/* Eth Configs */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* USB Configs */ #define CONFIG_USB_EHCI_MX5
include/configs/mx53smd.h +0 -1
@@ -40,7 +40,6 @@#define CONFIG_HAS_ETH1 #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/mx6cuboxi.h +0 -1
@@ -30,7 +30,6 @@/* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_PHY_ATHEROS /* Framebuffer */
include/configs/mx6sabre_common.h +0 -1
@@ -23,7 +23,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_PHY_ATHEROS
include/configs/mx6slevk.h +0 -1
@@ -34,7 +34,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_PHY_SMSC
include/configs/mx6sxsabreauto.h +0 -1
@@ -127,7 +127,6 @@/* Network */ #define IMX_FEC_BASE ENET2_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/mx6sxsabresd.h +0 -1
@@ -151,7 +151,6 @@/* Network */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC"
include/configs/mx6ul_14x14_evk.h +0 -2
@@ -188,11 +188,9 @@#if (CONFIG_FEC_ENET_DEV ==0 )#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x2#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#elif (CONFIG_FEC_ENET_DEV ==1 )#define IMX_FEC_BASE ENET2_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#endif #define CONFIG_ETHPRIME "FEC"
include/configs/mx7dsabresd.h +0 -1
@@ -21,7 +21,6 @@/* Network */ #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_PHY_BROADCOM /* ENET1 */
include/configs/nitrogen6x.h +0 -1
@@ -56,7 +56,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 6/* USB Configs */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
include/configs/novena.h +0 -1
@@ -64,7 +64,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x7#define CONFIG_ARP_TIMEOUT 200UL#endif
include/configs/opos6uldev.h +0 -1
@@ -48,7 +48,6 @@/* Ethernet */ #ifdef CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#endif
include/configs/ot1200.h +0 -1
@@ -71,7 +71,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x5#define CONFIG_PHY_SMSC #ifndef CONFIG_SPL
include/configs/pcm052.h +0 -1
@@ -43,7 +43,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII -#define CONFIG_FEC_MXC_PHYADDR 0/* QSPI Configs*/
include/configs/pcm058.h +0 -1
@@ -34,7 +34,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 3/* SPI Flash */ #define CONFIG_SF_DEFAULT_BUS 0
include/configs/pfla02.h +0 -1
@@ -32,7 +32,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 3/* SPI Flash */ #define CONFIG_SF_DEFAULT_BUS 2
include/configs/pico-imx6ul.h +0 -1
@@ -16,7 +16,6 @@/* Network support */ #define IMX_FEC_BASE ENET2_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII/* Size of malloc() pool */
include/configs/pico-imx7d.h +0 -1
@@ -20,7 +20,6 @@/* Network */ #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_PHY_ATHEROS
include/configs/platinum_picon.h +0 -1
@@ -13,7 +13,6 @@#include <configs/platinum.h> #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_HOSTNAME "picon"
include/configs/platinum_titanium.h +0 -1
@@ -16,7 +16,6 @@#include <configs/platinum.h> #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII -#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_RESET_DELAY 1000
include/configs/secomx6quq7.h +0 -1
@@ -29,7 +29,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 6#define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \
include/configs/sksimx6.h +0 -1
@@ -24,7 +24,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x01#define CONFIG_PHY_MICREL_KSZ9021
include/configs/tbs2910.h +0 -1
@@ -52,7 +52,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 4#define CONFIG_PHY_ATHEROS /* Framebuffer */
include/configs/titanium.h +0 -1
@@ -41,7 +41,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII -#define CONFIG_FEC_MXC_PHYADDR 4/* USB Configs */ #define CONFIG_MXC_USB_PORT 1
include/configs/tqma6_mba6.h +0 -2
@@ -12,8 +12,6 @@#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x03 -#define CONFIG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1"
include/configs/tqma6_wru4.h +0 -1
@@ -9,7 +9,6 @@/* Ethernet */ #define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x01#define CONFIG_PHY_SMSC /* UART */
include/configs/ts4800.h +0 -1
@@ -59,7 +59,6 @@#define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE /* disable vendor parameters protection (serial#, ethaddr) */
include/configs/udoo.h +0 -1
@@ -35,7 +35,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 6#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
include/configs/udoo_neo.h +0 -1
@@ -97,7 +97,6 @@/* Network */ #define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC0"
include/configs/vf610twr.h +0 -1
@@ -46,7 +46,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII -#define CONFIG_FEC_MXC_PHYADDR 0/* QSPI Configs*/
include/configs/vining_2000.h +0 -2
@@ -63,8 +63,6 @@/* Network */ #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"
include/configs/wandboard.h +0 -1
@@ -59,7 +59,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1#define CONFIG_PHY_ATHEROS /* Framebuffer */
include/configs/woodburn_common.h +0 -1
@@ -77,7 +77,6 @@* Ethernet on SOC (FEC) */ #define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1#define CONFIG_DISCOVER_PHY
include/configs/xpress.h +0 -1
@@ -67,7 +67,6 @@#define CONFIG_FEC_ENET_DEV 0#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII#define CONFIG_ETHPRIME "FEC"#define CONFIG_PHY_SMSC
include/configs/zc5202.h +0 -1
@@ -20,7 +20,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_MV88E6352_SWITCH #define CONFIG_PCI_SCAN_SHOW
include/configs/zc5601.h +0 -1
@@ -21,7 +21,6 @@#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x10#define CONFIG_FEC_FIXED_SPEED 1000/* No autoneg, fix Gb */ #endif /*__EL6Q_CONFIG_H */
include/configs/zmx25.h +0 -5
@@ -40,11 +40,6 @@#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -/* -* Ethernet -*/ -#define CONFIG_FEC_MXC_PHYADDR 0x00 -/* * BOOTP options */
scripts/config_whitelist.txt +0 -1
@@ -603,7 +603,6 @@ CONFIG_FEATURE_SH_STANDALONE_SHELL CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_25M_REF_CLK -CONFIG_FEC_MXC_PHYADDR CONFIG_FEC_MXC_SWAP_PACKET CONFIG_FEC_XCV_TYPE CONFIG_FEROCEON
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 5/10 net: fec: Use PHY_ADDR instead of FEC_MXC_PHYADDR
Quoted 5 lines · Jagan Teki
- use
PHY_ADDR_ENABLEandPHY_ADDR
- few boards are usingFEC_MXC_PHYADDRwithout PHYLIB enable the same.Signed-off-by Jagan Teki <[email protected]>
PATCH 6/10 net: fec_mxc: Use udevice to retrive priv, in fec_phy_init
In reply to Jagan TekiRetrive priv via udevice using dev_get_priv, so just pass udevice pointer.
--- drivers/net/fec_mxc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/fec_mxc.c +3 -2
@@ -1232,8 +1232,9 @@ static const struct eth_ops fecmxc_ops = { .read_rom_hwaddr = fecmxc_read_rom_hwaddr, }; -static int fec_phy_init (struct fec_priv *priv,struct udevice *dev) +static int fec_phy_init (struct udevice *dev) { +struct fec_priv *priv =dev_get_priv (dev);struct phy_device *phydev;int mask =0xffffffff ;
@@ -1292,7 +1293,7 @@ static int fecmxc_probe(struct udevice *dev) priv->bus = bus; priv->xcv_type = pdata->phy_interface; - ret =fec_phy_init (priv, dev); + ret =fec_phy_init (dev);if (ret) goto err_phy;
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 6/10 net: fec_mxc: Use udevice to retrive priv, in fec_phy_init
Quoted 4 lines · Jagan Teki
Retrive priv via udevice using
dev_get_priv, so just pass udevice pointer.Signed-off-by Jagan Teki <[email protected]>
PATCH 7/10 dm: net: fec: Move enet init in fec_enet
In reply to Jagan TekiMove enet initialization code in fec_enet function, no functional changes.
--- drivers/net/fec_mxc.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/net/fec_mxc.c +19 -5
@@ -1254,11 +1254,8 @@ static int fec_phy_init(struct udevice *dev)return 0 ; } -static int fecmxc_probe (struct udevice *dev) +static int fec_enet_init (struct fec_priv *priv) { -struct eth_pdata *pdata =dev_get_platdata (dev); -struct fec_priv *priv =dev_get_priv (dev); -struct mii_dev *bus =NULL ;uint32_t start;int ret;
@@ -1280,6 +1277,24 @@ static int fecmxc_probe(struct udevice *dev)fec_reg_setup (priv); +return 0 ; + +err_timeout: +fec_free_descs (priv); +return ret; +} + +static int fecmxc_probe (struct udevice *dev) +{ +struct eth_pdata *pdata =dev_get_platdata (dev); +struct fec_priv *priv =dev_get_priv (dev); +struct mii_dev *bus =NULL ; +int ret; + + ret =fec_enet_init (priv); +if (ret) +return ret; + priv->dev_id = dev->seq;#ifdef CONFIG_FEC_MXC_MDIO_BASE bus =fec_get_miibus ((ulong )CONFIG_FEC_MXC_MDIO_BASE , dev->seq);
@@ -1303,7 +1318,6 @@ err_phy:mdio_unregister (bus);free (bus); err_mii: -err_timeout:fec_free_descs (priv);return ret; }
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 7/10 dm: net: fec: Move enet init in fec_enet
Quoted 4 lines · Jagan Teki
Move enet initialization code in
fec_enetfunction, no functional changes.Signed-off-by Jagan Teki <[email protected]>
PATCH 8/10 dm: net: fec: Refactor mdio_init code
In reply to Jagan Tekimdio initialization in dm code is assigning bus->priv with pointer to struct ethernet_regs which leads to improper mii. Add proper udevice to store mii_bus priv and reuse the same in mdio ops.
Also refactor mdio code, to make common ops for dm and non-dm.
--- drivers/net/fec_mxc.c | 148 +++++++++++++++++++++++++----------------- 1 file changed, 87 insertions(+), 61 deletions(-)
drivers/net/fec_mxc.c +87 -61
@@ -91,11 +91,8 @@ static void swap_packet(uint32_t *packet, int length)#endif /* MII-interface related functions */ -static int fec_mdio_read (struct ethernet_regs *eth,uint8_t phyaddr, -uint8_t regaddr) +static int _fec_mdio_read (struct ethernet_regs *eth,int addr,int reg) { -uint32_t reg;/* convenient holder for the PHY register */ -uint32_t phy;/* convenient holder for the PHY */ uint32_t start;int val;
@@ -104,11 +101,10 @@ static int fec_mdio_read(struct ethernet_regs *eth, uint8_t phyaddr,* programming the FEC's MII data register. */ writel (FEC_IEVENT_MII , ð->ievent); - reg = regaddr <<FEC_MII_DATA_RA_SHIFT ; - phy = phyaddr <<FEC_MII_DATA_PA_SHIFT ;writel (FEC_MII_DATA_ST |FEC_MII_DATA_OP_RD |FEC_MII_DATA_TA | - phy | reg, ð->mii_data); + (addr <<FEC_MII_DATA_PA_SHIFT ) | (reg <<FEC_MII_DATA_RA_SHIFT ), + ð->mii_data);/* wait for the related interrupt */ start =get_timer (0 );
@@ -124,8 +120,8 @@ static int fec_mdio_read(struct ethernet_regs *eth, uint8_t phyaddr,/* it's now safe to read the PHY's register */ val = (unsigned short )readl (ð->mii_data); -debug ("%s: phy: %02x reg:%02x val:%#x\n" , __func__, phyaddr, - regaddr, val); +debug ("%s: phy: %02x reg:%02x val:%#x\n" , __func__, addr, + reg, val);return val; }
@@ -156,18 +152,14 @@ static void fec_mii_setspeed(struct ethernet_regs *eth)debug ("%s: mii_speed %08x\n" , __func__,readl (ð->mii_speed)); } -static int fec_mdio_write (struct ethernet_regs *eth,uint8_t phyaddr, -uint8_t regaddr,uint16_t data) +static int _fec_mdio_write (struct ethernet_regs *eth,int addr,int reg, +u16 val) { -uint32_t reg;/* convenient holder for the PHY register */ -uint32_t phy;/* convenient holder for the PHY */ uint32_t start; - reg = regaddr <<FEC_MII_DATA_RA_SHIFT ; - phy = phyaddr <<FEC_MII_DATA_PA_SHIFT ; - -writel (FEC_MII_DATA_ST |FEC_MII_DATA_OP_WR | -FEC_MII_DATA_TA | phy | reg | data, ð->mii_data); +writel (FEC_MII_DATA_ST |FEC_MII_DATA_OP_WR |FEC_MII_DATA_TA | + (addr <<FEC_MII_DATA_PA_SHIFT ) | (reg <<FEC_MII_DATA_RA_SHIFT ) | + val, ð->mii_data);/* wait for the MII interrupt */ start =get_timer (0 );
@@ -180,24 +172,12 @@ static int fec_mdio_write(struct ethernet_regs *eth, uint8_t phyaddr,/* clear MII interrupt bit */ writel (FEC_IEVENT_MII , ð->ievent); -debug ("%s: phy: %02x reg:%02x val:%#x\n" , __func__, phyaddr, - regaddr, data); +debug ("%s: phy: %02x reg:%02x val:%#x\n" , __func__, addr, + reg, val);return 0 ; } -static int fec_phy_read (struct mii_dev *bus,int phyaddr,int dev_addr, -int regaddr) -{ -return fec_mdio_read (bus->priv, phyaddr, regaddr); -} - -static int fec_phy_write (struct mii_dev *bus,int phyaddr,int dev_addr, -int regaddr,u16 data) -{ -return fec_mdio_write (bus->priv, phyaddr, regaddr, data); -} -#ifndef CONFIG_PHYLIB static int miiphy_restart_aneg (struct eth_device *dev) {
@@ -211,17 +191,17 @@ static int miiphy_restart_aneg(struct eth_device *dev)* Reset PHY, then delay 300ns */ #ifdef CONFIG_MX27 -fec_mdio_write (eth, fec->phy_id,MII_DCOUNTER ,0x00FF ); +_fec_mdio_write (eth, fec->phy_id,MII_DCOUNTER ,0x00FF );#endif -fec_mdio_write (eth, fec->phy_id,MII_BMCR ,BMCR_RESET ); +_fec_mdio_write (eth, fec->phy_id,MII_BMCR ,BMCR_RESET );udelay (1000 );/* Set the auto-negotiation advertisement register bits */ -fec_mdio_write (eth, fec->phy_id,MII_ADVERTISE , -LPA_100FULL |LPA_100HALF |LPA_10FULL | -LPA_10HALF |PHY_ANLPAR_PSB_802_3 ); -fec_mdio_write (eth, fec->phy_id,MII_BMCR , -BMCR_ANENABLE |BMCR_ANRESTART ); +_fec_mdio_write (eth, fec->phy_id,MII_ADVERTISE , +LPA_100FULL |LPA_100HALF |LPA_10FULL | +LPA_10HALF |PHY_ANLPAR_PSB_802_3 ); +_fec_mdio_write (eth, fec->phy_id,MII_BMCR , +BMCR_ANENABLE |BMCR_ANRESTART );if (fec->mii_postcall) ret = fec->mii_postcall (fec->phy_id);
@@ -246,7 +226,7 @@ static int miiphy_wait_aneg(struct eth_device *dev)return -1 ; } - status =fec_mdio_read (eth, fec->phy_id,MII_BMSR ); + status =_fec_mdio_read (eth, fec->phy_id,MII_BMSR );if (status <0 ) {printf ("%s: Autonegotiation failed. status: %d\n" , dev->name, status);
@@ -562,7 +542,7 @@ static int fec_init(struct eth_device *dev, bd_t *bd)fec_reg_setup (fec);if (fec->xcv_type !=PHY_INTERFACE_MODE_SEVENWIRE ) -fec_mii_setspeed (fec->bus->priv); +fec_mii_setspeed (fec->eth);/* Set Opcode/Pause Duration Register */ writel (0x00010020 , &fec->eth->op_pause);/* FIXME 0xffff0020; */
@@ -940,11 +920,6 @@ static int fec_recv(struct eth_device *dev)return len; } -static void fec_set_dev_name (char *dest,int dev_id) -{ -sprintf (dest, (dev_id ==-1 ) ?"FEC" :"FEC%i" , dev_id); -} -static int fec_alloc_descs (struct fec_priv *fec) {unsigned int size;
@@ -1020,6 +995,23 @@ static void fec_free_descs(struct fec_priv *fec)free (fec->tbd_base); } +#ifndef CONFIG_DM_ETH +static int fec_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) +{ +return _fec_mdio_read (bus->priv, addr, reg); +} + +static int fec_mdio_write (struct mii_dev *bus,int addr,int devad,int reg, +u16 val) +{ +return _fec_mdio_write (bus->priv, addr, reg, val); +} + +static void fec_set_dev_name (char *dest,int dev_id) +{ +sprintf (dest, (dev_id ==-1 ) ?"FEC" :"FEC%i" , dev_id); +} +struct mii_dev *fec_get_miibus (ulong base_addr,int dev_id) {struct ethernet_regs *eth = (struct ethernet_regs *)base_addr;
@@ -1031,8 +1023,8 @@ struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)printf ("mdio_alloc failed\n" );return NULL ; } - bus->read = fec_phy_read; - bus->write = fec_phy_write; + bus->read = fec_mdio_read; + bus->write = fec_mdio_write; bus->priv = eth;fec_set_dev_name (bus->name, dev_id);
@@ -1046,7 +1038,6 @@ struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)return bus; } -#ifndef CONFIG_DM_ETH #ifdef CONFIG_PHYLIB int fec_probe (bd_t *bd,int dev_id,uint32_t base_addr,struct mii_dev *bus,struct phy_device *phydev)
@@ -1254,6 +1245,41 @@ static int fec_phy_init(struct udevice *dev)return 0 ; } +static int fec_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) +{ +struct udevice *dev = bus->priv; +struct fec_priv *priv =dev_get_priv (dev); + +return _fec_mdio_read (priv->eth, addr, reg); +} + +static int fec_mdio_write (struct mii_dev *bus,int addr,int devad,int reg, +u16 val) +{ +struct udevice *dev = bus->priv; +struct fec_priv *priv =dev_get_priv (dev); + +return _fec_mdio_write (priv->eth, addr, reg, val); +} + +static int fec_mdio_init (struct udevice *dev) +{ +struct mii_dev *bus; + + bus =mdio_alloc (); +if (!bus) { +printf ("failed to allocate mdio\n" ); +return -ENOMEM ; + } + + bus->read = fec_mdio_read; + bus->write = fec_mdio_write; +snprintf (bus->name,sizeof (bus->name),"%s" , dev->name); + bus->priv = dev; + +return mdio_register (bus); +} +static int fec_enet_init (struct fec_priv *priv) {uint32_t start;
@@ -1288,26 +1314,26 @@ static int fecmxc_probe(struct udevice *dev) {struct eth_pdata *pdata =dev_get_platdata (dev);struct fec_priv *priv =dev_get_priv (dev); -struct mii_dev *bus =NULL ;int ret; ret =fec_enet_init (priv);if (ret)return ret; - priv->dev_id = dev->seq; + ret =fec_mdio_init (dev); +if (ret) + goto err_enet; +#ifdef CONFIG_FEC_MXC_MDIO_BASE - bus =fec_get_miibus ((ulong )CONFIG_FEC_MXC_MDIO_BASE , dev->seq); +fec_mii_setspeed ((struct ethernet_regs *)CONFIG_FEC_MXC_MDIO_BASE );#else - bus =fec_get_miibus ((ulong )priv->eth, dev->seq); +fec_mii_setspeed (priv->eth);#endif -if (!bus) { - ret = -ENOMEM ; - goto err_mii; - } - priv->bus = bus; + priv->bus =miiphy_get_dev_by_name (dev->name); + priv->dev_id = dev->seq; priv->xcv_type = pdata->phy_interface; + ret =fec_phy_init (dev);if (ret) goto err_phy;
@@ -1315,9 +1341,9 @@ static int fecmxc_probe(struct udevice *dev)return 0 ; err_phy: -mdio_unregister (bus); -free (bus); -err_mii: +mdio_unregister (priv->bus); +mdio_free (priv->bus); +err_enet:fec_free_descs (priv);return ret; }
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 8/10 dm: net: fec: Refactor mdio_init code
Quoted 8 lines · Jagan Teki
mdio initialization in dm code is assigning
bus->privwith pointer to structethernet_regswhich leads to improper mii. Add proper udevice to storemii_buspriv and reuse the same in mdio ops.Also refactor mdio code, to make common ops for dm and non-dm.
Signed-off-by Jagan Teki <[email protected]>
PATCH 9/10 dm: net: fec: Add support for PHY reset
In reply to Jagan TekiAdd PHY reset code for DM_ETH by retrieving phy-reset-gpios and phy-reset-duration in fec node.
--- drivers/net/fec_mxc.c | 50 +++++++++++++++++++++++++++++++++++++------ drivers/net/fec_mxc.h | 7 ++++++ 2 files changed, 51 insertions(+), 6 deletions(-)
drivers/net/fec_mxc.c +44 -6
@@ -16,7 +16,6 @@#include <net.h> #include <netdev.h> #include <phy.h> -#include "fec_mxc.h" #include <asm/io.h> #include <linux/errno.h>
@@ -25,6 +24,9 @@#include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/mach-imx/sys_proto.h> +#include <asm-generic/gpio.h> + +#include "fec_mxc.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -1245,6 +1247,33 @@ static int fec_phy_init(struct udevice *dev)return 0 ; } +#if defined(CONFIG_DM_GPIO ) +static int fec_mdio_reset (struct mii_dev *bus) +{ +struct udevice *dev = bus->priv; +struct fec_priv *priv =dev_get_priv (dev); +int ret; + +if (!dm_gpio_is_valid (&priv->reset_gpio)) +return 0 ; + + ret =dm_gpio_set_value (&priv->reset_gpio,1 ); +if (ret) +return ret; + +if (priv->reset_delay >20 ) +mdelay (priv->reset_delay); +else +udelay (priv->reset_delay *1000 ); + + ret =dm_gpio_set_value (&priv->reset_gpio,0 ); +if (ret) +return ret; + +return 0 ; +} +#endif +static int fec_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) {struct udevice *dev = bus->priv;
@@ -1275,6 +1304,9 @@ static int fec_mdio_init(struct udevice *dev) bus->read = fec_mdio_read; bus->write = fec_mdio_write;snprintf (bus->name,sizeof (bus->name),"%s" , dev->name); +#if defined(CONFIG_DM_GPIO ) + bus->reset = fec_mdio_reset; +#endif bus->priv = dev;return mdio_register (bus);
@@ -1365,6 +1397,7 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev)struct eth_pdata *pdata =dev_get_platdata (dev);struct fec_priv *priv =dev_get_priv (dev);const char *phy_mode; +int ret =0 ; pdata->iobase = (phys_addr_t )devfdt_get_addr (dev); priv->eth = (struct ethernet_regs *)pdata->iobase;
@@ -1379,12 +1412,17 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; } -/* TODO -* Need to get the reset-gpio and related properties from DT -* and implemet the enet reset code on .probe call -*/ +#ifdef CONFIG_DM_GPIO + ret =gpio_request_by_name (dev,"phy-reset-gpios" , dev->seq, + &priv->reset_gpio,GPIOD_IS_OUT ); +if (ret ==0 ) { + priv->reset_delay =dev_read_u32_default (dev,"phy-reset-duration" ,1 ); + }else if (ret == -ENOENT ) { + ret =0 ; + } +#endif -return 0 ; +return ret; }static const struct udevice_id fecmxc_ids[] = {
drivers/net/fec_mxc.h +7 -0
@@ -241,6 +241,13 @@ struct fec_priv {int phy_id;int (*mii_postcall)(int );#endif + +#ifdef CONFIG_DM_ETH +# if CONFIG_IS_ENABLED (DM_GPIO ) +struct gpio_desc reset_gpio; +uint32_t reset_delay; +# endif +#endif };void imx_get_mac_from_fuse (int dev_id,unsigned char *mac);
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 9/10 dm: net: fec: Add support for PHY reset
Quoted 4 lines · Jagan Teki
Add PHY reset code for
DM_ETHby retrieving phy-reset-gpios and phy-reset-duration in fec node.Signed-off-by Jagan Teki <[email protected]>
PATCH 10/10 net: fec: Setup common eth_ops code for dm and non-dm
In reply to Jagan TekiSetting up common code for dm and non-dm will easy and understandable for adding new features, debugging in both the code area.
--- drivers/net/fec_mxc.c | 225 ++++++++++++++++++++---------------------- drivers/net/fec_mxc.h | 3 + 2 files changed, 108 insertions(+), 120 deletions(-)
drivers/net/fec_mxc.c +105 -120
@@ -345,21 +345,8 @@ static int fec_get_hwaddr(int dev_id, unsigned char *mac)return !is_valid_ethaddr (mac); } -#ifdef CONFIG_DM_ETH -static int fecmxc_set_hwaddr(struct udevice *dev) -#else -static int fec_set_hwaddr(struct eth_device *dev) -#endif +static int _fec_set_hwaddr (struct fec_priv *fec,u8 *mac) { -#ifdef CONFIG_DM_ETH -struct fec_priv *fec =dev_get_priv (dev); -struct eth_pdata *pdata =dev_get_platdata (dev); -uchar *mac = pdata->enetaddr; -#else -uchar *mac = dev->enetaddr; -struct fec_priv *fec = (struct fec_priv *)dev->priv; -#endif -writel (0 , &fec->eth->iaddr1);writel (0 , &fec->eth->iaddr2);writel (0 , &fec->eth->gaddr1);
@@ -402,17 +389,8 @@ static void fec_reg_setup(struct fec_priv *fec)* Start the FEC engine * @param[in] dev Our device to handle */ -#ifdef CONFIG_DM_ETH -static int fec_open(struct udevice *dev) -#else -static int fec_open(struct eth_device *edev) -#endif +static int fec_open (struct fec_priv *fec) { -#ifdef CONFIG_DM_ETH -struct fec_priv *fec =dev_get_priv (dev); -#else -struct fec_priv *fec = (struct fec_priv *)edev->priv; -#endif int speed;ulong addr, size;int i;
@@ -487,9 +465,9 @@ static int fec_open(struct eth_device *edev)#elif CONFIG_FEC_FIXED_SPEED speed =CONFIG_FEC_FIXED_SPEED ;#else -miiphy_wait_aneg (edev); - speed =miiphy_speed (edev->name, fec->phy_id); -miiphy_duplex (edev->name, fec->phy_id); +miiphy_wait_aneg (fec->edev); + speed =miiphy_speed (fec->edev->name, fec->phy_id); +miiphy_duplex (fec->edev->name, fec->phy_id);#endif #ifdef FEC_QUIRK_ENET_MAC
@@ -513,27 +491,13 @@ static int fec_open(struct eth_device *edev)return 0 ; } -#ifdef CONFIG_DM_ETH -static int fecmxc_init(struct udevice *dev) -#else -static int fec_init(struct eth_device *dev, bd_t *bd) -#endif +static int _fec_init (struct fec_priv *fec,u8 *enetaddr) { -#ifdef CONFIG_DM_ETH -struct fec_priv *fec =dev_get_priv (dev); -#else -struct fec_priv *fec = (struct fec_priv *)dev->priv; -#endif u8 *mib_ptr = (uint8_t *)&fec->eth->rmon_t_drop;u8 *i;ulong addr; -/* Initialize MAC address */ -#ifdef CONFIG_DM_ETH -fecmxc_set_hwaddr (dev); -#else -fec_set_hwaddr (dev); -#endif +_fec_set_hwaddr (fec, enetaddr);/* Setup transmit descriptors, there are two in total. */ fec_tbd_init (fec);
@@ -575,9 +539,9 @@ static int fec_init(struct eth_device *dev, bd_t *bd)#ifndef CONFIG_PHYLIB if (fec->xcv_type !=PHY_INTERFACE_MODE_SEVENWIRE ) -miiphy_restart_aneg (dev); +miiphy_restart_aneg (fec->edev);#endif -fec_open (dev); +fec_open (fec);return 0 ; }
@@ -585,17 +549,8 @@ static int fec_init(struct eth_device *dev, bd_t *bd)* Halt the FEC engine * @param[in] dev Our device to handle */ -#ifdef CONFIG_DM_ETH -static void fecmxc_halt(struct udevice *dev) -#else -static void fec_halt(struct eth_device *dev) -#endif +static void _fec_halt (struct fec_priv *fec) { -#ifdef CONFIG_DM_ETH -struct fec_priv *fec =dev_get_priv (dev); -#else -struct fec_priv *fec = (struct fec_priv *)dev->priv; -#endif int counter =0xffff ;/* issue graceful stop command to the FEC transmitter if necessary */
@@ -629,11 +584,7 @@ static void fec_halt(struct eth_device *dev)* @param[in] length Data count in bytes * @return 0 on success */ -#ifdef CONFIG_DM_ETH -static int fecmxc_send(struct udevice *dev, void *packet, int length) -#else -static int fec_send(struct eth_device *dev, void *packet, int length) -#endif +static int _fec_send (struct fec_priv *fec,void *packet,int length) {unsigned int status;u32 size;
@@ -645,12 +596,6 @@ static int fec_send(struct eth_device *dev, void *packet, int length)* This routine transmits one frame. This routine only accepts * 6-byte Ethernet addresses. */ -#ifdef CONFIG_DM_ETH -struct fec_priv *fec =dev_get_priv (dev); -#else -struct fec_priv *fec = (struct fec_priv *)dev->priv; -#endif -/* * Check for valid length of data. */
@@ -780,17 +725,8 @@ out:* @param[in] dev Our ethernet device to handle * @return Length of packet read */ -#ifdef CONFIG_DM_ETH -static int fecmxc_recv(struct udevice *dev, int flags, uchar **packetp) -#else -static int fec_recv(struct eth_device *dev) -#endif +static int _fec_recv (struct fec_priv *fec,uchar **packetp,u8 *enetaddr) { -#ifdef CONFIG_DM_ETH -struct fec_priv *fec =dev_get_priv (dev); -#else -struct fec_priv *fec = (struct fec_priv *)dev->priv; -#endif struct fec_bd *rbd = &fec->rbd_base[fec->rbd_index];unsigned long ievent;int frame_length, len =0 ;
@@ -798,28 +734,13 @@ static int fec_recv(struct eth_device *dev)ulong addr, size, end;int i; -#ifdef CONFIG_DM_ETH - *packetp =memalign (ARCH_DMA_MINALIGN ,FEC_MAX_PKT_SIZE ); -if (*packetp ==0 ) { -printf ("%s: error allocating packetp\n" , __func__); -return -ENOMEM ; - } -#else -ALLOC_CACHE_ALIGN_BUFFER (uchar, buff,FEC_MAX_PKT_SIZE ); -#endif -/* Check if any critical events have happened */ ievent =readl (&fec->eth->ievent);writel (ievent, &fec->eth->ievent);debug ("fec_recv: ievent 0x%lx\n" , ievent);if (ievent &FEC_IEVENT_BABR ) { -#ifdef CONFIG_DM_ETH -fecmxc_halt (dev); -fecmxc_init (dev); -#else -fec_halt (dev); -fec_init (dev, fec->bd); -#endif +_fec_halt (fec); +_fec_init (fec, enetaddr);printf ("some error: 0x%08lx\n" , ievent);return 0 ; }
@@ -831,18 +752,10 @@ static int fec_recv(struct eth_device *dev)if (ievent &FEC_IEVENT_GRA ) {/* Graceful stop complete */ if (readl (&fec->eth->x_cntrl) &0x00000001 ) { -#ifdef CONFIG_DM_ETH -fecmxc_halt (dev); -#else -fec_halt (dev); -#endif +_fec_halt (fec);writel (~0x00000001 &readl (&fec->eth->x_cntrl), &fec->eth->x_cntrl); -#ifdef CONFIG_DM_ETH -fecmxc_init (dev); -#else -fec_init (dev, fec->bd); -#endif +_fec_init (fec, enetaddr); } }
@@ -882,13 +795,7 @@ static int fec_recv(struct eth_device *dev)#ifdef CONFIG_FEC_MXC_SWAP_PACKET swap_packet ((uint32_t *)addr, frame_length);#endif - -#ifdef CONFIG_DM_ETH memcpy (*packetp, (char *)addr, frame_length); -#else -memcpy (buff, (char *)addr, frame_length); -net_process_received_packet (buff, frame_length); -#endif len = frame_length; }else {if (bd_status &FEC_RBD_ERR )
@@ -998,6 +905,39 @@ static void fec_free_descs(struct fec_priv *fec) }#ifndef CONFIG_DM_ETH +static int fec_set_hwaddr (struct eth_device *dev) +{ +return _fec_set_hwaddr (dev->priv, dev->enetaddr); +} + +static void fec_halt (struct eth_device *dev) +{ +_fec_halt (dev->priv); +} + +static int fec_recv (struct eth_device *dev) +{ +ALLOC_CACHE_ALIGN_BUFFER (uchar, packet,FEC_MAX_PKT_SIZE ); +int length; + + length =_fec_recv (dev->priv, &packet, dev->enetaddr); +if (length == -EAGAIN ) +return 0 ; +net_process_received_packet (packet, length); + +return 0 ; +} + +static int fec_send (struct eth_device *dev,void *packet,int length) +{ +return _fec_send (dev->priv, packet, length); +} + +static int fec_init (struct eth_device *dev,bd_t *bd) +{ +return _fec_init (dev->priv, dev->enetaddr); +} +static int fec_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) {return _fec_mdio_read (bus->priv, addr, reg);
@@ -1084,6 +1024,7 @@ static int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr, edev->halt = fec_halt; edev->write_hwaddr = fec_set_hwaddr; + fec->edev = edev; fec->eth = (struct ethernet_regs *)(ulong )base_addr; fec->bd = bd;
@@ -1199,7 +1140,7 @@ int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int))#else -static int fecmxc_read_rom_hwaddr (struct udevice *dev) +static int fec_read_rom_hwaddr (struct udevice *dev) {struct fec_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_platdata (dev);
@@ -1207,7 +1148,22 @@ static int fecmxc_read_rom_hwaddr(struct udevice *dev)return fec_get_hwaddr (priv->dev_id, pdata->enetaddr); } -static int fecmxc_free_pkt (struct udevice *dev,uchar *packet,int length) +static int fec_set_hwaddr (struct udevice *dev) +{ +struct fec_priv *priv =dev_get_priv (dev); +struct eth_pdata *pdata =dev_get_platdata (dev); + +return _fec_set_hwaddr (priv, pdata->enetaddr); +} + +static void fec_halt (struct udevice *dev) +{ +struct fec_priv *priv =dev_get_priv (dev); + +_fec_halt (priv); +} + +static int fec_free_pkt (struct udevice *dev,uchar *packet,int length) {if (packet)free (packet);
@@ -1215,14 +1171,43 @@ static int fecmxc_free_pkt(struct udevice *dev, uchar *packet, int length)return 0 ; } -static const struct eth_ops fecmxc_ops = { - .start = fecmxc_init, - .send = fecmxc_send, - .recv = fecmxc_recv, - .free_pkt = fecmxc_free_pkt, - .stop = fecmxc_halt, - .write_hwaddr = fecmxc_set_hwaddr, - .read_rom_hwaddr = fecmxc_read_rom_hwaddr, +static int fec_recv (struct udevice *dev,int flags,uchar **packetp) +{ +struct fec_priv *priv =dev_get_priv (dev); +struct eth_pdata *pdata =dev_get_platdata (dev); + + *packetp =memalign (ARCH_DMA_MINALIGN ,FEC_MAX_PKT_SIZE ); +if (*packetp ==0 ) { +printf ("%s: error allocating packetp\n" , __func__); +return -ENOMEM ; + } + +return _fec_recv (priv, packetp, pdata->enetaddr); +} + +static int fec_send (struct udevice *dev,void *packet,int length) +{ +struct fec_priv *priv =dev_get_priv (dev); + +return _fec_send (priv, packet, length); +} + +static int fec_start (struct udevice *dev) +{ +struct fec_priv *priv =dev_get_priv (dev); +struct eth_pdata *pdata =dev_get_platdata (dev); + +return _fec_init (priv, pdata->enetaddr); +} + +static const struct eth_ops fec_ops = { + .start = fec_start, + .send = fec_send, + .recv = fec_recv, + .free_pkt = fec_free_pkt, + .stop = fec_halt, + .write_hwaddr = fec_set_hwaddr, + .read_rom_hwaddr = fec_read_rom_hwaddr, };static int fec_phy_init (struct udevice *dev)
@@ -1441,7 +1426,7 @@ U_BOOT_DRIVER(fecmxc_gem) = { .ofdata_to_platdata = fecmxc_ofdata_to_platdata, .probe = fecmxc_probe, .remove = fecmxc_remove, - .ops = &fecmxc_ops, + .ops = &fec_ops, .priv_auto_alloc_size = sizeof(struct fec_priv), .platdata_auto_alloc_size = sizeof(struct eth_pdata), };
drivers/net/fec_mxc.h +3 -0
@@ -235,6 +235,9 @@ struct fec_priv {uint8_t *tdb_ptr;int dev_id;struct mii_dev *bus; +#ifndef CONFIG_DM_ETH +struct eth_device *edev; +#endif #ifdef CONFIG_PHYLIB struct phy_device *phydev;#else
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 10/10 net: fec: Setup common eth_ops code for dm and non-dm
Quoted 5 lines · Jagan Teki
Setting up common code for dm and non-dm will easy and understandable for adding new features, debugging in both the code area.
Signed-off-by Jagan Teki <[email protected]>
cover net: fec: Code Improvement/cleanups
In reply to Jagan TekiHi Jagan,
Quoted 10 lines · Jagan Teki
dm code in
fec_mxchas some quite few issues with mdio handling and the dm vs non-dm code infec_mxclooks very uncomfortable to read and add new support.This series is trying to fixe all necessary issues regarding
fec_mxc, along with necessary CONFIG options are moved into defconfig.Require enough testing to get these changes to move further.
Quoted 11 lines
Jagan Teki (10):
configs: Dropimx27lite-common.h
configs: MoveCONFIG_FEC_MXC
net: fec: UsePHY_INTERFACE_MODE_forxcv_type
net: fec: Add defaultCONFIG_FEC_MXC_PHYADDRfor few boards
net: fec: UsePHY_ADDRinstead ofFEC_MXC_PHYADDR
net:fec_mxc: Use udevice to retrive priv, infec_phy_init
dm: net: fec: Move enet init infec_enet
dm: net: fec: Refactormdio_initcode
dm: net: fec: Add support for PHY reset
net: fec: Setup commoneth_opscode for dm and non-dm
I never heard back from you on a new version of "net: fec: Use PHY_INTERFACE_MODE_ for xcv_type" that deals with the change in phy header that happened last release, and now the series has diverged further. Can you rebase this series?
Thanks,
-Joe