diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts index eab7f788eb..e18ebc2d05 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts @@ -48,7 +48,7 @@ fan: pwm-fan { compatible = "pwm-fan"; #cooling-cells = <2>; - cooling-levels = <255 128 80 0>; + cooling-levels = <220 160 80 40>; pwms = <&pwm 0 10000 0>; status = "okay"; }; @@ -397,38 +397,7 @@ }; }; - usb_ngff_pins: usb-ngff-pins { - ngff-gnss-off { - pins = "GPIO_6"; - drive-strength = ; - mediatek,pull-up-adv = <1>; - }; - ngff-pe-rst { - pins = "GPIO_7"; - drive-strength = ; - mediatek,pull-up-adv = <1>; - }; - ngff-wwan-off { - pins = "GPIO_8"; - drive-strength = ; - mediatek,pull-up-adv = <1>; - }; - ngff-pwr-off { - pins = "GPIO_9"; - drive-strength = ; - mediatek,pull-up-adv = <1>; - }; - ngff-rst { - pins = "GPIO_10"; - drive-strength = ; - mediatek,pull-up-adv = <1>; - }; - ngff-coex { - pins = "SPI1_CS"; - drive-strength = ; - mediatek,pull-up-adv = <1>; - }; - }; + wf_2g_5g_pins: wf_2g_5g-pins { mux { @@ -466,7 +435,6 @@ }; &xhci { - pinctrl-names = "default"; - pinctrl-0 = <&usb_ngff_pins>; + status = "okay"; }; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi index 464eacb1c0..3fdd8afed4 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi @@ -75,7 +75,7 @@ }; gmac1: mac@1 { - label = "wan" + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c index 1fdb2fbfdd..dafafc071d 100644 --- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c +++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c @@ -1153,6 +1153,7 @@ mtk_hnat_br_nf_local_in(void *priv, struct sk_buff *skb, pre_routing_print(skb, state->in, state->out, __func__); + if (unlikely(debug_level >= 7)) { hnat_cpu_reason_cnt(skb); if (skb_hnat_reason(skb) == dbg_cpu_reason)