diff --git a/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts b/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts index f6ee498ae06..420bd53b69f 100644 --- a/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts +++ b/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts @@ -67,8 +67,6 @@ /* cooling level (0, 1, 2) : (0% duty, 50% duty, 100% duty) */ cooling-levels = <0 128 255>; pwms = <&pwm 1 40000 0>; - - status = "okay"; }; }; @@ -81,8 +79,6 @@ }; &mdio_bus { - #address-cells = <1>; - #size-cells = <0>; reset-gpios = <&pio 72 GPIO_ACTIVE_LOW>; reset-assert-us = <100000>; reset-deassert-us = <100000>; @@ -163,11 +159,11 @@ }; }; -&serial1 { +&pwm { status = "okay"; }; -&pwm { +&serial1 { status = "okay"; }; diff --git a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi index 302e8a81011..58d11476ddb 100644 --- a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi +++ b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi @@ -152,8 +152,6 @@ interrupt-parent = <&pio>; interrupts = <21 IRQ_TYPE_EDGE_FALLING>; pulses-per-revolution = <2>; - - status = "okay"; }; }; @@ -735,8 +733,6 @@ groups = "uart2"; }; }; - - }; &pwm { @@ -754,10 +750,9 @@ compatible = "spi-nand"; reg = <0>; spi-max-frequency = <52000000>; - spi-tx-buswidth = <4>; - spi-rx-buswidth = <4>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; }; - }; &ssusb0 { diff --git a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8-ubootmod.dts b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8-ubootmod.dts index 7cf84d99bd7..16d01774aba 100644 --- a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8-ubootmod.dts @@ -21,8 +21,8 @@ compatible = "spi-nand"; reg = <0>; spi-max-frequency = <52000000>; - spi-tx-buswidth = <4>; - spi-rx-buswidth = <4>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; partitions { compatible = "fixed-partitions"; diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi index a1ff582961a..fdf8ab8ff42 100644 --- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi @@ -76,6 +76,17 @@ }; }; + fan: pwm-fan { + compatible = "pwm-fan"; + /* cooling level (0, 1, 2, 3) : (0% duty, 30% duty, 50% duty, 100% duty) */ + cooling-levels = <0 80 128 255>; + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_pins>; + pwms = <&pwm 0 50000>; + #cooling-cells = <2>; + #thermal-sensor-cells = <1>; + }; + reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V"; @@ -442,19 +453,6 @@ groups = "spi0", "spi0_wp_hold"; }; }; - - fan: pwm-fan { - compatible = "pwm-fan"; - pinctrl-names = "default"; - pinctrl-0 = <&pwm0_pins>; - pwms = <&pwm 0 50000>; - /* cooling level (0, 1, 2, 3) : (0% duty, 30% duty, 50% duty, 100% duty) */ - cooling-levels = <0 80 128 255>; - #cooling-cells = <2>; - #thermal-sensor-cells = <1>; - - status = "okay"; - }; }; &pwm {