From d7a28e8ed2120d1ca34511401246744c4375765f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 14 May 2020 15:41:31 +0200 Subject: [PATCH] ramips: mt7620: tidy up ethernet node in DTS files This tidies up the ethernet node in mt7620 DTS files by: - removing unnecessary status as it is not disabled - reordering properties consistently - adding empty lines to enhance readability This should make comparison and reviewing new PRs based on C/P easier. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts | 1 + target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts | 6 ++++-- target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts | 1 + target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts | 2 ++ target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts | 2 ++ target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts | 1 + target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts | 1 - target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts | 4 ++-- target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts | 3 +-- target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts | 2 +- target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts | 5 +++-- target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts | 5 +++-- target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi | 6 ++---- target/linux/ramips/dts/mt7620a_engenius_esr600.dts | 2 +- target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts | 1 + target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts | 1 + target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts | 1 + target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts | 5 ++--- target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts | 5 +++-- target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi | 2 ++ target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts | 1 + target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts | 1 + target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts | 1 - target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts | 6 +++--- target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts | 2 ++ target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts | 5 +++-- target/linux/ramips/dts/mt7620a_linksys_e1700.dts | 4 ++-- target/linux/ramips/dts/mt7620a_microduino_microwrt.dts | 2 ++ target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts | 2 ++ target/linux/ramips/dts/mt7620a_phicomm_k2g.dts | 2 ++ target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts | 2 ++ target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts | 2 ++ target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts | 2 ++ target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts | 2 ++ target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts | 2 ++ target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts | 2 ++ target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts | 2 ++ target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts | 2 ++ target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts | 2 +- .../linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts | 2 +- .../linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts | 2 +- .../linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts | 2 +- target/linux/ramips/dts/mt7620a_sanlinking_d240.dts | 1 + target/linux/ramips/dts/mt7620a_sercomm_na930.dts | 2 +- target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts | 4 ++-- target/linux/ramips/dts/mt7620a_tplink_archer.dtsi | 2 ++ target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts | 2 ++ target/linux/ramips/dts/mt7620a_youku_yk1.dts | 2 ++ target/linux/ramips/dts/mt7620a_yukai_bocco.dts | 2 ++ target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts | 2 ++ target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi | 1 + target/linux/ramips/dts/mt7620a_zte_q7.dts | 1 + target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts | 2 +- target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts | 1 + target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts | 1 + target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts | 1 + target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts | 3 ++- target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts | 1 + target/linux/ramips/dts/mt7620n_kingston_mlw221.dts | 1 + target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts | 1 + target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi | 1 + target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts | 1 + target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts | 1 + target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts | 1 + target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts | 1 + target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts | 1 + target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts | 2 ++ target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts | 1 + target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts | 1 + 69 files changed, 107 insertions(+), 39 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts index a65654e78b60..2afaf52fd7ea 100644 --- a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts +++ b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts @@ -106,6 +106,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts index 95bd9b57da59..329d78f481f5 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts @@ -80,10 +80,12 @@ }; ðernet { - mtd-mac-address = <&factory 0x28>; - mediatek,portmap = "llllw"; pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + + mtd-mac-address = <&factory 0x28>; + + mediatek,portmap = "llllw"; }; &gpio1 { diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index 878c720c3910..c9ecf785732b 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts @@ -123,6 +123,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts index c35abf241e27..927a15074324 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts @@ -140,7 +140,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts index e95daf9b3461..fd36f160a481 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts @@ -140,7 +140,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index 9e60b42f71bc..8f6bf971ec29 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -126,6 +126,7 @@ ðernet { mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts index a01ef25bfa26..17df95b374a2 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts @@ -155,7 +155,6 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts index d795c06b509c..c54c85c420d5 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts @@ -153,11 +153,11 @@ }; ðernet { - status = "okay"; - mediatek,portmap = "wllll"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins>; + mediatek,portmap = "wllll"; + port@4 { status = "okay"; phy-handle = <&phy0>; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts index 71ed648d4162..ee8a48a08d56 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts @@ -91,10 +91,9 @@ }; ðernet { - status = "okay"; - pinctrl-names = "default"; pinctrl-0 = <&rgmii2_pins &mdio_pins>; + mediatek,portmap = "wllll"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index ed98c605f89d..6eab114fa5bd 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts @@ -112,9 +112,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mediatek,portmap = "llllw"; port@4 { diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts index 1c9ffc8dfc42..977f0aa356b3 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts @@ -138,10 +138,11 @@ }; ðernet { - status = "okay"; - mtd-mac-address = <&factory 0x4>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index d50a77096820..966c47b465b5 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts @@ -123,10 +123,11 @@ }; ðernet { - status = "okay"; - mtd-mac-address = <&factory 0x4>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 11cf9bb291f0..4f2745286dee 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -115,13 +115,11 @@ }; ðernet { - status = "okay"; - - mtd-mac-address = <&factory 0x4>; - pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins &phy_reset_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,mdio-mode = <1>; phy-reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts index d7dbb1bfa467..92d9008c699c 100644 --- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts +++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts @@ -136,9 +136,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins>; + mtd-mac-address = <&iNIC_rf 0x4>; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts index 6fad06d116f5..f414e3108c41 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts @@ -138,6 +138,7 @@ ðernet { mtd-mac-address = <&factory 0x4000>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts index 693a6bfa6f34..281ba366f1a8 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts @@ -129,6 +129,7 @@ ðernet { mtd-mac-address = <&factory 0x4000>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index 4e9616367a00..a772bca605d5 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts @@ -133,6 +133,7 @@ ðernet { mtd-mac-address = <&factory 0x4000>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts index abc13ee7d0e4..e52a56421315 100644 --- a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts +++ b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts @@ -122,12 +122,11 @@ }; ðernet { - status = "okay"; - - mtd-mac-address = <&factory 0x4>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mtd-mac-address = <&factory 0x4>; + port@4 { status = "okay"; phy-handle = <&phy4>; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts index 83a3a67ed0e1..8951044f6391 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts @@ -71,10 +71,11 @@ }; ðernet { - status = "okay"; - mtd-mac-address = <&factory 0x4>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins>; + + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi index e3494f9cb617..0676c6f84bf8 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi @@ -111,7 +111,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts index 1cc59e4bb66a..60a67c6eaca8 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts @@ -139,6 +139,7 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins>; + mtd-mac-address = <&factory 0x4>; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts index 098aaa007f09..02f620fbf381 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts @@ -147,6 +147,7 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins>; + mtd-mac-address = <&factory 0x4>; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts index c1406503eb05..b05a7a89b436 100644 --- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts +++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts @@ -110,7 +110,6 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; diff --git a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts index a55550d9699f..641b5ad7b1b6 100644 --- a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts +++ b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts @@ -93,11 +93,11 @@ }; ðernet { - status = "okay"; - - mtd-mac-address = <&factory 0x28>; pinctrl-names = "default"; pinctrl-0 = <&rgmii2_pins &mdio_pins>; + + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "wllll"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts index 2b98d6c55f14..88c747e2d66d 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts @@ -54,6 +54,8 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts index de01b480e5e5..60cd501aebf9 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts @@ -78,10 +78,11 @@ }; ðernet { - status = "okay"; - mtd-mac-address = <&factory 0x28>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "wllll"; port@4 { diff --git a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts index ed74068c8048..2eb3033b448d 100644 --- a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts +++ b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts @@ -105,11 +105,11 @@ }; ðernet { - status = "okay"; - mtd-mac-address = <&factory 0x28>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mtd-mac-address = <&factory 0x28>; + port@5 { status = "okay"; mediatek,fixed-link = <1000 1 1 1>; diff --git a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts index 037a8858f76a..b432bcf9f116 100644 --- a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts +++ b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts @@ -89,7 +89,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts index 4a2006da07fc..9992bb8b01a4 100644 --- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts +++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts @@ -103,7 +103,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts index 382a1d791342..a878c43054c4 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts @@ -103,7 +103,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&rgmii2_pins &mdio_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts index 5ed072425905..a0c7fe91bcb9 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts @@ -99,7 +99,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts index 0d9ef767c41d..71cf56c5543d 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts @@ -44,7 +44,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index 7f9fea2b07dd..2932b5a3dc6e 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts @@ -44,6 +44,8 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts index 4466c56fd40d..77a48e8ec177 100644 --- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts +++ b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts @@ -130,7 +130,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts index c38d1e55dd82..29b235d24c7f 100644 --- a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts +++ b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts @@ -90,7 +90,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts index dde751901e3f..87a6f2994444 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts @@ -110,7 +110,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts index 6eb3e85f2c4e..05478f59605c 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts @@ -130,7 +130,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts index 13a3ecdf831c..a5e44cff0b74 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts @@ -135,7 +135,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts index 4a3de47edbfa..fbdec1b5c584 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts @@ -74,9 +74,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mediatek,portmap = "llllw"; port@4 { diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts index 89c5aedcce7d..ba1d41545a78 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts @@ -55,9 +55,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mediatek,portmap = "llllw"; port@5 { diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts index a58917912184..0660047ead2b 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts @@ -71,9 +71,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts index ee148dbde36f..1baa3a733176 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts @@ -68,9 +68,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mediatek,portmap = "llllw"; port@4 { diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index 52d4477f57fb..79649a59900f 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts @@ -170,6 +170,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts index 9313e6259f39..e90f5a440bfa 100644 --- a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts +++ b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts @@ -139,9 +139,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins>; + mediatek,portmap = "llllw"; port@4 { diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts index 9681964cd2b3..c0b2c1ae9209 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts @@ -129,11 +129,11 @@ }; ðernet { - status = "okay"; - mtd-mac-address = <&rom 0xf100>; pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + mtd-mac-address = <&rom 0xf100>; + port@5 { status = "okay"; mediatek,fixed-link = <1000 1 1 1>; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi b/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi index 74908e05aa48..184627b9f4b5 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi +++ b/target/linux/ramips/dts/mt7620a_tplink_archer.dtsi @@ -91,7 +91,9 @@ ðernet { pinctrl-names = "default"; + mtd-mac-address = <&rom 0xf100>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts index 3857c4a9544f..f3340b9f5e2a 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts +++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts @@ -130,7 +130,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index ee7bb37d2c68..f14b70d4078c 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -119,7 +119,9 @@ ðernet { pinctrl-names = "default"; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts index e0a568f3b113..b05fb1719715 100644 --- a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts +++ b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts @@ -149,7 +149,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index 959fce350e28..4aa404542f62 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -111,7 +111,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 6cb67d40ded8..9ebd10bbb0d1 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi @@ -75,6 +75,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_zte_q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts index 0303e3fe3ec3..6933a86f604d 100644 --- a/target/linux/ramips/dts/mt7620a_zte_q7.dts +++ b/target/linux/ramips/dts/mt7620a_zte_q7.dts @@ -98,6 +98,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts index 2f648a2700e3..c41d0a1c1d12 100644 --- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts +++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts @@ -136,9 +136,9 @@ }; ðernet { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&rgmii2_pins &mdio_pins>; + mtd-mac-address = <&factory 0x00004>; port@4 { diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index e77615a9f558..5e610be86285 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts @@ -109,6 +109,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts index 423641d8338b..76f728ea6551 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts @@ -122,6 +122,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts index 986903b601b8..f84dda3bf870 100644 --- a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts +++ b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts @@ -98,6 +98,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts index 1c45c8e8cc07..3f75c763f726 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts @@ -105,7 +105,8 @@ }; ðernet { - mediatek,portmap = "llllw"; pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts index deb16785a0c7..5a75e5ab96cb 100644 --- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts +++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts @@ -119,6 +119,7 @@ ðernet { mtd-mac-address = <&factory 0x2e>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts index 2e37fdd88456..fbc751fb4821 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts @@ -114,6 +114,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts index 931f0500ba44..a4bc5c71bccf 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts @@ -114,6 +114,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi index 09df87966e31..97624723555f 100644 --- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi +++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi @@ -44,6 +44,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts index 09e2cf257daa..135e048fcaa1 100644 --- a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts +++ b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts @@ -82,6 +82,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts index 2c905f7f6a88..35dc933d993a 100644 --- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts +++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts @@ -87,6 +87,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts index 341a231daf41..eff3842a3e12 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts @@ -110,6 +110,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts index 9439b0c28e82..7a111ffac59e 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts @@ -114,6 +114,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index f293082e967a..e5d3cc0a29d9 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts @@ -95,6 +95,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts index ee31792ab006..675b42671b0f 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts @@ -107,7 +107,9 @@ ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts index 7846bd995aaf..00af10b0c7d1 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts @@ -133,6 +133,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts index 2e7a689e273b..cbeabf4ec831 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts @@ -133,6 +133,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "llllw"; }; -- 2.30.2