From 00568e07ed139eab32a259d35cf091f19e79fbf6 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 16 Apr 2020 10:00:29 +0800 Subject: [PATCH] ramips: add basic support for kernel 5.4 --- target/linux/ramips/dts/mt7620a.dtsi | 72 +++--- .../ramips/dts/mt7620a_aigale_ai-br100.dts | 4 +- .../dts/mt7620a_alfa-network_ac1200rm.dts | 4 +- .../dts/mt7620a_alfa-network_r36m-e4g.dts | 4 +- .../dts/mt7620a_alfa-network_tube-e4g.dts | 4 +- .../linux/ramips/dts/mt7620a_asus_rp-n53.dts | 4 +- .../ramips/dts/mt7620a_asus_rt-ac51u.dts | 4 +- .../ramips/dts/mt7620a_bdcom_wap2100-sk.dts | 4 +- .../ramips/dts/mt7620a_buffalo_whr-1166d.dts | 4 +- .../ramips/dts/mt7620a_buffalo_whr-300hp2.dts | 4 +- .../ramips/dts/mt7620a_buffalo_whr-600d.dts | 4 +- .../ramips/dts/mt7620a_dlink_dch-m225.dts | 8 +- .../ramips/dts/mt7620a_dlink_dir-510l.dts | 4 +- .../ramips/dts/mt7620a_dlink_dir-810l.dts | 4 +- .../ramips/dts/mt7620a_dlink_dwr-118-a1.dts | 4 +- .../ramips/dts/mt7620a_dlink_dwr-118-a2.dts | 4 +- .../ramips/dts/mt7620a_dlink_dwr-960.dts | 190 ++++++++++++++ .../ramips/dts/mt7620a_dovado_tiny-ac.dts | 4 +- .../dts/mt7620a_edimax_br-6478ac-v2.dts | 4 +- .../ramips/dts/mt7620a_edimax_ew-7478apc.dts | 4 +- .../ramips/dts/mt7620a_edimax_ew-747x.dtsi | 8 +- .../ramips/dts/mt7620a_engenius_esr600.dts | 4 +- .../linux/ramips/dts/mt7620a_fon_fon2601.dts | 12 +- .../ramips/dts/mt7620a_glinet_gl-mt300a.dts | 4 +- .../ramips/dts/mt7620a_glinet_gl-mt300n.dts | 4 +- .../ramips/dts/mt7620a_glinet_gl-mt750.dts | 4 +- .../dts/mt7620a_head-weblink_hdrm200.dts | 4 +- .../ramips/dts/mt7620a_hiwifi_hc5x61.dtsi | 4 +- target/linux/ramips/dts/mt7620a_hnet_c108.dts | 4 +- .../ramips/dts/mt7620a_iodata_wn-ac1167gr.dts | 4 +- .../ramips/dts/mt7620a_iodata_wn-ac733gr3.dts | 4 +- .../ramips/dts/mt7620a_iptime_a104ns.dts | 4 +- .../ramips/dts/mt7620a_kimax_u25awf-h1.dts | 4 +- .../ramips/dts/mt7620a_lava_lr-25g001.dts | 4 +- .../ramips/dts/mt7620a_lenovo_newifi-y1.dtsi | 4 +- .../ramips/dts/mt7620a_linksys_e1700.dts | 4 +- .../dts/mt7620a_microduino_microwrt.dts | 4 +- .../mt7620a_netgear_ex2700_wn3000rp-v3.dtsi | 4 +- .../dts/mt7620a_netgear_ex3700_ex6130.dtsi | 4 +- .../ramips/dts/mt7620a_ohyeah_oy-0001.dts | 4 +- .../linux/ramips/dts/mt7620a_phicomm_k2g.dts | 4 +- .../ramips/dts/mt7620a_phicomm_psg1208.dts | 4 +- .../ramips/dts/mt7620a_phicomm_psg1218a.dts | 4 +- .../ramips/dts/mt7620a_phicomm_psg1218b.dts | 4 +- .../ramips/dts/mt7620a_planex_cs-qr10.dts | 8 +- .../ramips/dts/mt7620a_planex_db-wrt01.dts | 4 +- .../ramips/dts/mt7620a_planex_mzk-750dhp.dts | 4 +- .../ramips/dts/mt7620a_planex_mzk-ex300np.dts | 4 +- .../ramips/dts/mt7620a_planex_mzk-ex750np.dts | 4 +- .../ramips/dts/mt7620a_ralink_mt7620a-evb.dts | 4 +- .../dts/mt7620a_ralink_mt7620a-mt7530-evb.dts | 4 +- .../dts/mt7620a_ralink_mt7620a-v22sg-evb.dts | 4 +- .../ramips/dts/mt7620a_sanlinking_d240.dts | 8 +- .../ramips/dts/mt7620a_sercomm_na930.dts | 8 +- .../dts/mt7620a_tplink_archer-c2-v1.dts | 4 +- .../dts/mt7620a_tplink_archer-c20-v1.dts | 4 +- .../ramips/dts/mt7620a_tplink_archer-c20i.dts | 4 +- .../dts/mt7620a_tplink_archer-c50-v1.dts | 4 +- .../dts/mt7620a_tplink_archer-mr200.dts | 4 +- .../ramips/dts/mt7620a_tplink_re200-v1.dts | 4 +- .../ramips/dts/mt7620a_tplink_re210-v1.dts | 4 +- .../ramips/dts/mt7620a_xiaomi_miwifi-mini.dts | 4 +- .../ramips/dts/mt7620a_xiaomi_miwifi-r3.dts | 8 +- target/linux/ramips/dts/mt7620a_youku_yk1.dts | 4 +- .../linux/ramips/dts/mt7620a_yukai_bocco.dts | 4 +- .../dts/mt7620a_zbtlink_zbt-ape522ii.dts | 4 +- .../dts/mt7620a_zbtlink_zbt-we1026.dtsi | 4 +- .../dts/mt7620a_zbtlink_zbt-we826-e.dts | 4 +- .../ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi | 4 +- target/linux/ramips/dts/mt7620a_zte_q7.dts | 4 +- .../dts/mt7620a_zyxel_keenetic-viva.dts | 4 +- target/linux/ramips/dts/mt7620n.dtsi | 28 +- .../linux/ramips/dts/mt7620n_asus_rt-n12p.dts | 4 +- .../linux/ramips/dts/mt7620n_asus_rt-n14u.dts | 4 +- .../ramips/dts/mt7620n_buffalo_wmr-300.dts | 4 +- .../ramips/dts/mt7620n_comfast_cf-wr800n.dts | 4 +- .../ramips/dts/mt7620n_dlink_dwr-116-a1.dts | 4 +- .../ramips/dts/mt7620n_dlink_dwr-921-c1.dts | 4 +- .../ramips/dts/mt7620n_dlink_dwr-922-e2.dts | 4 +- .../ramips/dts/mt7620n_elecom_wrh-300cr.dts | 4 +- .../linux/ramips/dts/mt7620n_kimax_u35wf.dts | 4 +- .../ramips/dts/mt7620n_kingston_mlw221.dts | 4 +- .../ramips/dts/mt7620n_kingston_mlwg2.dts | 4 +- .../linux/ramips/dts/mt7620n_nexx_wt3020.dtsi | 4 +- .../ramips/dts/mt7620n_ravpower_wd03.dts | 4 +- .../ramips/dts/mt7620n_vonets_var11n-300.dts | 4 +- .../ramips/dts/mt7620n_wrtnode_wrtnode.dts | 4 +- .../ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts | 4 +- .../ramips/dts/mt7620n_zbtlink_zbt-wa05.dts | 4 +- .../ramips/dts/mt7620n_zbtlink_zbt-we2026.dts | 4 +- .../dts/mt7620n_zbtlink_zbt-wr8305rt.dts | 4 +- .../dts/mt7620n_zyxel_keenetic-omni-ii.dts | 4 +- .../dts/mt7620n_zyxel_keenetic-omni.dts | 4 +- target/linux/ramips/dts/mt7621.dtsi | 241 ++++++++++++------ target/linux/ramips/dts/mt7621_adslr_g7.dts | 43 +++- .../ramips/dts/mt7621_afoundry_ew1200.dts | 49 +++- .../dts/mt7621_alfa-network_quad-e4g.dts | 76 ++++-- .../ramips/dts/mt7621_asiarf_ap7621-001.dts | 16 ++ .../ramips/dts/mt7621_asiarf_ap7621-nv1.dts | 21 ++ .../ramips/dts/mt7621_asiarf_ap7621.dtsi | 13 +- .../linux/ramips/dts/mt7621_asus_rt-ac57u.dts | 46 +++- .../ramips/dts/mt7621_asus_rt-acx5p.dtsi | 49 +++- .../ramips/dts/mt7621_buffalo_wsr-1166dhp.dts | 63 +++-- .../dts/mt7621_buffalo_wsr-2533dhpl.dts | 236 +++++++++++++++++ .../ramips/dts/mt7621_buffalo_wsr-600dhp.dts | 65 +++-- .../ramips/dts/mt7621_d-team_newifi-d2.dts | 61 +++-- .../linux/ramips/dts/mt7621_d-team_pbr-m1.dts | 57 ++++- .../ramips/dts/mt7621_dlink_dir-860l-b1.dts | 51 +++- .../ramips/dts/mt7621_dlink_dir-878-a1.dts | 4 +- .../linux/ramips/dts/mt7621_edimax_ra21s.dts | 8 +- .../linux/ramips/dts/mt7621_edimax_rg21s.dts | 8 +- .../linux/ramips/dts/mt7621_edimax_rx21s.dtsi | 42 ++- .../dts/mt7621_elecom_wrc-1167ghbk2-s.dts | 52 +++- .../ramips/dts/mt7621_elecom_wrc-gst.dtsi | 56 +++- .../ramips/dts/mt7621_firefly_firewrt.dts | 43 +++- .../ramips/dts/mt7621_gehua_ghl-r-001.dts | 40 ++- .../linux/ramips/dts/mt7621_gnubee_gb-pc1.dts | 31 ++- .../linux/ramips/dts/mt7621_gnubee_gb-pc2.dts | 35 ++- .../linux/ramips/dts/mt7621_hiwifi_hc5962.dts | 95 ++++--- .../ramips/dts/mt7621_iodata_wn-ax1167gr.dts | 49 +++- .../ramips/dts/mt7621_iodata_wn-ax2033gr.dts | 37 +++ .../ramips/dts/mt7621_iodata_wn-gx300gr.dts | 49 +++- .../ramips/dts/mt7621_iodata_wn-xx-xr.dtsi | 47 +++- .../ramips/dts/mt7621_iodata_wnpr2600g.dts | 50 +++- .../linux/ramips/dts/mt7621_iptime_a6ns-m.dts | 50 +++- .../linux/ramips/dts/mt7621_iptime_a8004t.dts | 46 +++- .../ramips/dts/mt7621_jcg_jhr-ac876m.dts | 46 +++- .../ramips/dts/mt7621_jdcloud_re-sp-01b.dts | 4 +- .../ramips/dts/mt7621_lenovo_newifi-d1.dts | 46 +++- .../ramips/dts/mt7621_linksys_re6500.dts | 38 ++- .../dts/mt7621_mediatek_ap-mt7621a-v60.dts | 41 ++- .../dts/mt7621_mediatek_mt7621-eval-board.dts | 37 ++- ...=> mt7621_mikrotik_routerboard-750gr3.dts} | 55 +++- ...s => mt7621_mikrotik_routerboard-m11g.dts} | 45 ++-- ...s => mt7621_mikrotik_routerboard-m33g.dts} | 43 +++- .../linux/ramips/dts/mt7621_mqmaker_witi.dts | 39 ++- target/linux/ramips/dts/mt7621_mtc_wr1201.dts | 49 +++- .../ramips/dts/mt7621_netgear_ex6150.dts | 41 +-- .../ramips/dts/mt7621_netgear_r6700-v2.dts | 9 +- .../linux/ramips/dts/mt7621_netgear_r6800.dts | 9 +- .../dts/mt7621_netgear_sercomm_ayx.dtsi | 57 ++++- .../dts/mt7621_netgear_sercomm_bzv.dtsi | 43 +++- .../dts/mt7621_netgear_sercomm_chj.dtsi | 53 +++- .../linux/ramips/dts/mt7621_netis_wf2881.dts | 44 +++- .../linux/ramips/dts/mt7621_phicomm_k2p.dts | 44 +++- .../linux/ramips/dts/mt7621_planex_vr500.dts | 40 ++- .../dts/mt7621_samknows_whitebox-v8.dts | 44 +++- .../dts/mt7621_storylink_sap-g3200u3.dts | 43 +++- .../dts/mt7621_telco-electronics_x1.dts | 60 +++-- .../ramips/dts/mt7621_thunder_timecloud.dts | 23 +- .../ramips/dts/mt7621_totolink_a7000r.dts | 41 ++- .../ramips/dts/mt7621_tplink_re350-v1.dts | 37 ++- .../ramips/dts/mt7621_tplink_re650-v1.dts | 44 ++-- .../dts/mt7621_ubiquiti_edgerouterx-sfp.dts | 22 -- .../dts/mt7621_ubiquiti_edgerouterx.dts | 8 - .../dts/mt7621_ubnt_edgerouter-x-sfp.dts | 17 ++ .../ramips/dts/mt7621_ubnt_edgerouter-x.dts | 8 + ...erx.dtsi => mt7621_ubnt_edgerouter-x.dtsi} | 48 +++- .../ramips/dts/mt7621_ubnt_unifi-nanohd.dts | 24 +- .../ramips/dts/mt7621_unielec_u7621-06.dtsi | 50 +++- .../linux/ramips/dts/mt7621_wevo_11acnas.dts | 2 +- .../ramips/dts/mt7621_wevo_w2914ns-v2.dts | 2 +- .../ramips/dts/mt7621_wevo_w2914ns-v2.dtsi | 43 +++- .../ramips/dts/mt7621_xiaomi_mir3g-v2.dts | 33 ++- .../linux/ramips/dts/mt7621_xiaomi_mir3g.dts | 49 +++- .../linux/ramips/dts/mt7621_xiaomi_mir3p.dts | 57 ++++- .../linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts | 50 +++- .../dts/mt7621_xzwifi_creativebox-v1.dts | 56 +++- .../ramips/dts/mt7621_youhua_wr1200js.dts | 48 +++- .../linux/ramips/dts/mt7621_youku_yk-l2.dts | 46 +++- .../ramips/dts/mt7621_zbtlink_zbt-we1326.dts | 38 ++- .../ramips/dts/mt7621_zbtlink_zbt-we3526.dts | 38 ++- .../ramips/dts/mt7621_zbtlink_zbt-wg2626.dts | 41 ++- .../ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi | 41 ++- .../linux/ramips/dts/mt7621_zio_freezio.dts | 2 +- target/linux/ramips/dts/mt7628an.dtsi | 78 +++--- .../dts/mt7628an_alfa-network_awusfree1.dts | 22 +- .../dts/mt7628an_buffalo_wcr-1166ds.dts | 26 +- .../linux/ramips/dts/mt7628an_cudy_wr1000.dts | 18 +- .../ramips/dts/mt7628an_d-team_pbr-d1.dts | 26 +- .../linux/ramips/dts/mt7628an_duzun_dm06.dts | 12 +- .../dts/mt7628an_glinet_gl-mt300n-v2.dts | 18 +- .../mt7628an_glinet_vixmini_microuter.dtsi | 10 +- .../ramips/dts/mt7628an_hilink_hlk-7628n.dts | 8 +- .../ramips/dts/mt7628an_hiwifi_hc5661a.dts | 18 +- .../ramips/dts/mt7628an_hiwifi_hc5761a.dts | 22 +- .../ramips/dts/mt7628an_hiwifi_hc5861b.dts | 8 +- .../ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi | 2 +- target/linux/ramips/dts/mt7628an_iptime.dtsi | 8 +- .../linux/ramips/dts/mt7628an_iptime_a3.dts | 4 +- .../ramips/dts/mt7628an_iptime_a604m.dts | 10 +- .../mt7628an_mediatek_linkit-smart-7688.dts | 28 +- .../mt7628an_mediatek_mt7628an-eval-board.dts | 4 +- .../dts/mt7628an_mercury_mac1200r-v2.dts | 2 +- .../ramips/dts/mt7628an_netgear_r6120.dts | 20 +- .../ramips/dts/mt7628an_onion_omega2.dtsi | 52 ++-- .../dts/mt7628an_rakwireless_rak633.dts | 6 +- .../ramips/dts/mt7628an_skylab_skw92a.dts | 10 +- target/linux/ramips/dts/mt7628an_tama_w06.dts | 12 +- .../linux/ramips/dts/mt7628an_totolink_a3.dts | 4 +- .../ramips/dts/mt7628an_totolink_lr1200.dts | 28 +- .../dts/mt7628an_tplink_archer-c20-v4.dts | 22 +- .../dts/mt7628an_tplink_archer-c20-v5.dts | 22 +- .../dts/mt7628an_tplink_archer-c50-v3.dts | 22 +- .../dts/mt7628an_tplink_archer-c50-v4.dts | 22 +- .../ramips/dts/mt7628an_tplink_re200-v2.dts | 20 +- .../ramips/dts/mt7628an_tplink_re200.dtsi | 4 +- .../ramips/dts/mt7628an_tplink_re305-v1.dts | 18 +- .../dts/mt7628an_tplink_tl-mr3020-v3.dts | 20 +- .../dts/mt7628an_tplink_tl-mr3420-v5.dts | 22 +- .../dts/mt7628an_tplink_tl-wa801nd-v5.dts | 18 +- .../dts/mt7628an_tplink_tl-wr802n-v4.dts | 8 +- .../dts/mt7628an_tplink_tl-wr840n-v4.dts | 16 +- .../dts/mt7628an_tplink_tl-wr840n-v5.dts | 10 +- .../dts/mt7628an_tplink_tl-wr841n-v13.dts | 26 +- .../dts/mt7628an_tplink_tl-wr841n-v14.dts | 18 +- .../dts/mt7628an_tplink_tl-wr842n-v5.dts | 22 +- .../dts/mt7628an_tplink_tl-wr902ac-v3.dts | 24 +- .../ramips/dts/mt7628an_unielec_u7628-01.dtsi | 30 +-- .../dts/mt7628an_vocore_vocore2-lite.dts | 2 +- .../ramips/dts/mt7628an_vocore_vocore2.dts | 2 +- .../ramips/dts/mt7628an_vocore_vocore2.dtsi | 4 +- .../dts/mt7628an_wavlink_wl-wn570ha1.dts | 18 +- .../dts/mt7628an_wavlink_wl-wn575a3.dts | 16 +- .../linux/ramips/dts/mt7628an_widora_neo.dtsi | 34 +-- .../ramips/dts/mt7628an_wiznet_wizfi630s.dts | 36 +-- .../ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi | 2 +- .../ramips/dts/mt7628an_wrtnode_wrtnode2p.dts | 6 +- .../ramips/dts/mt7628an_wrtnode_wrtnode2r.dts | 10 +- .../ramips/dts/mt7628an_xiaomi_mir4a-100m.dts | 10 +- .../dts/mt7628an_xiaomi_miwifi-nano.dts | 12 +- .../dts/mt7628an_zbtlink_zbt-we1226.dts | 14 +- .../dts/mt7628an_zyxel_keenetic-extra-ii.dts | 20 +- target/linux/ramips/dts/rt2880.dtsi | 22 +- .../ramips/dts/rt2880_airlink101_ar670w.dts | 4 +- .../ramips/dts/rt2880_airlink101_ar725w.dts | 4 +- .../linux/ramips/dts/rt2880_asus_rt-n15.dts | 4 +- .../ramips/dts/rt2880_belkin_f5d8235-v1.dts | 4 +- .../dts/rt2880_buffalo_wzr-agl300nh.dts | 4 +- .../ramips/dts/rt2880_dlink_dap-1522-a1.dts | 4 +- target/linux/ramips/dts/rt3050.dtsi | 26 +- .../ramips/dts/rt3050_8devices_carambola.dts | 4 +- .../ramips/dts/rt3050_allnet_all0256n.dtsi | 4 +- .../dts/rt3050_alphanetworks_asl26555.dtsi | 4 +- .../dts/rt3050_arcwireless_freestation5.dts | 4 +- .../ramips/dts/rt3050_asus_rt-g32-b1.dts | 4 +- .../linux/ramips/dts/rt3050_asus_wl-330n.dts | 4 +- .../ramips/dts/rt3050_asus_wl-330n3g.dts | 4 +- .../linux/ramips/dts/rt3050_dlink_dcs-930.dts | 4 +- .../ramips/dts/rt3050_dlink_dir-300-b1.dts | 4 +- .../ramips/dts/rt3050_dlink_dir-600-b1.dts | 4 +- .../ramips/dts/rt3050_dlink_dir-615-d.dts | 4 +- .../ramips/dts/rt3050_dlink_dir-620-a1.dts | 4 +- .../ramips/dts/rt3050_edimax_3g-6200n.dts | 4 +- .../ramips/dts/rt3050_edimax_3g-6200nl.dts | 4 +- .../linux/ramips/dts/rt3050_huawei_d105.dts | 4 +- .../linux/ramips/dts/rt3050_jcg_jhr-n805r.dts | 4 +- .../linux/ramips/dts/rt3050_netcore_nw718.dts | 4 +- .../ramips/dts/rt3050_sparklan_wcr-150gn.dts | 4 +- .../ramips/dts/rt3050_teltonika_rut5xx.dts | 4 +- .../linux/ramips/dts/rt3050_tenda_w150m.dts | 4 +- .../dts/rt3050_trendnet_tew-638apb-v2.dts | 4 +- .../linux/ramips/dts/rt3052_accton_wr6202.dts | 4 +- .../ramips/dts/rt3052_alfa-network_w502u.dts | 4 +- .../linux/ramips/dts/rt3052_argus_atp-52b.dts | 4 +- .../ramips/dts/rt3052_asiarf_awapn2403.dts | 4 +- .../linux/ramips/dts/rt3052_asus_rt-n13u.dts | 4 +- .../ramips/dts/rt3052_aximcom_mr-102n.dts | 4 +- .../ramips/dts/rt3052_aztech_hw550-3g.dts | 4 +- .../ramips/dts/rt3052_belkin_f5d8235-v2.dts | 4 +- .../ramips/dts/rt3052_buffalo_whr-g300n.dts | 4 +- .../ramips/dts/rt3052_dlink_dap-1350.dts | 4 +- .../ramips/dts/rt3052_engenius_esr-9753.dts | 4 +- .../ramips/dts/rt3052_fon_fonera-20n.dts | 4 +- .../ramips/dts/rt3052_hauppauge_broadway.dts | 4 +- .../linux/ramips/dts/rt3052_huawei_hg255d.dts | 4 +- .../linux/ramips/dts/rt3052_jcg_jhr-n825r.dts | 4 +- .../linux/ramips/dts/rt3052_jcg_jhr-n926r.dts | 4 +- .../dts/rt3052_mofinetwork_mofi3500-3gn.dts | 4 +- .../ramips/dts/rt3052_netgear_wnce2001.dts | 4 +- .../linux/ramips/dts/rt3052_nexaira_bc2.dts | 4 +- .../ramips/dts/rt3052_omnima_miniembwifi.dts | 4 +- .../ramips/dts/rt3052_petatel_psr-680w.dts | 4 +- .../ramips/dts/rt3052_planex_mzk-w300nh2.dts | 4 +- .../ramips/dts/rt3052_planex_mzk-wdpr.dts | 4 +- .../linux/ramips/dts/rt3052_poray_ip2202.dts | 4 +- .../ramips/dts/rt3052_prolink_pwh2004.dts | 4 +- .../ramips/dts/rt3052_ralink_v22rw-2x2.dts | 4 +- .../ramips/dts/rt3052_sitecom_wl-351.dts | 4 +- .../ramips/dts/rt3052_skyline_sl-r7205.dts | 4 +- .../linux/ramips/dts/rt3052_tenda_3g300m.dts | 4 +- .../ramips/dts/rt3052_tenda_w306r-v2.dts | 4 +- .../dts/rt3052_unbranded_wr512-3gn.dtsi | 4 +- .../dts/rt3052_unbranded_xdx-rn502j.dts | 4 +- .../ramips/dts/rt3052_upvel_ur-326n4g.dts | 4 +- .../ramips/dts/rt3052_upvel_ur-336un.dts | 4 +- .../ramips/dts/rt3052_zyxel_keenetic.dts | 4 +- .../ramips/dts/rt3052_zyxel_nbg-419n.dts | 4 +- target/linux/ramips/dts/rt3352.dtsi | 30 +-- .../ramips/dts/rt3352_allnet_all5002.dts | 4 +- .../ramips/dts/rt3352_dlink_dir-615-h1.dts | 4 +- .../ramips/dts/rt3352_dlink_dir-620-d1.dts | 4 +- .../ramips/dts/rt3352_zyxel_nbg-419n-v2.dts | 4 +- .../linux/ramips/dts/rt3662_asus_rt-n56u.dts | 4 +- .../linux/ramips/dts/rt3662_dlink_dir-645.dts | 4 +- .../ramips/dts/rt3662_edimax_br-6475nd.dts | 4 +- target/linux/ramips/dts/rt3662_omnima_hpm.dts | 4 +- .../ramips/dts/rt3662_samsung_cy-swr1100.dts | 4 +- target/linux/ramips/dts/rt3883.dtsi | 28 +- .../ramips/dts/rt3883_belkin_f9k110x.dtsi | 4 +- .../ramips/dts/rt3883_sitecom_wlr-6000.dts | 4 +- .../ramips/dts/rt3883_trendnet_tew-691gr.dts | 4 +- .../ramips/dts/rt3883_trendnet_tew-692gr.dts | 4 +- target/linux/ramips/dts/rt5350.dtsi | 28 +- .../ramips/dts/rt5350_7links_px-4885.dtsi | 4 +- .../ramips/dts/rt5350_airlive_air3gii.dts | 4 +- .../ramips/dts/rt5350_allnet_all5003.dts | 4 +- .../ramips/dts/rt5350_asiarf_awm002-evb.dtsi | 4 +- .../linux/ramips/dts/rt5350_belkin_f7c027.dts | 4 +- .../ramips/dts/rt5350_dlink_dcs-930l-b1.dts | 4 +- .../ramips/dts/rt5350_dlink_dir-300-b7.dts | 4 +- .../ramips/dts/rt5350_dlink_dir-320-b1.dts | 4 +- .../ramips/dts/rt5350_dlink_dir-610-a1.dts | 4 +- .../ramips/dts/rt5350_dlink_dwr-512-b.dts | 4 +- .../ramips/dts/rt5350_easyacc_wizard-8800.dts | 4 +- .../linux/ramips/dts/rt5350_hame_mpr-a1.dts | 4 +- .../linux/ramips/dts/rt5350_hame_mpr-a2.dts | 4 +- .../ramips/dts/rt5350_hilink_hlk-rm04.dts | 8 +- .../ramips/dts/rt5350_hootoo_ht-tm02.dts | 4 +- .../ramips/dts/rt5350_intenso_memory2move.dts | 4 +- .../linux/ramips/dts/rt5350_nexx_wt1520.dtsi | 4 +- .../linux/ramips/dts/rt5350_nixcore_x1.dtsi | 4 +- .../dts/rt5350_olimex_rt5350f-olinuxino.dtsi | 8 +- .../ramips/dts/rt5350_omnima_miniembplug.dts | 4 +- .../ramips/dts/rt5350_planex_mzk-dp150n.dts | 4 +- target/linux/ramips/dts/rt5350_poray_m3.dts | 4 +- target/linux/ramips/dts/rt5350_poray_m4.dtsi | 4 +- target/linux/ramips/dts/rt5350_poray_x5.dts | 4 +- target/linux/ramips/dts/rt5350_poray_x8.dts | 4 +- .../linux/ramips/dts/rt5350_tenda_3g150b.dts | 4 +- .../ramips/dts/rt5350_trendnet_tew-714tru.dts | 4 +- .../ramips/dts/rt5350_unbranded_a5-v11.dts | 4 +- .../ramips/dts/rt5350_vocore_vocore.dtsi | 4 +- .../ramips/dts/rt5350_wansview_ncs601w.dts | 4 +- .../ramips/dts/rt5350_wiznet_wizfi630a.dts | 4 +- .../ramips/dts/rt5350_zorlik_zl5900v2.dts | 4 +- .../dts/rt5350_zyxel_keenetic-start.dts | 4 +- .../drivers/net/ethernet/mediatek/Kconfig | 70 ----- .../drivers/net/ethernet/mediatek/Makefile | 22 -- .../drivers/mmc/host/mtk-mmc/Kconfig | 0 .../drivers/mmc/host/mtk-mmc/Makefile | 0 .../drivers/mmc/host/mtk-mmc/board.h | 0 .../drivers/mmc/host/mtk-mmc/dbg.c | 0 .../drivers/mmc/host/mtk-mmc/dbg.h | 0 .../drivers/mmc/host/mtk-mmc/mt6575_sd.h | 0 .../drivers/mmc/host/mtk-mmc/sd.c | 2 +- .../files/drivers/net/ethernet/ralink/Kconfig | 70 +++++ .../drivers/net/ethernet/ralink/Makefile | 22 ++ .../drivers/net/ethernet/ralink}/esw_rt3050.c | 0 .../drivers/net/ethernet/ralink}/esw_rt3050.h | 2 +- .../drivers/net/ethernet/ralink}/ethtool.c | 0 .../drivers/net/ethernet/ralink}/ethtool.h | 0 .../drivers/net/ethernet/ralink}/gsw_mt7620.c | 0 .../drivers/net/ethernet/ralink}/gsw_mt7620.h | 4 + .../drivers/net/ethernet/ralink}/gsw_mt7621.c | 28 +- .../drivers/net/ethernet/ralink}/mdio.c | 16 +- .../drivers/net/ethernet/ralink}/mdio.h | 2 +- .../net/ethernet/ralink}/mdio_mt7620.c | 0 .../net/ethernet/ralink}/mdio_rt2880.c | 0 .../net/ethernet/ralink}/mdio_rt2880.h | 0 .../drivers/net/ethernet/ralink}/mt7530.c | 83 ------ .../drivers/net/ethernet/ralink}/mt7530.h | 0 .../net/ethernet/ralink}/mtk_debugfs.c | 0 .../net/ethernet/ralink}/mtk_eth_soc.c | 62 +++-- .../net/ethernet/ralink}/mtk_eth_soc.h | 0 .../net/ethernet/ralink}/mtk_offload.c | 6 +- .../net/ethernet/ralink}/mtk_offload.h | 0 .../drivers/net/ethernet/ralink}/soc_mt7620.c | 34 +++ .../drivers/net/ethernet/ralink}/soc_mt7621.c | 0 .../drivers/net/ethernet/ralink}/soc_rt2880.c | 0 .../drivers/net/ethernet/ralink}/soc_rt3050.c | 0 .../drivers/net/ethernet/ralink}/soc_rt3883.c | 0 target/linux/ramips/image/Makefile | 1 + target/linux/ramips/image/mt7620.mk | 14 + target/linux/ramips/image/mt7621.mk | 54 ++-- .../mt7620/base-files/etc/board.d/01_leds | 4 + .../mt7620/base-files/etc/board.d/02_network | 5 + .../base-files/etc/board.d/03_gpio_switches | 3 + .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + .../mt7621/base-files/etc/board.d/01_leds | 2 +- .../mt7621/base-files/etc/board.d/02_network | 16 +- .../base-files/etc/board.d/03_gpio_switches | 6 +- .../etc/uci-defaults/04_led_migration | 9 +- .../mt7621/base-files/lib/upgrade/platform.sh | 10 +- 394 files changed, 4332 insertions(+), 2089 deletions(-) create mode 100644 target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts create mode 100644 target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts create mode 100644 target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts rename target/linux/ramips/dts/{mt7621_mikrotik_rb750gr3.dts => mt7621_mikrotik_routerboard-750gr3.dts} (70%) rename target/linux/ramips/dts/{mt7621_mikrotik_rbm11g.dts => mt7621_mikrotik_routerboard-m11g.dts} (72%) rename target/linux/ramips/dts/{mt7621_mikrotik_rbm33g.dts => mt7621_mikrotik_routerboard-m33g.dts} (81%) delete mode 100644 target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts delete mode 100644 target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts create mode 100644 target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts create mode 100644 target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts rename target/linux/ramips/dts/{mt7621_ubiquiti_edgerouterx.dtsi => mt7621_ubnt_edgerouter-x.dtsi} (66%) delete mode 100644 target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Kconfig delete mode 100644 target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Makefile rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/Kconfig (100%) rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/Makefile (100%) rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/board.h (100%) rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/dbg.c (100%) rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/dbg.h (100%) rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/mt6575_sd.h (100%) rename target/linux/ramips/{files-4.14 => files}/drivers/mmc/host/mtk-mmc/sd.c (99%) create mode 100644 target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig create mode 100644 target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/esw_rt3050.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/esw_rt3050.h (95%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/ethtool.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/ethtool.h (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/gsw_mt7620.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/gsw_mt7620.h (97%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/gsw_mt7621.c (89%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mdio.c (92%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mdio.h (96%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mdio_mt7620.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mdio_rt2880.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mdio_rt2880.h (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mt7530.c (92%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mt7530.h (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mtk_debugfs.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mtk_eth_soc.c (96%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mtk_eth_soc.h (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mtk_offload.c (99%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/mtk_offload.h (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/soc_mt7620.c (91%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/soc_mt7621.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/soc_rt2880.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/soc_rt3050.c (100%) rename target/linux/ramips/{files-4.14/drivers/net/ethernet/mediatek => files/drivers/net/ethernet/ralink}/soc_rt3883.c (100%) diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 150c0e14ca..29d138c84e 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -133,7 +133,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -152,7 +152,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <32>; + ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -171,7 +171,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,nr-gpio = <1>; + ralink,num-gpios = <1>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -315,113 +315,113 @@ pcm_i2s_pins: pcm_i2s { pcm_i2s { - ralink,group = "uartf"; - ralink,function = "pcm i2s"; + groups = "uartf"; + function = "pcm i2s"; }; }; uartf_gpio_pins: uartf_gpio { uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; + groups = "uartf"; + function = "gpio uartf"; }; }; gpio_i2s_pins: gpio_i2s { gpio_i2s { - ralink,group = "uartf"; - ralink,function = "gpio i2s"; + groups = "uartf"; + function = "gpio i2s"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi refclk"; - ralink,function = "spi refclk"; + groups = "spi refclk"; + function = "spi refclk"; }; }; i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; mdio_pins: mdio { mdio { - ralink,group = "mdio"; - ralink,function = "mdio"; + groups = "mdio"; + function = "mdio"; }; }; mdio_refclk_pins: mdio_refclk { mdio_refclk { - ralink,group = "mdio"; - ralink,function = "refclk"; + groups = "mdio"; + function = "refclk"; }; }; ephy_pins: ephy { ephy { - ralink,group = "ephy"; - ralink,function = "ephy"; + groups = "ephy"; + function = "ephy"; }; }; wled_pins: wled { wled { - ralink,group = "wled"; - ralink,function = "wled"; + groups = "wled"; + function = "wled"; }; }; rgmii1_pins: rgmii1 { rgmii1 { - ralink,group = "rgmii1"; - ralink,function = "rgmii1"; + groups = "rgmii1"; + function = "rgmii1"; }; }; rgmii2_pins: rgmii2 { rgmii2 { - ralink,group = "rgmii2"; - ralink,function = "rgmii2"; + groups = "rgmii2"; + function = "rgmii2"; }; }; pcie_pins: pcie { pcie { - ralink,group = "pcie"; - ralink,function = "pcie rst"; + groups = "pcie"; + function = "pcie rst"; }; }; pa_pins: pa { pa { - ralink,group = "pa"; - ralink,function = "pa"; + groups = "pa"; + function = "pa"; }; }; sdhci_pins: sdhci { sdhci { - ralink,group = "nd_sd"; - ralink,function = "sd"; + groups = "nd_sd"; + function = "sd"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts index 2ffe8431ee..3a84a30c61 100644 --- a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts +++ b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts @@ -99,8 +99,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts index fa03d14814..47a8e5a180 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts @@ -125,8 +125,8 @@ &state_default { gpio { - ralink,group = "nd_sd", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "nd_sd", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts index 4ba57dda41..b0ac4a37d4 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts @@ -156,8 +156,8 @@ &state_default { gpio { - ralink,group = "ephy", "pcie", "rgmii1", "wled"; - ralink,function = "gpio"; + groups = "ephy", "pcie", "rgmii1", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts index 4953c4c906..eec7d5883e 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts @@ -133,8 +133,8 @@ &state_default { gpio { - ralink,group = "ephy", "nd_sd", "pcie", "uartf"; - ralink,function = "gpio"; + groups = "ephy", "nd_sd", "pcie", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts index 4f92993064..c32c3f017d 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts @@ -150,8 +150,8 @@ &state_default { gpio { - ralink,group = "mdio", "rgmii1"; - ralink,function = "gpio"; + groups = "mdio", "rgmii1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts index 4acab8c032..a8c6a87577 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts @@ -127,8 +127,8 @@ &state_default { gpio { - ralink,group = "i2c", "wled", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "wled", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index e77f39843d..64aafd0a52 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts @@ -144,7 +144,7 @@ &state_default { default { - ralink,group = "spi refclk", "uartf", "wled"; - ralink,function = "gpio"; + groups = "spi refclk", "uartf", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts index aed4ce1693..86420bf674 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts @@ -132,8 +132,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "wled", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts index eeb4ee67d4..60d6d62a4e 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts @@ -132,8 +132,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts index 0800e3d78b..2cf26c7ddc 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts @@ -132,8 +132,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts index 27056a668b..59d7b34331 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts @@ -163,13 +163,13 @@ &state_default { gpio { - ralink,group = "wdt", "rgmii1"; - ralink,function = "gpio"; + groups = "wdt", "rgmii1"; + function = "gpio"; }; gpio_i2s { - ralink,group = "uartf"; - ralink,function = "gpio i2s"; + groups = "uartf"; + function = "gpio i2s"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts index 8a79d9a454..e8a8e65c7d 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts @@ -131,7 +131,7 @@ &state_default { default { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index 0a22eee3b5..9e60b42f71 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -119,8 +119,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; 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 a69b17d739..a01ef25bfa 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts @@ -131,8 +131,8 @@ &state_default { default { - ralink,group = "ephy", "uartf", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "ephy", "uartf", "spi refclk", "wled"; + function = "gpio"; }; }; 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 5134e9e1ca..d795c06b50 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts @@ -129,8 +129,8 @@ &state_default { default { - ralink,group = "ephy", "uartf", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "ephy", "uartf", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts new file mode 100644 index 0000000000..71ed648d41 --- /dev/null +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts @@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7620a.dtsi" + +#include +#include + +/ { + compatible = "dlink,dwr-960", "ralink,mt7620a-soc"; + model = "D-Link DWR-960"; + + aliases { + led-boot = &led_status; + led-failsafe = &led_status; + led-running = &led_status; + led-upgrade = &led_status; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status: status { + label = "dwr-960:green:status"; + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "dwr-960:green:wan"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "dwr-960:green:lan"; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + }; + + sms { + label = "dwr-960:green:sms"; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + + signal_green { + label = "dwr-960:green:signal"; + gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; + }; + + signal_red { + label = "dwr-960:red:signal"; + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + }; + + 4g { + label = "dwr-960:green:4g"; + gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + }; + + 3g { + label = "dwr-960:green:3g"; + gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + }; + + wlan5g { + label = "dwr-960:green:wlan5g"; + gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wlan2g { + label = "dwr-960:green:wlan2g"; + gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + }; +}; + +ðernet { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&rgmii2_pins &mdio_pins>; + mediatek,portmap = "wllll"; + + port@5 { + status = "okay"; + phy-mode = "rgmii-txid"; + phy-handle = <&phy7>; + }; + + mdio-bus { + status = "okay"; + + phy7: ethernet-phy@7 { + reg = <7>; + phy-mode = "rgmii-id"; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&gpio2 { + status = "okay"; +}; + +&gpio3 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "jboot"; + reg = <0x0 0x10000>; + read-only; + }; + + partition@10000 { + compatible = "amit,jimage"; + label = "firmware"; + reg = <0x10000 0xfe0000>; + }; + + config: partition@ff0000 { + label = "config"; + reg = <0xff0000 0x10000>; + read-only; + }; + }; + }; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + ieee80211-freq-limit = <5000000 6000000>; + mediatek,mtd-eeprom = <&config 0xe08e>; + mtd-mac-address = <&config 0xe50e>; + mtd-mac-address-increment = <2>; + }; +}; + +&state_default { + default { + groups = "i2c", "wled", "spi refclk", "uartf", "ephy"; + function = "gpio"; + }; +}; diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index 88bd514d53..d77a503d7a 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts @@ -154,8 +154,8 @@ &state_default { gpio { - ralink,group = "uartf", "nd_sd", "wled"; - ralink,function = "gpio"; + groups = "uartf", "nd_sd", "wled"; + function = "gpio"; }; }; 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 d34bc1b22b..c3267bb3c0 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts @@ -132,8 +132,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index e2765b1877..97a89b896c 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts @@ -117,8 +117,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 1202ac1b69..14ac27f2ae 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -100,16 +100,16 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "nd_sd", "rgmii2"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "nd_sd", "rgmii2"; + function = "gpio"; }; }; &pinctrl { phy_reset_pins: phy-reset { gpio { - ralink,group = "spi refclk"; - ralink,function = "gpio"; + groups = "spi refclk"; + function = "gpio"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts index 3213132c43..d7dbb1bfa4 100644 --- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts +++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts @@ -167,8 +167,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "nd_sd", "wled"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "nd_sd", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_fon_fon2601.dts b/target/linux/ramips/dts/mt7620a_fon_fon2601.dts index 33329a1049..019274a0d3 100644 --- a/target/linux/ramips/dts/mt7620a_fon_fon2601.dts +++ b/target/linux/ramips/dts/mt7620a_fon_fon2601.dts @@ -100,16 +100,16 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; nd_sd { - ralink,group = "nd_sd"; - ralink,function = "sd"; + groups = "nd_sd"; + function = "sd"; }; spi_cs { - ralink,group = "spi refclk"; - ralink,function = "spi refclk"; + groups = "spi refclk"; + function = "spi refclk"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts index d66861c9ad..9a9d9f45ae 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts @@ -147,7 +147,7 @@ &state_default { gpio { - ralink,group = "wled","ephy","uartf","i2c"; - ralink,function = "gpio"; + groups = "wled","ephy","uartf","i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts index 633253fadd..5291b5fcca 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts @@ -138,7 +138,7 @@ &state_default { gpio { - ralink,group = "wled","ephy","i2c"; - ralink,function = "gpio"; + groups = "wled","ephy","i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index e6b30449e8..9df5f464c7 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts @@ -153,7 +153,7 @@ &state_default { gpio { - ralink,group = "wled","ephy","uartf"; - ralink,function = "gpio"; + groups = "wled","ephy","uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts index 6395aa37f6..fbee809893 100644 --- a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts +++ b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts @@ -161,9 +161,9 @@ &state_default { default { - ralink,group = "i2c", "uartf", "pa", "spi refclk", + groups = "i2c", "uartf", "pa", "spi refclk", "wled"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi index 4f4fc4a725..82bc8c9957 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi @@ -127,7 +127,7 @@ &state_default { gpio { - ralink,group = "uartf", "wled"; - ralink,function = "gpio"; + groups = "uartf", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hnet_c108.dts b/target/linux/ramips/dts/mt7620a_hnet_c108.dts index 49fa6b2c8e..15b2a12af7 100644 --- a/target/linux/ramips/dts/mt7620a_hnet_c108.dts +++ b/target/linux/ramips/dts/mt7620a_hnet_c108.dts @@ -174,8 +174,8 @@ &state_default { default { - ralink,group = "i2c", "uartf", "spi refclk", "ephy"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "spi refclk", "ephy"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts index 200df6000e..1cc59e4bb6 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts @@ -186,8 +186,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts index 062ef93ed4..098aaa007f 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts @@ -167,8 +167,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "mdio"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "mdio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts index 14b5071007..28963edadc 100644 --- a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts +++ b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts @@ -53,7 +53,7 @@ &state_default { gpio { - ralink,group = "uartf", "spi refclk"; - ralink,function = "gpio"; + groups = "uartf", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts index ef4dc233ea..ce73886ade 100644 --- a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts +++ b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts @@ -107,7 +107,7 @@ &state_default { default { - ralink,group = "uartf", "ephy", "wled"; - ralink,function = "gpio"; + groups = "uartf", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts index e400ebcff0..c1406503eb 100644 --- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts +++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts @@ -172,7 +172,7 @@ &state_default { gpio { - ralink,group = "uartf", "i2c"; - ralink,function = "gpio"; + groups = "uartf", "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi index 29832ac42b..bf83400957 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi @@ -101,7 +101,7 @@ &state_default { gpio { - ralink,group = "uartf", "wled", "nd_sd"; - ralink,function = "gpio"; + groups = "uartf", "wled", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts index 799d660d3c..6efe9d2b06 100644 --- a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts +++ b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts @@ -99,8 +99,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts index 57f408a648..23d08ad3e4 100644 --- a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts +++ b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts @@ -99,7 +99,7 @@ &state_default { default { - ralink,group = "wled", "i2c", "wdt", "uartf"; - ralink,function = "gpio"; + groups = "wled", "i2c", "wdt", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi index 8199147165..2cd5da9b9c 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi @@ -56,7 +56,7 @@ &state_default { default { - ralink,group = "i2c", "uartf", "spi refclk"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi index ec9b6c587e..697a661481 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi @@ -107,7 +107,7 @@ &state_default { default { - ralink,group = "i2c", "rgmii2", "spi refclk"; - ralink,function = "gpio"; + groups = "i2c", "rgmii2", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts index 98dac3f5b6..b8f86fad50 100644 --- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts +++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts index 5071aed165..63dde14975 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts index 92fcfdf68c..34dfc9976d 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts index 1474422a24..0d9ef767c4 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts @@ -36,8 +36,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index 15fb40fa7d..7f9fea2b07 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts @@ -36,8 +36,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts index 8390d18918..3998ea6019 100644 --- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts +++ b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts @@ -118,12 +118,12 @@ &state_default { gpio { - ralink,group = "spi refclk", "rgmii1"; - ralink,function = "gpio"; + groups = "spi refclk", "rgmii1"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "wdt refclk"; + groups = "wdt"; + function = "wdt refclk"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts index a7c614cc21..e9c2e295e4 100644 --- a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts +++ b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts @@ -82,8 +82,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi refclk", "rgmii1"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "rgmii1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts index 6062a76f76..28473a52c6 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "rgmii1", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts index 3313c6c071..116d5874e1 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts @@ -122,8 +122,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi refclk", "rgmii1", "wled"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "rgmii1", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts index 4b64afd228..e25b969701 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts @@ -127,8 +127,8 @@ &state_default { gpio { - ralink,group = "uartf", "nd_sd", "rgmii2", "wled"; - ralink,function = "gpio"; + groups = "uartf", "nd_sd", "rgmii2", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts index 56f427aa8a..34f870906e 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts @@ -68,8 +68,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; 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 e106af402e..909fd7e0b2 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts @@ -49,8 +49,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; 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 74c82341fe..ee148dbde3 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts @@ -62,8 +62,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "spi"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "spi"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index 35617c0880..2bbd68cf7a 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts @@ -179,8 +179,8 @@ &state_default { default { - ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled", "spi refclk", "pa"; + function = "gpio"; }; /* @@ -193,8 +193,8 @@ * means during pinmux driver load. */ gpio_sd { - ralink,group = "nd_sd"; - ralink,function = "sd"; + groups = "nd_sd"; + function = "sd"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts index 952f371ce0..9313e6259f 100644 --- a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts +++ b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts @@ -116,13 +116,13 @@ &state_default { gpio { - ralink,group = "i2c", "rgmii2", "spi", "ephy"; - ralink,function = "gpio"; + groups = "i2c", "rgmii2", "spi", "ephy"; + function = "gpio"; }; uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; + groups = "uartf"; + function = "gpio uartf"; }; }; 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 efa83eb16d..d8146218c9 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts @@ -159,8 +159,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled", "ephy", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts index b1d3e23450..1d8f3316ad 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts @@ -65,8 +65,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index 7e05a2e1ea..b1cde57d77 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts @@ -49,8 +49,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts index ca03d2ed78..eb5d867a19 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts @@ -65,8 +65,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts index ea42ef2c54..cad83c125b 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts @@ -163,8 +163,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts index c8b2794714..b6e5518f53 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "ephy", "wled", "rgmii1", "spi refclk"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "ephy", "wled", "rgmii1", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts index 49c56a8cb4..a1fa3330d7 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts @@ -56,8 +56,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "wled", "rgmii1"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled", "rgmii1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts index d076e10ced..1442151063 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts +++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts @@ -154,7 +154,7 @@ &state_default { gpio { - ralink,group = "i2c", "rgmii1"; - ralink,function = "gpio"; + groups = "i2c", "rgmii1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-r3.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-r3.dts index 3d6377c104..e047f6781f 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-r3.dts +++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-r3.dts @@ -157,13 +157,13 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "rgmii1"; - ralink,function = "gpio"; + groups = "rgmii1"; + function = "gpio"; }; pa { - ralink,group = "pa"; - ralink,function = "pa"; + groups = "pa"; + function = "pa"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index 641c05a628..a95f1e9320 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -112,8 +112,8 @@ &state_default { default { - ralink,group = "i2c", "rgmii1", "ephy", "wled"; - ralink,function = "gpio"; + groups = "i2c", "rgmii1", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts index 94ac1dd4f9..389fa1b62f 100644 --- a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts +++ b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts @@ -141,8 +141,8 @@ &state_default { gpio { - ralink,group = "spi refclk", "rgmii1"; - ralink,function = "gpio"; + groups = "spi refclk", "rgmii1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index cf9b91f564..c2c6b8b4bb 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -135,7 +135,7 @@ &state_default { gpio { - ralink,group = "wled", "i2c", "uartf", "wdt"; - ralink,function = "gpio"; + groups = "wled", "i2c", "uartf", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi index 3d971ba2c6..91bbd4a044 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi @@ -96,7 +96,7 @@ &state_default { default { - ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "spi refclk", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts index a7779a0071..40df9424a9 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts @@ -76,7 +76,7 @@ &state_default { default { - ralink,group = "i2c", "uartf", "wled"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 82d5de4012..a2051efaad 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi @@ -84,8 +84,8 @@ &state_default { default { - ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "wled", "spi refclk", "pa"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zte_q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts index fc07b57418..182b7db905 100644 --- a/target/linux/ramips/dts/mt7620a_zte_q7.dts +++ b/target/linux/ramips/dts/mt7620a_zte_q7.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts index 563a159ffc..58c96cd197 100644 --- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts +++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts @@ -130,8 +130,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index 54370a0c75..4717f6c043 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -101,7 +101,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -118,7 +118,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -137,7 +137,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <32>; + ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -156,7 +156,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,nr-gpio = <1>; + ralink,num-gpios = <1>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -250,36 +250,36 @@ ephy_pins: ephy { ephy { - ralink,group = "ephy"; - ralink,function = "ephy"; + groups = "ephy"; + function = "ephy"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi refclk"; - ralink,function = "spi refclk"; + groups = "spi refclk"; + function = "spi refclk"; }; }; i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index 801f4c50ec..04afb68061 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts @@ -118,7 +118,7 @@ &state_default { default { - ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk"; - ralink,function = "gpio"; + groups = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts index 2e7f8ea5f6..2ae2182862 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts @@ -131,7 +131,7 @@ &state_default { default { - ralink,group = "ephy", "wled", "i2c"; - ralink,function = "gpio"; + groups = "ephy", "wled", "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts index 9db47c814c..df5761664c 100644 --- a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts +++ b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts @@ -107,7 +107,7 @@ &state_default { default { - ralink,group = "i2c", "ephy"; - ralink,function = "gpio"; + groups = "i2c", "ephy"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts index 16eea14bdf..a2285ea707 100644 --- a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts +++ b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts @@ -116,7 +116,7 @@ &state_default { default { - ralink,group = "ephy", "wled", "spi refclk", "i2c"; - ralink,function = "gpio"; + groups = "ephy", "wled", "spi refclk", "i2c"; + function = "gpio"; }; }; 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 cac849c919..1c45c8e8cc 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts @@ -99,8 +99,8 @@ &state_default { default { - ralink,group = "i2c", "wled"; - ralink,function = "gpio"; + groups = "i2c", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts index 27703acc08..9103857f7a 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts @@ -143,7 +143,7 @@ &state_default { default { - ralink,group = "spi refclk", "i2c", "ephy", "wled"; - ralink,function = "gpio"; + groups = "spi refclk", "i2c", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts index ebd9171415..61ef68c025 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts @@ -145,7 +145,7 @@ &state_default { default { - ralink,group = "spi refclk", "i2c", "ephy", "wled"; - ralink,function = "gpio"; + groups = "spi refclk", "i2c", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts index a8d5b04b37..1d44049548 100644 --- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts +++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts @@ -128,7 +128,7 @@ &state_default { default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; + groups = "i2c", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts index c48560bb94..337abbb68e 100644 --- a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts +++ b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts @@ -107,7 +107,7 @@ &state_default { default { - ralink,group = "ephy", "wled"; - ralink,function = "gpio"; + groups = "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts index 6decec798d..2d7e39f912 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts @@ -123,7 +123,7 @@ &state_default { default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; + groups = "i2c", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts index 75267c68b9..2385ca92f8 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts @@ -123,7 +123,7 @@ &state_default { default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; + groups = "i2c", "ephy", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi index cee1e04e81..a8d0a00441 100644 --- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi +++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi @@ -53,7 +53,7 @@ &state_default { default { - ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf"; - ralink,function = "gpio"; + groups = "ephy", "wled", "pa", "i2c", "wdt", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts index 1740de16eb..381975d26f 100644 --- a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts +++ b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts @@ -109,7 +109,7 @@ &state_default { gpio { - ralink,group = "wled", "ephy"; - ralink,function = "gpio"; + groups = "wled", "ephy"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts index ddcfb1d9b5..cc817f78ef 100644 --- a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts +++ b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts @@ -91,7 +91,7 @@ &state_default { default { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts index 1c346856d1..8877f0f95f 100644 --- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts +++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts @@ -96,7 +96,7 @@ &state_default { default { - ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk"; - ralink,function = "gpio"; + groups = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts index 7a646882f3..b2a3b0d61d 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts @@ -119,7 +119,7 @@ &state_default { default { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts index 41029440e8..f441e0fcb5 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts @@ -123,7 +123,7 @@ &state_default { default { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index 725a070fd6..cc3e82ab4b 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts @@ -104,7 +104,7 @@ &state_default { default { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts index 12b1c5908b..c95c951d21 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts @@ -117,7 +117,7 @@ &state_default { default { - ralink,group = "i2c", "uartf", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "uartf", "spi refclk", "wled"; + function = "gpio"; }; }; 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 c974c9b1d0..c8fcef1b3d 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts @@ -126,8 +126,8 @@ &state_default { gpio { - ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "wdt", "pa", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts index 6e8a333069..34f3e7d371 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts @@ -126,8 +126,8 @@ &state_default { gpio { - ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; - ralink,function = "gpio"; + groups = "i2c", "wdt", "pa", "spi refclk", "wled"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index 849f1f0a09..63befa1fdc 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -1,5 +1,6 @@ #include #include +#include / { #address-cells = <1>; @@ -67,36 +68,15 @@ reg = <0x100 0x100>; }; - gpio@600 { - #address-cells = <1>; - #size-cells = <0>; - - compatible = "mtk,mt7621-gpio"; + gpio: gpio@600 { + #gpio-cells = <2>; + #interrupt-cells = <2>; + compatible = "mediatek,mt7621-gpio"; + gpio-controller; + interrupt-controller; reg = <0x600 0x100>; - interrupt-parent = <&gic>; interrupts = ; - - gpio0: bank@0 { - reg = <0>; - compatible = "mtk,mt7621-gpio-bank"; - gpio-controller; - #gpio-cells = <2>; - }; - - gpio1: bank@1 { - reg = <1>; - compatible = "mtk,mt7621-gpio-bank"; - gpio-controller; - #gpio-cells = <2>; - }; - - gpio2: bank@2 { - reg = <2>; - compatible = "mtk,mt7621-gpio-bank"; - gpio-controller; - #gpio-cells = <2>; - }; }; i2c: i2c@900 { @@ -278,83 +258,83 @@ i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; uart1_pins: uart1 { uart1 { - ralink,group = "uart1"; - ralink,function = "uart1"; + groups = "uart1"; + function = "uart1"; }; }; uart2_pins: uart2 { uart2 { - ralink,group = "uart2"; - ralink,function = "uart2"; + groups = "uart2"; + function = "uart2"; }; }; uart3_pins: uart3 { uart3 { - ralink,group = "uart3"; - ralink,function = "uart3"; + groups = "uart3"; + function = "uart3"; }; }; rgmii1_pins: rgmii1 { rgmii1 { - ralink,group = "rgmii1"; - ralink,function = "rgmii1"; + groups = "rgmii1"; + function = "rgmii1"; }; }; rgmii2_pins: rgmii2 { rgmii2 { - ralink,group = "rgmii2"; - ralink,function = "rgmii2"; + groups = "rgmii2"; + function = "rgmii2"; }; }; mdio_pins: mdio { mdio { - ralink,group = "mdio"; - ralink,function = "mdio"; + groups = "mdio"; + function = "mdio"; }; }; pcie_pins: pcie { pcie { - ralink,group = "pcie"; - ralink,function = "pcie rst"; + groups = "pcie"; + function = "gpio"; }; }; nand_pins: nand { spi-nand { - ralink,group = "spi"; - ralink,function = "nand1"; + groups = "spi"; + function = "nand1"; }; sdhci-nand { - ralink,group = "sdhci"; - ralink,function = "nand2"; + groups = "sdhci"; + function = "nand2"; }; }; sdhci_pins: sdhci { sdhci { - ralink,group = "sdhci"; - ralink,function = "sdhci"; + groups = "sdhci"; + function = "sdhci"; }; }; }; @@ -434,21 +414,41 @@ }; }; + nficlock: nficlock { + #clock-cells = <0>; + compatible = "fixed-clock"; + + clock-frequency = <125000000>; + }; + nand: nand@1e003000 { status = "disabled"; - compatible = "mtk,mt7621-nand"; - bank-width = <2>; + compatible = "mediatek,mt7621-nfc"; reg = <0x1e003000 0x800 0x1e003800 0x800>; + reg-names = "nfi", "ecc"; + + clocks = <&nficlock>; + clock-names = "nfi_clk"; + }; + + ethsys: syscon@1e000000 { + compatible = "mediatek,mt7621-ethsys", + "syscon"; + reg = <0x1e000000 0x1000>; + #clock-cells = <1>; }; ethernet: ethernet@1e100000 { compatible = "mediatek,mt7621-eth"; reg = <0x1e100000 0x10000>; + clocks = <&sysclock>; + clock-names = "ethif"; + #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; resets = <&rstctrl 6 &rstctrl 23>; reset-names = "fe", "eth"; @@ -456,26 +456,88 @@ interrupt-parent = <&gic>; interrupts = ; - mediatek,switch = <&gsw>; + mediatek,ethsys = <ðsys>; - mdio-bus { - #address-cells = <1>; - #size-cells = <0>; + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "rgmii"; - phy1f: ethernet-phy@1f { - reg = <0x1f>; - phy-mode = "rgmii"; + fixed-link { + speed = <1000>; + full-duplex; + pause; }; }; - hnat: hnat@0 { - compatible = "mediatek,mt7623-hnat"; - reg = <0 0x10000>; - mtketh-ppd = "eth0"; - mtketh-lan = "eth0"; - mtketh-wan = "eth0"; - resets = <&rstctrl 0>; - reset-names = "mtketh"; + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + status = "disabled"; + phy-mode = "rgmii-rxid"; + }; + + mdio: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + switch0: switch@1f { + compatible = "mediatek,mt7621"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1f>; + mediatek,mcm; + resets = <&rstctrl 2>; + reset-names = "mcm"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + port@0 { + status = "disabled"; + reg = <0>; + label = "lan0"; + }; + + port@1 { + status = "disabled"; + reg = <1>; + label = "lan1"; + }; + + port@2 { + status = "disabled"; + reg = <2>; + label = "lan2"; + }; + + port@3 { + status = "disabled"; + reg = <3>; + label = "lan3"; + }; + + port@4 { + status = "disabled"; + reg = <4>; + label = "lan4"; + }; + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "rgmii"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; }; }; @@ -488,9 +550,10 @@ pcie: pcie@1e140000 { compatible = "mediatek,mt7621-pci"; - reg = <0x1e140000 0x100 - 0x1e142000 0x100>; - + reg = <0x1e140000 0x100 /* host-pci bridge registers */ + 0x1e142000 0x100 /* pcie port 0 RC control registers */ + 0x1e143000 0x100 /* pcie port 1 RC control registers */ + 0x1e144000 0x100>; /* pcie port 2 RC control registers */ #address-cells = <3>; #size-cells = <2>; @@ -505,10 +568,11 @@ 0x01000000 0 0x00000000 0x1e160000 0 0x00010000 /* io space */ >; - interrupt-parent = <&gic>; - interrupts = ; + #interrupt-cells = <1>; + interrupt-map-mask = <0xF0000 0 0 1>; + interrupt-map = <0x10000 0 0 1 &gic GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH>, + <0x20000 0 0 1 &gic GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH>, + <0x30000 0 0 1 &gic GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -516,32 +580,45 @@ reset-names = "pcie0", "pcie1", "pcie2"; clocks = <&clkctrl 24 &clkctrl 25 &clkctrl 26>; clock-names = "pcie0", "pcie1", "pcie2"; + phys = <&pcie0_phy 1>, <&pcie2_phy 0>; + phy-names = "pcie-phy0", "pcie-phy2"; + + reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>; pcie0: pcie@0,0 { reg = <0x0000 0 0 0 0>; - #address-cells = <3>; #size-cells = <2>; - ranges; + bus-range = <0x00 0xff>; }; pcie1: pcie@1,0 { reg = <0x0800 0 0 0 0>; - #address-cells = <3>; #size-cells = <2>; - ranges; + bus-range = <0x00 0xff>; }; pcie2: pcie@2,0 { reg = <0x1000 0 0 0 0>; - #address-cells = <3>; #size-cells = <2>; - ranges; + bus-range = <0x00 0xff>; }; }; + + pcie0_phy: pcie-phy@1e149000 { + compatible = "mediatek,mt7621-pci-phy"; + reg = <0x1e149000 0x0700>; + #phy-cells = <1>; + }; + + pcie2_phy: pcie-phy@1e14a000 { + compatible = "mediatek,mt7621-pci-phy"; + reg = <0x1e14a000 0x0700>; + #phy-cells = <1>; + }; }; diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts index 26e66f9a31..aa3f423f9b 100644 --- a/target/linux/ramips/dts/mt7621_adslr_g7.dts +++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts @@ -15,7 +15,7 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -27,7 +27,7 @@ led_sys: sys { label = "g7:blue:sys"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; }; @@ -36,7 +36,7 @@ reset { label = "reset"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; debounce-interval = <60>; linux,code = ; }; @@ -105,13 +105,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe00c>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe00c>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts index 8dab036b17..97f13b0bb0 100644 --- a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts +++ b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts @@ -20,18 +20,12 @@ bootargs = "console=ttyS0,57600"; }; - palmbus: palmbus@1E000000 { - i2c@900 { - status = "okay"; - }; - }; - keys { compatible = "gpio-keys"; reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -41,12 +35,12 @@ led_run: run { label = "ew1200:green:run"; - gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; }; usb { label = "ew1200:green:usb"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -117,13 +111,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; + groups = "i2c", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts index 1066536ea6..6ac9e337fc 100644 --- a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts +++ b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts @@ -11,7 +11,7 @@ model = "ALFA Network Quad-E4G"; aliases { - label-mac-device = ðernet; + label-mac-device = &gmac0; led-boot = &led_system; led-failsafe = &led_system; led-running = &led_system; @@ -29,61 +29,61 @@ m2-enable { gpio-export,name = "m2-enable"; gpio-export,output = <1>; - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 32 GPIO_ACTIVE_HIGH>; }; minipcie0-enable { gpio-export,name = "minipcie0-enable"; gpio-export,output = <1>; - gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; }; minipcie0-reset { gpio-export,name = "minipcie0-reset"; gpio-export,output = <0>; - gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; }; minipcie1-enable { gpio-export,name = "minipcie1-enable"; gpio-export,output = <1>; - gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 30 GPIO_ACTIVE_HIGH>; }; minipcie1-reset { gpio-export,name = "minipcie1-reset"; gpio-export,output = <0>; - gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; }; minipcie2-enable { gpio-export,name = "minipcie2-enable"; gpio-export,output = <1>; - gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 31 GPIO_ACTIVE_HIGH>; }; minipcie2-reset { gpio-export,name = "minipcie2-reset"; gpio-export,output = <0>; - gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; }; pcie-perst-disable { gpio-export,name = "pcie-perst-enable"; gpio-export,output = <0>; - gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; }; sim-select { gpio-export,name = "sim-select"; gpio-export,output = <1>; - gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; watchdog-enable { gpio-export,name = "watchdog-enable"; gpio-export,output = <1>; - gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; }; }; @@ -92,19 +92,19 @@ reset { label = "reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; user1 { label = "user1"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; linux,code = ; }; user2 { label = "user2"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -114,44 +114,74 @@ led_system: system { label = "quad-e4g:red:system"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; default-state = "keep"; }; m2 { label = "quad-e4g:orange:m2"; - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; }; minipcie0 { label = "quad-e4g:orange:minipcie0"; - gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; minipcie1 { label = "quad-e4g:orange:minipcie1"; - gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; minipcie2 { label = "quad-e4g:orange:minipcie2"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; }; watchdog { compatible = "linux,wdt-gpio"; - gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; hw_algo = "toggle"; hw_margin_ms = <25000>; always-running; }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &i2c { status = "okay"; @@ -167,8 +197,8 @@ &state_default { gpio { - ralink,group = "jtag", "rgmii2", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "rgmii2", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts b/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts index 9926a9bd5a..6e21420733 100644 --- a/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts +++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts @@ -7,3 +7,19 @@ compatible = "asiarf,ap7621-001", "mediatek,mt7621-soc"; model = "AsiaRF AP7621-001"; }; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts b/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts index ec322d0e08..977f43e114 100644 --- a/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts +++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts @@ -7,3 +7,24 @@ compatible = "asiarf,ap7621-nv1", "mediatek,mt7621-soc"; model = "AsiaRF AP7621-NV1"; }; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + + port@2 { + status = "okay"; + label = "lan1"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi index d4e5cfbf04..bd6642fe51 100644 --- a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi +++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi @@ -15,7 +15,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -25,12 +25,12 @@ wlan1 { label = "ap7621-001:orange:wlan1"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan0 { label = "ap7621-001:orange:wlan0"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; }; }; @@ -103,14 +103,13 @@ status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "llllw"; }; &state_default { gpio { - ralink,group = "wdt", "jtag"; - ralink,function = "gpio"; + groups = "wdt", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts index 0a315398ef..0b37dc8395 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts @@ -26,12 +26,12 @@ led_power: power { label = "rt-ac57u:blue:power"; - gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; usb { label = "rt-ac57u:blue:usb"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; trigger-sources = <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -42,14 +42,14 @@ wps { label = "wps"; - gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 43 GPIO_ACTIVE_HIGH>; linux,code = ; debounce-interval = <60>; }; reset { label = "reset"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <60>; }; @@ -58,7 +58,7 @@ led-regulator { compatible = "regulator-fixed"; regulator-name = "LED-Power"; - gpio = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpio = <&gpio 46 GPIO_ACTIVE_LOW>; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; @@ -134,13 +134,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + + port@1 { + status = "okay"; + label = "lan1"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan3"; + }; + + port@4 { + status = "okay"; + label = "lan4"; + }; + }; +}; + &state_default { gpio { - ralink,group = "sdhci"; - ralink,function = "gpio"; + groups = "sdhci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi index 2de6d4c761..37056c7934 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi +++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi @@ -28,13 +28,13 @@ reset { label = "reset"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -44,17 +44,17 @@ led_power: power { label = "rt-ac85p:blue:power"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wlan2g { label = "rt-ac85p:blue:wlan2g"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan5g { label = "rt-ac85p:blue:wlan5g"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1radio"; }; }; @@ -135,21 +135,42 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "wllll"; - port@5 { - status = "disabled"; - }; }; -&i2c { - status = "disabled"; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + }; + + port@1 { + status = "okay"; + label = "lan1"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan3"; + }; + + port@4 { + status = "okay"; + label = "lan4"; + }; + }; }; &state_default { gpio { - ralink,group = "uart2", "uart3", "i2c"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts index b67e430e5f..af83d0f1b3 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts @@ -25,42 +25,42 @@ internet_g { label = "wsr-1166:green:internet"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; router_g { label = "wsr-1166:green:router"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; router_o { label = "wsr-1166:orange:router"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; internet_o { label = "wsr-1166:orange:internet"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wifi_o { label = "wsr-1166:orange:wifi"; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; led_power: power { label = "wsr-1166:green:power"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; diag { label = "wsr-1166:orange:diag"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; wifi_g { label = "wsr-1166:green:wifi"; - gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; }; @@ -69,39 +69,39 @@ power { label = "power"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; aoss { label = "aoss"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; linux,code = ; }; auto { label = "mode"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; linux,code = ; linux,input-type = ; }; ap { label = "ap"; - gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; linux,code = ; linux,input-type = ; }; router { label = "router"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; linux,code = ; linux,input-type = ; }; @@ -109,7 +109,7 @@ gpio_poweroff { compatible = "gpio-poweroff"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; }; @@ -158,10 +158,39 @@ }; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; + groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts new file mode 100644 index 0000000000..e17c66689a --- /dev/null +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts @@ -0,0 +1,236 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "buffalo,wsr-2533dhpl", "mediatek,mt7621-soc"; + model = "Buffalo WSR-2533DHPL"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_diag; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = &gmac0; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + leds { + compatible = "gpio-leds"; + + internet_green { + label = "wsr-2533dhpl:green:internet"; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; + }; + + router_green { + label = "wsr-2533dhpl:green:router"; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; + }; + + router_amber { + label = "wsr-2533dhpl:amber:router"; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; + }; + + internet_amber { + label = "wsr-2533dhpl:amber:internet"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + wireless_amber { + label = "wsr-2533dhpl:amber:wireless"; + gpios = <&gpio 45 GPIO_ACTIVE_LOW>; + }; + + led_power: power { + label = "wsr-2533dhpl:green:power"; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; + }; + + led_diag: diag { + label = "wsr-2533dhpl:amber:diag"; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; + }; + + wireless_green { + label = "wsr-2533dhpl:green:wireless"; + gpios = <&gpio 48 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + aoss { + label = "aoss"; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + auto { + label = "auto"; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + bridge { + label = "wb"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + router { + label = "router"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + power { + label = "power"; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + compatible = "openwrt,trx"; + label = "firmware"; + reg = <0x50000 0x7c0000>; + }; + + partition@810000 { + label = "Kernel2"; + reg = <0x810000 0x7c0000>; + read-only; + }; + + partition@fd0000 { + label = "glbcfg"; + reg = <0xfd0000 0x010000>; + read-only; + }; + + partition@fe0000 { + label = "board_data"; + reg = <0xfe0000 0x20000>; + read-only; + }; + }; + }; +}; + +&gmac0 { + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <(-1)>; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + ieee80211-freq-limit = <2400000 2500000>; + }; +}; + +&pcie1 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&state_default { + gpio { + groups = "i2c", "uart2", "uart3", "wdt", "sdhci"; + function = "gpio"; + }; +}; + +&xhci { + status = "disabled"; +}; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts index dadc26c12b..1d0c8b3dcc 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts @@ -25,42 +25,42 @@ led_power: power { label = "wsr-600:green:power"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; wifi_o { label = "wsr-600:orange:wifi"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; diag { label = "wsr-600:orange:diag"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wifi_g { label = "wsr-600:green:wifi"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; router_o { label = "wsr-600:orange:router"; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; router_g { label = "wsr-600:green:router"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; internet_o { label = "wsr-600:orange:internet"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; internet_g { label = "wsr-600:green:internet"; - gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; }; @@ -69,39 +69,39 @@ power { label = "power"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; linux,code = ; }; aoss { label = "aoss"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; auto { label = "mode"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; linux,code = ; linux,input-type = ; }; ap { label = "ap"; - gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; linux,code = ; linux,input-type = ; }; router { label = "router"; - gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; linux,code = ; linux,input-type = ; }; @@ -109,7 +109,7 @@ gpio_poweroff { compatible = "gpio-poweroff"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; @@ -155,8 +155,8 @@ &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; + groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + function = "gpio"; }; }; @@ -178,10 +178,39 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + }; + }; +}; + &xhci { status = "disabled"; }; diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts index f1b4d3d8ab..2a9e327fa4 100644 --- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts +++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts @@ -14,7 +14,7 @@ led-failsafe = &led_power_blue; led-running = &led_power_blue; led-upgrade = &led_power_blue; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -26,37 +26,37 @@ power-amber { label = "newifi-d2:amber:power"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_power_blue: power-blue { label = "newifi-d2:blue:power"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; internet-amber { label = "newifi-d2:amber:internet"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; internet-blue { label = "newifi-d2:blue:internet"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; wlan2g { label = "newifi-d2:blue:wlan2g"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; wlan5g { label = "newifi-d2:blue:wlan5g"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; usb { label = "newifi-d2:blue:usb"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -67,13 +67,13 @@ reset { label = "reset"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -85,7 +85,7 @@ power_usb3 { gpio-export,name = "power_usb3"; gpio-export,output = <1>; - gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; }; }; @@ -96,7 +96,8 @@ m25p80@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <10000000>; + spi-max-frequency = <45000000>; + broken-flash-reset; partitions { compatible = "fixed-partitions"; @@ -149,13 +150,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "jtag", "uart2", "uart3"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uart2", "uart3"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts index 59dd80fc62..49d8648f8a 100644 --- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts +++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts @@ -37,28 +37,28 @@ power { label = "pbr-m1:blue:power"; - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_sys: sys { label = "pbr-m1:blue:sys"; - gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 32 GPIO_ACTIVE_LOW>; }; internet { label = "pbr-m1:blue:internet"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; wlan2g { label = "pbr-m1:blue:wlan2g"; - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; }; wlan5g { label = "pbr-m1:blue:wlan5g"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; }; @@ -67,7 +67,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -79,25 +79,25 @@ power_usb2 { gpio-export,name = "power_usb2"; gpio-export,output = <1>; - gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; }; power_usb3 { gpio-export,name = "power_usb3"; gpio-export,output = <1>; - gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; }; power_sata { gpio-export,name = "power_sata"; gpio-export,output = <1>; - gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; }; }; beeper: beeper { compatible = "gpio-beeper"; - gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; }; @@ -112,6 +112,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <10000000>; + broken-flash-reset; partitions { compatible = "fixed-partitions"; @@ -164,13 +165,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts index 65924bb2e6..7a3afa00dd 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts @@ -14,7 +14,7 @@ led-failsafe = &led_power_green; led-running = &led_power_green; led-upgrade = &led_power_green; - label-mac-device = &wifi1; + label-mac-device = &gmac0; }; chosen { @@ -26,22 +26,22 @@ power { label = "dir-860l-b1:orange:power"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_power_green: power2 { label = "dir-860l-b1:green:power"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; net { label = "dir-860l-b1:orange:net"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; net2 { label = "dir-860l-b1:green:net"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; }; @@ -50,13 +50,13 @@ reset { label = "reset"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -114,6 +114,39 @@ }; }; +&gmac0 { + mtd-mac-address = <&radio 0x4>; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &pcie { status = "okay"; }; @@ -136,7 +169,7 @@ &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; + groups = "uart3", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts index b86291cab9..305dbdbd57 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts @@ -147,7 +147,7 @@ &state_default { gpio { - ralink,group = "i2c", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart3", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_edimax_ra21s.dts b/target/linux/ramips/dts/mt7621_edimax_ra21s.dts index ad0eee0d18..7f41bb14e9 100644 --- a/target/linux/ramips/dts/mt7621_edimax_ra21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_ra21s.dts @@ -19,22 +19,22 @@ led_power: led_1 { label = "ra21s:red:led1"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; led_2 { label = "ra21s:red:led2"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; led_3 { label = "ra21s:red:led3"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; }; led_4 { label = "ra21s:red:led4"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; }; }; diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index 4325e98132..f00d0cf859 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -19,22 +19,22 @@ led_power: led_1 { label = "rg21s:red:led1"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; led_2 { label = "rg21s:red:led2"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; led_3 { label = "rg21s:red:led3"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; }; led_4 { label = "rg21s:red:led4"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; }; }; diff --git a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi index 31498a5340..b52ead09d3 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi +++ b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi @@ -8,7 +8,7 @@ / { aliases { - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -20,13 +20,13 @@ reset { label = "reset"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -94,19 +94,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; +}; - mediatek,portmap = "wllll"; - port@5 { - status = "disabled"; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; }; }; &state_default { gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart3", "uart2", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts index c43f0ad198..5a8ee2884c 100644 --- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts +++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts @@ -25,33 +25,33 @@ wlan2g { label = "wrc-1167ghbk2-s:white:wlan2g"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan5g { label = "wrc-1167ghbk2-s:white:wlan5g"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; led_power_green: power_green { label = "wrc-1167ghbk2-s:green:power"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; power_blue { label = "wrc-1167ghbk2-s:blue:power"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; }; wps { label = "wrc-1167ghbk2-s:red:wps"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; power_red { label = "wrc-1167ghbk2-s:red:power"; - gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; }; }; @@ -60,22 +60,52 @@ reset { label = "reset"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &spi0 { status = "okay"; @@ -130,8 +160,8 @@ &state_default { gpio { - ralink,group = "i2c", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart3", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi index 0a4afd964f..85bbcd0b6a 100644 --- a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi +++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi @@ -22,22 +22,22 @@ led_power_green: power_green { label = "wrc-gst:green:power"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; power_blue { label = "wrc-gst:blue:power"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; }; wps { label = "wrc-gst:red:wps"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; power_red { label = "wrc-gst:red:power"; - gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; }; }; @@ -46,50 +46,80 @@ reset { label = "reset"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; client { label = "client"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; ap { label = "ap"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; extender { label = "extender"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; router { label = "router"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &spi0 { status = "okay"; @@ -156,8 +186,8 @@ &state_default { gpio { - ralink,group = "uart3", "jtag", "wdt", "sdhci"; - ralink,function = "gpio"; + groups = "uart3", "jtag", "wdt", "sdhci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts index 1df3116d22..10b33993ac 100644 --- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts +++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts @@ -25,7 +25,7 @@ led_power: power { label = "firewrt:green:power"; - gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; }; @@ -34,13 +34,13 @@ wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; power { label = "power"; - gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -110,13 +110,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts index 0792675587..8f7e273b10 100644 --- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts +++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts @@ -19,12 +19,12 @@ internet { label = "ghl-r-001:blue:internet"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; usb { label = "ghl-r-001:blue:usb"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -35,7 +35,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -52,6 +52,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; + broken-flash-reset; + m25p,fast-read; partitions { compatible = "fixed-partitions"; @@ -109,13 +111,39 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "jtag", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts index 25ad9dc131..6b1c9a8f9d 100644 --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts @@ -25,7 +25,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; linux,code = ; }; }; @@ -35,22 +35,22 @@ system { label = "gb-pc1:green:system"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status: status { label = "gb-pc1:green:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; lan1 { label = "gb-pc1:green:lan1"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; lan2 { label = "gb-pc1:green:lan2"; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; }; @@ -66,6 +66,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <80000000>; + broken-flash-reset; m25p,fast-read; partitions { @@ -104,13 +105,27 @@ status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "lan2"; + }; + }; +}; + &state_default { gpio { - ralink,group = "jtag", "rgmii2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "rgmii2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts index 9920a1f0ba..a015a5e84a 100644 --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts @@ -25,7 +25,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; linux,code = ; }; }; @@ -35,32 +35,32 @@ system { label = "gb-pc2:green:system"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status: status { label = "gb-pc2:green:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; lan1 { label = "gb-pc2:green:lan1"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; lan2 { label = "gb-pc2:green:lan2"; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; lan3-yellow { label = "gb-pc2:yellow:lan3"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; lan3-green { label = "gb-pc2:green:lan3"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; }; }; @@ -76,6 +76,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <80000000>; + broken-flash-reset; m25p,fast-read; partitions { @@ -114,13 +115,27 @@ status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "lan2"; + }; + }; +}; + &state_default { gpio { - ralink,group = "jtag", "rgmii2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "rgmii2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts index aabf9f3213..9d60d509ab 100644 --- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts +++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts @@ -25,12 +25,12 @@ led_status: status { label = "hc5962:white:status"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_system: system { label = "hc5962:red:system"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; panic-indicator; }; }; @@ -40,26 +40,10 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; linux,code = ; }; }; - - ubi-concat { - compatible = "mtd-concat"; - devices = <&ubipart0 &ubipart1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - ubi@540000 { - label = "ubi"; - reg = <0x0 0x79c0000>; - }; - }; - }; }; &nand { @@ -90,12 +74,18 @@ partition@140000 { label = "kernel"; - reg = <0x140000 0x400000>; + reg = <0x140000 0x200000>; }; - ubipart0: partition@540000 { - label = "ubipart0"; - reg = <0x540000 0x1c80000>; + partition@340000 { + label = "ubi"; + reg = <0x340000 0x1E00000>; + }; + + partition@2140000 { + label = "hw_panic"; + reg = <0x2140000 0x80000>; + read-only; }; partition@21c0000 { @@ -104,9 +94,30 @@ read-only; }; - ubipart1: partition@2240000 { - label = "ubipart1"; - reg = <0x2240000 0x5d40000>; + partition@2240000 { + label = "backup"; + reg = <0x2240000 0x80000>; + read-only; + }; + + partition@22c0000 { + label = "overly"; + reg = <0x22c0000 0x1000000>; + }; + + partition@32c0000 { + label = "firmware_backup"; + reg = <0x32c0000 0x2000000>; + }; + + partition@52c0000 { + label = "oem"; + reg = <0x52c0000 0x200000>; + }; + + partition@54c0000 { + label = "opt"; + reg = <0x54c0000 0x2ac0000>; }; }; }; @@ -131,9 +142,33 @@ }; }; -&state_default { - gpio { - ralink,group = "uart3", "jtag"; - ralink,function = "gpio"; +&switch0 { + ports { + port@1 { + status = "okay"; + label = "lan1"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan3"; + }; + + port@4 { + status = "okay"; + label = "wan"; + }; + }; +}; + +&state_default { + gpio { + groups = "uart3", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts index d3bdc4acd8..1fabad5da6 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts @@ -25,12 +25,12 @@ led_power: power { label = "wn-ax1167gr:green:power"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; wps { label = "wn-ax1167gr:green:wps"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; }; @@ -39,26 +39,26 @@ reset { label = "reset"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; auto { label = "auto"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; custom { label = "custom"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; @@ -129,14 +129,45 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&iNIC_rf 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <1>; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart2", "uart3", "jtag"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts new file mode 100644 index 0000000000..39f72e375a --- /dev/null +++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621_iodata_wn-xx-xr.dtsi" + +/ { + compatible = "iodata,wn-ax2033gr", "mediatek,mt7621-soc"; + model = "I-O DATA WN-AX2033GR"; +}; + +&partitions { + partition@6b00000 { + label = "Backup"; + reg = <0x6b00000 0x1480000>; + read-only; + }; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + + mediatek,mtd-eeprom = <&factory 0x0>; + ieee80211-freq-limit = <2400000 2483000>; + }; +}; + +&pcie1 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 5710000>; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts index fa8c4aa653..c345896bd2 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts @@ -25,12 +25,12 @@ led_power: power { label = "wn-gx300gr:green:power"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; wps { label = "wn-gx300gr:green:wps"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; }; @@ -39,26 +39,26 @@ reset { label = "reset"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; auto { label = "auto"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; custom { label = "custom"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; @@ -129,14 +129,45 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <1>; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart2", "uart3", "jtag"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi index 8b3329113f..acef4d22a0 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi +++ b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi @@ -11,6 +11,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = &wan; }; chosen { @@ -22,12 +23,12 @@ wps { label = "iodata:green:wps"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_power: power { label = "iodata:green:power"; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; }; @@ -36,20 +37,20 @@ reset { label = "reset"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; linux,code = ; }; repeater { label = "repeater"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -120,18 +121,48 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + wan: port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &pcie { status = "okay"; }; &state_default { gpio { - ralink,group = "uart2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts index 7fa06b1844..94b0c18d45 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts @@ -26,24 +26,24 @@ led_power: power { label = "wnpr2600g:green:power"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; default-state = "on"; }; notification { label = "wnpr2600g:green:notification"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; wlan2g { label = "wnpr2600g:green:wlan2g"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0radio"; }; wlan5g { label = "wnpr2600g:green:wlan5g"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1radio"; }; }; @@ -53,20 +53,20 @@ auto { label = "auto"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; reset { label = "reset"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -124,15 +124,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; }; &state_default { gpio { - ralink,group = "uart2", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts b/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts index 92e2d9908c..be8b101b78 100644 --- a/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts +++ b/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts @@ -15,7 +15,7 @@ led-failsafe = &led_cpu; led-running = &led_cpu; led-upgrade = &led_cpu; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -27,26 +27,26 @@ usb { label = "a6ns-m:blue:usb"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>; linux,default-trigger = "usbport"; }; wlan5g { label = "a6ns-m:blue:wlan5g"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan2g { label = "a6ns-m:blue:wlan2g"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1radio"; }; led_cpu: cpu { label = "a6ns-m:blue:cpu"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; }; @@ -55,13 +55,13 @@ wps { label = "wps"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -110,15 +110,45 @@ &state_default { gpio { - ralink,group = "i2c", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart3", "jtag", "wdt"; + function = "gpio"; }; }; -ðernet { +&gmac0 { mtd-mac-address = <&uboot 0x1fc20>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&uboot 0x1fc40>; + }; + + port@1 { + status = "okay"; + label = "lan1"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan3"; + }; + + port@4 { + status = "okay"; + label = "lan4"; + }; + }; +}; + &pcie { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts index 81643e6f6a..b948236c15 100644 --- a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts +++ b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts @@ -26,18 +26,18 @@ led_cpu: cpu { label = "a8004t:orange:cpu"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; wlan2g { label = "a8004t:orange:wlan2g"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan5g { label = "a8004t:orange:wlan5g"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1radio"; }; }; @@ -47,13 +47,13 @@ reset { label = "reset"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -100,10 +100,40 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&uboot 0x1fc20>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&uboot 0x1fc40>; + }; + + port@1 { + status = "okay"; + label = "lan4"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan2"; + }; + + port@4 { + status = "okay"; + label = "lan1"; + }; + }; +}; + &pcie { status = "okay"; }; @@ -128,7 +158,7 @@ &state_default { gpio { - ralink,group = "wdt", "jtag", "i2c"; - ralink,function = "gpio"; + groups = "wdt", "jtag", "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts b/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts index e3266ebbcb..126896c906 100644 --- a/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts +++ b/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts @@ -15,6 +15,7 @@ led-failsafe = &led_wps; led-running = &led_wps; led-upgrade = &led_wps; + label-mac-device = &wan; }; chosen { @@ -26,21 +27,21 @@ usb3 { label = "jhr-ac876m:blue:usb3"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>; linux,default-trigger = "usbport"; }; usb2 { label = "jhr-ac876m:blue:usb2"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; trigger-sources = <&ehci_port2>; linux,default-trigger = "usbport"; }; led_wps: wps { label = "jhr-ac876m:blue:wps"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; }; @@ -49,13 +50,13 @@ reset { label = "reset"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -132,13 +133,42 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + wan: port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart3", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_jdcloud_re-sp-01b.dts b/target/linux/ramips/dts/mt7621_jdcloud_re-sp-01b.dts index 4392a8d1fe..603fbc96e1 100644 --- a/target/linux/ramips/dts/mt7621_jdcloud_re-sp-01b.dts +++ b/target/linux/ramips/dts/mt7621_jdcloud_re-sp-01b.dts @@ -138,7 +138,7 @@ &state_default { gpio { - ralink,group = "uart2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts index 0ff5f2e76d..5654a6f196 100644 --- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts +++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts @@ -14,7 +14,7 @@ led-failsafe = &led_blue; led-running = &led_blue; led-upgrade = &led_blue; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -26,17 +26,17 @@ status-red { label = "newifi-d1:red:status"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; status-green { label = "newifi-d1:green:status"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_blue: status-blue { label = "newifi-d1:blue:status"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; default-state = "on"; }; }; @@ -46,7 +46,7 @@ reset { label = "reset"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -58,13 +58,13 @@ usb2power { gpio-export,name = "usb2power"; gpio-export,output = <1>; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; usb3power { gpio-export,name = "usb3power"; gpio-export,output = <1>; - gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; }; }; @@ -77,10 +77,10 @@ status = "okay"; m25p80@0 { - compatible = "mx25l25635f", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <25000000>; - m25p,fast-read; + spi-max-frequency = <45000000>; + broken-flash-reset; partitions { compatible = "fixed-partitions"; @@ -133,13 +133,33 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c"; - ralink,function = "gpio"; + groups = "jtag", "uart2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_linksys_re6500.dts b/target/linux/ramips/dts/mt7621_linksys_re6500.dts index 9c12f0ff80..61d99009d4 100644 --- a/target/linux/ramips/dts/mt7621_linksys_re6500.dts +++ b/target/linux/ramips/dts/mt7621_linksys_re6500.dts @@ -25,12 +25,12 @@ wifi { label = "re6500:orange:wifi"; - gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; led_power: power { label = "re6500:white:power"; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; }; @@ -39,13 +39,13 @@ wps { label = "wps"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; linux,code = ; }; }; @@ -93,8 +93,8 @@ &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2"; - ralink,function = "gpio"; + groups = "i2c", "uart2"; + function = "gpio"; }; }; @@ -118,10 +118,34 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x2e>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + }; +}; + &xhci { status = "disabled"; }; diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts index 09063e677f..731eb4d8e2 100644 --- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts +++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts @@ -38,16 +38,16 @@ &state_default { gpio { - ralink,group = "uart2", "rgmii2"; - ralink,function = "gpio"; + groups = "uart2", "rgmii2"; + function = "gpio"; }; }; &pinctrl { i2s_pins: i2s { i2s { - ralink,group = "uart3"; - ralink,function = "i2s"; + groups = "uart3"; + function = "i2s"; }; }; }; @@ -118,10 +118,41 @@ status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x5>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x5>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &pcie { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts index 5a330a7428..8321caae6e 100644 --- a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts +++ b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts @@ -45,9 +45,38 @@ status = "okay"; }; -&state_default { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + }; + }; +}; + +&state_default { + gpio { + groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts similarity index 70% rename from target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts rename to target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts index da2b571dd4..3f37155f24 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts @@ -7,7 +7,7 @@ #include / { - compatible = "mikrotik,rb750gr3", "mediatek,mt7621-soc"; + compatible = "mikrotik,routerboard-750gr3", "mediatek,mt7621-soc"; model = "MikroTik RouterBOARD 750Gr3"; aliases { @@ -25,14 +25,14 @@ compatible = "gpio-leds"; pwr { - label = "rb750gr3:blue:pwr"; - gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; + label = "routerboard-750gr3:blue:pwr"; + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; default-state = "on"; }; led_usr: usr { - label = "rb750gr3:green:usr"; - gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; + label = "routerboard-750gr3:green:usr"; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; }; @@ -41,20 +41,20 @@ mode { label = "mode"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; beeper { compatible = "gpio-beeper"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; gpio_export { @@ -64,7 +64,7 @@ usb_power { gpio-export,name = "usb_power"; gpio-export,output = <1>; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; }; }; @@ -129,16 +129,47 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&hard_config 0x0010>; mtd-mac-address-increment = <1>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&hard_config 0x0010>; + mtd-mac-address-increment = <2>; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "lan5"; + }; + }; +}; + &state_default { gpio { /* via gpio7 (uart3 group) the PoE status can be read */ - ralink,group = "uart2", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts similarity index 72% rename from target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts rename to target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts index 60b6395c17..bd58aea951 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts @@ -6,7 +6,7 @@ #include / { - compatible = "mikrotik,rbm11g", "mediatek,mt7621-soc"; + compatible = "mikrotik,routerboard-m11g", "mediatek,mt7621-soc"; model = "MikroTik RouterBOARD M11G"; aliases { @@ -24,33 +24,33 @@ compatible = "gpio-leds"; led_usr: usr { - label = "rbm11g:green:usr"; - gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; + label = "routerboard-m11g:green:usr"; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; rssi0 { - label = "rbm11g:green:rssi0"; - gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; + label = "routerboard-m11g:green:rssi0"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; rssi1 { - label = "rbm11g:green:rssi1"; - gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; + label = "routerboard-m11g:green:rssi1"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; rssi2 { - label = "rbm11g:green:rssi2"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + label = "routerboard-m11g:green:rssi2"; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; rssi3 { - label = "rbm11g:green:rssi3"; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; + label = "routerboard-m11g:green:rssi3"; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; rssi4 { - label = "rbm11g:green:rssi4"; - gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; + label = "routerboard-m11g:green:rssi4"; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; }; @@ -59,7 +59,7 @@ res { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -70,7 +70,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 9 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -138,15 +138,24 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&hard_config 0x0010>; mtd-mac-address-increment = <1>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart2", "wdt", "rgmii2"; - ralink,function = "gpio"; + groups = "uart2", "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts similarity index 81% rename from target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts rename to target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts index 2500ae29da..19e1a71e99 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts @@ -6,7 +6,7 @@ #include / { - compatible = "mikrotik,rbm33g", "mediatek,mt7621-soc"; + compatible = "mikrotik,routerboard-m33g", "mediatek,mt7621-soc"; model = "MikroTik RouterBOARD M33G"; aliases { @@ -24,8 +24,8 @@ compatible = "gpio-leds"; led_usr: usr { - label = "rbm33g:green:usr"; - gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; + label = "routerboard-m33g:green:usr"; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; }; @@ -34,7 +34,7 @@ res { label = "res"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -45,7 +45,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 9 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -57,7 +57,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 10 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -69,7 +69,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 11 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; regulator-always-on; @@ -81,7 +81,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 12 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-always-on; }; @@ -162,15 +162,36 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&hard_config 0x0010>; mtd-mac-address-increment = <1>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&hard_config 0x0010>; + mtd-mac-address-increment = <2>; + }; + + port@1 { + status = "okay"; + label = "lan1"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart2", "wdt"; - ralink,function = "gpio"; + groups = "uart2", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts index d0ea445283..87421486a9 100644 --- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts +++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts @@ -30,7 +30,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -101,13 +101,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts index 40180068e4..66b4f92852 100644 --- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts +++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts @@ -14,7 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -26,24 +26,24 @@ led_power: power { label = "wr1201:green:power"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; usb { label = "wr1201:green:usb"; - gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; eth_link { label = "wr1201:green:eth_link"; - gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; wps { label = "wr1201:green:wps"; - gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; }; @@ -52,7 +52,7 @@ reset { label = "reset"; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -104,10 +104,41 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &sdhci { status = "okay"; }; @@ -144,7 +175,7 @@ &state_default { gpio { - ralink,group = "rgmii2"; - ralink,function = "gpio"; + groups = "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts index 0d6dac0ca2..1b0b9e29e9 100644 --- a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts +++ b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts @@ -26,49 +26,49 @@ power_amber: power_amber { label = "ex6150:amber:power"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; power_green: power_green { label = "ex6150:green:power"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; wps { label = "ex6150:green:wps"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; rightarrow { label = "ex6150:blue:rightarrow"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; leftarrow { label = "ex6150:blue:leftarrow"; - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; }; router_green { label = "ex6150:green:router"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; router_red { label = "ex6150:red:router"; - gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; + gpios = <&gpio 30 GPIO_ACTIVE_LOW>; }; client_green { label = "ex6150:green:client"; - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; client_red { label = "ex6150:red:client"; - gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 32 GPIO_ACTIVE_LOW>; }; }; @@ -77,19 +77,19 @@ wps { label = "wps"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; toggle { label = "AP/Extender toggle"; - gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 48 GPIO_ACTIVE_LOW>; linux,code = ; /* Active when switch is set to "Access Point" */ }; @@ -228,13 +228,22 @@ }; }; -ðernet { - mtd-mac-address = <&factory 0x00000004>; +&gmac0 { + mtd-mac-address = <&factory 0x4>; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + }; }; &state_default { gpio { - ralink,group = "sdhci", "rgmii2", "jtag"; - ralink,function = "gpio"; + groups = "sdhci", "rgmii2", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts b/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts index 6a8cd6e4e4..b206cf7d95 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts @@ -12,7 +12,6 @@ led-failsafe = &led_power_orange; led-running = &led_power_white; led-upgrade = &led_power_orange; - label-mac-device = ðernet; }; leds { @@ -103,12 +102,12 @@ }; wps { - gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; label = "r6700-v2:white:wps"; }; wlan { - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; label = "r6700-v2:white:wlan"; }; }; @@ -116,7 +115,7 @@ &state_default { gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart3", "uart2", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6800.dts b/target/linux/ramips/dts/mt7621_netgear_r6800.dts index fed7bbba38..cce701ea32 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6800.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6800.dts @@ -12,7 +12,6 @@ led-failsafe = &led_power_orange; led-running = &led_power_white; led-upgrade = &led_power_orange; - label-mac-device = ðernet; }; leds { @@ -105,12 +104,12 @@ }; wps { - gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; label = "r6800:white:wps"; }; wlan { - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; label = "r6800:white:wlan"; }; }; @@ -118,7 +117,7 @@ &state_default { gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart3", "uart2", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi index 116c412b06..0b9e7c6626 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi @@ -13,7 +13,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -25,19 +25,19 @@ wps { label = "wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; linux,code = ; }; wifi { label = "wifi"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -46,26 +46,26 @@ compatible = "gpio-leds"; led_power: power { - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; led_usb: usb { - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; led_internet: internet { - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_wifi: wifi { - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; led_wps: wps { - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; }; @@ -74,7 +74,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 10 GPIO_ACTIVE_HIGH>; enable-active-high; }; }; @@ -105,13 +105,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart3", "uart2", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi index 6538b6926e..d2e5502e48 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi @@ -8,6 +8,10 @@ / { compatible = "mediatek,mt7621-soc"; + aliases { + label-mac-device = &gmac0; + }; + chosen { bootargs = "console=ttyS0,57600"; }; @@ -17,19 +21,19 @@ wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -57,10 +61,41 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <2>; + }; + }; +}; + &i2c { status = "okay"; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi index 52af14723e..b781edf6be 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi @@ -13,7 +13,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -24,21 +24,21 @@ compatible = "gpio-leds"; led_power: power { - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; led_usb: usb { - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; led_internet: internet { - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_wifi: wifi { - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; }; @@ -48,13 +48,13 @@ wps { label = "wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -64,7 +64,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 10 GPIO_ACTIVE_HIGH>; enable-active-high; }; }; @@ -95,14 +95,45 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <2>; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; + groups = "uart3", "uart2", "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netis_wf2881.dts b/target/linux/ramips/dts/mt7621_netis_wf2881.dts index 63a4975dcf..e937134ae9 100644 --- a/target/linux/ramips/dts/mt7621_netis_wf2881.dts +++ b/target/linux/ramips/dts/mt7621_netis_wf2881.dts @@ -14,7 +14,7 @@ led-failsafe = &led_wps; led-running = &led_wps; led-upgrade = &led_wps; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -26,14 +26,14 @@ usb { label = "wf2881:green:usb"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; led_wps: wps { label = "wf2881:green:wps"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; }; @@ -42,7 +42,7 @@ reset { label = "reset"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -127,13 +127,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart3", "uart2"; - ralink,function = "gpio"; + groups = "uart3", "uart2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts index 9e9e2c0df4..761b690d1e 100644 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts @@ -25,17 +25,17 @@ stat_r { label = "k2p:red:status"; - gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; stat_y { label = "k2p:yellow:status"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; led_blue: stat_b { label = "k2p:blue:status"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; }; @@ -44,7 +44,7 @@ reset { label = "reset"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -107,13 +107,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; + groups = "i2c", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_planex_vr500.dts b/target/linux/ramips/dts/mt7621_planex_vr500.dts index 87c638429f..096faba8bc 100644 --- a/target/linux/ramips/dts/mt7621_planex_vr500.dts +++ b/target/linux/ramips/dts/mt7621_planex_vr500.dts @@ -25,7 +25,7 @@ led_power: power { label = "vr500:green:power"; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; }; @@ -34,7 +34,7 @@ reset { label = "reset"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -80,13 +80,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; + groups = "sdhci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts index 4b5fc7edfd..a2614869f4 100644 --- a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts +++ b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts @@ -24,12 +24,12 @@ led_wps: wps { label = "sk-wb8:green:wps"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; usb { label = "sk-wb8:green:usb"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -40,13 +40,13 @@ wps { label = "wps"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -110,13 +110,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; + groups = "sdhci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts index 002804bbf1..84bd049d8a 100644 --- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts +++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts @@ -18,7 +18,7 @@ usb { label = "sap-g3200u3:green:usb"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -29,13 +29,13 @@ reset { label = "reset"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -107,13 +107,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe006>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart3", "jtag"; - ralink,function = "gpio"; + groups = "uart3", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts index 50df90b695..f76dc110ac 100644 --- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts +++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts @@ -27,7 +27,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -37,47 +37,47 @@ system_led: system { label = "x1:green:system"; - gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; modem_offline { label = "x1:red:modem-offline"; - gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; }; modem_4g { label = "x1:blue:modem-4g"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; modem_3g { label = "x1:green:modem-3g"; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; modem_rssi_lowest { label = "x1:green:modem-rssi-lowest"; - gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; modem_rssi_low { label = "x1:green:modem-rssi-low"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; modem_rssi_medium { label = "x1:green:modem-rssi-medium"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; modem_rssi_high { label = "x1:green:modem-rssi-high"; - gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; + gpios = <&gpio 30 GPIO_ACTIVE_LOW>; }; modem_rssi_highest { label = "x1:green:modem-rssi-highest"; - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; }; }; }; @@ -122,19 +122,49 @@ }; }; -&gpio0 { +&gpio { status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe006>; - mediatek,portmap = "llllw"; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + mtd-mac-address-increment = <1>; + }; + }; }; &state_default { gpio { - ralink,group = "jtag", "uart2", "wdt", "rgmii2"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts index e1f6835a81..60eea877b1 100644 --- a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts +++ b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts @@ -25,12 +25,12 @@ statw { label = "timecloud:white:status"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; led_statuso: stato { label = "timecloud:orange:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; }; }; @@ -39,13 +39,13 @@ reset { label = "reset"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,code = ; }; BTN_0 { label = "BTN_0"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -95,13 +95,22 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@4 { + status = "okay"; + label = "lan"; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart2", "jtag"; - ralink,function = "gpio"; + groups = "i2c", "uart2", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts index dd4336367a..fd24d40fe1 100644 --- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts +++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts @@ -26,7 +26,7 @@ led_sys: sys { label = "a7000r:blue:sys"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; }; @@ -35,7 +35,7 @@ reset { label = "reset"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; debounce-interval = <60>; linux,code = ; }; @@ -104,13 +104,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts index 76134925b1..d04d87dd37 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts @@ -25,37 +25,37 @@ led_power: power { label = "re350-v1:blue:power"; - gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; wifi2g { label = "re350-v1:blue:wifi2G"; - gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; wifi5g { label = "re350-v1:blue:wifi5G"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; wps_r { label = "re350-v1:red:wps"; - gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; }; wps_b { label = "re350-v1:blue:wps"; - gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; }; eth { label = "re350-v1:green:eth_act"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; eth2 { label = "re350-v1:green:eth_link"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; }; @@ -64,25 +64,25 @@ led { label = "led"; - gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; + gpios = <&gpio 30 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; linux,code = ; }; power { label = "power"; - gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 32 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -151,13 +151,22 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&config 0x10008>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + }; +}; + &state_default { gpio { - ralink,group = "rgmii2", "wdt"; - ralink,function = "gpio"; + groups = "rgmii2", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts index 8122e11a31..a26ad98cc2 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts @@ -15,7 +15,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -27,37 +27,37 @@ led_power: power { label = "re650-v1:blue:power"; - gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; wifi2g { label = "re650-v1:blue:wifi2G"; - gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; wifi5g { label = "re650-v1:blue:wifi5G"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; wps_red { label = "re650-v1:red:wps"; - gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; }; wps_blue { label = "re650-v1:blue:wps"; - gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; }; eth_act { label = "re650-v1:green:eth_act"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; eth_link { label = "re650-v1:green:eth_link"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; }; @@ -66,28 +66,28 @@ wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; debounce-interval = <60>; linux,code = ; }; power { label = "power"; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; debounce-interval = <60>; linux,code = ; }; led { label = "led"; - gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; + gpios = <&gpio 30 GPIO_ACTIVE_LOW>; debounce-interval = <60>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; debounce-interval = <60>; linux,code = ; }; @@ -164,13 +164,23 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&config 0x10008>; }; -&state_default { - gpio { - ralink,group = "rgmii2", "wdt"; - ralink,function = "gpio"; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + }; +}; + + +&state_default { + gpio { + groups = "rgmii2", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts deleted file mode 100644 index 4715cecb61..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts +++ /dev/null @@ -1,22 +0,0 @@ -/dts-v1/; - -#include "mt7621_ubiquiti_edgerouterx.dtsi" - -/ { - model = "UBNT-ERX-SFP"; - compatible = "ubiquiti,edgerouterx-sfp", "mediatek,mt7621-soc"; - - i2c-gpio { - compatible = "i2c-gpio"; - gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* sda */ - &gpio0 4 GPIO_ACTIVE_HIGH /* scl */ - >; - #address-cells = <1>; - #size-cells = <0>; - - pca9555@25 { - compatible = "pca9555"; - reg = <0x25>; - }; - }; -}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts deleted file mode 100644 index 5c1d9ec887..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts +++ /dev/null @@ -1,8 +0,0 @@ -/dts-v1/; - -#include "mt7621_ubiquiti_edgerouterx.dtsi" - -/ { - model = "UBNT-ERX"; - compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc"; -}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts new file mode 100644 index 0000000000..9515f1d8b5 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "mt7621_ubnt_edgerouter-x.dtsi" + +/ { + model = "Ubiquiti EdgeRouter X SFP"; + compatible = "ubnt,edgerouter-x-sfp", "mediatek,mt7621-soc"; +}; + +&i2c { + status = "okay"; + + pca9555@25 { + compatible = "nxp,pca9555"; + reg = <0x25>; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts new file mode 100644 index 0000000000..260baf9cf9 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "mt7621_ubnt_edgerouter-x.dtsi" + +/ { + model = "Ubiquiti EdgeRouter X"; + compatible = "ubnt,edgerouter-x", "mediatek,mt7621-soc"; +}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi similarity index 66% rename from target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi rename to target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi index 540ef10e2a..4503f67a64 100644 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi @@ -5,7 +5,7 @@ / { aliases { - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -17,14 +17,52 @@ reset { label = "reset"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; linux,code = ; }; }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x22>; + label = "dsa"; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "eth0"; + }; + + port@1 { + status = "okay"; + label = "eth1"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <1>; + }; + + port@2 { + status = "okay"; + label = "eth2"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <2>; + }; + + port@3 { + status = "okay"; + label = "eth3"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <3>; + }; + + port@4 { + status = "okay"; + label = "eth4"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <4>; + }; + }; }; &nand { @@ -71,8 +109,8 @@ &state_default { gpio { - ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag"; - ralink,function = "gpio"; + groups = "uart2", "uart3", "pcie", "rgmii2", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts index 903cbc6125..6292762ea7 100644 --- a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts +++ b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts @@ -15,8 +15,7 @@ led-failsafe = &led_white; led-running = &led_blue; led-upgrade = &led_blue; - - label-mac-device = ðernet; + label-mac-device = &gmac0; }; chosen { @@ -28,12 +27,12 @@ led_blue: dome_blue { label = "nanohd:blue:dome"; - gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 3 GPIO_ACTIVE_HIGH>; }; led_white: dome_white { label = "nanohd:white:dome"; - gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; }; }; @@ -42,7 +41,7 @@ reset { label = "reset"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -129,13 +128,22 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&eeprom 0x0>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart2"; - ralink,function = "gpio"; + groups = "i2c", "uart2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi index 209656232b..ca0e2d7dcd 100644 --- a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi +++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi @@ -58,7 +58,7 @@ modem_reset { gpio-export,name = "modem_reset"; gpio-export,output = <1>; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; }; @@ -67,7 +67,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -77,22 +77,22 @@ led_status: status { label = "u7621-06:green:status"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; led4 { label = "u7621-06:green:led4"; - gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; led5 { label = "u7621-06:green:led5"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; }; }; -&gpio0 { +&gpio { status = "okay"; }; @@ -104,14 +104,44 @@ status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "llllw"; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; }; &state_default { gpio { - ralink,group = "jtag", "uart2", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "uart2", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts index 0320a45060..9c04b5b117 100644 --- a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts +++ b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts @@ -11,7 +11,7 @@ usb { label = "11acnas:green:usb"; - gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts index bb9fa59484..65000c1ed4 100644 --- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts +++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts @@ -11,7 +11,7 @@ usb { label = "w2914nsv2:green:usb"; - gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi index 2cffb9520c..9592363260 100644 --- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi +++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi @@ -4,6 +4,10 @@ #include / { + aliases { + label-mac-device = &wan; + }; + chosen { bootargs = "console=ttyS0,57600"; }; @@ -13,13 +17,13 @@ reset { label = "reset"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -97,13 +101,42 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + wan: port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x2e>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts index 6e06ed07e8..41e11216d2 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts @@ -15,6 +15,7 @@ led-failsafe = &led_status_yellow; led-running = &led_status_blue; led-upgrade = &led_status_yellow; + label-mac-device = &wan; }; chosen { @@ -26,12 +27,12 @@ led_status_blue: status_blue { label = "mir3gv2:blue:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { label = "mir3gv2:yellow:status"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; }; @@ -40,7 +41,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -132,14 +133,32 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "llllw"; +}; + +&switch0 { + ports { + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + wan: port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; }; &state_default { gpio { - ralink,group = "jtag", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "uart2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts index a09cbb6ee4..60786e421e 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts @@ -14,6 +14,7 @@ led-failsafe = &led_status_red; led-running = &led_status_blue; led-upgrade = &led_status_yellow; + label-mac-device = &gmac0; }; chosen { @@ -25,32 +26,35 @@ led_status_red: status_red { label = "mir3g:red:status"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { label = "mir3g:blue:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { label = "mir3g:yellow:status"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; wan_amber { label = "mir3g:amber:wan"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:01:1Gbps"; }; lan1_amber { label = "mir3g:amber:lan1"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:03:1Gbps"; }; lan2_amber { label = "mir3g:amber:lan2"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:02:1Gbps"; }; }; @@ -59,7 +63,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -69,7 +73,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 12 GPIO_ACTIVE_HIGH>; enable-active-high; }; }; @@ -186,14 +190,33 @@ }; }; -ðernet { - mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "lwlll"; +&gmac0 { + mtd-mac-address = <&factory 0xe006>; +}; + +&switch0 { + ports { + port@1 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + }; }; &state_default { gpio { - ralink,group = "jtag", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "uart2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts index 0a566afffd..8a85c8b48d 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts @@ -15,6 +15,7 @@ led-failsafe = &led_status_red; led-running = &led_status_blue; led-upgrade = &led_status_yellow; + label-mac-device = &gmac0; }; chosen { @@ -26,37 +27,41 @@ led_status_red: status_red { label = "mir3p:red:status"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { label = "mir3p:blue:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { label = "mir3p:yellow:status"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; wan_amber { label = "mir3p:amber:wan"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:04:1Gbps"; }; lan3_amber { label = "mir3p:amber:lan3"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:01:1Gbps"; }; lan2_amber { label = "mir3p:amber:lan2"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:02:1Gbps"; }; lan1_amber { label = "mir3p:amber:lan1"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + linux,default-trigger = "dsa-0.0:03:1Gbps"; }; }; @@ -65,7 +70,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -75,7 +80,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 12 GPIO_ACTIVE_HIGH>; enable-active-high; }; }; @@ -171,14 +176,38 @@ }; }; -ðernet { - mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "llllw"; +&gmac0 { + mtd-mac-address = <&factory 0xe006>; +}; + +&switch0 { + ports { + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + }; + }; }; &state_default { gpio { - ralink,group = "jtag", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "uart2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts index 9360ed54b8..d99cc7d257 100644 --- a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts +++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts @@ -14,12 +14,7 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; - label-mac-device = ðernet; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x1c000000>, <0x20000000 0x4000000>; + label-mac-device = &gmac0; }; chosen { @@ -31,12 +26,12 @@ work { label = "xy-c5:green:work"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_sys: sys { label = "xy-c5:green:sys"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; }; @@ -45,7 +40,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -95,13 +90,44 @@ status = "okay"; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0x4>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0x4>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "uart3", "wdt"; - ralink,function = "gpio"; + groups = "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts index 0792b7fb90..0db8b34474 100644 --- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts +++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts @@ -26,29 +26,29 @@ power { label = "creativebox-v1:blue:power"; - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_sys: sys { label = "creativebox-v1:blue:sys"; - gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 32 GPIO_ACTIVE_LOW>; }; internet { label = "creativebox-v1:blue:internet"; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; wlan2g { label = "creativebox-v1:blue:wlan2g"; - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { label = "creativebox-v1:blue:wlan5g"; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; }; @@ -58,7 +58,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -70,19 +70,19 @@ power_usb2 { gpio-export,name = "power_usb2"; gpio-export,output = <1>; - gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; }; power_usb3 { gpio-export,name = "power_usb3"; gpio-export,output = <1>; - gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; }; power_sata { gpio-export,name = "power_sata"; gpio-export,output = <1>; - gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; }; }; }; @@ -94,6 +94,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; + broken-flash-reset; partitions { compatible = "fixed-partitions"; @@ -152,13 +153,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts index 1a759bf7c3..c70350fd41 100644 --- a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts +++ b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts @@ -23,17 +23,17 @@ internet { label = "wr1200js:blue:internet"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_wps: wps { label = "wr1200js:blue:wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; usb { label = "wr1200js:blue:usb"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -44,19 +44,19 @@ reset { label = "reset"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; linux,code = ; }; wifi { label = "wifi"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -126,13 +126,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + + port@1 { + status = "okay"; + label = "lan1"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan3"; + }; + + port@4 { + status = "okay"; + label = "lan4"; + }; + }; +}; + &state_default { gpio { - ralink,group = "i2c", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart2", "uart3", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts index 1673baabc1..e43ee8451a 100644 --- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts +++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts @@ -26,18 +26,18 @@ led_power: power { label = "yk-l2:blue:power"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_wps: wps { label = "yk-l2:blue:wps"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; usb { label = "yk-l2:blue:usb"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; @@ -48,13 +48,13 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -137,13 +137,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "jtag", "wdt"; - ralink,function = "gpio"; + groups = "jtag", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts index 7bfb39212e..f91f0d77d4 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts @@ -22,7 +22,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -30,8 +30,8 @@ &state_default { gpio { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; @@ -75,10 +75,40 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &pcie { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts index 15a4472cd8..1f43f2a2dc 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts @@ -24,7 +24,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -99,13 +99,43 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts index f3f06dd69b..5e8e250432 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts @@ -31,7 +31,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -41,7 +41,7 @@ led_status: status { label = "zbt-wg2626:green:status"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; }; }; @@ -110,13 +110,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi index 48de87269a..8c9d31325a 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi @@ -29,7 +29,7 @@ reset { label = "reset"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -39,7 +39,7 @@ led_status: status { label = "zbt-wg3526:green:status"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; }; }; @@ -112,13 +112,44 @@ }; }; -ðernet { +&gmac0 { mtd-mac-address = <&factory 0xe000>; }; +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan1"; + }; + + port@1 { + status = "okay"; + label = "lan2"; + }; + + port@2 { + status = "okay"; + label = "lan3"; + }; + + port@3 { + status = "okay"; + label = "lan4"; + }; + + port@4 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe000>; + mtd-mac-address-increment = <1>; + }; + }; +}; + &state_default { gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; + groups = "wdt", "rgmii2"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zio_freezio.dts b/target/linux/ramips/dts/mt7621_zio_freezio.dts index dce1c4bd4d..cf194f1ff5 100644 --- a/target/linux/ramips/dts/mt7621_zio_freezio.dts +++ b/target/linux/ramips/dts/mt7621_zio_freezio.dts @@ -12,7 +12,7 @@ usb { label = "freezio:green:usb"; - gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>; linux,default-trigger = "usbport"; }; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index 61016c8b40..097fc3b4a1 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -81,36 +81,18 @@ interrupts = <3>; }; - gpio@600 { - #address-cells = <1>; - #size-cells = <0>; - - compatible = "mtk,mt7628-gpio", "mtk,mt7621-gpio"; + gpio: gpio@600 { + compatible = "mediatek,mt7621-gpio"; reg = <0x600 0x100>; interrupt-parent = <&intc>; interrupts = <6>; - gpio0: bank@0 { - reg = <0>; - compatible = "mtk,mt7621-gpio-bank"; - gpio-controller; - #gpio-cells = <2>; - }; + #interrupt-cells = <2>; + interrupt-controller; - gpio1: bank@1 { - reg = <1>; - compatible = "mtk,mt7621-gpio-bank"; - gpio-controller; - #gpio-cells = <2>; - }; - - gpio2: bank@2 { - reg = <2>; - compatible = "mtk,mt7621-gpio-bank"; - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; i2c: i2c@900 { @@ -284,85 +266,85 @@ spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; spi_cs1_pins: spi_cs1 { spi_cs1 { - ralink,group = "spi cs1"; - ralink,function = "spi cs1"; + groups = "spi cs1"; + function = "spi cs1"; }; }; i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; i2s_pins: i2s { i2s { - ralink,group = "i2s"; - ralink,function = "i2s"; + groups = "i2s"; + function = "i2s"; }; }; uart0_pins: uartlite { uartlite { - ralink,group = "uart0"; - ralink,function = "uart0"; + groups = "uart0"; + function = "uart0"; }; }; uart1_pins: uart1 { uart1 { - ralink,group = "uart1"; - ralink,function = "uart1"; + groups = "uart1"; + function = "uart1"; }; }; uart2_pins: uart2 { uart2 { - ralink,group = "uart2"; - ralink,function = "uart2"; + groups = "uart2"; + function = "uart2"; }; }; sdxc_pins: sdxc { sdxc { - ralink,group = "sdmode"; - ralink,function = "sdxc"; + groups = "sdmode"; + function = "sdxc"; }; }; pwm0_pins: pwm0 { pwm0 { - ralink,group = "pwm0"; - ralink,function = "pwm0"; + groups = "pwm0"; + function = "pwm0"; }; }; pwm1_pins: pwm1 { pwm1 { - ralink,group = "pwm1"; - ralink,function = "pwm1"; + groups = "pwm1"; + function = "pwm1"; }; }; pcm_i2s_pins: pcm_i2s { pcm_i2s { - ralink,group = "i2s"; - ralink,function = "pcm"; + groups = "i2s"; + function = "pcm"; }; }; refclk_pins: refclk { refclk { - ralink,group = "refclk"; - ralink,function = "refclk"; + groups = "refclk"; + function = "refclk"; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts index 3c38cc7b46..ada00fa3f1 100644 --- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts +++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts @@ -57,7 +57,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -67,12 +67,12 @@ led_system: system { label = "awusfree1:orange:system"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { label = "awusfree1:blue:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; @@ -89,28 +89,24 @@ mtd-mac-address = <&factory 0x2e>; }; -&gpio1 { - status = "okay"; -}; - &ohci { status = "disabled"; }; &state_default { gpio { - ralink,group = "p0led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "p0led_an", "wdt", "wled_an"; + function = "gpio"; }; ext_lna { - ralink,group = "uart1"; - ralink,function = "sw_r"; + groups = "uart1"; + function = "sw_r"; }; ext_pa { - ralink,group = "i2s"; - ralink,function = "antenna"; + groups = "i2s"; + function = "antenna"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts index 25c3c403d2..b617e74264 100644 --- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts +++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts @@ -21,20 +21,20 @@ aoss { label = "aoss"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; linux,code = ; }; ap { label = "ap"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; }; reset { label = "reset"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -44,42 +44,42 @@ router_o { label = "wcr-1166ds:orange:router"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; router_g { label = "wcr-1166ds:green:router"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; }; internet_o { label = "wcr-1166ds:orange:internet"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; internet_g { label = "wcr-1166ds:green:internet"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wireless_o { label = "wcr-1166ds:orange:wireless"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wireless_g { label = "wcr-1166ds:green:wireless"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; diag { label = "wcr-1166ds:orange:diag"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; led_power: power { label = "wcr-1166ds:green:power"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; @@ -111,8 +111,8 @@ &state_default { gpio { - ralink,group = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s"; - ralink,function = "gpio"; + groups = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index 71aefcb525..c977d5c993 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -22,13 +22,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "rfkill"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -38,28 +38,28 @@ lan1 { label = "wr1000:blue:lan1"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; lan2 { label = "wr1000:blue:lan2"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wan { label = "wr1000:blue:wan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wlan2g { label = "wr1000:blue:wlan2g"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; led_wps: wps { label = "wr1000:blue:wps"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; }; @@ -106,9 +106,9 @@ &state_default { gpio { - ralink,group = "i2s", "refclk", "wdt", "p4led_an", + groups = "i2s", "refclk", "wdt", "p4led_an", "p3led_an", "p2led_an", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts index bcc9d00519..d406bac0e8 100644 --- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts +++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts @@ -29,14 +29,14 @@ usb { label = "pbr-d1:orange:usb"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_power: power { label = "pbr-d1:orange:power"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; }; @@ -46,7 +46,7 @@ reset { label = "reset"; - gpios = <&gpio1 38 GPIO_ACTIVE_LOW>; + gpios = <&gpio 70 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -62,28 +62,28 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; i2c { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts index 83f93e0de5..4164bae184 100644 --- a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts +++ b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts @@ -14,13 +14,13 @@ reset { label = "reset"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -50,15 +50,11 @@ &state_default { gpio { - ralink,group = "wdt", "uart1"; - ralink,function = "gpio"; + groups = "wdt", "uart1"; + function = "gpio"; }; }; -&gpio1 { - status = "okay"; -}; - &i2c { status = "okay"; diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index 533f3b0dc3..4dbacba8c6 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts @@ -27,17 +27,17 @@ led_power: power { label = "gl-mt300n-v2:green:power"; default-state = "on"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wan { label = "gl-mt300n-v2:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { label = "gl-mt300n-v2:red:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; @@ -46,19 +46,19 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; BTN_0 { label = "BTN_0"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; linux,code = ; }; BTN_1 { label = "BTN_1"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -70,15 +70,15 @@ usb { gpio-export,name = "usb"; gpio-export,output = <1>; - gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; }; }; &state_default { gpio { - ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s"; - ralink,function = "gpio"; + groups = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi index b88f9e7356..ea43a87372 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi @@ -24,12 +24,12 @@ led_power_blue: power { /* Name is set device-specific */ - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; led_wlan_white: wlan { /* Name is set device-specific */ - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; }; @@ -39,7 +39,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -47,8 +47,8 @@ &state_default { gpio { - ralink,group = "wdt", "wled_an", "p1led_an"; - ralink,function = "gpio"; + groups = "wdt", "wled_an", "p1led_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index d0df692a3b..ae085255b3 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -19,7 +19,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -29,15 +29,15 @@ wlan { label = "hlk-7628n:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts index 192f46e0e7..4376e4b734 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts @@ -11,17 +11,17 @@ led_system: system { label = "hc5661a:blue:system"; - gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; }; internet { label = "hc5661a:blue:internet"; - gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; }; wlan2g { label = "hc5661a:blue:wlan2g"; - gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; }; @@ -30,20 +30,20 @@ &pinctrl { sdxc_router_pins: sdxc_router_mode { gpio { - ralink,group = "i2s", "sdmode", "uart1", "gpio"; - ralink,function = "gpio"; + groups = "i2s", "sdmode", "uart1", "gpio"; + function= "gpio"; }; esdmode { - ralink,group = "esdmode"; - ralink,function = "sdxc"; + groups = "esdmode"; + function= "sdxc"; }; }; state_default: pinctrl0 { gpio { - ralink,group = "i2c", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "refclk", "wdt", "wled_an"; + function= "gpio"; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts index 3ce8a1b6f9..628602b0c8 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts @@ -12,23 +12,23 @@ led_system: system { label = "hc5761a:blue:system"; - gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; }; internet { label = "hc5761a:blue:internet"; - gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; }; wlan2g { label = "hc5761a:blue:wlan2g"; - gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5g { label = "hc5761a:blue:wlan5g"; - gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 40 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; }; @@ -40,7 +40,7 @@ usb_power { gpio-export,name = "usb_power"; gpio-export,output = <0>; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; }; @@ -48,20 +48,20 @@ &pinctrl { sdxc_router_pins: sdxc_router_mode { gpio { - ralink,group = "i2s", "sdmode", "uart1", "gpio"; - ralink,function = "gpio"; + groups = "i2s", "sdmode", "uart1", "gpio"; + function = "gpio"; }; esdmode { - ralink,group = "esdmode"; - ralink,function = "sdxc"; + groups = "esdmode"; + function = "sdxc"; }; }; state_default: pinctrl0 { gpio { - ralink,group = "i2c", "refclk", "wdt", "p2led_an", "p3led_an", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "refclk", "wdt", "p2led_an", "p3led_an", "wled_an"; + function = "gpio"; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts index fbc8d9837a..b69214ed5d 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts @@ -11,12 +11,12 @@ led_system: system { label = "hc5861b:green:system"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wlan2g { label = "hc5861b:green:wlan2g"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; }; @@ -24,8 +24,8 @@ &state_default { gpio { - ralink,group = "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi index 7a6631d2e4..7bd394c346 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi @@ -24,7 +24,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi index 8ee865ddff..8a33c37f7a 100644 --- a/target/linux/ramips/dts/mt7628an_iptime.dtsi +++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi @@ -15,14 +15,14 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <60>; }; wps { label = "wps"; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 45 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <60>; }; @@ -71,8 +71,8 @@ &state_default { gpio { - ralink,group = "uart1", "wdt"; - ralink,function = "gpio"; + groups = "uart1", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime_a3.dts b/target/linux/ramips/dts/mt7628an_iptime_a3.dts index a4d8458ded..6b124cc2c8 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a3.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a3.dts @@ -19,12 +19,12 @@ led_cpu: cpu { label = "a3:blue:cpu"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan { label = "a3:blue:wlan"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts index d9e0f8c593..661439f03b 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts @@ -19,18 +19,18 @@ wlan5g { label = "a604m:blue:wlan5g"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; led_cpu: cpu { label = "a604m:blue:cpu"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan2g { label = "a604m:blue:wlan2g"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; }; @@ -38,7 +38,7 @@ &state_default { gpio { - ralink,group = "i2c", "uart1", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart1", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index 229843fe1c..ebc4c3d6f9 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -35,7 +35,7 @@ led_wifi: wifi { label = "linkit-smart-7688:orange:wifi"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; @@ -44,7 +44,7 @@ wps { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -52,33 +52,33 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts index 5558892a22..260ac14c30 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts @@ -9,8 +9,8 @@ &state_default { gpio { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts index 22a8b566e2..560690d6de 100644 --- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts +++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts @@ -25,7 +25,7 @@ led_status: status { label = "mac1200rv2:green:status"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index dc9de9f4bf..f4fe73a526 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -22,7 +22,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -32,32 +32,32 @@ lan { label = "r6120:green:lan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; led_power: power { label = "r6120:green:power"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan2g_green { label = "r6120:green:wlan2g"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wlan2g_orange { label = "r6120:orange:wlan2g"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wan_green { label = "r6120:green:wan"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wan_orange { label = "r6120:orange:wan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; }; @@ -65,7 +65,7 @@ compatible = "regulator-fixed"; regulator-name = "USB-power"; - gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 45 GPIO_ACTIVE_HIGH>; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -76,10 +76,10 @@ &state_default { gpio { - ralink,group = "p0led_an", "p1led_an", "p2led_an", + groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "wled_an", "uart1"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index 89f00a3e67..f8fad35c05 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -21,7 +21,7 @@ compatible = "gpio-leds"; system_led: system { - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; @@ -30,7 +30,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 38 GPIO_ACTIVE_HIGH>; linux,code = ; }; }; @@ -38,64 +38,56 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; perst { - ralink,group = "perst"; - ralink,function = "gpio"; + groups = "perst"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; + groups = "wled_kn"; + function = "gpio"; }; wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; pwm0 { - ralink,group = "pwm0"; - ralink,function = "gpio"; + groups = "pwm0"; + function = "gpio"; }; pwm1 { - ralink,group = "pwm1"; - ralink,function = "gpio"; + groups = "pwm1"; + function = "gpio"; }; }; -&gpio1 { - status = "okay"; -}; - -&gpio2 { - status = "okay"; -}; - &spi0 { status = "okay"; diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts index 01fe7025bb..2e8b45a046 100644 --- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts +++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts @@ -15,15 +15,15 @@ wifi { label = "rak633:blue:wifi"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; &state_default { wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index 0efe14621a..a231985b9c 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -24,12 +24,12 @@ led_power: wps { label = "skw92a:green:wps"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wlan { label = "skw92a:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; @@ -38,7 +38,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -46,8 +46,8 @@ &state_default { gpio { - ralink,group = "wdt", "refclk", "wled_an"; - ralink,function = "gpio"; + groups = "wdt", "refclk", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts index 782e2dcd7f..95a6e790fb 100644 --- a/target/linux/ramips/dts/mt7628an_tama_w06.dts +++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts @@ -14,17 +14,17 @@ wps { label = "w06:green:wps"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wan { label = "w06:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wireless { label = "w06:green:wlan"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; }; @@ -33,7 +33,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "uart1", "p0led_an", "wdt"; - ralink,function = "gpio"; + groups = "uart1", "p0led_an", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_a3.dts b/target/linux/ramips/dts/mt7628an_totolink_a3.dts index 87dd8559b7..a5b8d91499 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_a3.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_a3.dts @@ -19,12 +19,12 @@ led_cpu: cpu { label = "a3:blue:cpu"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan { label = "a3:blue:wlan"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts index 55c1ff03e3..88bdbf5bbf 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts @@ -22,48 +22,48 @@ led_sys: sys { label = "lr1200:blue:sys"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; sms { label = "lr1200:blue:sms"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wifi { label = "lr1200:blue:wifi"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; 3g { label = "lr1200:blue:3g"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; 4g { label = "lr1200:blue:4g"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; rssi1 { label = "lr1200:blue:rssi1"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; rssi2 { label = "lr1200:blue:rssi2"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; rssi3 { label = "lr1200:blue:rssi3"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; rssi4 { label = "lr1200:blue:rssi4"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; }; @@ -72,16 +72,16 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; }; -&gpio1 { +&gpio { gpio_modem_reset { gpio-hog; - gpios = <13 GPIO_ACTIVE_HIGH>; + gpios = <45 GPIO_ACTIVE_HIGH>; output-high; line-name = "modem-reset"; }; @@ -89,8 +89,8 @@ &state_default { gpio { - ralink,group = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index 9d0f6563c3..faba69cca4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -18,39 +18,39 @@ lan { label = "archer-c20-v4:green:lan"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; led_power: power { label = "archer-c20-v4:green:power"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; wan { label = "archer-c20-v4:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wan_orange { label = "archer-c20-v4:orange:wan"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan5g { label = "archer-c20-v4:green:wlan5g"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wlan2g { label = "archer-c20-v4:green:wlan2g"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps { label = "archer-c20-v4:green:wps"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; @@ -59,13 +59,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; - ralink,function = "gpio"; + groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts index 9aca8429b4..6cff9c4070 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts @@ -19,13 +19,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -35,48 +35,48 @@ led_power: power { label = "archer-c20-v5:green:power"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; wlan2g { label = "archer-c20-v5:green:wlan2g"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { label = "archer-c20-v5:green:wlan5g"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; lan { label = "archer-c20-v5:green:lan"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wan_green { label = "archer-c20-v5:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wan_orange { label = "archer-c20-v5:orange:wan"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wps { label = "archer-c20-v5:green:wps"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", + groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index 360466d56f..49a3bf7c7a 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -18,13 +18,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -34,46 +34,46 @@ lan { label = "archer-c50-v3:green:lan"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { label = "archer-c50-v3:green:power"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wan { label = "archer-c50-v3:green:wan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_orange { label = "archer-c50-v3:orange:wan"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wlan { label = "archer-c50-v3:green:wlan2g"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wlan5 { label = "archer-c50-v3:green:wlan5g"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wps { label = "archer-c50-v3:green:wps"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", + groups = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts index 8db4f21987..3216d38908 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts @@ -19,13 +19,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -35,46 +35,46 @@ led_power: power { label = "archer-c50-v4:green:power"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan2 { label = "archer-c50-v4:green:wlan2g"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wlan5 { label = "archer-c50-v4:green:wlan5g"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; lan { label = "archer-c50-v4:green:lan"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wan { label = "archer-c50-v4:green:wan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_orange { label = "archer-c50-v4:orange:wan"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wps { label = "archer-c50-v4:green:wps"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an", + groups = "i2c", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts index 54fd805cee..5b2b36fd4c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts @@ -19,52 +19,52 @@ wps { label = "re200-v2:green:wps"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wifi { label = "re200-v2:green:wifi"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; lan { label = "re200-v2:green:lan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; led_power: power { label = "re200-v2:green:power"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wifi2g_green { label = "re200-v2:green:wifi2g"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wifi5g_green { label = "re200-v2:green:wifi5g"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wifi2g_red { label = "re200-v2:red:wifi2g"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wifi5g_red { label = "re200-v2:red:wifi5g"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", + groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wled_an", "i2c", "wdt", "refclk"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi index 45d5b8ed76..a1acc556f2 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi @@ -19,13 +19,13 @@ reset { label = "reset"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts index d1adb1b38a..21d804f77c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts @@ -27,13 +27,13 @@ reset { label = "reset"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -43,29 +43,29 @@ led_power: power { label = "re305-v1:blue:power"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wlan2g { label = "re305-v1:blue:wlan2g"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { label = "re305-v1:blue:wlan5g"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; rssi1 { label = "re305-v1:red:rssi"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; rssi2 { label = "re305-v1:blue:rssi"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; }; }; @@ -117,8 +117,8 @@ &state_default { gpio { - ralink,group = "refclk", "wdt", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an"; - ralink,function = "gpio"; + groups = "refclk", "wdt", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index cf0f5eb796..d418eb9308 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -25,19 +25,19 @@ wps { label = "wps"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; modec1 { label = "sw1"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; }; modec2 { label = "sw2"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -47,31 +47,31 @@ led_power: power { label = "tl-mr3020-v3:green:power"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; default-state = "on"; }; wan { label = "tl-mr3020-v3:green:3g"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; trigger-sources = <&ehci_port1>, <&ohci_port1>; linux,default-trigger = "usbport"; }; wlan { label = "tl-mr3020-v3:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps { label = "tl-mr3020-v3:green:wps"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; lan { label = "tl-mr3020-v3:green:lan"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; }; }; @@ -126,8 +126,8 @@ &state_default { gpio { - ralink,group = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; - ralink,function = "gpio"; + groups = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index ad60548678..67dfb81376 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -18,13 +18,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -34,39 +34,39 @@ lan { label = "tl-mr3420-v5:green:lan"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { label = "tl-mr3420-v5:green:power"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; usb { label = "tl-mr3420-v5:green:usb"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { label = "tl-mr3420-v5:green:wan"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wan_amber { label = "tl-mr3420-v5:amber:wan"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wlan { label = "tl-mr3420-v5:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { label = "tl-mr3420-v5:green:wps"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; }; @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index 5485a04119..cc8fd3c352 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -18,13 +18,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -34,36 +34,36 @@ led_power: power { label = "tl-wa801nd-v5:green:power"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; lan { label = "tl-wa801nd-v5:green:lan"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wlan { label = "tl-wa801nd-v5:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps_red { label = "tl-wa801nd-v5:red:wps"; - gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 43 GPIO_ACTIVE_HIGH>; }; wps_green { label = "tl-wa801nd-v5:green:wps"; - gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; }; }; &state_default { gpio { - ralink,group = "p0led_an", "p1led_an", "perst", "refclk", + groups = "p0led_an", "p1led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index 25444b1d3d..3b497ef0c9 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -19,7 +19,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -29,15 +29,15 @@ led_power: power { label = "tl-wr802n-v4:green:power"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "refclk", "wdt"; - ralink,function = "gpio"; + groups = "refclk", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index 5d7035bba4..c81793e2ef 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -18,7 +18,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -28,35 +28,35 @@ lan { label = "tl-wr840n-v4:green:lan"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { label = "tl-wr840n-v4:green:power"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; wan { label = "tl-wr840n-v4:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { label = "tl-wr840n-v4:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { label = "tl-wr840n-v4:green:wps"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts index 3de58a71f6..f6d26d1fae 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts @@ -25,7 +25,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -36,12 +36,12 @@ led_power_green: power { label = "tl-wr840n-v5:green:power"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; orange { label = "tl-wr840n-v5:orange:power"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; }; @@ -103,7 +103,7 @@ &state_default { gpio { - ralink,group = "p0led_an", "p2led_an", "perst"; - ralink,function = "gpio"; + groups = "p0led_an", "p2led_an", "perst"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index ca25ce643d..3b12098ada 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -18,13 +18,13 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -34,55 +34,55 @@ led_power: power { label = "tl-wr841n-v13:green:power"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; wps { label = "tl-wr841n-v13:green:wps"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; lan1 { label = "tl-wr841n-v13:green:lan1"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; lan2 { label = "tl-wr841n-v13:green:lan2"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; lan3 { label = "tl-wr841n-v13:green:lan3"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; lan4 { label = "tl-wr841n-v13:green:lan4"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_green { label = "tl-wr841n-v13:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wan_orange { label = "tl-wr841n-v13:orange:wan"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan { label = "tl-wr841n-v13:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index 1654e1819f..eaac196c19 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -27,7 +27,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -37,23 +37,23 @@ lan { label = "tl-wr841n-v14:green:lan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_green { label = "tl-wr841n-v14:green:wan"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; led_wlan: wlan { label = "tl-wr841n-v14:green:wlan"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wan_orange { label = "tl-wr841n-v14:orange:wan"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; }; }; @@ -117,15 +117,15 @@ &state_default { gpio { - ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt"; - ralink,function = "gpio"; + groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt"; + function = "gpio"; }; }; -&gpio1 { +&gpio { led_wlan_enable { gpio-hog; - gpios = <11 GPIO_ACTIVE_HIGH>; + gpios = <43 GPIO_ACTIVE_HIGH>; output-high; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index 50974fafe7..8f818bef62 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -18,13 +18,13 @@ reset { label = "reset"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; rfkill { label = "rfkill"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -34,39 +34,39 @@ lan { label = "tl-wr842n-v5:green:lan"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { label = "tl-wr842n-v5:green:power"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; usb { label = "tl-wr842n-v5:green:usb"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { label = "tl-wr842n-v5:green:wan"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wan_amber { label = "tl-wr842n-v5:amber:wan"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wlan { label = "tl-wr842n-v5:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { label = "tl-wr842n-v5:green:wps"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; }; @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts index 9d5dddbe4b..2f238189d4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -18,25 +18,25 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; sw1 { label = "sw1"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; linux,code = ; }; sw2 { label = "sw2"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -46,42 +46,42 @@ lan { label = "tl-wr902ac-v3:green:lan"; - gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; }; led_power: power { label = "tl-wr902ac-v3:green:power"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; usb { label = "tl-wr902ac-v3:green:usb"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { label = "tl-wr902ac-v3:green:wan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wlan { label = "tl-wr902ac-v3:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { label = "tl-wr902ac-v3:green:wps"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi index afa7f18efc..69f371a724 100644 --- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi +++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi @@ -56,7 +56,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -66,56 +66,48 @@ led_power: power { label = "u7628-01:green:power"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wlan { label = "u7628-01:green:wlan"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wan { label = "u7628-01:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; lan1 { label = "u7628-01:green:lan1"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; lan2 { label = "u7628-01:green:lan2"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; lan3 { label = "u7628-01:green:lan3"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; lan4 { label = "u7628-01:green:lan4"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; usb { label = "u7628-01:green:usb"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; }; }; -&gpio0 { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - &pcie { status = "okay"; }; @@ -130,7 +122,7 @@ &state_default { gpio { - ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts index 12e45be574..421c8becc0 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts @@ -18,7 +18,7 @@ led_status: status { label = "vocore2lite:green:status"; - gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts index 2630f5261e..a275d8835e 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts @@ -18,7 +18,7 @@ led_status: status { label = "vocore2:fuchsia:status"; - gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi index 34664bde94..bffcdf67c6 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi @@ -16,8 +16,8 @@ &state_default { gpio { - ralink,group = "wled_an", "refclk", "wdt"; - ralink,function = "gpio"; + groups = "wled_an", "refclk", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index a38907400c..e1e9479c81 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -17,7 +17,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -27,41 +27,41 @@ power { label = "wl-wn570ha1:green:power"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; default-state = "keep"; }; wan { label = "wl-wn570ha1:green:wan"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wifi-high { label = "wl-wn570ha1:green:wifi-high"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wifi-med { label = "wl-wn570ha1:green:wifi-med"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wifi-low { label = "wl-wn570ha1:green:wifi-low"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wifi { label = "wl-wn570ha1:green:wifi"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c", "wled_an", "p0led_an", "wdt", "refclk"; - ralink,function = "gpio"; + groups = "i2c", "wled_an", "p0led_an", "wdt", "refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index 330ae58074..bee13a9683 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -17,13 +17,13 @@ reset { label = "reset"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -33,30 +33,30 @@ wifi-high { label = "wl-wn575a3:green:wifi-high"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wifi-med { label = "wl-wn575a3:green:wifi-med"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wifi-low { label = "wl-wn575a3:green:wifi-low"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { label = "wl-wn575a3:green:wps"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an"; - ralink,function = "gpio"; + groups = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi index f89342eb8f..252ffd71f5 100644 --- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi +++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi @@ -32,7 +32,7 @@ wps { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -48,43 +48,43 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; perst { - ralink,group = "perst"; - ralink,function = "gpio"; + groups = "perst"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; + groups = "wled_kn"; + function = "gpio"; }; wled_an { - ralink,group = "wled_an"; - ralink,function = "wled_an"; + groups = "wled_an"; + function = "wled_an"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index c3a37fad47..0aeff750e9 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -28,22 +28,22 @@ led_run: run { label = "wizfi630s:green:run"; - gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; ledwps { label = "wizfi630s:green:wps"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; leduart1 { label = "wizfi630s:green:uart1"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; leduart2 { label = "wizfi630s:green:uart2"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; }; @@ -55,25 +55,25 @@ reset { label = "reset"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 32 GPIO_ACTIVE_HIGH>; linux,code = ; }; scm1 { label = "SCM1"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; linux,code = ; }; scm2 { label = "SCM2"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -81,28 +81,28 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; i2c { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi index 89b37f6b37..882a8838dd 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi @@ -15,7 +15,7 @@ reset { label = "reset"; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; linux,code = ; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts index 6ac44ec8ea..f2fec2815b 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts @@ -18,14 +18,14 @@ led_indicator: indicator { label = "wrtnode:blue:indicator"; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "i2c", "gpio"; - ralink,function = "gpio"; + groups = "i2c", "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts index afd0c93595..a111a67560 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts @@ -21,23 +21,23 @@ led_indicator: indicator { label = "wrtnode:blue:indicator"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; }; &pinctrl { led_pins: led { gpio { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts index fcbacf6db8..377f71186c 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts @@ -26,12 +26,12 @@ power_blue: power_blue { label = "mir4a-100m:blue:power"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; power_yellow: power_yellow { label = "mir4a-100m:yellow:power"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; @@ -40,7 +40,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -119,8 +119,8 @@ &state_default { gpio { - ralink,group = "gpio", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index e502f273af..398d16817f 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -26,17 +26,17 @@ led_status_blue: status_blue { label = "miwifi-nano:blue:status"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; led_status_red: status_red { label = "miwifi-nano:red:status"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; led_status_amber: status_amber { label = "miwifi-nano:amber:status"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; @@ -45,7 +45,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "gpio", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index fb620eae3e..d674d6e9c1 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -24,7 +24,7 @@ reset { label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -34,30 +34,30 @@ wan { label = "zbt-we1226:green:wan"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; lan1 { label = "zbt-we1226:green:lan1"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; lan2 { label = "zbt-we1226:green:lan2"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; led_wlan: wlan { label = "zbt-we1226:green:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; }; &state_default { gpio { - ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index 0fd8c56d03..e31209f391 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -25,19 +25,19 @@ reset { label = "reset"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,code = ; }; fn { label = "fn"; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + gpios = <&gpio 45 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -47,23 +47,23 @@ led_power: power { label = "keenetic-extra-ii:green:power"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; default-state = "keep"; }; internet { label = "keenetic-extra-ii:green:internet"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wifi { label = "keenetic-extra-ii:green:wifi"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; usb { label = "keenetic-extra-ii:green:usb"; - gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; @@ -76,7 +76,7 @@ usbpower { gpio-export,name = "usbpower"; gpio-export,output = <1>; - gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; }; }; }; @@ -203,7 +203,7 @@ &state_default { gpio { - ralink,group = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 762fe49e7c..321c1b14cf 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -80,7 +80,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -94,7 +94,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -110,7 +110,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <32>; + ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -153,29 +153,29 @@ state_default: pinctrl0 { sdram { - ralink,group = "sdram"; - ralink,function = "sdram"; + groups = "sdram"; + function = "sdram"; }; }; i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts index 8a472626bd..90196849ca 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts @@ -84,8 +84,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "uartlite"; - ralink,function = "gpio"; + groups = "i2c", "spi", "uartlite"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts index 3e6691287b..5890f9958a 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts @@ -94,8 +94,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "uartlite"; - ralink,function = "gpio"; + groups = "i2c", "spi", "uartlite"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts index 6830fc5bac..9bd080ea44 100644 --- a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts +++ b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts @@ -94,8 +94,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartlite", "mdio"; - ralink,function = "gpio"; + groups = "i2c", "uartlite", "mdio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts index 2f0475b33c..3d3a0e84e9 100644 --- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts +++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts @@ -195,8 +195,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "mdio", "uartlite"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts index ff7660723a..9a8e052e12 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts @@ -115,8 +115,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartlite", "mdio"; - ralink,function = "gpio"; + groups = "i2c", "uartlite", "mdio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts index cf5a3cf2c8..ed44f10f93 100644 --- a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts +++ b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts @@ -119,8 +119,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartlite", "pci"; - ralink,function = "gpio"; + groups = "i2c", "uartlite", "pci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 84ddb061e6..c9cc9c432a 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -109,7 +109,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -129,7 +129,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -145,7 +145,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <12>; + ralink,num-gpios = <12>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -245,36 +245,36 @@ state_default: pinctrl0 { sdram { - ralink,group = "sdram"; - ralink,function = "sdram"; + groups = "sdram"; + function = "sdram"; }; }; i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; rgmii_pins: rgmii { rgmii { - ralink,group = "rgmii"; - ralink,function = "rgmii"; + groups = "rgmii"; + function = "rgmii"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/rt3050_8devices_carambola.dts b/target/linux/ramips/dts/rt3050_8devices_carambola.dts index aa9cf5927f..69eea2c7b7 100644 --- a/target/linux/ramips/dts/rt3050_8devices_carambola.dts +++ b/target/linux/ramips/dts/rt3050_8devices_carambola.dts @@ -59,8 +59,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi index 32fbe68f10..0f07e25685 100644 --- a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi +++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi @@ -43,8 +43,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi index 1172c74831..be57cd8e57 100644 --- a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi +++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi @@ -83,8 +83,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts index 0289e11104..9909fab0ae 100644 --- a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts +++ b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts index a4b1c98015..3603f163b8 100644 --- a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts +++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts @@ -69,8 +69,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts index 3a34449166..36d80086dc 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts index 23f8457fd5..76de3063c4 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts index 679173c799..bfcdab6e08 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts @@ -92,8 +92,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts index 945182e693..46988d2e9a 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts index 864f864517..7eabafc01c 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts index a9d0dc985c..2137aa2f88 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts @@ -112,7 +112,7 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts index a0f3659128..48561835dc 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts index edd95a756a..d963aba25e 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts @@ -100,8 +100,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts index 31d311f72e..11912d79c5 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_huawei_d105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts index ca30791d8d..1f5fbc9379 100644 --- a/target/linux/ramips/dts/rt3050_huawei_d105.dts +++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts @@ -83,8 +83,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts index 8709a21abf..9916efdb7c 100644 --- a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts +++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts @@ -39,8 +39,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_netcore_nw718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts index fe13d9ac9b..e17d5a8fcd 100644 --- a/target/linux/ramips/dts/rt3050_netcore_nw718.dts +++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts @@ -97,8 +97,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts index 66abb4853f..b6308290e1 100644 --- a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts +++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts @@ -89,8 +89,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts index 9532d922f9..280246cf9a 100644 --- a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts +++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts @@ -79,8 +79,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts index 6e2ea916ed..9c28c2999d 100644 --- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts +++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts index 66a6372065..a7c5f8342f 100644 --- a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts +++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "uartf"; - ralink,function = "gpio"; + groups = "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts index bc7a79c977..fa5f740e17 100644 --- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts +++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts index 489b85338d..cbe04e321f 100644 --- a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts +++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts @@ -93,8 +93,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts index 3170f88d90..6d466cd57d 100644 --- a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts +++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts @@ -85,8 +85,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts index f3a21fadaa..23418ec5fc 100644 --- a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts +++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts @@ -79,8 +79,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts index 20e287b1cc..7382980887 100644 --- a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts +++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts index cbb8b7b947..b364c3a865 100644 --- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts +++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts @@ -104,8 +104,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts index 8eb02f14c2..4541f99464 100644 --- a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts +++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts @@ -105,8 +105,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts index af2a5bc9b5..b14a4fe5c1 100644 --- a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts +++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts @@ -111,8 +111,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts index 90e7ee81c0..9e3d2d4d84 100644 --- a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts +++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts @@ -109,8 +109,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts index 60ef24db25..a506b792ef 100644 --- a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts +++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts @@ -114,8 +114,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts index 82ab9db6f7..99ce63ba5a 100644 --- a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts +++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts index 8ff73bdc58..37ae9438f7 100644 --- a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts +++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts index 0d94db8553..b954cdfa61 100644 --- a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts +++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts @@ -76,8 +76,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts index 24eb32005e..ac60f2b7d2 100644 --- a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts +++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts @@ -121,8 +121,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts index 936de03913..15eceec661 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts @@ -74,8 +74,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts index 93ed7029d0..9a23ee63da 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts @@ -120,8 +120,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts index 7f11bb57fd..7468441ae2 100644 --- a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts +++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts @@ -105,8 +105,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts index 3954ce4e77..60f637f3c4 100644 --- a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts +++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts @@ -133,8 +133,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts index 80fbfce07c..05f20cb863 100644 --- a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts +++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts @@ -71,8 +71,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts index ac0e65be6d..0c2f46d885 100644 --- a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts +++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts index f57522571c..8f0a3567ce 100644 --- a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts +++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts @@ -80,8 +80,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts index e21926ce1d..b3f00da2f6 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts @@ -104,8 +104,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts index 00b479b7b6..83854b3e6c 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts @@ -69,8 +69,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_poray_ip2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts index a754136198..c7126bc05f 100644 --- a/target/linux/ramips/dts/rt3052_poray_ip2202.dts +++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts index 7a8a85b5dd..24a8346bc8 100644 --- a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts +++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts index 6816305e27..17dee2d153 100644 --- a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts +++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts index 2b92f6bf12..c8a1b125ec 100644 --- a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts +++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts @@ -98,8 +98,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts index 664bced348..e158cbee3c 100644 --- a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts +++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts @@ -82,8 +82,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts index 8189297494..97b2be0885 100644 --- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts +++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts @@ -112,8 +112,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts index a25d2c56b9..54fd6d785e 100644 --- a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts +++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi index 2718946396..4994d65e1a 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi +++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi @@ -62,8 +62,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts index d8739d7586..352459ab2a 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts +++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts index 489772940b..df447134c1 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts index 823913cfdb..042193fb57 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index 436743cff3..b4e01b05d3 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts @@ -101,8 +101,8 @@ &state_default { gpio { - ralink,group = "uartf"; - ralink,function = "gpio"; + groups = "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts index 608f21ddfc..9fd3b3eb32 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index 548a6bb84a..7b7ef13e4b 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -107,7 +107,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -126,7 +126,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -142,7 +142,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <6>; + ralink,num-gpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -261,43 +261,43 @@ i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; mdio_pins: mdio { mdio { - ralink,group = "mdio"; - ralink,function = "mdio"; + groups = "mdio"; + function = "mdio"; }; }; rgmii_pins: rgmii { rgmii { - ralink,group = "rgmii"; - ralink,function = "rgmii"; + groups = "rgmii"; + function = "rgmii"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi_cs1"; - ralink,function = "spi_cs1"; + groups = "spi_cs1"; + function = "spi_cs1"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/rt3352_allnet_all5002.dts b/target/linux/ramips/dts/rt3352_allnet_all5002.dts index ea5386c5e4..8f66a7ea4d 100644 --- a/target/linux/ramips/dts/rt3352_allnet_all5002.dts +++ b/target/linux/ramips/dts/rt3352_allnet_all5002.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts index 72145b4e44..fa82246f31 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts index c85f72d019..e52a838b1f 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts @@ -84,8 +84,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts index fde9b8198d..d70ddb2d4a 100644 --- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts +++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts index 4f9bc9843a..ed3ac792c4 100644 --- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts +++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts index 235bcf8793..5973e0e175 100644 --- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -123,8 +123,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts index 233a7d37cc..9f8298b0b3 100644 --- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts +++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts @@ -123,8 +123,8 @@ &state_default { gpio { - ralink,group = "spi", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts index 7ac16cbf99..ee36547798 100644 --- a/target/linux/ramips/dts/rt3662_omnima_hpm.dts +++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts @@ -128,8 +128,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts index aaa0985bf8..9b1c41cde0 100644 --- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts +++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts @@ -115,8 +115,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi"; - ralink,function = "gpio"; + groups = "i2c", "spi"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index fffac16911..35a1128bfc 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -130,7 +130,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -146,7 +146,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <32>; + ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -162,7 +162,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -281,36 +281,36 @@ i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "pci"; - ralink,function = "pci-func"; + groups = "pci"; + function = "pci-func"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; pci_pins: pci { pci { - ralink,group = "pci"; - ralink,function = "pci-fnc"; + groups = "pci"; + function = "pci-fnc"; }; }; }; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi index 47e24c66d0..f1c9a1d52f 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi +++ b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi @@ -75,8 +75,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts index b41bb74214..e43562d684 100644 --- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts +++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts @@ -59,8 +59,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts index 6830f736fa..118b3bb5b9 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts index 6d234796d8..2c750eb1d7 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 89a3903118..9be841f8cb 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <22>; + ralink,num-gpios = <22>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -133,7 +133,7 @@ #gpio-cells = <2>; ralink,gpio-base = <22>; - ralink,nr-gpio = <6>; + ralink,num-gpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -275,43 +275,43 @@ i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; phy_led_pins: phy_led { phy_led { - ralink,group = "led"; - ralink,function = "led"; + groups = "led"; + function = "led"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; uartf_pins: uartf { uartf { - ralink,group = "uartf"; - ralink,function = "uartf"; + groups = "uartf"; + function = "uartf"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi_cs1"; - ralink,function = "spi_cs1"; + groups = "spi_cs1"; + function = "spi_cs1"; }; }; }; diff --git a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi index 6ce6c3f4ab..d9e1cb5397 100644 --- a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi +++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi @@ -43,8 +43,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts index 50d08a8fec..f7be825d12 100644 --- a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts +++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts @@ -83,8 +83,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_allnet_all5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts index 0571b89fb9..a5500c5c20 100644 --- a/target/linux/ramips/dts/rt5350_allnet_all5003.dts +++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi index 974a902e2d..7dafd0548a 100644 --- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi +++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; + groups = "i2c", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts index 0869b43158..a89cbad80b 100644 --- a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts +++ b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts @@ -135,7 +135,7 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts index c08a76d554..c52e75cab5 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts index b5e966cfdd..4fd2755d90 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts index c1eb2a8d1e..9556287760 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts @@ -112,8 +112,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts index e791c9a5f2..d7dffd6c0c 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts index c5ccfd0c97..e467c82688 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts @@ -127,8 +127,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts index c3e76cb132..c3016bcda3 100644 --- a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts +++ b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts @@ -57,8 +57,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts index 88aec94711..043cdf4826 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts @@ -105,8 +105,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts index c55fa68920..bcb828ac1c 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts @@ -101,8 +101,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts index c6eda2e272..95d47e401b 100644 --- a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts +++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts @@ -94,13 +94,13 @@ &state_default { gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; + groups = "i2c", "jtag"; + function = "gpio"; }; uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; + groups = "uartf"; + function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts index 7f71e3fa3f..2c80536d94 100644 --- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts +++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts index 57a9bec410..14794b510b 100644 --- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts +++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts @@ -94,8 +94,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi index 10b51d7c5f..ef445603cc 100644 --- a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi +++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi @@ -20,8 +20,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf"; - ralink,function = "gpio"; + groups = "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi index 17f1497bfc..a0768587a4 100644 --- a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi +++ b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi @@ -127,8 +127,8 @@ &state_default { gpio { - ralink,group = "jtag", "led", "spi_cs1"; - ralink,function = "gpio"; + groups = "jtag", "led", "spi_cs1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi index 8665c7dd73..0a49e22de2 100644 --- a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi +++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi @@ -55,12 +55,12 @@ &state_default { gpio { - ralink,group = "jtag"; - ralink,function = "gpio"; + groups = "jtag"; + function = "gpio"; }; uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; + groups = "uartf"; + function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts index 4e7b6e267b..3e635d9082 100644 --- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts +++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts @@ -57,8 +57,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts index bddf7adb5f..bc92859880 100644 --- a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts +++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts index 294cf3367f..6f23cd160d 100644 --- a/target/linux/ramips/dts/rt5350_poray_m3.dts +++ b/target/linux/ramips/dts/rt5350_poray_m3.dts @@ -86,8 +86,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi index db39c77050..f6fb9011b3 100644 --- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi +++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi @@ -36,8 +36,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts index 4a65acc5c6..419d57487c 100644 --- a/target/linux/ramips/dts/rt5350_poray_x5.dts +++ b/target/linux/ramips/dts/rt5350_poray_x5.dts @@ -118,8 +118,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts index b02056379b..db48a03407 100644 --- a/target/linux/ramips/dts/rt5350_poray_x8.dts +++ b/target/linux/ramips/dts/rt5350_poray_x8.dts @@ -79,8 +79,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts index ece2db036c..06b632bc5b 100644 --- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts +++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts @@ -101,8 +101,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts index b485e1cefa..108d1f0389 100644 --- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts +++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts @@ -100,8 +100,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index 8a3485971d..73cd4274f6 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -106,8 +106,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi index f5642744d8..76ed58e8f6 100644 --- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi +++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi @@ -166,8 +166,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts index 4d1093d832..7fb1fb93da 100644 --- a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts +++ b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts @@ -49,8 +49,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts index ce747994d3..ceab5394e5 100644 --- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts +++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts @@ -130,8 +130,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag" ; - ralink,function = "gpio"; + groups = "i2c", "jtag" ; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts index 56e3f0854d..0dbdc6ea6d 100644 --- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts +++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts @@ -84,8 +84,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf"; - ralink,function = "gpio"; + groups = "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index f96ad9092a..c50a08d98a 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts @@ -92,8 +92,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Kconfig b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Kconfig deleted file mode 100644 index 822806fd85..0000000000 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Kconfig +++ /dev/null @@ -1,70 +0,0 @@ -config NET_VENDOR_MEDIATEK - tristate "Mediatek/Ralink ethernet driver" - depends on RALINK - help - This driver supports the ethernet mac inside the Mediatek and Ralink WiSoCs - -config NET_MEDIATEK_SOC - def_tristate NET_VENDOR_MEDIATEK - -if NET_MEDIATEK_SOC -choice - prompt "MAC type" - -config NET_MEDIATEK_RT2880 - bool "RT2882" - depends on MIPS && SOC_RT288X - -config NET_MEDIATEK_RT3050 - bool "RT3050/MT7628" - depends on MIPS && (SOC_RT305X || SOC_MT7620) - -config NET_MEDIATEK_RT3883 - bool "RT3883" - depends on MIPS && SOC_RT3883 - -config NET_MEDIATEK_MT7620 - bool "MT7620" - depends on MIPS && SOC_MT7620 - -config NET_MEDIATEK_MT7621 - bool "MT7621" - depends on MIPS && SOC_MT7621 - -endchoice - -config NET_MEDIATEK_OFFLOAD - def_bool NET_MEDIATEK_SOC - depends on NET_MEDIATEK_MT7621 - -config NET_MEDIATEK_HW_QOS - def_bool NET_MEDIATEK_SOC - depends on NET_MEDIATEK_MT7623 - -config NET_MEDIATEK_MDIO - def_bool NET_MEDIATEK_SOC - depends on (NET_MEDIATEK_RT2880 || NET_MEDIATEK_RT3883 || NET_MEDIATEK_MT7620 || NET_MEDIATEK_MT7621) - select PHYLIB - -config NET_MEDIATEK_MDIO_RT2880 - def_bool NET_MEDIATEK_SOC - depends on (NET_MEDIATEK_RT2880 || NET_MEDIATEK_RT3883) - select NET_MEDIATEK_MDIO - -config NET_MEDIATEK_MDIO_MT7620 - def_bool NET_MEDIATEK_SOC - depends on (NET_MEDIATEK_MT7620 || NET_MEDIATEK_MT7621) - select NET_MEDIATEK_MDIO - -config NET_MEDIATEK_ESW_RT3050 - def_tristate NET_MEDIATEK_SOC - depends on NET_MEDIATEK_RT3050 - -config NET_MEDIATEK_GSW_MT7620 - def_tristate NET_MEDIATEK_SOC - depends on NET_MEDIATEK_MT7620 - -config NET_MEDIATEK_GSW_MT7621 - def_tristate NET_MEDIATEK_SOC - depends on NET_MEDIATEK_MT7621 -endif diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Makefile b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Makefile deleted file mode 100644 index b038ae3699..0000000000 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# Makefile for the Ralink SoCs built-in ethernet macs -# - -mtk-eth-soc-y += mtk_eth_soc.o ethtool.o - -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO) += mdio.o -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO_RT2880) += mdio_rt2880.o -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO_MT7620) += mdio_mt7620.o - -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_OFFLOAD) += mtk_offload.o mtk_debugfs.o - -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_RT2880) += soc_rt2880.o -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_RT3050) += soc_rt3050.o -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_RT3883) += soc_rt3883.o -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MT7620) += soc_mt7620.o -mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MT7621) += soc_mt7621.o - -obj-$(CONFIG_NET_MEDIATEK_ESW_RT3050) += esw_rt3050.o -obj-$(CONFIG_NET_MEDIATEK_GSW_MT7620) += gsw_mt7620.o mt7530.o -obj-$(CONFIG_NET_MEDIATEK_GSW_MT7621) += gsw_mt7621.o mt7530.o -obj-$(CONFIG_NET_MEDIATEK_SOC) += mtk-eth-soc.o diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Kconfig b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/Kconfig similarity index 100% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Kconfig rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/Kconfig diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Makefile b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/Makefile similarity index 100% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Makefile rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/Makefile diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/board.h b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/board.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/board.h rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/board.h diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/dbg.c b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/dbg.c rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.c diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/dbg.h b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/dbg.h rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.h diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/mt6575_sd.h b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/mt6575_sd.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/mt6575_sd.h rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/mt6575_sd.h diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c similarity index 99% rename from target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c rename to target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c index cb0aa4231a..8cbc87da3a 100644 --- a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c +++ b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c @@ -2284,7 +2284,7 @@ static int msdc_drv_probe(struct platform_device *pdev) host->mrq = NULL; //init_MUTEX(&host->sem); /* we don't need to support multiple threads access */ - mmc_dev(mmc)->dma_mask = NULL; + dma_coerce_mask_and_coherent(mmc_dev(mmc), DMA_BIT_MASK(32)); /* using dma_alloc_coherent*/ /* todo: using 1, for all 4 slots */ host->dma.gpd = dma_alloc_coherent(&pdev->dev, diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig b/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig new file mode 100644 index 0000000000..51cace5333 --- /dev/null +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig @@ -0,0 +1,70 @@ +config NET_VENDOR_RALINK + tristate "Ralink ethernet driver" + depends on RALINK + help + This driver supports the ethernet mac inside Ralink WiSoCs + +config NET_RALINK_SOC + def_tristate NET_VENDOR_RALINK + +if NET_RALINK_SOC +choice + prompt "MAC type" + +config NET_RALINK_RT2880 + bool "RT2882" + depends on MIPS && SOC_RT288X + +config NET_RALINK_RT3050 + bool "RT3050/MT7628" + depends on MIPS && (SOC_RT305X || SOC_MT7620) + +config NET_RALINK_RT3883 + bool "RT3883" + depends on MIPS && SOC_RT3883 + +config NET_RALINK_MT7620 + bool "MT7620" + depends on MIPS && SOC_MT7620 + +config NET_RALINK_MT7621 + bool "MT7621" + depends on MIPS && SOC_MT7621 + +endchoice + +config NET_RALINK_OFFLOAD + def_bool NET_RALINK_SOC + depends on NET_RALINK_MT7621 + +config NET_RALINK_HW_QOS + def_bool NET_RALINK_SOC + depends on NET_RALINK_MT7623 + +config NET_RALINK_MDIO + def_bool NET_RALINK_SOC + depends on (NET_RALINK_RT2880 || NET_RALINK_RT3883 || NET_RALINK_MT7620 || NET_RALINK_MT7621) + select PHYLIB + +config NET_RALINK_MDIO_RT2880 + def_bool NET_RALINK_SOC + depends on (NET_RALINK_RT2880 || NET_RALINK_RT3883) + select NET_RALINK_MDIO + +config NET_RALINK_MDIO_MT7620 + def_bool NET_RALINK_SOC + depends on (NET_RALINK_MT7620 || NET_RALINK_MT7621) + select NET_RALINK_MDIO + +config NET_RALINK_ESW_RT3050 + def_tristate NET_RALINK_SOC + depends on NET_RALINK_RT3050 + +config NET_RALINK_GSW_MT7620 + def_tristate NET_RALINK_SOC + depends on NET_RALINK_MT7620 + +config NET_RALINK_GSW_MT7621 + def_tristate NET_RALINK_SOC + depends on NET_RALINK_MT7621 +endif diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile b/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile new file mode 100644 index 0000000000..eba21643b2 --- /dev/null +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile @@ -0,0 +1,22 @@ +# +# Makefile for the Ralink SoCs built-in ethernet macs +# + +ralink-eth-y += mtk_eth_soc.o ethtool.o + +ralink-eth-$(CONFIG_NET_RALINK_MDIO) += mdio.o +ralink-eth-$(CONFIG_NET_RALINK_MDIO_RT2880) += mdio_rt2880.o +ralink-eth-$(CONFIG_NET_RALINK_MDIO_MT7620) += mdio_mt7620.o + +ralink-eth-$(CONFIG_NET_RALINK_OFFLOAD) += mtk_offload.o mtk_debugfs.o + +ralink-eth-$(CONFIG_NET_RALINK_RT2880) += soc_rt2880.o +ralink-eth-$(CONFIG_NET_RALINK_RT3050) += soc_rt3050.o +ralink-eth-$(CONFIG_NET_RALINK_RT3883) += soc_rt3883.o +ralink-eth-$(CONFIG_NET_RALINK_MT7620) += soc_mt7620.o +ralink-eth-$(CONFIG_NET_RALINK_MT7621) += soc_mt7621.o + +obj-$(CONFIG_NET_RALINK_ESW_RT3050) += esw_rt3050.o +obj-$(CONFIG_NET_RALINK_GSW_MT7620) += gsw_mt7620.o mt7530.o +obj-$(CONFIG_NET_RALINK_GSW_MT7621) += gsw_mt7621.o mt7530.o +obj-$(CONFIG_NET_RALINK_SOC) += ralink-eth.o diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.h similarity index 95% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.h index b757e5d639..bbc8fbd52a 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.h +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.h @@ -15,7 +15,7 @@ #ifndef _RALINK_ESW_RT3052_H__ #define _RALINK_ESW_RT3052_H__ -#ifdef CONFIG_NET_MEDIATEK_ESW_RT3052 +#ifdef CONFIG_NET_RALINK_ESW_RT3052 int __init mtk_switch_init(void); void mtk_switch_exit(void); diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.h diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.h similarity index 97% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.h index 555a586c40..03d030446a 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.h +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.h @@ -46,6 +46,10 @@ #define GSW_REG_IMR 0x7008 #define GSW_REG_ISR 0x700c #define GSW_REG_GPC1 0x7014 +#define GSW_REG_GPC2 0x701c + +#define GSW_REG_GPCx_TXDELAY BIT(3) +#define GSW_REG_GPCx_RXDELAY BIT(2) #define GSW_REG_MAC_P0_MCR 0x100 #define GSW_REG_MAC_P1_MCR 0x200 diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7621.c similarity index 89% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7621.c index ac1d36a9a8..232bcd8cf4 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7621.c @@ -98,15 +98,9 @@ static void mt7621_hw_init(struct mt7620_gsw *gsw, struct device_node *np) mt7530_mdio_w32(gsw, 0x7000, 0x3); usleep_range(10, 20); - if ((rt_sysc_r32(SYSC_REG_CHIP_REV_ID) & 0xFFFF) == 0x0101) { - /* (GE1, Force 1000M/FD, FC ON, MAX_RX_LENGTH 1536) */ - mtk_switch_w32(gsw, 0x2305e30b, GSW_REG_MAC_P0_MCR); - mt7530_mdio_w32(gsw, 0x3600, 0x5e30b); - } else { - /* (GE1, Force 1000M/FD, FC ON, MAX_RX_LENGTH 1536) */ - mtk_switch_w32(gsw, 0x2305e33b, GSW_REG_MAC_P0_MCR); - mt7530_mdio_w32(gsw, 0x3600, 0x5e33b); - } + /* (GE1, Force 1000M/FD, FC OFF, MAX_RX_LENGTH 1536) */ + mtk_switch_w32(gsw, 0x2305e30b, GSW_REG_MAC_P0_MCR); + mt7530_mdio_w32(gsw, 0x3600, 0x5e30b); /* (GE2, Link down) */ mtk_switch_w32(gsw, 0x8000, GSW_REG_MAC_P1_MCR); @@ -186,22 +180,6 @@ static void mt7621_hw_init(struct mt7620_gsw *gsw, struct device_node *np) mt7530_mdio_w32(gsw, 0x7a74, 0x44); mt7530_mdio_w32(gsw, 0x7a7c, 0x44); - /* Disable EEE */ - for (i = 0; i <= 4; i++) { - _mt7620_mii_write(gsw, i, 13, 0x7); - _mt7620_mii_write(gsw, i, 14, 0x3C); - _mt7620_mii_write(gsw, i, 13, 0x4007); - _mt7620_mii_write(gsw, i, 14, 0x0); - } - - /* Disable EEE 10Base-Te */ - for (i = 0; i <= 4; i++) { - _mt7620_mii_write(gsw, i, 13, 0x1f); - _mt7620_mii_write(gsw, i, 14, 0x027b); - _mt7620_mii_write(gsw, i, 13, 0x401f); - _mt7620_mii_write(gsw, i, 14, 0x1177); - } - /* turn on all PHYs */ for (i = 0; i <= 4; i++) { val = _mt7620_mii_read(gsw, i, 0); diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c similarity index 92% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c index ce27abf69c..74babc59a0 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c @@ -88,8 +88,13 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node, int return -ENODEV; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) phydev->supported &= PHY_GBIT_FEATURES; phydev->advertising = phydev->supported; +#else + phy_set_max_speed(phydev, SPEED_1000); + linkmode_copy(phydev->advertising, phydev->supported); +#endif phydev->no_auto_carrier_off = 1; dev_info(priv->dev, @@ -110,9 +115,18 @@ static void phy_init(struct fe_priv *priv, struct phy_device *phy) phy->autoneg = AUTONEG_ENABLE; phy->speed = 0; phy->duplex = 0; - phy->supported &= IS_ENABLED(CONFIG_NET_MEDIATEK_MDIO_MT7620) ? + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) + phy->supported &= IS_ENABLED(CONFIG_NET_RALINK_MDIO_MT7620) ? PHY_GBIT_FEATURES : PHY_BASIC_FEATURES; phy->advertising = phy->supported | ADVERTISED_Autoneg; +#else + phy_set_max_speed(phy, IS_ENABLED(CONFIG_NET_RALINK_MDIO_MT7620) ? + SPEED_1000 : + SPEED_100); + linkmode_copy(phy->advertising, phy->supported); + linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phy->advertising); +#endif phy_start_aneg(phy); } diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.h similarity index 96% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.h index 78364e33a1..d4a2a40473 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.h +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.h @@ -15,7 +15,7 @@ #ifndef _RALINK_MDIO_H__ #define _RALINK_MDIO_H__ -#ifdef CONFIG_NET_MEDIATEK_MDIO +#ifdef CONFIG_NET_RALINK_MDIO int fe_mdio_init(struct fe_priv *priv); void fe_mdio_cleanup(struct fe_priv *priv); int fe_connect_phy_node(struct fe_priv *priv, diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_mt7620.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_mt7620.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_mt7620.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.h diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c similarity index 92% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c index 7003f3efe4..d1e56a76e9 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c @@ -781,65 +781,6 @@ mt7530_get_port_link(struct switch_dev *dev, int port, return 0; } -static int mt7530_set_port_link(struct switch_dev *sw_dev, int port, - struct switch_port_link *link) -{ - if (port < 0 || port >= MT7530_NUM_PORTS) - return -EINVAL; - - /* Setup autoneg advertise here */ - if (link->aneg) { - u16 bmsr, adv, gctrl; - bool ercap; - - sw_dev->ops->phy_read16(sw_dev, port, MII_BMSR, &bmsr); - /* ERCAP means we have MII_CTRL1000 register */ - ercap = !!(bmsr | BMSR_ERCAP); - - adv = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; - gctrl = CTL1000_ENABLE_MASTER; - - switch (link->speed) { - case SWITCH_PORT_SPEED_10: - if (link->duplex) - adv |= ADVERTISE_10FULL; - else - adv |= ADVERTISE_10HALF; - break; - case SWITCH_PORT_SPEED_100: - if (link->duplex) - adv |= ADVERTISE_100FULL; - else - adv |= ADVERTISE_100HALF; - break; - case SWITCH_PORT_SPEED_1000: - if (!ercap || !link->duplex) - return -ENOTSUPP; - /* PHY only supports 1000FULL */ - gctrl |= ADVERTISE_1000FULL; - break; - default: - /* For unknown input speed just enable all speed grades */ - if (link->duplex) { - adv |= ADVERTISE_FULL; - gctrl |= ADVERTISE_1000FULL; - } else { - adv |= ADVERTISE_10HALF | ADVERTISE_100HALF; - gctrl = 0x0; - } - break; - } - - sw_dev->ops->phy_write16(sw_dev, port, MII_ADVERTISE, adv); - if (ercap) - sw_dev->ops->phy_write16(sw_dev, port, MII_CTRL1000, gctrl); - /* Autoneg restart will be triggered in switch_generic_set_link */ - } - - /* Let switch_generic_set_link handle not autoneg case */ - return switch_generic_set_link(sw_dev, port, link); -} - static u64 get_mib_counter(struct mt7530_priv *priv, int i, int port) { unsigned int port_base; @@ -980,24 +921,6 @@ static int mt7621_get_port_stats(struct switch_dev *dev, int port, return 0; } -static int mt7530_phy_read16(struct switch_dev *dev, int addr, - u8 reg, u16 *value) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - *value = mdiobus_read(priv->bus, addr, reg); - - return 0; -} - -static int mt7530_phy_write16(struct switch_dev *dev, int addr, - u8 reg, u16 value) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - return mdiobus_write(priv->bus, addr, reg, value); -} - static const struct switch_attr mt7530_global[] = { { .type = SWITCH_TYPE_INT, @@ -1111,12 +1034,9 @@ static const struct switch_dev_ops mt7621_ops = { .get_port_pvid = mt7530_get_port_pvid, .set_port_pvid = mt7530_set_port_pvid, .get_port_link = mt7530_get_port_link, - .set_port_link = mt7530_set_port_link, .get_port_stats = mt7621_get_port_stats, .apply_config = mt7530_apply_config, .reset_switch = mt7530_reset_switch, - .phy_read16 = mt7530_phy_read16, - .phy_write16 = mt7530_phy_write16, }; static const struct switch_dev_ops mt7530_ops = { @@ -1137,12 +1057,9 @@ static const struct switch_dev_ops mt7530_ops = { .get_port_pvid = mt7530_get_port_pvid, .set_port_pvid = mt7530_set_port_pvid, .get_port_link = mt7530_get_port_link, - .set_port_link = mt7530_set_port_link, .get_port_stats = mt7530_get_port_stats, .apply_config = mt7530_apply_config, .reset_switch = mt7530_reset_switch, - .phy_read16 = mt7530_phy_read16, - .phy_write16 = mt7530_phy_write16, }; int diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.h diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_debugfs.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_debugfs.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_debugfs.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_debugfs.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c similarity index 96% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c index d17a38eab7..7191a7a382 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c @@ -230,7 +230,7 @@ static void fe_clean_rx(struct fe_priv *priv) for (i = 0; i < ring->rx_ring_size; i++) if (ring->rx_data[i]) { if (ring->rx_dma && ring->rx_dma[i].rxd1) - dma_unmap_single(&priv->netdev->dev, + dma_unmap_single(priv->dev, ring->rx_dma[i].rxd1, ring->rx_buf_size, DMA_FROM_DEVICE); @@ -242,7 +242,7 @@ static void fe_clean_rx(struct fe_priv *priv) } if (ring->rx_dma) { - dma_free_coherent(&priv->netdev->dev, + dma_free_coherent(priv->dev, ring->rx_ring_size * sizeof(*ring->rx_dma), ring->rx_dma, ring->rx_phys); @@ -259,7 +259,6 @@ static void fe_clean_rx(struct fe_priv *priv) static int fe_alloc_rx(struct fe_priv *priv) { - struct net_device *netdev = priv->netdev; struct fe_rx_ring *ring = &priv->rx_ring; int i, pad; @@ -276,7 +275,7 @@ static int fe_alloc_rx(struct fe_priv *priv) goto no_rx_mem; } - ring->rx_dma = dma_alloc_coherent(&netdev->dev, + ring->rx_dma = dma_alloc_coherent(priv->dev, ring->rx_ring_size * sizeof(*ring->rx_dma), &ring->rx_phys, GFP_ATOMIC | __GFP_ZERO); @@ -288,11 +287,11 @@ static int fe_alloc_rx(struct fe_priv *priv) else pad = NET_IP_ALIGN; for (i = 0; i < ring->rx_ring_size; i++) { - dma_addr_t dma_addr = dma_map_single(&netdev->dev, + dma_addr_t dma_addr = dma_map_single(priv->dev, ring->rx_data[i] + NET_SKB_PAD + pad, ring->rx_buf_size, DMA_FROM_DEVICE); - if (unlikely(dma_mapping_error(&netdev->dev, dma_addr))) + if (unlikely(dma_mapping_error(priv->dev, dma_addr))) goto no_rx_mem; ring->rx_dma[i].rxd1 = (unsigned int)dma_addr; @@ -342,7 +341,7 @@ static void fe_txd_unmap(struct device *dev, struct fe_tx_buf *tx_buf) static void fe_clean_tx(struct fe_priv *priv) { int i; - struct device *dev = &priv->netdev->dev; + struct device *dev = priv->dev; struct fe_tx_ring *ring = &priv->tx_ring; if (ring->tx_buf) { @@ -378,7 +377,7 @@ static int fe_alloc_tx(struct fe_priv *priv) if (!ring->tx_buf) goto no_tx_mem; - ring->tx_dma = dma_alloc_coherent(&priv->netdev->dev, + ring->tx_dma = dma_alloc_coherent(priv->dev, ring->tx_ring_size * sizeof(*ring->tx_dma), &ring->tx_phys, GFP_ATOMIC | __GFP_ZERO); @@ -565,7 +564,7 @@ static inline u32 fe_empty_txd(struct fe_tx_ring *ring) barrier(); return (u32)(ring->tx_ring_size - ((ring->tx_next_idx - ring->tx_free_idx) & - (ring->tx_ring_size - 1)) - 1); + (ring->tx_ring_size - 1))); } struct fe_map_state { @@ -664,7 +663,7 @@ static int fe_tx_map_dma(struct sk_buff *skb, struct net_device *dev, { struct fe_priv *priv = netdev_priv(dev); struct fe_map_state st = { - .dev = &dev->dev, + .dev = priv->dev, .ring_idx = ring->tx_next_idx, }; struct sk_buff *head = skb; @@ -716,11 +715,19 @@ next_frag: /* TX SG offload */ nr_frags = skb_shinfo(skb)->nr_frags; for (i = 0; i < nr_frags; i++) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) struct skb_frag_struct *frag; +#else + skb_frag_t *frag; +#endif frag = &skb_shinfo(skb)->frags[i]; if (fe_tx_dma_map_page(ring, &st, skb_frag_page(frag), +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) frag->page_offset, skb_frag_size(frag))) +#else + skb_frag_off(frag), skb_frag_size(frag))) +#endif goto err_dma; } @@ -755,7 +762,11 @@ next_frag: netif_wake_queue(dev); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)) || !head->xmit_more) +#else + if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)) || !netdev_xmit_more()) +#endif fe_reg_w32(ring->tx_next_idx, FE_REG_TX_CTX_IDX0); return 0; @@ -764,7 +775,7 @@ err_dma: j = ring->tx_next_idx; for (i = 0; i < tx_num; i++) { /* unmap dma */ - fe_txd_unmap(&dev->dev, &ring->tx_buf[j]); + fe_txd_unmap(priv->dev, &ring->tx_buf[j]); ring->tx_dma[j].txd2 = TX_DMA_DESP2_DEF; j = NEXT_TX_DESP_IDX(j); @@ -814,14 +825,22 @@ static inline int fe_cal_txd_req(struct sk_buff *skb) { struct sk_buff *head = skb; int i, nfrags = 0; +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) struct skb_frag_struct *frag; +#else + skb_frag_t *frag; +#endif next_frag: nfrags++; if (skb_is_gso(skb)) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { frag = &skb_shinfo(skb)->frags[i]; +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) nfrags += DIV_ROUND_UP(frag->size, TX_DMA_BUF_LEN); +#else + nfrags += DIV_ROUND_UP(skb_frag_size(frag), TX_DMA_BUF_LEN); +#endif } } else { nfrags += skb_shinfo(skb)->nr_frags; @@ -908,11 +927,11 @@ static int fe_poll_rx(struct napi_struct *napi, int budget, stats->rx_dropped++; goto release_desc; } - dma_addr = dma_map_single(&netdev->dev, + dma_addr = dma_map_single(priv->dev, new_data + NET_SKB_PAD + pad, ring->rx_buf_size, DMA_FROM_DEVICE); - if (unlikely(dma_mapping_error(&netdev->dev, dma_addr))) { + if (unlikely(dma_mapping_error(priv->dev, dma_addr))) { skb_free_frag(new_data); goto release_desc; } @@ -925,7 +944,7 @@ static int fe_poll_rx(struct napi_struct *napi, int budget, } skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN); - dma_unmap_single(&netdev->dev, trxd.rxd1, + dma_unmap_single(priv->dev, trxd.rxd1, ring->rx_buf_size, DMA_FROM_DEVICE); pktlen = RX_DMA_GET_PLEN0(trxd.rxd2); skb->dev = netdev; @@ -941,14 +960,14 @@ static int fe_poll_rx(struct napi_struct *napi, int budget, __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), RX_DMA_VID(trxd.rxd3)); -#ifdef CONFIG_NET_MEDIATEK_OFFLOAD +#ifdef CONFIG_NET_RALINK_OFFLOAD if (mtk_offload_check_rx(priv, skb, trxd.rxd4) == 0) { #endif stats->rx_packets++; stats->rx_bytes += pktlen; napi_gro_receive(napi, skb); -#ifdef CONFIG_NET_MEDIATEK_OFFLOAD +#ifdef CONFIG_NET_RALINK_OFFLOAD } else { dev_kfree_skb(skb); } @@ -981,7 +1000,6 @@ static int fe_poll_tx(struct fe_priv *priv, int budget, u32 tx_intr, int *tx_again) { struct net_device *netdev = priv->netdev; - struct device *dev = &netdev->dev; unsigned int bytes_compl = 0; struct sk_buff *skb; struct fe_tx_buf *tx_buf; @@ -1004,7 +1022,7 @@ static int fe_poll_tx(struct fe_priv *priv, int budget, u32 tx_intr, done++; budget--; } - fe_txd_unmap(dev, tx_buf); + fe_txd_unmap(priv->dev, tx_buf); idx = NEXT_TX_DESP_IDX(idx); } ring->tx_free_idx = idx; @@ -1290,7 +1308,7 @@ static int fe_open(struct net_device *dev) napi_enable(&priv->rx_napi); fe_int_enable(priv->soc->tx_int | priv->soc->rx_int); netif_start_queue(dev); -#ifdef CONFIG_NET_MEDIATEK_OFFLOAD +#ifdef CONFIG_NET_RALINK_OFFLOAD mtk_ppe_probe(priv); #endif @@ -1329,7 +1347,7 @@ static int fe_stop(struct net_device *dev) fe_free_dma(priv); -#ifdef CONFIG_NET_MEDIATEK_OFFLOAD +#ifdef CONFIG_NET_RALINK_OFFLOAD mtk_ppe_remove(priv); #endif @@ -1493,7 +1511,7 @@ static int fe_change_mtu(struct net_device *dev, int new_mtu) return fe_open(dev); } -#ifdef CONFIG_NET_MEDIATEK_OFFLOAD +#ifdef CONFIG_NET_RALINK_OFFLOAD static int fe_flow_offload(enum flow_offload_type type, struct flow_offload *flow, struct flow_offload_hw_path *src, @@ -1527,7 +1545,7 @@ static const struct net_device_ops fe_netdev_ops = { #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = fe_poll_controller, #endif -#ifdef CONFIG_NET_MEDIATEK_OFFLOAD +#ifdef CONFIG_NET_RALINK_OFFLOAD .ndo_flow_offload = fe_flow_offload, #endif }; diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.h diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_offload.c similarity index 99% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_offload.c index 6c23bbc036..2fd424f6e3 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_offload.c @@ -60,7 +60,7 @@ mtk_foe_prepare_v4(struct mtk_foe_entry *entry, entry->ipv4_hnapt.iblk2.dscp = 0; entry->ipv4_hnapt.iblk2.port_mg = 0x3f; entry->ipv4_hnapt.iblk2.port_ag = 0x1f; -#ifdef CONFIG_NET_MEDIATEK_HW_QOS +#ifdef CONFIG_NET_RALINK_HW_QOS entry->ipv4_hnapt.iblk2.qid = 1; entry->ipv4_hnapt.iblk2.fqos = 1; #endif @@ -202,7 +202,7 @@ int mtk_flow_offload(struct mtk_eth *eth, return 0; } -#ifdef CONFIG_NET_MEDIATEK_HW_QOS +#ifdef CONFIG_NET_RALINK_HW_QOS #define QDMA_TX_SCH_TX 0x1a14 @@ -393,7 +393,7 @@ static int mtk_ppe_start(struct mtk_eth *eth) dev_info(eth->dev, "PPE started\n"); -#ifdef CONFIG_NET_MEDIATEK_HW_QOS +#ifdef CONFIG_NET_RALINK_HW_QOS mtk_ppe_scheduler(eth, 0, 500000); mtk_ppe_scheduler(eth, 1, 500000); mtk_ppe_queue(eth, 0, 0, 7, 32, 250000, 0); diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_offload.h similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.h rename to target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_offload.h diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c similarity index 91% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7620.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c index fb2d45a56e..c4684d02d6 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7620.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c @@ -146,6 +146,8 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np) int phy_mode, size, id; int shift = 12; u32 val, mask = 0; + u32 val_delay = 0; + u32 mask_delay = GSW_REG_GPCx_TXDELAY | GSW_REG_GPCx_RXDELAY; int min = (gsw->port4 == PORT4_EPHY) ? (5) : (4); if (!_id || (be32_to_cpu(*_id) < min) || (be32_to_cpu(*_id) > 5)) { @@ -175,6 +177,25 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np) switch (phy_mode) { case PHY_INTERFACE_MODE_RGMII: mask = 0; + /* Do not touch rx/tx delay in this state to avoid problems with + * backward compability. + */ + mask_delay = 0; + break; + case PHY_INTERFACE_MODE_RGMII_ID: + mask = 0; + val_delay |= GSW_REG_GPCx_TXDELAY; + val_delay &= ~GSW_REG_GPCx_RXDELAY; + break; + case PHY_INTERFACE_MODE_RGMII_RXID: + mask = 0; + val_delay &= ~GSW_REG_GPCx_TXDELAY; + val_delay &= ~GSW_REG_GPCx_RXDELAY; + break; + case PHY_INTERFACE_MODE_RGMII_TXID: + mask = 0; + val_delay &= ~GSW_REG_GPCx_TXDELAY; + val_delay |= GSW_REG_GPCx_RXDELAY; break; case PHY_INTERFACE_MODE_MII: mask = 1; @@ -196,6 +217,19 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np) val |= mask << shift; rt_sysc_w32(val, SYSC_REG_CFG1); + if (id == 4) { + val = mtk_switch_r32(gsw, GSW_REG_GPC2); + val &= ~(mask_delay); + val |= val_delay & mask_delay; + mtk_switch_w32(gsw, val, GSW_REG_GPC2); + } + else if (id == 5) { + val = mtk_switch_r32(gsw, GSW_REG_GPC1); + val &= ~(mask_delay); + val |= val_delay & mask_delay; + mtk_switch_w32(gsw, val, GSW_REG_GPC1); + } + if (priv->phy->phy_fixed[id]) { const __be32 *link = priv->phy->phy_fixed[id]; int tx_fc, rx_fc; diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7621.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7621.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7621.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7621.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt2880.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt2880.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3050.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3050.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3050.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3050.c diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3883.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c similarity index 100% rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3883.c rename to target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 5e69f27379..1e3ee57470 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -7,6 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +DEVICE_VARS += LOADER_TYPE DEVICE_VARS += IMAGE_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index febed62a05..30060da36f 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -279,6 +279,20 @@ define Device/dlink_dwr-922-e2 endef TARGET_DEVICES += dlink_dwr-922-e2 +define Device/dlink_dwr-960 + $(Device/amit_jboot) + SOC := mt7620a + IMAGE_SIZE := 16256k + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DWR-960 + DLINK_ROM_ID := DLK6E2429001 + DLINK_FAMILY_MEMBER := 0x6E24 + DLINK_FIRMWARE_SIZE := 0xFE0000 + DEVICE_PACKAGES += kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi \ + kmod-mt76x0e +endef +TARGET_DEVICES += dlink_dwr-960 + define Device/dovado_tiny-ac SOC := mt7620a IMAGE_SIZE := 7872k diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d04435eae8..264843f29f 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -202,6 +202,15 @@ define Device/buffalo_wsr-1166dhp endef TARGET_DEVICES += buffalo_wsr-1166dhp +define Device/buffalo_wsr-2533dhpl + IMAGE_SIZE := 7936k + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WSR-2533DHPL + IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata + DEVICE_PACKAGES := kmod-mt7615e wpad-openssl +endef +TARGET_DEVICES += buffalo_wsr-2533dhpl + define Device/buffalo_wsr-600dhp IMAGE_SIZE := 16064k DEVICE_VENDOR := Buffalo @@ -513,25 +522,27 @@ define Device/MikroTik check-size $$$$(IMAGE_SIZE) endef -define Device/mikrotik_rb750gr3 +define Device/mikrotik_routerboard-750gr3 $(Device/MikroTik) - DEVICE_MODEL := RouterBOARD RB750G - DEVICE_VARIANT := r3 + DEVICE_MODEL := RouterBOARD 750Gr3 DEVICE_PACKAGES += kmod-gpio-beeper + SUPPORTED_DEVICES += mikrotik,rb750gr3 endef -TARGET_DEVICES += mikrotik_rb750gr3 +TARGET_DEVICES += mikrotik_routerboard-750gr3 -define Device/mikrotik_rbm11g +define define Device/mikrotik_routerboard-m11g $(Device/MikroTik) DEVICE_MODEL := RouterBOARD M11G + SUPPORTED_DEVICES += mikrotik,rbm11g endef -TARGET_DEVICES += mikrotik_rbm11g +TARGET_DEVICES += mikrotik_routerboard-m11g -define Device/mikrotik_rbm33g +define Device/mikrotik_routerboard-m33g $(Device/MikroTik) DEVICE_MODEL := RouterBOARD M33G + SUPPORTED_DEVICES += mikrotik,rbm33g endef -TARGET_DEVICES += mikrotik_rbm33g +TARGET_DEVICES += mikrotik_routerboard-m33g define Device/mqmaker_witi IMAGE_SIZE := 16064k @@ -794,28 +805,31 @@ define Device/tplink_re650-v1 endef TARGET_DEVICES += tplink_re650-v1 -define Device/ubiquiti_edgerouterx +define Device/ubnt_edgerouter_common $(Device/uimage-lzma-loader) + DEVICE_VENDOR := Ubiquiti IMAGE_SIZE := 256768k FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 KERNEL_INITRAMFS := $$(KERNEL) | \ ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := EdgeRouter X - SUPPORTED_DEVICES += ubnt-erx endef -TARGET_DEVICES += ubiquiti_edgerouterx -define Device/ubiquiti_edgerouterx-sfp - $(Device/ubiquiti_edgerouterx) - DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := EdgeRouter X-SFP - DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c-gpio-custom - SUPPORTED_DEVICES += ubnt-erx-sfp +define Device/ubnt_edgerouter-x + $(Device/ubnt_edgerouter_common) + DEVICE_MODEL := EdgeRouter X + SUPPORTED_DEVICES += ubnt-erx ubiquiti,edgerouterx endef -TARGET_DEVICES += ubiquiti_edgerouterx-sfp +TARGET_DEVICES += ubnt_edgerouter-x + +define Device/ubnt_edgerouter-x-sfp + $(Device/ubnt_edgerouter_common) + DEVICE_MODEL := EdgeRouter X SFP + DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x + SUPPORTED_DEVICES += ubnt-erx-sfp ubiquiti,edgerouterx-sfp +endef +TARGET_DEVICES += ubnt_edgerouter-x-sfp define Device/ubnt_unifi-nanohd DEVICE_VENDOR := Ubiquiti diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index fe6dfac50e..7338b4f74e 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -60,6 +60,10 @@ comfast,cf-wr800n) ucidef_set_led_netdev "lan" "lan" "$boardname:white:ethernet" eth0.1 set_wifi_led "$boardname:white:wifi" ;; +dlink,dwr-960) + ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x2e" + ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ;; dlink,dwr-116-a1|\ head-weblink,hdrm200|\ ohyeah,oy-0001|\ diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index ab67ab4fa9..aca01323c9 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -105,6 +105,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch1" \ "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" ;; + dlink,dwr-960) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "5:lan" "0:wan" "6@eth0" + ;; edimax,ew-7476rpc|\ edimax,ew-7478ac|\ kimax,u35wf|\ @@ -277,6 +281,7 @@ ramips_setup_macs() dlink,dwr-118-a2|\ dlink,dwr-921-c1|\ dlink,dwr-922-e2|\ + dlink,dwr-960|\ lava,lr-25g001) wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000) lan_mac=$(macaddr_add "$wan_mac" 1) diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches index 85380d84a8..f2355fdb97 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches @@ -11,6 +11,9 @@ dlink,dir-510l) ucidef_add_gpio_switch "usb_enable1" "USB 1A enable" "12" "0" ucidef_add_gpio_switch "usb_enable05" "USB 0.5A enable" "13" "1" ;; +dlink,dwr-960) + ucidef_add_gpio_switch "power_mpcie" "mPCIe power" "0" "1" + ;; head-weblink,hdrm200) ucidef_add_gpio_switch "sim_switch" "SIM slot switch" "0" ucidef_add_gpio_switch "io1" "I/O 1" "1" diff --git a/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index cf9243adc3..1ae3e665f4 100644 --- a/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -60,6 +60,7 @@ case "$FIRMWARE" in dlink,dwr-118-a2|\ dlink,dwr-921-c1|\ dlink,dwr-922-e2|\ + dlink,dwr-960|\ lava,lr-25g001) wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000) wifi_mac=$(macaddr_add "$wan_mac" 1) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds index 8c35f507ff..2a99067d16 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds @@ -38,7 +38,7 @@ gnubee,gb-pc2) ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x01" ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x10" ;; -mikrotik,rbm11g) +mikrotik,routerboard-m11g) ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssi0" "wlan0" "1" "100" ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssi1" "wlan0" "20" "100" diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 9f33b79881..9cab8edec7 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -66,7 +66,7 @@ ramips_setup_interfaces() asus,rt-ac57u|\ asus,rt-ac85p|\ iptime,a6ns-m|\ - mikrotik,rb750gr3|\ + mikrotik,routerboard-750gr3|\ ubiquiti,edgerouterx|\ ubiquiti,edgerouterx-sfp|\ youhua,wr1200js) @@ -122,14 +122,14 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "6@eth0" ;; - mikrotik,rbm11g|\ + mikrotik,routerboard-m11g|\ thunder,timecloud) ucidef_add_switch "switch0" ucidef_add_switch_attr "switch0" "enable" "false" ucidef_set_interface_lan "eth0" ;; jdcloud,re-sp-01b|\ - mikrotik,rbm33g) + mikrotik,routerboard-m33g) ucidef_add_switch "switch0" \ "1:lan" "2:lan" "0:wan" "6@eth0" ;; @@ -255,9 +255,9 @@ ramips_setup_macs() mediatek,ap-mt7621a-v60) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x5)" 1) ;; - mikrotik,rb750gr3|\ - mikrotik,rbm11g|\ - mikrotik,rbm33g) + mikrotik,routerboard-750gr3|\ + mikrotik,routerboard-m11g|\ + mikrotik,routerboard-m33g) wan_mac=$(macaddr_add "$(mtd_get_mac_binary hard_config 0x10)" 2) label_mac=$(mtd_get_mac_binary hard_config 0x10) ;; @@ -272,8 +272,8 @@ ramips_setup_macs() telco-electronics,x1) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0xe006)" 1) ;; - ubiquiti,edgerouterx|\ - ubiquiti,edgerouterx-sfp) + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x22)" 1) ;; wevo,11acnas|\ diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches index d3bc85f827..91a9459d8c 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches @@ -7,16 +7,16 @@ board_config_update board=$(board_name) case "$board" in -mikrotik,rb750gr3) +mikrotik,routerboard-750gr3) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "17" ;; telco-electronics,x1) ucidef_add_gpio_switch "modem_reset" "Modem Reset" "16" ;; -ubiquiti,edgerouterx) +ubnt,edgerouter-x) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "0" ;; -ubiquiti,edgerouterx-sfp) +ubnt,edgerouter-x-sfp) ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "496" ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "497" ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "498" diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration index e745c2c5d4..2e824c4d69 100644 --- a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration @@ -4,10 +4,17 @@ . /lib/functions/migrations.sh board=$(board_name) +boardonly="${board##*,}" case "$board" in +mikrotik,routerboard-750gr3) + migrate_leds "^rb750gr3:=$boardonly:" +mikrotik,routerboard-m11g) + migrate_leds "^rbm11g:=$boardonly:" +mikrotik,routerboard-m33g) + migrate_leds "^rbm33g:=$boardonly:" netgear,wndr3700-v5) - migrate_leds "^wndr3700v5:=wndr3700-v5:" + migrate_leds "^wndr3700v5:=$boardonly:" ;; esac diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index ad10dcbdaa..e26be13911 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -27,9 +27,9 @@ platform_do_upgrade() { fi } ;; - mikrotik,rb750gr3|\ - mikrotik,rbm11g|\ - mikrotik,rbm33g) + mikrotik,routerboard-750gr3|\ + mikrotik,routerboard-m11g|\ + mikrotik,routerboard-m33g) [ -z "$(rootfs_type)" ] && mtd erase firmware ;; asus,rt-ac65p|\ @@ -61,8 +61,8 @@ platform_do_upgrade() { iodata_mstc_upgrade_prepare nand_do_upgrade "$1" ;; - ubiquiti,edgerouterx|\ - ubiquiti,edgerouterx-sfp) + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp) platform_upgrade_ubnt_erx "$1" ;; *)