Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5707d5ffd42a45088f433a2514d1320a6491697b

Authored by Shengzhou Liu
Committed by Joe Hershberger
1 parent c6a40f6e51
Exists in v2017.01-smarct4x and in 34 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

net/phy: fixup for get_phy_id 

commit 3c6928fd7b0f84 "net: phy: fix warnings with W=1" caused
some PHYs(e.g. CS4315/CS4340) not working. This patch fixes the
warning and make those special PHYs working as well.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

drivers/net/phy/phy.c
Diff comments   View file @ 5707d5f
... ... @@ -582,7 +582,7 @@
582 582 * Description: Reads the ID registers of the PHY at @addr on the
583 583 * @bus, stores it in @phy_id and returns zero on success.
584 584 */
585   -static int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
  585 +int __weak get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
586 586 {
587 587 int phy_reg;
588 588  
... ... @@ -254,6 +254,7 @@
254 254 int phy_vitesse_init(void);
255 255  
256 256 int board_phy_config(struct phy_device *phydev);
  257 +int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id);
257 258  
258 259 /**
259 260 * phy_get_interface_by_name() - Look up a PHY interface name