From e4ce3109f28712dad3b3db27938a7b853346d9b6 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun, 22 Dec 2019 21:26:01 +0100
Subject: [PATCH] ramips: simplify state_default/pinctrl0 in device DTS files

The node pinctrl0 is already set up in the SOC DTSI files, but
defined again as member of pinctrl in most of the device DTS(I)
files. This patch removes this redundancy for the entire ramips
target.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../ramips/dts/mt7620a_aigale_ai-br100.dts    | 10 +--
 .../dts/mt7620a_alfa-network_ac1200rm.dts     | 10 +--
 .../dts/mt7620a_alfa-network_r36m-e4g.dts     | 10 +--
 .../dts/mt7620a_alfa-network_tube-e4g.dts     | 10 +--
 .../linux/ramips/dts/mt7620a_asus_rp-n53.dts  | 10 +--
 .../ramips/dts/mt7620a_asus_rt-ac51u.dts      | 10 +--
 .../ramips/dts/mt7620a_bdcom_wap2100-sk.dts   | 10 +--
 .../ramips/dts/mt7620a_buffalo_whr-1166d.dts  | 10 +--
 .../ramips/dts/mt7620a_buffalo_whr-300hp2.dts | 10 +--
 .../ramips/dts/mt7620a_buffalo_whr-600d.dts   | 10 +--
 .../ramips/dts/mt7620a_dlink_dch-m225.dts     | 18 ++--
 .../ramips/dts/mt7620a_dlink_dir-510l.dts     | 10 +--
 .../ramips/dts/mt7620a_dlink_dir-810l.dts     | 10 +--
 .../ramips/dts/mt7620a_dlink_dwr-118-a1.dts   | 10 +--
 .../ramips/dts/mt7620a_dlink_dwr-118-a2.dts   | 10 +--
 .../ramips/dts/mt7620a_dovado_tiny-ac.dts     | 10 +--
 .../dts/mt7620a_edimax_br-6478ac-v2.dts       | 10 +--
 .../ramips/dts/mt7620a_edimax_ew-7478apc.dts  | 10 +--
 .../ramips/dts/mt7620a_edimax_ew-747x.dtsi    | 14 ++--
 .../ramips/dts/mt7620a_engenius_esr600.dts    | 13 +--
 .../ramips/dts/mt7620a_glinet_gl-mt300a.dts   | 10 +--
 .../ramips/dts/mt7620a_glinet_gl-mt300n.dts   | 10 +--
 .../ramips/dts/mt7620a_glinet_gl-mt750.dts    | 10 +--
 .../dts/mt7620a_head-weblink_hdrm200.dts      | 12 ++-
 .../ramips/dts/mt7620a_hiwifi_hc5x61.dtsi     | 10 +--
 target/linux/ramips/dts/mt7620a_hnet_c108.dts | 10 +--
 .../ramips/dts/mt7620a_iodata_wn-ac1167gr.dts | 10 +--
 .../ramips/dts/mt7620a_iodata_wn-ac733gr3.dts | 10 +--
 .../ramips/dts/mt7620a_kimax_u25awf-h1.dts    | 10 +--
 .../ramips/dts/mt7620a_lava_lr-25g001.dts     | 10 +--
 .../ramips/dts/mt7620a_lenovo_newifi-y1.dtsi  | 10 +--
 .../ramips/dts/mt7620a_linksys_e1700.dts      | 10 +--
 .../dts/mt7620a_microduino_microwrt.dts       | 10 +--
 .../mt7620a_netgear_ex2700_wn3000rp-v3.dtsi   | 10 +--
 .../dts/mt7620a_netgear_ex3700_ex6130.dtsi    | 10 +--
 .../ramips/dts/mt7620a_ohyeah_oy-0001.dts     | 10 +--
 .../linux/ramips/dts/mt7620a_phicomm_k2g.dts  | 10 +--
 .../ramips/dts/mt7620a_phicomm_psg1208.dts    | 10 +--
 .../ramips/dts/mt7620a_phicomm_psg1218a.dts   | 10 +--
 .../ramips/dts/mt7620a_phicomm_psg1218b.dts   | 10 +--
 .../ramips/dts/mt7620a_planex_cs-qr10.dts     | 18 ++--
 .../ramips/dts/mt7620a_planex_db-wrt01.dts    | 10 +--
 .../ramips/dts/mt7620a_planex_mzk-750dhp.dts  | 10 +--
 .../ramips/dts/mt7620a_planex_mzk-ex300np.dts | 10 +--
 .../ramips/dts/mt7620a_planex_mzk-ex750np.dts | 10 +--
 .../ramips/dts/mt7620a_ralink_mt7620a-evb.dts | 10 +--
 .../dts/mt7620a_ralink_mt7620a-mt7530-evb.dts | 10 +--
 .../dts/mt7620a_ralink_mt7620a-v22sg-evb.dts  | 10 +--
 .../ramips/dts/mt7620a_sanlinking_d240.dts    | 36 ++++----
 .../ramips/dts/mt7620a_sercomm_na930.dts      | 18 ++--
 .../dts/mt7620a_tplink_archer-c2-v1.dts       | 16 ++--
 .../dts/mt7620a_tplink_archer-c20-v1.dts      | 10 +--
 .../ramips/dts/mt7620a_tplink_archer-c20i.dts | 10 +--
 .../dts/mt7620a_tplink_archer-c50-v1.dts      | 10 +--
 .../dts/mt7620a_tplink_archer-mr200.dts       | 10 +--
 .../ramips/dts/mt7620a_xiaomi_miwifi-mini.dts | 10 +--
 target/linux/ramips/dts/mt7620a_youku_yk1.dts | 10 +--
 .../linux/ramips/dts/mt7620a_yukai_bocco.dts  | 10 +--
 .../dts/mt7620a_zbtlink_zbt-ape522ii.dts      | 10 +--
 .../dts/mt7620a_zbtlink_zbt-we1026.dtsi       | 10 +--
 .../dts/mt7620a_zbtlink_zbt-we826-e.dts       | 10 +--
 .../ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi | 10 +--
 target/linux/ramips/dts/mt7620a_zte_q7.dts    | 10 +--
 .../dts/mt7620a_zyxel_keenetic-viva.dts       | 10 +--
 .../linux/ramips/dts/mt7620n_asus_rt-n12p.dts | 10 +--
 .../linux/ramips/dts/mt7620n_asus_rt-n14u.dts | 10 +--
 .../ramips/dts/mt7620n_buffalo_wmr-300.dts    | 10 +--
 .../ramips/dts/mt7620n_comfast_cf-wr800n.dts  | 10 +--
 .../ramips/dts/mt7620n_dlink_dwr-116-a1.dts   | 10 +--
 .../ramips/dts/mt7620n_dlink_dwr-921-c1.dts   | 10 +--
 .../ramips/dts/mt7620n_dlink_dwr-922-e2.dts   | 10 +--
 .../ramips/dts/mt7620n_elecom_wrh-300cr.dts   | 10 +--
 .../linux/ramips/dts/mt7620n_kimax_u35wf.dts  | 10 +--
 .../ramips/dts/mt7620n_kingston_mlw221.dts    | 10 +--
 .../ramips/dts/mt7620n_kingston_mlwg2.dts     | 10 +--
 .../linux/ramips/dts/mt7620n_nexx_wt3020.dtsi | 10 +--
 .../ramips/dts/mt7620n_ravpower_wd03.dts      | 10 +--
 .../ramips/dts/mt7620n_vonets_var11n-300.dts  | 10 +--
 .../ramips/dts/mt7620n_wrtnode_wrtnode.dts    | 10 +--
 .../ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts | 10 +--
 .../ramips/dts/mt7620n_zbtlink_zbt-wa05.dts   | 10 +--
 .../ramips/dts/mt7620n_zbtlink_zbt-we2026.dts | 10 +--
 .../dts/mt7620n_zbtlink_zbt-wr8305rt.dts      | 10 +--
 .../dts/mt7620n_zyxel_keenetic-omni-ii.dts    | 10 +--
 .../dts/mt7620n_zyxel_keenetic-omni.dts       | 10 +--
 target/linux/ramips/dts/mt7621_adslr_g7.dts   | 10 +--
 .../ramips/dts/mt7621_afoundry_ew1200.dts     | 10 +--
 .../dts/mt7621_alfa-network_quad-e4g.dts      | 10 +--
 .../ramips/dts/mt7621_asiarf_ap7621.dtsi      | 10 +--
 .../linux/ramips/dts/mt7621_asus_rt-ac57u.dts | 10 +--
 .../ramips/dts/mt7621_asus_rt-acx5p.dtsi      | 10 +--
 .../ramips/dts/mt7621_buffalo_wsr-1166dhp.dts | 10 +--
 .../ramips/dts/mt7621_buffalo_wsr-600dhp.dts  | 10 +--
 .../ramips/dts/mt7621_d-team_newifi-d2.dts    | 10 +--
 .../linux/ramips/dts/mt7621_d-team_pbr-m1.dts | 10 +--
 .../ramips/dts/mt7621_dlink_dir-860l-b1.dts   | 10 +--
 .../dts/mt7621_elecom_wrc-1167ghbk2-s.dts     | 10 +--
 .../ramips/dts/mt7621_elecom_wrc-gst.dtsi     | 10 +--
 .../ramips/dts/mt7621_firefly_firewrt.dts     | 10 +--
 .../ramips/dts/mt7621_gehua_ghl-r-001.dts     | 10 +--
 .../linux/ramips/dts/mt7621_gnubee_gb-pc1.dts | 10 +--
 .../linux/ramips/dts/mt7621_gnubee_gb-pc2.dts | 10 +--
 .../linux/ramips/dts/mt7621_hiwifi_hc5962.dts | 10 +--
 .../ramips/dts/mt7621_iodata_wn-ax1167gr.dts  | 10 +--
 .../ramips/dts/mt7621_iodata_wn-gx300gr.dts   | 10 +--
 .../ramips/dts/mt7621_iodata_wnpr2600g.dts    | 10 +--
 .../ramips/dts/mt7621_lenovo_newifi-d1.dts    | 10 +--
 .../ramips/dts/mt7621_linksys_re6500.dts      | 10 +--
 .../dts/mt7621_mediatek_ap-mt7621a-v60.dts    | 13 +--
 .../dts/mt7621_mediatek_mt7621-eval-board.dts | 10 +--
 .../ramips/dts/mt7621_mikrotik_rb750gr3.dts   | 12 ++-
 .../ramips/dts/mt7621_mikrotik_rbm11g.dts     | 10 +--
 .../ramips/dts/mt7621_mikrotik_rbm33g.dts     | 10 +--
 .../linux/ramips/dts/mt7621_mqmaker_witi.dts  | 10 +--
 target/linux/ramips/dts/mt7621_mtc_wr1201.dts | 10 +--
 .../ramips/dts/mt7621_netgear_ex6150.dts      | 10 +--
 .../dts/mt7621_netgear_sercomm_ayx.dtsi       | 10 +--
 .../dts/mt7621_netgear_sercomm_chj.dtsi       | 10 +--
 .../linux/ramips/dts/mt7621_netis_wf-2881.dts | 10 +--
 .../linux/ramips/dts/mt7621_phicomm_k2p.dts   | 10 +--
 .../linux/ramips/dts/mt7621_planex_vr500.dts  | 10 +--
 .../dts/mt7621_samknows_whitebox-v8.dts       | 10 +--
 .../dts/mt7621_storylink_sap-g3200u3.dts      | 10 +--
 .../dts/mt7621_telco-electronics_x1.dts       | 10 +--
 .../ramips/dts/mt7621_thunder_timecloud.dts   | 10 +--
 .../ramips/dts/mt7621_totolink_a7000r.dts     | 10 +--
 .../ramips/dts/mt7621_tplink_re350-v1.dts     | 10 +--
 .../ramips/dts/mt7621_tplink_re650-v1.dts     | 10 +--
 .../dts/mt7621_ubiquiti_edgerouterx.dtsi      | 10 +--
 .../ramips/dts/mt7621_unielec_u7621-06.dtsi   | 10 +--
 .../ramips/dts/mt7621_xiaomi_mir3g-v2.dts     | 10 +--
 .../linux/ramips/dts/mt7621_xiaomi_mir3g.dts  | 10 +--
 .../linux/ramips/dts/mt7621_xiaomi_mir3p.dts  | 10 +--
 .../linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts  | 10 +--
 .../dts/mt7621_xzwifi_creativebox-v1.dts      | 10 +--
 .../ramips/dts/mt7621_youhua_wr1200js.dts     | 10 +--
 .../linux/ramips/dts/mt7621_youku_yk-l2.dts   | 10 +--
 .../ramips/dts/mt7621_zbtlink_zbt-we1326.dts  | 10 +--
 .../ramips/dts/mt7621_zbtlink_zbt-we3526.dts  | 10 +--
 .../ramips/dts/mt7621_zbtlink_zbt-wg2626.dts  | 10 +--
 .../ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi | 10 +--
 .../dts/mt7628an_alfa-network_awusfree1.dts   | 26 +++---
 .../dts/mt7628an_buffalo_wcr-1166ds.dts       | 10 +--
 .../linux/ramips/dts/mt7628an_cudy_wr1000.dts | 12 ++-
 .../ramips/dts/mt7628an_d-team_pbr-d1.dts     | 42 +++++-----
 .../linux/ramips/dts/mt7628an_duzun_dm06.dts  | 10 +--
 .../dts/mt7628an_glinet_gl-mt300n-v2.dts      | 10 +--
 .../ramips/dts/mt7628an_glinet_vixmini.dts    | 10 +--
 .../ramips/dts/mt7628an_hilink_hlk-7628n.dts  | 10 +--
 .../ramips/dts/mt7628an_hiwifi_hc5661a.dts    | 10 +--
 .../ramips/dts/mt7628an_hiwifi_hc5761a.dts    | 10 +--
 .../ramips/dts/mt7628an_hiwifi_hc5861b.dts    | 10 +--
 target/linux/ramips/dts/mt7628an_iptime.dtsi  | 10 +--
 .../ramips/dts/mt7628an_iptime_a604m.dts      | 10 +--
 .../mt7628an_mediatek_linkit-smart-7688.dts   | 50 ++++++-----
 .../mt7628an_mediatek_mt7628an-eval-board.dts | 10 +--
 .../ramips/dts/mt7628an_netgear_r6120.dts     | 14 ++--
 .../ramips/dts/mt7628an_onion_omega2.dtsi     | 82 +++++++++----------
 .../dts/mt7628an_rakwireless_rak633.dts       | 10 +--
 .../ramips/dts/mt7628an_skylab_skw92a.dts     | 10 +--
 target/linux/ramips/dts/mt7628an_tama_w06.dts | 10 +--
 .../ramips/dts/mt7628an_totolink_lr1200.dts   | 10 +--
 .../dts/mt7628an_tplink_archer-c20-v4.dts     | 10 +--
 .../dts/mt7628an_tplink_archer-c50-v3.dts     | 12 ++-
 .../dts/mt7628an_tplink_archer-c50-v4.dts     | 12 ++-
 .../dts/mt7628an_tplink_tl-mr3020-v3.dts      | 10 +--
 .../dts/mt7628an_tplink_tl-mr3420-v5.dts      | 10 +--
 .../dts/mt7628an_tplink_tl-wa801nd-v5.dts     | 10 +--
 .../dts/mt7628an_tplink_tl-wr802n-v4.dts      | 10 +--
 .../dts/mt7628an_tplink_tl-wr840n-v4.dts      | 10 +--
 .../dts/mt7628an_tplink_tl-wr840n-v5.dts      | 10 +--
 .../dts/mt7628an_tplink_tl-wr841n-v13.dts     | 10 +--
 .../dts/mt7628an_tplink_tl-wr841n-v14.dts     | 10 +--
 .../dts/mt7628an_tplink_tl-wr842n-v5.dts      | 10 +--
 .../dts/mt7628an_tplink_tl-wr902ac-v3.dts     | 10 +--
 .../ramips/dts/mt7628an_unielec_u7628-01.dtsi | 10 +--
 .../ramips/dts/mt7628an_vocore_vocore2.dtsi   | 10 +--
 .../dts/mt7628an_wavlink_wl-wn570ha1.dts      | 10 +--
 .../dts/mt7628an_wavlink_wl-wn575a3.dts       | 10 +--
 .../linux/ramips/dts/mt7628an_widora_neo.dtsi | 66 ++++++++-------
 .../ramips/dts/mt7628an_wiznet_wizfi630s.dts  | 42 +++++-----
 .../ramips/dts/mt7628an_wrtnode_wrtnode2p.dts | 10 +--
 .../ramips/dts/mt7628an_wrtnode_wrtnode2r.dts | 12 +--
 .../ramips/dts/mt7628an_xiaomi_mir4a-100m.dts | 10 +--
 .../dts/mt7628an_zbtlink_zbt-we1226.dts       | 10 +--
 .../dts/mt7628an_zyxel_keenetic-extra-ii.dts  | 10 +--
 .../ramips/dts/rt2880_airlink101_ar670w.dts   | 10 +--
 .../ramips/dts/rt2880_airlink101_ar725w.dts   | 10 +--
 .../linux/ramips/dts/rt2880_asus_rt-n15.dts   | 10 +--
 .../ramips/dts/rt2880_belkin_f5d8235-v1.dts   | 10 +--
 .../dts/rt2880_buffalo_wzr-agl300nh.dts       | 10 +--
 .../ramips/dts/rt2880_dlink_dap-1522-a1.dts   | 10 +--
 .../ramips/dts/rt3050_8devices_carambola.dts  | 10 +--
 .../ramips/dts/rt3050_allnet_all0256n.dtsi    | 10 +--
 .../dts/rt3050_alphanetworks_asl26555.dtsi    | 10 +--
 .../dts/rt3050_arcwireless_freestation5.dts   | 10 +--
 .../ramips/dts/rt3050_asus_rt-g32-b1.dts      | 10 +--
 .../linux/ramips/dts/rt3050_asus_wl-330n.dts  | 10 +--
 .../ramips/dts/rt3050_asus_wl-330n3g.dts      | 10 +--
 .../linux/ramips/dts/rt3050_dlink_dcs-930.dts | 10 +--
 .../ramips/dts/rt3050_dlink_dir-300-b1.dts    | 10 +--
 .../ramips/dts/rt3050_dlink_dir-600-b1.dts    | 10 +--
 .../ramips/dts/rt3050_dlink_dir-615-d.dts     | 10 +--
 .../ramips/dts/rt3050_dlink_dir-620-a1.dts    | 10 +--
 .../ramips/dts/rt3050_edimax_3g-6200n.dts     | 10 +--
 .../ramips/dts/rt3050_edimax_3g-6200nl.dts    | 10 +--
 .../linux/ramips/dts/rt3050_huawei_d105.dts   | 10 +--
 .../linux/ramips/dts/rt3050_jcg_jhr-n805r.dts | 10 +--
 .../linux/ramips/dts/rt3050_netcore_nw718.dts | 10 +--
 .../ramips/dts/rt3050_sparklan_wcr-150gn.dts  | 10 +--
 .../ramips/dts/rt3050_teltonika_rut5xx.dts    | 10 +--
 .../linux/ramips/dts/rt3050_tenda_w150m.dts   | 10 +--
 .../dts/rt3050_trendnet_tew-638apb-v2.dts     | 10 +--
 .../linux/ramips/dts/rt3052_accton_wr6202.dts | 10 +--
 .../ramips/dts/rt3052_alfa-network_w502u.dts  | 10 +--
 .../linux/ramips/dts/rt3052_argus_atp-52b.dts | 10 +--
 .../ramips/dts/rt3052_asiarf_awapn2403.dts    | 10 +--
 .../linux/ramips/dts/rt3052_asus_rt-n13u.dts  | 10 +--
 .../ramips/dts/rt3052_aximcom_mr-102n.dts     | 10 +--
 .../ramips/dts/rt3052_aztech_hw550-3g.dts     | 10 +--
 .../ramips/dts/rt3052_belkin_f5d8235-v2.dts   | 10 +--
 .../ramips/dts/rt3052_buffalo_whr-g300n.dts   | 10 +--
 .../ramips/dts/rt3052_dlink_dap-1350.dts      | 10 +--
 .../ramips/dts/rt3052_engenius_esr-9753.dts   | 10 +--
 .../ramips/dts/rt3052_fon_fonera-20n.dts      | 10 +--
 .../ramips/dts/rt3052_hauppauge_broadway.dts  | 10 +--
 .../linux/ramips/dts/rt3052_huawei_hg255d.dts | 10 +--
 .../linux/ramips/dts/rt3052_jcg_jhr-n825r.dts | 10 +--
 .../linux/ramips/dts/rt3052_jcg_jhr-n926r.dts | 10 +--
 .../dts/rt3052_mofinetwork_mofi3500-3gn.dts   | 10 +--
 .../ramips/dts/rt3052_netgear_wnce2001.dts    | 10 +--
 .../linux/ramips/dts/rt3052_nexaira_bc2.dts   | 10 +--
 .../ramips/dts/rt3052_omnima_miniembwifi.dts  | 10 +--
 .../ramips/dts/rt3052_petatel_psr-680w.dts    | 10 +--
 .../ramips/dts/rt3052_planex_mzk-w300nh2.dts  | 10 +--
 .../ramips/dts/rt3052_planex_mzk-wdpr.dts     | 10 +--
 .../linux/ramips/dts/rt3052_poray_ip2202.dts  | 10 +--
 .../ramips/dts/rt3052_prolink_pwh2004.dts     | 10 +--
 .../ramips/dts/rt3052_ralink_v22rw-2x2.dts    | 10 +--
 .../ramips/dts/rt3052_sitecom_wl-351.dts      | 10 +--
 .../ramips/dts/rt3052_skyline_sl-r7205.dts    | 10 +--
 .../linux/ramips/dts/rt3052_tenda_3g300m.dts  | 10 +--
 .../ramips/dts/rt3052_tenda_w306r-v2.dts      | 10 +--
 .../dts/rt3052_unbranded_wr512-3gn.dtsi       | 10 +--
 .../dts/rt3052_unbranded_xdx-rn502j.dts       | 10 +--
 .../ramips/dts/rt3052_upvel_ur-326n4g.dts     | 10 +--
 .../ramips/dts/rt3052_upvel_ur-336un.dts      | 10 +--
 .../ramips/dts/rt3052_zyxel_keenetic.dts      | 10 +--
 .../ramips/dts/rt3052_zyxel_nbg-419n.dts      | 10 +--
 .../ramips/dts/rt3352_allnet_all5002.dts      | 10 +--
 .../ramips/dts/rt3352_dlink_dir-615-h1.dts    | 10 +--
 .../ramips/dts/rt3352_dlink_dir-620-d1.dts    | 10 +--
 .../ramips/dts/rt3352_zyxel_nbg-419n-v2.dts   | 10 +--
 .../linux/ramips/dts/rt3662_asus_rt-n56u.dts  | 10 +--
 .../linux/ramips/dts/rt3662_dlink_dir-645.dts | 10 +--
 .../ramips/dts/rt3662_edimax_br-6475nd.dts    | 10 +--
 target/linux/ramips/dts/rt3662_omnima_hpm.dts | 10 +--
 .../ramips/dts/rt3662_samsung_cy-swr1100.dts  | 10 +--
 .../ramips/dts/rt3883_belkin_f9k110x.dtsi     | 10 +--
 .../ramips/dts/rt3883_sitecom_wlr-6000.dts    | 10 +--
 .../ramips/dts/rt3883_trendnet_tew-691gr.dts  | 10 +--
 .../ramips/dts/rt3883_trendnet_tew-692gr.dts  | 10 +--
 .../ramips/dts/rt5350_7links_px-4885.dtsi     | 10 +--
 .../ramips/dts/rt5350_airlive_air3gii.dts     | 10 +--
 .../ramips/dts/rt5350_allnet_all5003.dts      | 10 +--
 .../ramips/dts/rt5350_asiarf_awm002-evb.dtsi  | 10 +--
 .../linux/ramips/dts/rt5350_belkin_f7c027.dts | 10 +--
 .../ramips/dts/rt5350_dlink_dcs-930l-b1.dts   | 10 +--
 .../ramips/dts/rt5350_dlink_dir-300-b7.dts    | 10 +--
 .../ramips/dts/rt5350_dlink_dir-320-b1.dts    | 10 +--
 .../ramips/dts/rt5350_dlink_dir-610-a1.dts    | 10 +--
 .../ramips/dts/rt5350_dlink_dwr-512-b.dts     | 10 +--
 .../ramips/dts/rt5350_easyacc_wizard-8800.dts | 10 +--
 .../linux/ramips/dts/rt5350_hame_mpr-a1.dts   | 10 +--
 .../linux/ramips/dts/rt5350_hame_mpr-a2.dts   | 10 +--
 .../ramips/dts/rt5350_hilink_hlk-rm04.dts     | 18 ++--
 .../ramips/dts/rt5350_hootoo_ht-tm02.dts      | 10 +--
 .../ramips/dts/rt5350_intenso_memory2move.dts | 10 +--
 .../linux/ramips/dts/rt5350_nexx_wt1520.dtsi  | 10 +--
 .../linux/ramips/dts/rt5350_nixcore_x1.dtsi   | 10 +--
 .../dts/rt5350_olimex_rt5350f-olinuxino.dtsi  | 18 ++--
 .../ramips/dts/rt5350_omnima_miniembplug.dts  | 10 +--
 .../ramips/dts/rt5350_planex_mzk-dp150n.dts   | 10 +--
 target/linux/ramips/dts/rt5350_poray_m3.dts   | 10 +--
 target/linux/ramips/dts/rt5350_poray_m4.dtsi  | 10 +--
 target/linux/ramips/dts/rt5350_poray_x5.dts   | 10 +--
 target/linux/ramips/dts/rt5350_poray_x8.dts   | 10 +--
 .../linux/ramips/dts/rt5350_tenda_3g150b.dts  | 10 +--
 .../ramips/dts/rt5350_trendnet_tew-714tru.dts | 10 +--
 .../ramips/dts/rt5350_unbranded_a5-v11.dts    | 10 +--
 .../ramips/dts/rt5350_vocore_vocore.dtsi      | 10 +--
 .../ramips/dts/rt5350_wansview_ncs601w.dts    | 10 +--
 .../ramips/dts/rt5350_wiznet_wizfi630a.dts    | 10 +--
 .../ramips/dts/rt5350_zorlik_zl5900v2.dts     | 10 +--
 .../dts/rt5350_zyxel_keenetic-start.dts       | 10 +--
 295 files changed, 1355 insertions(+), 1941 deletions(-)

diff --git a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts
index 019fdf92cd..2ffe8431ee 100644
--- a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts
+++ b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts
@@ -97,12 +97,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
+		ralink,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 0be685844f..fa03d14814 100644
--- a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts
@@ -123,12 +123,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "nd_sd", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "nd_sd", "spi refclk", "wled";
+		ralink,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 ce839f72f1..4ba57dda41 100644
--- a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts
@@ -154,12 +154,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "ephy", "pcie", "rgmii1", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "ephy", "pcie", "rgmii1", "wled";
+		ralink,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 b02b1629bb..4953c4c906 100644
--- a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
@@ -131,12 +131,10 @@
 	status = "disabled";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "ephy", "nd_sd", "pcie", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "ephy", "nd_sd", "pcie", "uartf";
+		ralink,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 c9c440fe82..4f92993064 100644
--- a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
@@ -148,12 +148,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "mdio", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "mdio", "rgmii1";
+		ralink,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 6efba7489f..4acab8c032 100644
--- a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
@@ -125,12 +125,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wled", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wled", "uartf";
+		ralink,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 898deee7e5..e77f39843d 100644
--- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
+++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
@@ -142,11 +142,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "spi refclk", "uartf", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "spi refclk", "uartf", "wled";
+		ralink,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 64fbeb0fe5..aed4ce1693 100644
--- a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts
+++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts
@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "wled", "nd_sd";
+		ralink,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 8bdf87501e..eeb4ee67d4 100644
--- a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts
+++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts
@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		ralink,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 a99910db8e..0800e3d78b 100644
--- a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts
+++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts
@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		ralink,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 b08edfadf7..27056a668b 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
@@ -161,17 +161,15 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii1";
+		ralink,function = "gpio";
+	};
 
-		gpio_i2s {
-			ralink,group = "uartf";
-			ralink,function = "gpio i2s";
-		};
+	gpio_i2s {
+		ralink,group = "uartf";
+		ralink,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 56c0f8f890..8a79d9a454 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
@@ -129,11 +129,9 @@
 	mediatek,port4 = "ephy";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf";
+		ralink,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 9232d4929a..da8d2238a1 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
@@ -117,12 +117,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
+		ralink,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 44ca663694..a69b17d739 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
@@ -129,12 +129,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "uartf", "spi refclk", "wled";
+		ralink,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 449f4ff4b6..5134e9e1ca 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
@@ -127,12 +127,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "uartf", "spi refclk", "wled";
+		ralink,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 d0229e4718..88bd514d53 100644
--- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts
+++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts
@@ -152,12 +152,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "nd_sd", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "nd_sd", "wled";
+		ralink,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 43698d9fd6..d34bc1b22b 100644
--- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd";
+		ralink,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 da5b428fa5..e2765b1877 100644
--- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts
@@ -115,12 +115,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd";
+		ralink,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 52c0ac0925..3b8ba4ec38 100644
--- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
+++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
@@ -98,14 +98,14 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "nd_sd", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd", "rgmii2";
+		ralink,function = "gpio";
 	};
+};
 
+&pinctrl {
 	phy_reset_pins: phy-reset {
 		gpio {
 			ralink,group = "spi refclk";
@@ -115,8 +115,8 @@
 };
 
 &ethernet {
-
 	status = "okay";
+
 	mtd-mac-address = <&factory 0x4>;
 
 	pinctrl-names = "default";
diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
index 65d71b99af..3213132c43 100644
--- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
+++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
@@ -165,15 +165,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group =	"i2c",	/* gpio0: 1-2 */
-				"uartf",	/* gpio0: 7-14 */
-				"nd_sd",	/* gpio2: 45-59 */
-				"wled";		/* gpio3: 72 */
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd", "wled";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
index 6b2e2d115b..d66861c9ad 100644
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
@@ -145,11 +145,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled","ephy","uartf","i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled","ephy","uartf","i2c";
+		ralink,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 1c2b296a9c..633253fadd 100644
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
@@ -136,11 +136,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled","ephy","i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled","ephy","i2c";
+		ralink,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 08451d8a8c..e6b30449e8 100644
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
@@ -151,11 +151,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled","ephy","uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled","ephy","uartf";
+		ralink,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 8d58d12f02..6395aa37f6 100644
--- a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts
+++ b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts
@@ -159,13 +159,11 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "pa", "spi refclk",
-				       "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "pa", "spi refclk",
+			       "wled";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
index a7e3bd199a..4f4fc4a725 100644
--- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
@@ -125,11 +125,9 @@
 	pinctrl-0 = <&pa_pins>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "wled";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620a_hnet_c108.dts b/target/linux/ramips/dts/mt7620a_hnet_c108.dts
index c122b6dfd5..49fa6b2c8e 100644
--- a/target/linux/ramips/dts/mt7620a_hnet_c108.dts
+++ b/target/linux/ramips/dts/mt7620a_hnet_c108.dts
@@ -172,12 +172,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk", "ephy";
+		ralink,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 5da91071db..200df6000e 100644
--- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
+++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
@@ -184,12 +184,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,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 12e6e12f00..062ef93ed4 100644
--- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
+++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
@@ -165,12 +165,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "mdio";
+		ralink,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 e1aeb4fa8a..ef4dc233ea 100644
--- a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts
+++ b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts
@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "uartf", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "uartf", "ephy", "wled";
+		ralink,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 3130365b96..e400ebcff0 100644
--- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
+++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
@@ -170,11 +170,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "i2c";
+		ralink,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 a5262ffca6..29832ac42b 100644
--- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi
@@ -99,11 +99,9 @@
 	pinctrl-0 = <&pa_pins>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts
index 256b306306..799d660d3c 100644
--- a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts
+++ b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts
@@ -97,12 +97,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
index 76ab099a16..57f408a648 100644
--- a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
+++ b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
@@ -97,11 +97,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "wled", "i2c", "wdt", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "wled", "i2c", "wdt", "uartf";
+		ralink,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 000c7535da..8199147165 100755
--- a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi
+++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi
@@ -54,11 +54,9 @@
 	mtd-mac-address = <&art 0x6>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk";
+		ralink,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 d8d74ffc30..ec9b6c587e 100644
--- a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi
+++ b/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi
@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0x0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "rgmii2", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "rgmii2", "spi refclk";
+		ralink,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 6ef7e84154..98dac3f5b6 100644
--- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
+++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
index e71211e681..5071aed165 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
index 310f78ec51..92fcfdf68c 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
index 4e023ed6b0..1474422a24 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
index f451b43ae3..15fb40fa7d 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
+		ralink,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 c5efb39563..8390d18918 100644
--- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
@@ -116,16 +116,14 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi refclk", "rgmii1";
-			ralink,function = "gpio";
-		};
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "wdt refclk";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi refclk", "rgmii1";
+		ralink,function = "gpio";
+	};
+	wdt {
+		ralink,group = "wdt";
+		ralink,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 ecbf91083a..a7c614cc21 100644
--- a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts
@@ -80,12 +80,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "rgmii1";
+		ralink,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 be7a569838..6062a76f76 100644
--- a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts
@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd";
+		ralink,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 ea2a11b82f..3313c6c071 100644
--- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
@@ -120,12 +120,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
+		ralink,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 7fe329f03e..4b64afd228 100644
--- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts
@@ -125,12 +125,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "nd_sd", "rgmii2", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "nd_sd", "rgmii2", "wled";
+		ralink,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 5b62fd92db..56f427aa8a 100644
--- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts
@@ -66,12 +66,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,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 976e2acca3..e106af402e 100644
--- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts
@@ -47,12 +47,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,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 7b3517c135..74c82341fe 100644
--- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts
@@ -60,12 +60,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "spi";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "spi";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts
index c2b94eebb3..35617c0880 100644
--- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts
+++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts
@@ -177,26 +177,24 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
+		ralink,function = "gpio";
+	};
 
-		/*
-		 * The sd function of the nd_sd group configures two of the
-		 * groups pins as gpios. The pins are used as PCIe reset/power.
-		 * Due to the driver load order, the pins are configured way to
-		 * late if triggered by the sd-card driver.
-		 * To not introduce another kind of driver load order
-		 * dependency and configure the pins as early as possible,
-		 * means during pinmux driver load.
-		 */
-		gpio_sd {
-			ralink,group = "nd_sd";
-			ralink,function = "sd";
-		};
+	/*
+	 * The sd function of the nd_sd group configures two of the
+	 * groups pins as gpios. The pins are used as PCIe reset/power.
+	 * Due to the driver load order, the pins are configured way to
+	 * late if triggered by the sd-card driver.
+	 * To not introduce another kind of driver load order
+	 * dependency and configure the pins as early as possible,
+	 * means during pinmux driver load.
+	 */
+	gpio_sd {
+		ralink,group = "nd_sd";
+		ralink,function = "sd";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts
index 76e1eb79bc..952f371ce0 100644
--- a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts
+++ b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts
@@ -114,17 +114,15 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "rgmii2", "spi", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "rgmii2", "spi", "ephy";
+		ralink,function = "gpio";
+	};
 
-		uartf_gpio {
-			ralink,group = "uartf";
-			ralink,function = "gpio uartf";
-		};
+	uartf_gpio {
+		ralink,group = "uartf";
+		ralink,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 2da35936b1..45752c095d 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
@@ -20,15 +20,6 @@
 		bootargs = "console=ttyS0,115200";
 	};
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -165,6 +156,13 @@
 	status = "okay";
 };
 
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk";
+		ralink,function = "gpio";
+	};
+};
+
 &wmac {
 	ralink,mtd-eeprom = <&radio 0>;
 	mtd-mac-address = <&rom 0xf100>;
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 23719c3f35..59e109c8a2 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
@@ -61,12 +61,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
+		ralink,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 975e0af661..707453d2b5 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
@@ -42,11 +42,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
+		ralink,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 77885853ef..ed2b00836e 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
@@ -61,12 +61,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
+		ralink,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 21fc3a1858..bc7825df00 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts
@@ -160,12 +160,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
+		ralink,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 8bf6565d2f..d076e10ced 100644
--- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts
+++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts
@@ -152,11 +152,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "rgmii1";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts
index 82be9c4c97..641c05a628 100644
--- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts
+++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts
@@ -110,12 +110,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "rgmii1", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "rgmii1", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts
index 7abc34d194..94ac1dd4f9 100644
--- a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts
+++ b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts
@@ -139,12 +139,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi refclk", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi refclk", "rgmii1";
+		ralink,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 f7bc4f2001..cf9b91f564 100644
--- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts
@@ -133,11 +133,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled", "i2c", "uartf", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled", "i2c", "uartf", "wdt";
+		ralink,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 d5a6d5389d..3d971ba2c6 100644
--- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi
@@ -94,11 +94,9 @@
 	ralink,mtd-eeprom = <&factory 0x0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled";
+		ralink,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 2496a16a29..a7779a0071 100644
--- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts
@@ -74,11 +74,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "wled";
+		ralink,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 41c6b07dbd..82d5de4012 100644
--- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi
@@ -82,12 +82,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_zte_q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts
index 50368b8bd5..fc07b57418 100644
--- a/target/linux/ramips/dts/mt7620a_zte_q7.dts
+++ b/target/linux/ramips/dts/mt7620a_zte_q7.dts
@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
+		ralink,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 16a606ea1a..563a159ffc 100644
--- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
+++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
@@ -128,12 +128,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts
index 76c362f593..801f4c50ec 100644
--- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts
+++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts
@@ -116,11 +116,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
+		ralink,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 960d2acaec..2e7f8ea5f6 100644
--- a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts
+++ b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts
@@ -129,11 +129,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "i2c";
+		ralink,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 f7c24ec481..9db47c814c 100644
--- a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts
+++ b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts
@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy";
+		ralink,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 b033ef90c4..16eea14bdf 100644
--- a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
+++ b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
@@ -114,11 +114,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "spi refclk", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "spi refclk", "i2c";
+		ralink,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 14bfc0f30c..cac849c919 100644
--- a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts
+++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts
@@ -97,12 +97,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "wled";
+		ralink,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 8214e4a780..27703acc08 100644
--- a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts
+++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts
@@ -141,11 +141,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "spi refclk", "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "spi refclk", "i2c", "ephy", "wled";
+		ralink,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 ab38ad0577..ebd9171415 100644
--- a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts
+++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts
@@ -143,11 +143,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "spi refclk", "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "spi refclk", "i2c", "ephy", "wled";
+		ralink,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 b1eceeed8e..a8d5b04b37 100644
--- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
+++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
@@ -126,11 +126,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts
index c49cb02bb5..c48560bb94 100644
--- a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts
+++ b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts
@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts
index 9658f6c4de..6decec798d 100644
--- a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts
+++ b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts
@@ -121,11 +121,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts
index 6d7d2d06b7..75267c68b9 100644
--- a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts
+++ b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts
@@ -121,11 +121,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi
index 2fc3662645..cee1e04e81 100644
--- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi
+++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi
@@ -51,11 +51,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts
index 7dcff46917..ee92860b9f 100644
--- a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts
+++ b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts
@@ -107,11 +107,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled", "ephy";
+		ralink,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 184d947e36..ddcfb1d9b5 100644
--- a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts
+++ b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts
@@ -89,11 +89,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
index a808818201..1c346856d1 100644
--- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
+++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
@@ -94,11 +94,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
+		ralink,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 3885428345..7a646882f3 100644
--- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts
@@ -117,11 +117,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,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 7949c48383..41029440e8 100644
--- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts
@@ -121,11 +121,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,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 0cadbddcb4..725a070fd6 100644
--- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts
@@ -102,11 +102,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,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 cdfeaff39f..12b1c5908b 100644
--- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts
@@ -115,11 +115,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk", "wled";
+		ralink,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 98c5609211..c974c9b1d0 100644
--- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
+++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
@@ -124,12 +124,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
+		ralink,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 ff9a9ee1a3..6e8a333069 100644
--- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts
+++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts
@@ -124,12 +124,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts
index c086b16f7d..26e66f9a31 100644
--- a/target/linux/ramips/dts/mt7621_adslr_g7.dts
+++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts
@@ -109,11 +109,9 @@
 	mtd-mac-address = <&factory 0xe00c>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
index a165c20742..8dab036b17 100644
--- a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
+++ b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
@@ -121,11 +121,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,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 f3080c29e0..1066536ea6 100644
--- a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
+++ b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
@@ -165,12 +165,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "rgmii2", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "rgmii2", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
index db83f99c3a..d4e5cfbf04 100644
--- a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
+++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
@@ -108,11 +108,9 @@
 	mediatek,portmap = "llllw";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "jtag";
+		ralink,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 e589461a4d..0a315398ef 100644
--- a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts
+++ b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts
@@ -138,11 +138,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "sdhci";
+		ralink,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 8eaf55dbc7..2de6d4c761 100644
--- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
+++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
@@ -147,11 +147,9 @@
 	status = "disabled";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "uart3", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "uart3", "i2c";
+		ralink,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 1b99f8147c..b67e430e5f 100644
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
@@ -158,12 +158,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
index 36bcd15e48..dadc26c12b 100644
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
@@ -153,12 +153,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,function = "gpio";
 	};
 };
 
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 896d9f6037..f1b4d3d8ab 100644
--- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
@@ -153,11 +153,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uart2", "uart3";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uart2", "uart3";
+		ralink,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 fd598de4bb..59dd80fc62 100644
--- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
@@ -168,11 +168,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,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 f189365bad..65924bb2e6 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
@@ -134,11 +134,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,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 3d0b726526..c43f0ad198 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
@@ -128,12 +128,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart3", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart3", "jtag", "wdt";
+		ralink,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 b4aaec46fc..0a4afd964f 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi
@@ -154,12 +154,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "jtag", "wdt", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "jtag", "wdt", "sdhci";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
index 773cf82e36..1df3116d22 100644
--- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
+++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
@@ -114,11 +114,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2";
+		ralink,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 b7ddc51fb6..fea83e5e15 100644
--- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
+++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
@@ -114,11 +114,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "wdt";
+		ralink,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 c7a6105903..25ad9dc131 100644
--- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
+++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
@@ -108,11 +108,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "rgmii2", "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "rgmii2", "uart3", "wdt";
+		ralink,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 bd3411b614..9920a1f0ba 100644
--- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
+++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
@@ -118,11 +118,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "rgmii2", "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "rgmii2", "uart3", "wdt";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
index 1d0471fd37..0d0e44ca13 100644
--- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
+++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
@@ -141,11 +141,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "jtag";
+		ralink,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 40e11014d7..d3bdc4acd8 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
@@ -133,12 +133,10 @@
 	mtd-mac-address = <&iNIC_rf 0x4>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "uart3", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "uart3", "jtag";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
index 1e692ea3cb..fa8c4aa653 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
@@ -133,12 +133,10 @@
 	mtd-mac-address = <&factory 0x4>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "uart3", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "uart3", "jtag";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
index 09bc9a3d56..7fa06b1844 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
@@ -129,12 +129,10 @@
 	mediatek,portmap = "wllll";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "uart3", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "uart3", "jtag", "wdt";
+		ralink,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 7403a8760f..0ff5f2e76d 100644
--- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
+++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
@@ -137,11 +137,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_linksys_re6500.dts b/target/linux/ramips/dts/mt7621_linksys_re6500.dts
index a7f1fdd262..9c12f0ff80 100644
--- a/target/linux/ramips/dts/mt7621_linksys_re6500.dts
+++ b/target/linux/ramips/dts/mt7621_linksys_re6500.dts
@@ -91,12 +91,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2";
+		ralink,function = "gpio";
 	};
 };
 
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 15a4d71c1b..09063e677f 100644
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
@@ -36,13 +36,14 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "rgmii2";
+		ralink,function = "gpio";
 	};
+};
+
+&pinctrl {
 	i2s_pins: i2s {
 		i2s {
 			ralink,group = "uart3";
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 177154b8d9..5a330a7428 100644
--- a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
@@ -45,11 +45,9 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts
index b164ed2c70..da2b571dd4 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts
@@ -134,13 +134,11 @@
 	mtd-mac-address-increment = <1>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			/* via gpio7 (uart3 group) the PoE status can be read */
-			ralink,group = "uart2", "uart3", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		/* via gpio7 (uart3 group) the PoE status can be read */
+		ralink,group = "uart2", "uart3", "jtag", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts
index f13a779600..60b6395c17 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts
@@ -143,12 +143,10 @@
 	mtd-mac-address-increment = <1>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "wdt", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "wdt", "rgmii2";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts
index 45b2182ded..2500ae29da 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts
@@ -167,12 +167,10 @@
 	mtd-mac-address-increment = <1>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
index 6d13ac1479..d0ea445283 100644
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
+++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
@@ -105,11 +105,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
index fb3efe6d72..40180068e4 100644
--- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
+++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
@@ -142,11 +142,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "rgmii2";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
index fc8a68a135..0d6dac0ca2 100644
--- a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
@@ -232,11 +232,9 @@
 	mtd-mac-address = <&factory 0x00000004>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "sdhci", "rgmii2", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "sdhci", "rgmii2", "jtag";
+		ralink,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 864952f25f..116c412b06 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
@@ -109,11 +109,9 @@
 	mtd-mac-address = <&factory 0x4>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "uart2", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "uart2", "jtag", "wdt";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
index cf9d1c6077..52af14723e 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
@@ -99,12 +99,10 @@
 	mtd-mac-address = <&factory 0x4>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "uart2", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "uart2", "jtag", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_netis_wf-2881.dts b/target/linux/ramips/dts/mt7621_netis_wf-2881.dts
index 1f16174cf8..a7e8e06ff2 100644
--- a/target/linux/ramips/dts/mt7621_netis_wf-2881.dts
+++ b/target/linux/ramips/dts/mt7621_netis_wf-2881.dts
@@ -118,11 +118,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "uart2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "uart2";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts
index 909df622f4..9e9e2c0df4 100644
--- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts
+++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts
@@ -111,11 +111,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_planex_vr500.dts b/target/linux/ramips/dts/mt7621_planex_vr500.dts
index 3d8d346488..87c638429f 100644
--- a/target/linux/ramips/dts/mt7621_planex_vr500.dts
+++ b/target/linux/ramips/dts/mt7621_planex_vr500.dts
@@ -84,11 +84,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,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 84cc4541e9..4b5fc7edfd 100644
--- a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
+++ b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
@@ -114,11 +114,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,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 4194154f07..002804bbf1 100644
--- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
+++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
@@ -111,11 +111,9 @@
 	mtd-mac-address = <&factory 0xe006>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "jtag";
+		ralink,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 9e8f9f75ed..50df90b695 100644
--- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
+++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
@@ -131,12 +131,10 @@
 	mediatek,portmap = "llllw";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uart2", "wdt", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uart2", "wdt", "rgmii2";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts
index 4ff845543d..e1f6835a81 100644
--- a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts
+++ b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts
@@ -99,11 +99,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "jtag";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
index 68bc8afa19..dd4336367a 100644
--- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
+++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
@@ -108,11 +108,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt";
+		ralink,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 7859f611ee..76134925b1 100644
--- a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
@@ -155,11 +155,9 @@
 	mtd-mac-address = <&config 0x10008>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "rgmii2", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "rgmii2", "wdt";
+		ralink,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 23b559daa8..8122e11a31 100644
--- a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts
@@ -168,11 +168,9 @@
 	mtd-mac-address = <&config 0x10008>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "rgmii2", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "rgmii2", "wdt";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
index d03c3256e6..d8b4aa0a07 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
@@ -71,12 +71,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
+		ralink,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 5bd7f0b92d..209656232b 100644
--- a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
+++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
@@ -109,11 +109,9 @@
 	mediatek,portmap = "llllw";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uart2", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uart2", "wdt";
+		ralink,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 757e487bcb..ec0ee087e8 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
@@ -137,11 +137,9 @@
 	mediatek,portmap = "lllwl";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uart2", "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uart2", "uart3", "wdt";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
index 29ac019899..a09cbb6ee4 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
@@ -191,11 +191,9 @@
 	mediatek,portmap = "lwlll";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uart2", "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uart2", "uart3", "wdt";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
index 9482889b8a..0a566afffd 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
@@ -176,11 +176,9 @@
 	mediatek,portmap = "llllw";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uart2", "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uart2", "uart3", "wdt";
+		ralink,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 072b2cc455..b544760967 100644
--- a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
+++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
@@ -94,11 +94,9 @@
 	mtd-mac-address = <&factory 0x4>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "wdt";
+		ralink,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 f33a6fce43..0792b7fb90 100644
--- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
+++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
@@ -156,11 +156,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
index 7f7d5cb276..1a759bf7c3 100644
--- a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
+++ b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
@@ -130,11 +130,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "wdt";
+		ralink,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 3a9794da02..1673baabc1 100644
--- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
+++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
@@ -141,11 +141,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "wdt";
+		ralink,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 9d4ab65d3f..7bfb39212e 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
@@ -28,12 +28,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
index 9ee88d9648..15a4472cd8 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
@@ -103,11 +103,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt";
+		ralink,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 d1cf30880a..f3f06dd69b 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
@@ -114,11 +114,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,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 f1b126ad15..48de87269a 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
@@ -116,11 +116,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
index 35665172c5..3c38cc7b46 100644
--- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
+++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
@@ -97,22 +97,20 @@
 	status = "disabled";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p0led_an", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p0led_an", "wdt", "wled_an";
+		ralink,function = "gpio";
+	};
 
-		ext_lna {
-			ralink,group = "uart1";
-			ralink,function = "sw_r";
-		};
+	ext_lna {
+		ralink,group = "uart1";
+		ralink,function = "sw_r";
+	};
 
-		ext_pa {
-			ralink,group = "i2s";
-			ralink,function = "antenna";
-		};
+	ext_pa {
+		ralink,group = "i2s";
+		ralink,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 2c878ff8a2..25c3c403d2 100644
--- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
+++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
@@ -109,12 +109,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s";
-			ralink,function = "gpio";
-		};
+&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";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index aa3f01e68e..2d70e1225b 100644
--- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
+++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
@@ -104,13 +104,11 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2s", "refclk", "wdt", "p4led_an",
-					"p3led_an", "p2led_an", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2s", "refclk", "wdt", "p4led_an",
+				"p3led_an", "p2led_an", "wled_an";
+		ralink,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 cef92c5bf8..bcc9d00519 100644
--- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
+++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
@@ -60,32 +60,30 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio";
+		ralink,function = "gpio";
+	};
 
-		i2c {
-			ralink,group = "i2c";
-			ralink,function = "gpio";
-		};
+	i2c {
+		ralink,group = "i2c";
+		ralink,function = "gpio";
+	};
 
-		i2s {
-			ralink,group = "i2s";
-			ralink,function = "gpio";
-		};
+	i2s {
+		ralink,group = "i2s";
+		ralink,function = "gpio";
+	};
 
-		spis {
-			ralink,group = "spis";
-			ralink,function = "gpio";
-		};
+	spis {
+		ralink,group = "spis";
+		ralink,function = "gpio";
+	};
 
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+	wdt {
+		ralink,group = "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
index 20d3bd83b8..83f93e0de5 100644
--- a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
+++ b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
@@ -48,12 +48,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "uart1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "uart1";
+		ralink,function = "gpio";
 	};
 };
 
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 979f5d2bc9..533f3b0dc3 100644
--- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
@@ -75,12 +75,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts
index 46d74b7651..0935ec869b 100644
--- a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts
@@ -48,12 +48,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "wled_an", "p1led_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "wled_an", "p1led_an";
+		ralink,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 f31e129e9e..d0df692a3b 100644
--- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
+++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
index 1f93141a36..3b6a92c01d 100644
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
@@ -27,12 +27,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "refclk", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "refclk", "wdt", "wled_an";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts
index a8b9049391..1f7715bb38 100644
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts
@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "refclk", "wdt", "p3led_an", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "refclk", "wdt", "p3led_an", "wled_an";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
index 050c91d120..fbc8d9837a 100644
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
@@ -22,12 +22,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "refclk", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "refclk", "wdt", "wled_an";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi
index bbd8642f2a..8ee865ddff 100644
--- a/target/linux/ramips/dts/mt7628an_iptime.dtsi
+++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi
@@ -69,12 +69,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart1", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart1", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts
index da44eb539a..d9e0f8c593 100644
--- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts
+++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts
@@ -36,11 +36,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart1", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart1", "wdt";
+		ralink,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 d4eadf68ee..e9cb5d1900 100644
--- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
@@ -50,37 +50,35 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio";
+		ralink,function = "gpio";
+	};
 
-		refclk {
-			ralink,group = "refclk";
-			ralink,function = "gpio";
-		};
+	refclk {
+		ralink,group = "refclk";
+		ralink,function = "gpio";
+	};
 
-		i2s {
-			ralink,group = "i2s";
-			ralink,function = "gpio";
-		};
+	i2s {
+		ralink,group = "i2s";
+		ralink,function = "gpio";
+	};
 
-		spis {
-			ralink,group = "spis";
-			ralink,function = "gpio";
-		};
+	spis {
+		ralink,group = "spis";
+		ralink,function = "gpio";
+	};
 
-		wled_an {
-			ralink,group = "wled_an";
-			ralink,function = "gpio";
-		};
+	wled_an {
+		ralink,group = "wled_an";
+		ralink,function = "gpio";
+	};
 
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+	wdt {
+		ralink,group = "wdt";
+		ralink,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 6b9c3e4af7..5558892a22 100644
--- a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
@@ -7,12 +7,10 @@
 	model = "Mediatek MT7628AN evaluation board";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index 12eb638df3..49ca189645 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -74,14 +74,12 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p0led_an", "p1led_an", "p2led_an",
-				       "p3led_an", "p4led_an", "wdt",
-				       "wled_an", "uart1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p0led_an", "p1led_an", "p2led_an",
+			       "p3led_an", "p4led_an", "wdt",
+			       "wled_an", "uart1";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index 8b761d7814..89f00a3e67 100644
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -36,57 +36,55 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio";
+		ralink,function = "gpio";
+	};
 
-		perst {
-			ralink,group = "perst";
-			ralink,function = "gpio";
-		};
+	perst {
+		ralink,group = "perst";
+		ralink,function = "gpio";
+	};
 
-		refclk {
-			ralink,group = "refclk";
-			ralink,function = "gpio";
-		};
+	refclk {
+		ralink,group = "refclk";
+		ralink,function = "gpio";
+	};
 
-		i2s {
-			ralink,group = "i2s";
-			ralink,function = "gpio";
-		};
+	i2s {
+		ralink,group = "i2s";
+		ralink,function = "gpio";
+	};
 
-		spis {
-			ralink,group = "spis";
-			ralink,function = "gpio";
-		};
+	spis {
+		ralink,group = "spis";
+		ralink,function = "gpio";
+	};
 
-		wled_kn {
-			ralink,group = "wled_kn";
-			ralink,function = "gpio";
-		};
+	wled_kn {
+		ralink,group = "wled_kn";
+		ralink,function = "gpio";
+	};
 
-		wled_an {
-			ralink,group = "wled_an";
-			ralink,function = "gpio";
-		};
+	wled_an {
+		ralink,group = "wled_an";
+		ralink,function = "gpio";
+	};
 
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+	wdt {
+		ralink,group = "wdt";
+		ralink,function = "gpio";
+	};
 
-		pwm0 {
-			ralink,group = "pwm0";
-			ralink,function = "gpio";
-		};
+	pwm0 {
+		ralink,group = "pwm0";
+		ralink,function = "gpio";
+	};
 
-		pwm1 {
-			ralink,group = "pwm1";
-			ralink,function = "gpio";
-		};
+	pwm1 {
+		ralink,group = "pwm1";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
index 1316a290d7..66e6c94b31 100644
--- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
+++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
@@ -20,12 +20,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		wled_an {
-			ralink,group = "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	wled_an {
+		ralink,group = "wled_an";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
index addcabd7f9..0efe14621a 100644
--- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
+++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
@@ -44,12 +44,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "refclk", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "refclk", "wled_an";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts
index 2a906c2669..782e2dcd7f 100644
--- a/target/linux/ramips/dts/mt7628an_tama_w06.dts
+++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts
@@ -51,12 +51,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart1", "p0led_an", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart1", "p0led_an", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
index 4a712e917a..1e99ba368a 100644
--- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
+++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
@@ -87,12 +87,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an";
+		ralink,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 91401b5a32..502c271ae2 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -80,12 +80,10 @@
 	mediatek,portmap = "wllll";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2s", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2s", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt";
+		ralink,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 2f0576f2fd..e0b025d20d 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -72,13 +72,11 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an",
-				       "p3led_an", "p4led_an", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an",
+				   "p3led_an", "p4led_an", "wdt", "wled_an";
+		ralink,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 197773db07..f7a559918c 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -73,13 +73,11 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an",
-				       "p3led_an", "p4led_an", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an",
+				   "p3led_an", "p4led_an", "wdt", "wled_an";
+		ralink,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 84fe3224b6..fa69110d45 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
@@ -123,12 +123,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an";
+		ralink,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 2bc4fac508..279f9ec69a 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -82,11 +82,9 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";
+		ralink,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 0336730a4b..b4c004b955 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -51,11 +51,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p0led_an", "perst", "refclk", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p0led_an", "perst", "refclk", "wdt", "wled_an";
+		ralink,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 5e97733d0e..fcb483594a 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -37,12 +37,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "refclk", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "refclk", "wdt";
+		ralink,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 32d4cdf4eb..1fc2316d70 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -56,11 +56,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an";
+		ralink,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 93869381cf..c0ae199d22 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
@@ -98,11 +98,9 @@
 	mediatek,portmap = "wllll";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p0led_an", "p2led_an", "perst";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p0led_an", "p2led_an", "perst";
+		ralink,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 5bfabe4bdc..eedce357c7 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -82,11 +82,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&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";
 	};
 };
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 554300c972..6268bd13cc 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
@@ -112,12 +112,10 @@
 	mediatek,portmap = "wllll";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt";
+		ralink,function = "gpio";
 	};
 };
 
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 648e64766f..10bfe2d655 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -82,11 +82,9 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";
+		ralink,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 33449d9651..f4b50a37ff 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -81,12 +81,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an";
+		ralink,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 3416714d96..afa7f18efc 100644
--- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
+++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
@@ -128,11 +128,9 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
index 6a312ff0b1..918951c35f 100644
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
@@ -12,12 +12,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled_an", "refclk", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled_an", "refclk", "wdt";
+		ralink,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 fa59a8b105..2c0815fba4 100644
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
@@ -58,12 +58,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wled_an", "p0led_an", "wdt", "refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wled_an", "p0led_an", "wdt", "refclk";
+		ralink,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 0aed99c459..13f045f13f 100644
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
@@ -53,12 +53,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
index 5457ca85cf..f89342eb8f 100644
--- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
+++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
@@ -46,47 +46,45 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio";
+		ralink,function = "gpio";
+	};
 
-		perst {
-			ralink,group = "perst";
-			ralink,function = "gpio";
-		};
+	perst {
+		ralink,group = "perst";
+		ralink,function = "gpio";
+	};
 
-		refclk {
-			ralink,group = "refclk";
-			ralink,function = "gpio";
-		};
+	refclk {
+		ralink,group = "refclk";
+		ralink,function = "gpio";
+	};
 
-		i2s {
-			ralink,group = "i2s";
-			ralink,function = "gpio";
-		};
+	i2s {
+		ralink,group = "i2s";
+		ralink,function = "gpio";
+	};
 
-		spis {
-			ralink,group = "spis";
-			ralink,function = "gpio";
-		};
+	spis {
+		ralink,group = "spis";
+		ralink,function = "gpio";
+	};
 
-		wled_kn {
-			ralink,group = "wled_kn";
-			ralink,function = "gpio";
-		};
+	wled_kn {
+		ralink,group = "wled_kn";
+		ralink,function = "gpio";
+	};
 
-		wled_an {
-			ralink,group = "wled_an";
-			ralink,function = "wled_an";
-		};
+	wled_an {
+		ralink,group = "wled_an";
+		ralink,function = "wled_an";
+	};
 
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+	wdt {
+		ralink,group = "wdt";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
index b5da84c9f8..c3a37fad47 100644
--- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
+++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
@@ -79,32 +79,30 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio";
+		ralink,function = "gpio";
+	};
 
-		i2s {
-			ralink,group = "i2s";
-			ralink,function = "gpio";
-		};
+	i2s {
+		ralink,group = "i2s";
+		ralink,function = "gpio";
+	};
 
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "gpio";
-		};
+	wdt {
+		ralink,group = "wdt";
+		ralink,function = "gpio";
+	};
 
-		i2c {
-			ralink,group = "i2c";
-			ralink,function = "gpio";
-		};
+	i2c {
+		ralink,group = "i2c";
+		ralink,function = "gpio";
+	};
 
-		refclk {
-			ralink,group = "refclk";
-			ralink,function = "gpio";
-		};
+	refclk {
+		ralink,group = "refclk";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
index fe9cf0dd1a..6ac44ec8ea 100644
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
@@ -23,11 +23,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "gpio";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
index 7defe9c033..afd0c93595 100644
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
@@ -26,14 +26,14 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio";
+		ralink,function = "gpio";
 	};
+};
 
+&pinctrl {
 	led_pins: led {
 		gpio {
 			ralink,group = "wled_an";
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
index 2de28041e4..fcbacf6db8 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
@@ -117,12 +117,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio", "wdt", "wled_an";
+		ralink,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 b89e689508..e537be0a80 100644
--- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
@@ -54,12 +54,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an";
+		ralink,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 f4d678e38e..5b44808fc6 100644
--- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
+++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
@@ -198,11 +198,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an";
+		ralink,function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
index 96e4a8cbe2..8a472626bd 100644
--- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
+++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
@@ -82,12 +82,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "uartlite";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "uartlite";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts
index 5e3782ac28..3e6691287b 100644
--- a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts
+++ b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts
@@ -92,12 +92,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "uartlite";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "uartlite";
+		ralink,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 4ed6c1ed45..6830fc5bac 100644
--- a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts
+++ b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts
@@ -92,12 +92,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartlite", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartlite", "mdio";
+		ralink,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 04728c582e..2f0475b33c 100644
--- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
+++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
@@ -193,12 +193,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite";
+		ralink,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 c6a90d426a..ff7660723a 100644
--- a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts
+++ b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts
@@ -113,12 +113,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartlite", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartlite", "mdio";
+		ralink,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 56e3990bfe..cf5a3cf2c8 100644
--- a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts
+++ b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts
@@ -117,12 +117,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartlite", "pci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartlite", "pci";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_8devices_carambola.dts b/target/linux/ramips/dts/rt3050_8devices_carambola.dts
index aaaea8fd4e..aa9cf5927f 100644
--- a/target/linux/ramips/dts/rt3050_8devices_carambola.dts
+++ b/target/linux/ramips/dts/rt3050_8devices_carambola.dts
@@ -57,12 +57,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi
index d31547c335..32fbe68f10 100644
--- a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi
+++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi
@@ -41,12 +41,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi
index d1c21f8082..1172c74831 100644
--- a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi
+++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi
@@ -81,12 +81,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts
index b924229a7e..0289e11104 100644
--- a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts
+++ b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts
@@ -88,12 +88,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 8f0544e7ef..a4b1c98015 100644
--- a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
+++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
@@ -67,12 +67,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 48a6e3a4cf..3a34449166 100644
--- a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts
+++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts
@@ -88,12 +88,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 8453147b6b..23f8457fd5 100644
--- a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts
+++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts
@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 1c44e28fe4..679173c799 100644
--- a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts
@@ -90,12 +90,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+		ralink,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 030796f286..945182e693 100644
--- a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts
@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+		ralink,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 a77bfd717f..864f864517 100644
--- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+		ralink,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 c0593dd6e9..a9d0dc985c 100644
--- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
@@ -110,11 +110,9 @@
 	ralink,mtd-eeprom = <&devdata 0x4000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+		ralink,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 24fdec8ed4..a0f3659128 100644
--- a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts
@@ -105,12 +105,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 3859812217..edd95a756a 100644
--- a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts
+++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts
@@ -98,12 +98,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 7742561e50..31d311f72e 100644
--- a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts
+++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts
@@ -85,12 +85,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_huawei_d105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts
index 10732cc5ec..ca30791d8d 100644
--- a/target/linux/ramips/dts/rt3050_huawei_d105.dts
+++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts
@@ -81,12 +81,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 702d779aa2..8709a21abf 100644
--- a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts
+++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts
@@ -37,12 +37,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_netcore_nw718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts
index 61af498fd8..fe13d9ac9b 100644
--- a/target/linux/ramips/dts/rt3050_netcore_nw718.dts
+++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts
@@ -95,12 +95,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 a2f763cb8b..66abb4853f 100644
--- a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts
+++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts
@@ -87,12 +87,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts
index 52638f94e6..9532d922f9 100644
--- a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts
+++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts
@@ -77,12 +77,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts
index e6a2c4ab17..6e2ea916ed 100644
--- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts
+++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts
@@ -105,12 +105,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 a014b32802..66a6372065 100644
--- a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts
+++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts
@@ -85,12 +85,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts
index 1caec41a4b..bc7a79c977 100644
--- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts
+++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts
@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 5c1b47bc03..489b85338d 100644
--- a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts
+++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts
@@ -91,12 +91,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 046fe676c5..3170f88d90 100644
--- a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts
+++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts
@@ -83,12 +83,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts
index 38ad539eb9..f3a21fadaa 100644
--- a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts
+++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts
@@ -77,12 +77,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 c3a3d2346f..20e287b1cc 100644
--- a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts
+++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts
@@ -85,12 +85,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 d8efb425e8..c2bb9bb20f 100644
--- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
+++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
@@ -102,12 +102,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 372d18e75e..8eb02f14c2 100644
--- a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts
+++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts
@@ -103,12 +103,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 93725e9336..af2a5bc9b5 100644
--- a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
+++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
@@ -109,12 +109,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
+		ralink,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 3871b55495..90e7ee81c0 100644
--- a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts
+++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts
@@ -107,12 +107,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 06d490cacc..60ef24db25 100644
--- a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts
+++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts
@@ -112,12 +112,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 4b55af0691..82ab9db6f7 100644
--- a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts
+++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts
@@ -85,12 +85,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 dfe55a2575..8ff73bdc58 100644
--- a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts
+++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts
@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts
index 353cfbf415..0d94db8553 100644
--- a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts
+++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts
@@ -74,12 +74,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts
index df8a72c8cb..24eb32005e 100644
--- a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts
+++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts
@@ -119,12 +119,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 4c0640b881..936de03913 100644
--- a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts
+++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts
@@ -72,12 +72,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 9414828594..93ed7029d0 100644
--- a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts
+++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts
@@ -118,12 +118,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 d20f2d2703..7f11bb57fd 100644
--- a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts
+++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts
@@ -103,12 +103,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts
index 3f0d93d8a4..3954ce4e77 100644
--- a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts
+++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts
@@ -131,12 +131,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts
index 324909e82f..80fbfce07c 100644
--- a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts
+++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts
@@ -69,12 +69,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts
index 2f045c7884..ac0e65be6d 100644
--- a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts
+++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts
@@ -79,12 +79,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 260d0a1444..f57522571c 100644
--- a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts
+++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts
@@ -78,12 +78,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 ab749fc43d..e21926ce1d 100644
--- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
+++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
@@ -102,12 +102,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 17591268b6..00b479b7b6 100644
--- a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts
+++ b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts
@@ -67,12 +67,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_poray_ip2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts
index 31478da694..a754136198 100644
--- a/target/linux/ramips/dts/rt3052_poray_ip2202.dts
+++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts
@@ -79,12 +79,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts
index 3280c93afb..7a8a85b5dd 100644
--- a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts
+++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts
@@ -79,12 +79,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 df56c80819..6816305e27 100644
--- a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts
+++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts
@@ -85,12 +85,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 1b31bda736..2b92f6bf12 100644
--- a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts
+++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts
@@ -96,12 +96,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
+		ralink,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 3d8a9ec464..664bced348 100644
--- a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts
+++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts
@@ -80,12 +80,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
index a463890dea..8189297494 100644
--- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
+++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
@@ -110,12 +110,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 233a6d2e46..a25d2c56b9 100644
--- a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts
+++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts
@@ -79,12 +79,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 5761b8b532..2718946396 100644
--- a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi
+++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi
@@ -60,12 +60,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 2d1b416ce5..d8739d7586 100644
--- a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts
+++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts
@@ -79,12 +79,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 d67c2e0ec5..489772940b 100644
--- a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts
+++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts
@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 937278db92..823913cfdb 100644
--- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
+++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts
index 1f9928e59a..ad641f47e4 100644
--- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts
+++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts
@@ -99,12 +99,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf";
+		ralink,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 625e1616d8..608f21ddfc 100644
--- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts
+++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts
@@ -85,12 +85,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3352_allnet_all5002.dts b/target/linux/ramips/dts/rt3352_allnet_all5002.dts
index a604ec1511..ea5386c5e4 100644
--- a/target/linux/ramips/dts/rt3352_allnet_all5002.dts
+++ b/target/linux/ramips/dts/rt3352_allnet_all5002.dts
@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 a87fc1e9a2..72145b4e44 100644
--- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts
+++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts
@@ -105,12 +105,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 74fd4af753..c85f72d019 100644
--- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
+++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
@@ -82,12 +82,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 e150eff9e8..fde9b8198d 100644
--- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
+++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+		ralink,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 13f6cdd1dd..4f9bc9843a 100644
--- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
+++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
@@ -105,12 +105,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "uartf";
+		ralink,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 5effbf9fa2..235bcf8793 100644
--- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
+++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
@@ -121,12 +121,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 9e6d98f95a..233a7d37cc 100644
--- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
+++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
@@ -121,12 +121,10 @@
 	*/
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts
index 5d3f3278a5..7ac16cbf99 100644
--- a/target/linux/ramips/dts/rt3662_omnima_hpm.dts
+++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts
@@ -126,12 +126,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 0d98a43e0b..aaa0985bf8 100644
--- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
+++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
@@ -113,12 +113,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
index 98ad1b13e2..47e24c66d0 100644
--- a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
+++ b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
@@ -73,12 +73,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 2b1f707658..b41bb74214 100644
--- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
+++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
@@ -57,12 +57,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 aeed7fbb24..6830f736fa 100644
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
@@ -89,12 +89,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "uartf";
+		ralink,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 03395a92dd..6d234796d8 100644
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
@@ -88,12 +88,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi", "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi
index cdd3033bed..6ce6c3f4ab 100644
--- a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi
+++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi
@@ -41,12 +41,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts
index 111119eea4..50d08a8fec 100644
--- a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts
+++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts
@@ -81,12 +81,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_allnet_all5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts
index 8a3488a7e0..0571b89fb9 100644
--- a/target/linux/ramips/dts/rt5350_allnet_all5003.dts
+++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts
@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 384b2efec0..974a902e2d 100644
--- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi
+++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi
@@ -51,12 +51,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts
index f3bf00e30a..0869b43158 100644
--- a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts
+++ b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts
@@ -133,11 +133,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 0fff5e8b5c..c08a76d554 100644
--- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
@@ -88,12 +88,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf", "led";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf", "led";
+		ralink,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 2b6af163bc..b5e966cfdd 100644
--- a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts
@@ -88,12 +88,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 040a223986..c1eb2a8d1e 100644
--- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts
@@ -110,12 +110,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 7a0323e219..e791c9a5f2 100644
--- a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts
@@ -88,12 +88,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 a08ea5d03c..c5ccfd0c97 100644
--- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
@@ -125,12 +125,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 a69ed4bd09..c3e76cb132 100644
--- a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts
+++ b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts
@@ -55,12 +55,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 328351a550..88aec94711 100644
--- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts
+++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts
@@ -103,12 +103,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf", "led";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf", "led";
+		ralink,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 fedb5b061e..c55fa68920 100644
--- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts
+++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts
@@ -99,12 +99,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 cf586bf598..c6eda2e272 100644
--- a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts
+++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts
@@ -92,17 +92,15 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag";
+		ralink,function = "gpio";
+	};
 
-		uartf_gpio {
-			ralink,group = "uartf";
-			ralink,function = "gpio uartf";
-		};
+	uartf_gpio {
+		ralink,group = "uartf";
+		ralink,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 4e73c6988d..7f71e3fa3f 100644
--- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts
+++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts
@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
index 763256934d..57a9bec410 100644
--- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
+++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
@@ -92,12 +92,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi
index a66b0096a7..10b51d7c5f 100644
--- a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi
+++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi
@@ -18,12 +18,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi
index 1702d74db7..17f1497bfc 100644
--- a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi
+++ b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi
@@ -125,12 +125,10 @@
 	reset-names = "gpio uartf";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "led", "spi_cs1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "led", "spi_cs1";
+		ralink,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 ff30966bf5..8665c7dd73 100644
--- a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
+++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
@@ -53,16 +53,14 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag";
-			ralink,function = "gpio";
-		};
-		uartf_gpio {
-			ralink,group = "uartf";
-			ralink,function = "gpio uartf";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag";
+		ralink,function = "gpio";
+	};
+	uartf_gpio {
+		ralink,group = "uartf";
+		ralink,function = "gpio uartf";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts
index 5db1ce48a1..4e7b6e267b 100644
--- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts
+++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts
@@ -55,12 +55,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 41fb6e06d8..bddf7adb5f 100644
--- a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts
+++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts
@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uartf", "led";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uartf", "led";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts
index 1c894aff12..294cf3367f 100644
--- a/target/linux/ramips/dts/rt5350_poray_m3.dts
+++ b/target/linux/ramips/dts/rt5350_poray_m3.dts
@@ -84,12 +84,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi
index df8db131e9..db39c77050 100644
--- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi
+++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi
@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts
index 7e3d8b6f03..4a65acc5c6 100644
--- a/target/linux/ramips/dts/rt5350_poray_x5.dts
+++ b/target/linux/ramips/dts/rt5350_poray_x5.dts
@@ -116,12 +116,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts
index 3b6d60478f..b02056379b 100644
--- a/target/linux/ramips/dts/rt5350_poray_x8.dts
+++ b/target/linux/ramips/dts/rt5350_poray_x8.dts
@@ -77,12 +77,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts
index 9d13625516..ece2db036c 100644
--- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts
+++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts
@@ -99,12 +99,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf", "led";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf", "led";
+		ralink,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 00e3d2df12..b485e1cefa 100644
--- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts
+++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts
@@ -98,12 +98,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,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 f4e4d17b02..8a3485971d 100644
--- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts
+++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts
@@ -104,12 +104,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf", "led";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf", "led";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
index cce444c007..f5642744d8 100644
--- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
+++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
@@ -164,12 +164,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uartf", "led";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uartf", "led";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts
index ff6ccd2247..4d1093d832 100644
--- a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts
+++ b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts
@@ -47,12 +47,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts
index f88d5ae63f..ce747994d3 100644
--- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts
+++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts
@@ -128,12 +128,10 @@
 	pinctrl-0 = <&uartf_pins>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag" ;
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag" ;
+		ralink,function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
index d5d0ca3728..2be3c0b527 100644
--- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
+++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
@@ -82,12 +82,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "uartf";
+		ralink,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 b8db4fdc7f..f96ad9092a 100644
--- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts
+++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts
@@ -90,12 +90,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uartf";
+		ralink,function = "gpio";
 	};
 };
 
-- 
2.30.2