From 7c07a0f4c335bd79b0cac3d91192e76a42bc4e18 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 3 Aug 2020 23:11:01 +0200 Subject: [PATCH] ramips/mt7620: fix portmap based on board.d port assignment When comparing to the port assignment in board.d/02_network, many devices seem to use the wrong setup of mediatek,portmap. The corrects the values for mt7620 subtarget based on the location of the wan port. A previous cleanup of obviously wrong values has already been done in d3c0a944059b ("ramips: mt7620/mt7621: remove invalid mediatek,portmap") Cc: Sungbo Eo Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts | 2 +- target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts | 2 +- target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts | 2 +- target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts | 2 -- target/linux/ramips/dts/mt7620a_sanlinking_d240.dts | 2 +- target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts | 2 +- target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi | 2 +- target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts | 2 +- target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index c9ecf78573..c8d67db884 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts @@ -124,7 +124,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "llllw"; + mediatek,portmap = "wllll"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index a772bca605..c9b2abd5fb 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts @@ -134,7 +134,7 @@ ðernet { mtd-mac-address = <&factory 0x4000>; - mediatek,portmap = "llllw"; + mediatek,portmap = "wllll"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts index 8951044f63..fc4b807ffd 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts @@ -76,7 +76,7 @@ mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; port@5 { status = "okay"; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index 2932b5a3dc..f003df6859 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts @@ -46,6 +46,4 @@ pinctrl-0 = <&ephy_pins>; mtd-mac-address = <&factory 0x28>; - - mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index 79649a5990..9a9201b6ae 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts @@ -171,7 +171,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index 4aa404542f..53d98cf35a 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -114,7 +114,7 @@ mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 9ebd10bbb0..0e3d689b4f 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi @@ -76,7 +76,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index 5e610be862..64f32ac5d4 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts @@ -110,7 +110,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index e5d3cc0a29..5f6925bb88 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts @@ -96,7 +96,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac {