Skip to content

Commit

Permalink
Revert "arm64: dts: rockchip: add GPIO nodes for NanoPi R6 and NanoPC…
Browse files Browse the repository at this point in the history
… T6"

This reverts commit a3b4862.
  • Loading branch information
Joshua-Riek authored and amazingfate committed Oct 8, 2023
1 parent 14d48ce commit 80b56be
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 92 deletions.
58 changes: 0 additions & 58 deletions arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
Original file line number Diff line number Diff line change
Expand Up @@ -715,61 +715,3 @@
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};

&pwm5 {
pinctrl-0 = <&pwm5m1_pins>;
status = "okay";
};

&pwm9 {
pinctrl-0 = <&pwm9m0_pins>;
status = "okay";
};

&spi0 {
num-cs = <1>;
pinctrl-0 = <&spi0m2_cs0 &spi0m2_pins>;
status = "disabled";

spidev0: spidev@0 {
compatible = "rockchip,spidev";
reg = <0>;
spi-max-frequency = <5000000>;
status = "disabled";
};
};

&spi4 {
num-cs = <1>;
pinctrl-0 = <&spi4m1_cs0 &spi4m1_pins>;
status = "disabled";
};

&uart0 {
pinctrl-0 = <&uart0m0_xfer>;
status = "disabled";
};

&uart3 {
pinctrl-0 = <&uart3m1_xfer>;
status = "disabled";
};

&uart4 {
pinctrl-0 = <&uart4m2_xfer>;
status = "disabled";
};

&uart6 {
pinctrl-0 = <&uart6m1_xfer>;
status = "okay";
};

&uart7 {
pinctrl-0 = <&uart7m2_xfer>;
status = "disabled";
};

&uart8 {
pinctrl-0 = <&uart8m1_xfer>;
status = "disabled";
};
24 changes: 1 addition & 23 deletions arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -690,26 +690,4 @@
&display_subsystem {
clocks = <&hdptxphy_hdmi_clk0>;
clock-names = "hdmi0_phy_pll";
};

&spi0 {
pinctrl-0 = <&spi0m2_cs0 &spi0m2_pins>;
status = "disabled";

spidev0: spidev@0 {
compatible = "rockchip,spidev";
reg = <0>;
spi-max-frequency = <10000000>;
status = "disabled";
};
};

&uart4 {
pinctrl-0 = <&uart4m2_xfer>;
status = "disabled";
};

&uart5 {
pinctrl-0 = <&uart5m1_xfer>;
status = "okay";
};
};
12 changes: 1 addition & 11 deletions arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,4 @@

&pcie2x1l2 {
/delete-node/ pcie@40;
};

&pwm0 {
pinctrl-0 = <&pwm0m2_pins>;
status = "okay";
};

&pwm1 {
pinctrl-0 = <&pwm1m2_pins>;
status = "okay";
};
};

0 comments on commit 80b56be

Please sign in to comment.