As part of the effort of making U-Boot work with the same device tree as Linux, align with upstream node name.
Signed-off-by: Beiyan Yun <[email protected]> --- (no changes since v2) Changes in v2: - New arch/arm/dts/fsl-sch-30841.dtsi | 8 ++++---- arch/arm/dts/fsl-sch-30842.dtsi | 2 +- drivers/net/phy/aquantia.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/fsl-sch-30841.dtsi b/arch/arm/dts/fsl-sch-30841.dtsi index 28b1bec18a5..a92d9811fd3 100644 --- a/arch/arm/dts/fsl-sch-30841.dtsi +++ b/arch/arm/dts/fsl-sch-30841.dtsi @@ -15,24 +15,24 @@ */ phy@00 { reg = <0x00>; - mdi-reversal = <1>; + marvell,mdi-cfg-order = <1>; smb-addr = <0x25>; }; phy@01 { reg = <0x01>; - mdi-reversal = <1>; + marvell,mdi-cfg-order = <1>; smb-addr = <0x26>; }; phy@02 { reg = <0x02>; - mdi-reversal = <1>; + marvell,mdi-cfg-order = <1>; smb-addr = <0x27>; }; phy@03 { reg = <0x03>; - mdi-reversal = <1>; + marvell,mdi-cfg-order = <1>; smb-addr = <0x28>; }; diff --git a/arch/arm/dts/fsl-sch-30842.dtsi b/arch/arm/dts/fsl-sch-30842.dtsi index bff9e76570b..fca38d14975 100644 --- a/arch/arm/dts/fsl-sch-30842.dtsi +++ b/arch/arm/dts/fsl-sch-30842.dtsi @@ -13,6 +13,6 @@ */ phy@02 { reg = <0x02>; - mdi-reversal = <1>; + marvell,mdi-cfg-order = <1>; smb-addr = <0x25>; }; diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 439c4c48bdc..11e450cdb0b 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -351,8 +351,8 @@ static int aquantia_dts_config(struct phy_device *phydev) if (!ofnode_valid(node)) return 0; - if (!ofnode_read_u32(node, "mdi-reversal", &prop)) { - debug("mdi-reversal = %d\n", (int)prop); + if (!ofnode_read_u32(node, "marvell,mdi-cfg-order", &prop)) { + debug("marvell,mdi-cfg-order = %d\n", (int)prop); reg = phy_read(phydev, MDIO_MMD_PMAPMD, AQUANTIA_PMA_RX_VENDOR_P1); reg &= ~AQUANTIA_PMA_RX_VENDOR_P1_MDI_MSK; -- 2.47.3
