dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 14:01:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

colibri-imx6ull: migrate fec to using driver model

Browse Source 
Migrate Ethernet FEC to using driver model.
Drop PHY_MICREL_KSZ90X1 which slipped in from Apalis iMX6.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
This commit is contained in:
Marcel Ziswiler
2019-04-09 17:24:17 +02:00
committed by Stefano Babic
parent 87b32297f5
commit 5d67b73c1a
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/dts/imx6ull-colibri.dts
View File

@@ -80,6 +80,7 @@
pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
}; };
/* Ethernet */
&fec2 { &fec2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2>; pinctrl-0 = <&pinctrl_enet2>;
@@ -233,6 +234,21 @@
}; };
&iomuxc { &iomuxc {
pinctrl_enet2: enet2-grp {
fsl,pins = <
MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0
MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0
MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0
MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0
MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
>;
};
pinctrl_gpio1: gpio1-grp { pinctrl_gpio1: gpio1-grp {
fsl,pins = < fsl,pins = <
MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */
@@ -295,21 +311,6 @@
>; >;
}; };
pinctrl_enet2: enet2-grp {
fsl,pins = <
MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0
MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0
MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0
MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0
MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
>;
};
pinctrl_ecspi1_cs: ecspi1-cs-grp { pinctrl_ecspi1_cs: ecspi1-cs-grp {
fsl,pins = < fsl,pins = <
MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0 MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0

3
configs/colibri-imx6ull_defconfig
View File

@@ -58,9 +58,8 @@ CONFIG_NAND_MXS=y
CONFIG_NAND_MXS_DT=y CONFIG_NAND_MXS_DT=y
CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_ADDR_ENABLE=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y
CONFIG_FEC_MXC=y CONFIG_FEC_MXC=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y

4
include/configs/colibri-imx6ull.h
View File

@@ -19,10 +19,6 @@
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
/* Network */ /* Network */
#define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_IP_DEFRAG #define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 16352 #define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE