From ab3e75aca829d5bfb998ce3434b419139b7ca7c8 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Mon, 8 May 2017 03:05:09 -0500 Subject: [PATCH] MLK-14768 fec: Change CONFIG_ETHPRIME name to align with DM ETH The DM Ethernet driver requests the "ethprime" to align with DTB name or start with "eth" with seq number as index. So previous name "FEC" can't work as prime. Must change it to the "eth0" for first ethernet device, or "eth1" for second one. Signed-off-by: Ye Li --- include/configs/mx6dqscm.h | 4 ++++ include/configs/mx6sabre_common.h | 4 ++++ include/configs/mx6slevk.h | 4 ++++ include/configs/mx6sx_arm2.h | 4 ++++ include/configs/mx6sxsabreauto.h | 8 ++++++++ include/configs/mx6sxsabresd.h | 8 ++++++++ include/configs/mx6ul_14x14_ddr3_arm2.h | 8 ++++++++ include/configs/mx6ul_14x14_evk.h | 8 ++++++++ include/configs/mx6ul_14x14_lpddr2_arm2.h | 8 ++++++++ include/configs/mx6ull_ddr3_arm2.h | 8 ++++++++ include/configs/mx6ullevk.h | 8 ++++++++ include/configs/mx7d_12x12_lpddr3_arm2.h | 4 ++++ include/configs/mx7d_19x19_ddr3_arm2.h | 4 ++++ include/configs/mx7d_19x19_lpddr3_arm2.h | 4 ++++ include/configs/mx7dsabresd.h | 8 ++++++++ 15 files changed, 92 insertions(+) diff --git a/include/configs/mx6dqscm.h b/include/configs/mx6dqscm.h index ec215d7685..3172ee6b65 100644 --- a/include/configs/mx6dqscm.h +++ b/include/configs/mx6dqscm.h @@ -24,7 +24,11 @@ #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 3 #define CONFIG_PHYLIB diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index d55371d9cd..9c8582cee4 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -25,7 +25,11 @@ #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 1 #define CONFIG_PHYLIB diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 5d9539ba52..1b5ea02d6b 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -52,7 +52,11 @@ #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_PHYLIB diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h index 2ed83a1401..973d356c2c 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -31,7 +31,11 @@ #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 1 #define CONFIG_PHYLIB diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 4ed6385434..294e099ec2 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -233,12 +233,20 @@ #if (CONFIG_FEC_ENET_DEV == 0) #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x0 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_FEC_XCV_TYPE RGMII diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 02785b78e9..0d7ee3b25a 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -216,12 +216,20 @@ #if (CONFIG_FEC_ENET_DEV == 0) #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_FEC_XCV_TYPE RGMII diff --git a/include/configs/mx6ul_14x14_ddr3_arm2.h b/include/configs/mx6ul_14x14_ddr3_arm2.h index 025371a7b1..6a84f2efd6 100644 --- a/include/configs/mx6ul_14x14_ddr3_arm2.h +++ b/include/configs/mx6ul_14x14_ddr3_arm2.h @@ -46,13 +46,21 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE MII100 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index ccd13ea193..63306c1875 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -299,13 +299,21 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE RMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #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 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL diff --git a/include/configs/mx6ul_14x14_lpddr2_arm2.h b/include/configs/mx6ul_14x14_lpddr2_arm2.h index c932eb2f54..a3ac215962 100644 --- a/include/configs/mx6ul_14x14_lpddr2_arm2.h +++ b/include/configs/mx6ul_14x14_lpddr2_arm2.h @@ -57,13 +57,21 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE MII100 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #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 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL diff --git a/include/configs/mx6ull_ddr3_arm2.h b/include/configs/mx6ull_ddr3_arm2.h index 5455fb539b..ae85f5bb6c 100644 --- a/include/configs/mx6ull_ddr3_arm2.h +++ b/include/configs/mx6ull_ddr3_arm2.h @@ -61,13 +61,21 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE MII100 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 92fbac304f..d9f03ddd3f 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -298,13 +298,21 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE RMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #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 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL diff --git a/include/configs/mx7d_12x12_lpddr3_arm2.h b/include/configs/mx7d_12x12_lpddr3_arm2.h index 305a50d319..5e3adda783 100644 --- a/include/configs/mx7d_12x12_lpddr3_arm2.h +++ b/include/configs/mx7d_12x12_lpddr3_arm2.h @@ -19,7 +19,11 @@ #define CONFIG_FEC_MXC #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RGMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 1 #define CONFIG_PHYLIB diff --git a/include/configs/mx7d_19x19_ddr3_arm2.h b/include/configs/mx7d_19x19_ddr3_arm2.h index 2c516edb9f..e5bdf56f34 100644 --- a/include/configs/mx7d_19x19_ddr3_arm2.h +++ b/include/configs/mx7d_19x19_ddr3_arm2.h @@ -19,7 +19,11 @@ #define CONFIG_FEC_MXC #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RGMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_PHYLIB diff --git a/include/configs/mx7d_19x19_lpddr3_arm2.h b/include/configs/mx7d_19x19_lpddr3_arm2.h index 031901572a..1a83520683 100644 --- a/include/configs/mx7d_19x19_lpddr3_arm2.h +++ b/include/configs/mx7d_19x19_lpddr3_arm2.h @@ -23,7 +23,11 @@ #define CONFIG_FEC_MXC #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RGMII +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC" +#endif #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_PHYLIB diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 55415e474c..9f068788c3 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -32,12 +32,20 @@ #if (CONFIG_FEC_ENET_DEV == 0) #define IMX_FEC_BASE ENET_IPS_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x0 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth0" +#else #define CONFIG_ETHPRIME "FEC0" +#endif #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_IPS_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 +#ifdef CONFIG_DM_ETH +#define CONFIG_ETHPRIME "eth1" +#else #define CONFIG_ETHPRIME "FEC1" #endif +#endif #define CONFIG_FEC_MXC_MDIO_BASE ENET_IPS_BASE_ADDR #endif -- 2.17.1