From de8eb38db808504fd33bec9f558f473ebf17de09 Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Wed, 5 Nov 2025 23:10:16 +0800 Subject: [PATCH] mediatek: move node from mt7987a SoC dtsi Remove I2C, PCIe, PWM, UART and USB from the MT7987A SoC dtsi. These should not be enabled by default, but rather enabled based on the device. Signed-off-by: Chukun Pan --- .../dts/mt7987a-bananapi-bpi-r4-lite.dts | 19 +++++++++++ target/linux/mediatek/dts/mt7987a-rfb.dts | 32 ++++++++++++++++++ target/linux/mediatek/dts/mt7987a.dtsi | 33 ------------------- 3 files changed, 51 insertions(+), 33 deletions(-) diff --git a/target/linux/mediatek/dts/mt7987a-bananapi-bpi-r4-lite.dts b/target/linux/mediatek/dts/mt7987a-bananapi-bpi-r4-lite.dts index a6765a8b77..f4366ce349 100644 --- a/target/linux/mediatek/dts/mt7987a-bananapi-bpi-r4-lite.dts +++ b/target/linux/mediatek/dts/mt7987a-bananapi-bpi-r4-lite.dts @@ -244,10 +244,23 @@ }; }; +&pcie0 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie0_pins>; + status = "okay"; +}; + +&pcie1 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie1_pins>; + status = "disabled"; +}; + &ssusb { mediatek,u3p-dis-msk=<0>; phys = <&tphyu2port0 PHY_TYPE_USB2>, <&tphyu3port0 PHY_TYPE_USB3>; + status = "okay"; /* * VIA VL817 USB3.1/USB2.0 hub @@ -313,6 +326,12 @@ status = "okay"; }; +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; + &spi2 { pinctrl-names = "default"; pinctrl-0 = <&spi2_flash_pins>; diff --git a/target/linux/mediatek/dts/mt7987a-rfb.dts b/target/linux/mediatek/dts/mt7987a-rfb.dts index 2824daa1d5..5d338f2290 100644 --- a/target/linux/mediatek/dts/mt7987a-rfb.dts +++ b/target/linux/mediatek/dts/mt7987a-rfb.dts @@ -81,7 +81,39 @@ }; }; +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; +}; + &fan { pwms = <&pwm 0 50000 0>; status = "disabled"; }; + +&pcie0 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie0_pins>; + status = "okay"; +}; + +&pcie1 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie1_pins>; + status = "disabled"; +}; + +&pwm { + status = "okay"; +}; + +&ssusb { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; diff --git a/target/linux/mediatek/dts/mt7987a.dtsi b/target/linux/mediatek/dts/mt7987a.dtsi index 1ace91a5f9..f299a58025 100644 --- a/target/linux/mediatek/dts/mt7987a.dtsi +++ b/target/linux/mediatek/dts/mt7987a.dtsi @@ -14,19 +14,12 @@ memory { reg = <0 0x40000000 0 0x10000000>; }; - }; &boottrap { status = "okay"; }; -&i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; - status = "okay"; -}; - &infra_bus_prot { status = "okay"; }; @@ -35,36 +28,10 @@ status = "okay"; }; -&pcie0 { - pinctrl-names = "default"; - pinctrl-0 = <&pcie0_pins>; - status = "okay"; -}; - -&pcie1 { - pinctrl-names = "default"; - pinctrl-0 = <&pcie1_pins>; - status = "disabled"; -}; - -&pwm { - status = "okay"; -}; - &trng { status = "okay"; }; -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins>; - status = "okay"; -}; - &watchdog { status = "okay"; }; - -&ssusb { - status = "okay"; -}; -- 2.30.2