MT7621 is a SoC, so using "mediatek,mt7621" as its compatible is ambiguous. Rename it to "mediatek,mt7621-gsw".
Signed-off-by: DENG Qingfang <dqf...@gmail.com> --- Documentation/devicetree/bindings/net/dsa/mt7530.txt | 8 ++++---- drivers/net/dsa/mt7530.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/mt7530.txt b/Documentation/devicetree/bindings/net/dsa/mt7530.txt index 560369efad6c..a9c8492296b3 100644 --- a/Documentation/devicetree/bindings/net/dsa/mt7530.txt +++ b/Documentation/devicetree/bindings/net/dsa/mt7530.txt @@ -4,7 +4,7 @@ Mediatek MT7530 Ethernet switch Required properties: - compatible: may be compatible = "mediatek,mt7530" - or compatible = "mediatek,mt7621" + or compatible = "mediatek,mt7621-gsw" or compatible = "mediatek,mt7531" - #address-cells: Must be 1. - #size-cells: Must be 0. @@ -35,7 +35,7 @@ Required properties for the child nodes within ports container: user ports. - phy-mode: String, the following values are acceptable for port labeled "cpu": - If compatible mediatek,mt7530 or mediatek,mt7621 is set, + If compatible mediatek,mt7530 or mediatek,mt7621-gsw is set, must be either "trgmii" or "rgmii" If compatible mediatek,mt7531 is set, must be either "sgmii", "1000base-x" or "2500base-x" @@ -168,7 +168,7 @@ Example 2: MT7621: Port 4 is WAN port: 2nd GMAC -> Port 5 -> PHY port 4. }; mt7530: switch@1f { - compatible = "mediatek,mt7621"; + compatible = "mediatek,mt7621-gsw"; #address-cells = <1>; #size-cells = <0>; reg = <0x1f>; @@ -251,7 +251,7 @@ Example 3: MT7621: Port 5 is connected to external PHY: Port 5 -> external PHY. }; mt7530: switch@1f { - compatible = "mediatek,mt7621"; + compatible = "mediatek,mt7621-gsw"; #address-cells = <1>; #size-cells = <0>; reg = <0x1f>; diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 55c8baa31e5d..347845d66671 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2688,7 +2688,7 @@ static const struct mt753x_info mt753x_table[] = { }; static const struct of_device_id mt7530_of_match[] = { - { .compatible = "mediatek,mt7621", .data = &mt753x_table[ID_MT7621], }, + { .compatible = "mediatek,mt7621-gsw", .data = &mt753x_table[ID_MT7621], }, { .compatible = "mediatek,mt7530", .data = &mt753x_table[ID_MT7530], }, { .compatible = "mediatek,mt7531", .data = &mt753x_table[ID_MT7531], }, { /* sentinel */ }, -- 2.25.1