From a68f6942bc539c3e27afbb40fdc726fe1affea5b Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 25 Jan 2017 08:23:38 +0100 Subject: [PATCH] mediatek: update the ethernet compat string mt2701 is an earlier version of the ip core, so use that compat string as baseline. Signed-off-by: John Crispin --- target/linux/mediatek/files/arch/arm/boot/dts/_mt7623.dtsi | 2 +- .../0023-ARM-dts-mediatek-add-MT7623-basic-support.patch | 2 +- ...net-next-mediatek-document-MediaTek-SoC-ethernet-bin.patch | 4 ++-- ...49-net-next-mediatek-add-support-for-MT7623-ethernet.patch | 2 +- ...net-mediatek-update-the-IRQ-part-of-the-binding-docu.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/mediatek/files/arch/arm/boot/dts/_mt7623.dtsi b/target/linux/mediatek/files/arch/arm/boot/dts/_mt7623.dtsi index 4afcc75096..87be1b8092 100644 --- a/target/linux/mediatek/files/arch/arm/boot/dts/_mt7623.dtsi +++ b/target/linux/mediatek/files/arch/arm/boot/dts/_mt7623.dtsi @@ -535,7 +535,7 @@ }; eth: ethernet@1b100000 { - compatible = "mediatek,mt7623-eth"; + compatible = "mediatek,mt2701-eth"; reg = <0 0x1b100000 0 0x20000>; clocks = <&topckgen CLK_TOP_ETHIF_SEL>, diff --git a/target/linux/mediatek/patches-4.4/0023-ARM-dts-mediatek-add-MT7623-basic-support.patch b/target/linux/mediatek/patches-4.4/0023-ARM-dts-mediatek-add-MT7623-basic-support.patch index 5be3b27eb2..c1f2690391 100644 --- a/target/linux/mediatek/patches-4.4/0023-ARM-dts-mediatek-add-MT7623-basic-support.patch +++ b/target/linux/mediatek/patches-4.4/0023-ARM-dts-mediatek-add-MT7623-basic-support.patch @@ -968,7 +968,7 @@ Signed-off-by: John Crispin + }; + + eth: ethernet@1b100000 { -+ compatible = "mediatek,mt7623-eth"; ++ compatible = "mediatek,mt2701-eth"; + reg = <0 0x1b100000 0 0x20000>; + + clocks = <&topckgen CLK_TOP_ETHIF_SEL>, diff --git a/target/linux/mediatek/patches-4.4/0048-net-next-mediatek-document-MediaTek-SoC-ethernet-bin.patch b/target/linux/mediatek/patches-4.4/0048-net-next-mediatek-document-MediaTek-SoC-ethernet-bin.patch index 7d1e7422ea..8721d770fd 100644 --- a/target/linux/mediatek/patches-4.4/0048-net-next-mediatek-document-MediaTek-SoC-ethernet-bin.patch +++ b/target/linux/mediatek/patches-4.4/0048-net-next-mediatek-document-MediaTek-SoC-ethernet-bin.patch @@ -27,7 +27,7 @@ Cc: devicetree@vger.kernel.org +* Ethernet controller node + +Required properties: -+- compatible: Should be "mediatek,mt7623-eth" ++- compatible: Should be "mediatek,mt2701-eth" +- reg: Address and length of the register set for the device +- interrupts: Should contain the frame engines interrupt +- clocks: the clock used by the core @@ -55,7 +55,7 @@ Cc: devicetree@vger.kernel.org +Example: + +eth: ethernet@1b100000 { -+ compatible = "mediatek,mt7623-eth"; ++ compatible = "mediatek,mt2701-eth"; + reg = <0 0x1b100000 0 0x20000>; + clocks = <&topckgen CLK_TOP_ETHIF_SEL>, + <ðsys CLK_ETHSYS_ESW>, diff --git a/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch b/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch index 85aa93d475..9d445921aa 100644 --- a/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch +++ b/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch @@ -1817,7 +1817,7 @@ Signed-off-by: John Crispin +} + +const struct of_device_id of_mtk_match[] = { -+ { .compatible = "mediatek,mt7623-eth" }, ++ { .compatible = "mediatek,mt2701-eth" }, + {}, +}; + diff --git a/target/linux/mediatek/patches-4.4/0070-net-mediatek-update-the-IRQ-part-of-the-binding-docu.patch b/target/linux/mediatek/patches-4.4/0070-net-mediatek-update-the-IRQ-part-of-the-binding-docu.patch index efc59c06f2..afb01748f1 100644 --- a/target/linux/mediatek/patches-4.4/0070-net-mediatek-update-the-IRQ-part-of-the-binding-docu.patch +++ b/target/linux/mediatek/patches-4.4/0070-net-mediatek-update-the-IRQ-part-of-the-binding-docu.patch @@ -20,7 +20,7 @@ Signed-off-by: John Crispin +++ b/Documentation/devicetree/bindings/net/mediatek-net.txt @@ -9,7 +9,8 @@ have dual GMAC each represented by a chi Required properties: - - compatible: Should be "mediatek,mt7623-eth" + - compatible: Should be "mediatek,mt2701-eth" - reg: Address and length of the register set for the device -- interrupts: Should contain the frame engines interrupt +- interrupts: Should contain the three frame engines interrupts in numeric -- 2.30.2