From 5fc76ed7b54e1c4817bd52457e8d5706cafb3efc Mon Sep 17 00:00:00 2001
From: Joshua-Riek <jjriek@verizon.net>
Date: Sat, 7 Oct 2023 14:49:32 -0400
Subject: [PATCH] Revert "arm64: dts: rockchip: add GPIO nodes for NanoPi R6
 and NanoPC T6"

This reverts commit a3b48625d5ddf04a81a3feca8192f3252ca58b67.
---
 .../boot/dts/rockchip/rk3588-nanopc-t6.dts    | 58 -------------------
 .../rockchip/rk3588s-nanopi-r6-common.dtsi    | 24 +-------
 .../boot/dts/rockchip/rk3588s-nanopi-r6c.dts  | 12 +---
 3 files changed, 2 insertions(+), 92 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
index 6e843c94f254..1624b28f0529 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -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";
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
index eca8ae30a17e..21f3c6d68f45 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
@@ -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";
-};
+};
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
index 9bf3527e65da..eb4a3e0c5bb2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
@@ -25,14 +25,4 @@
 
 &pcie2x1l2 {
 	/delete-node/ pcie@40;
-};
-
-&pwm0 {
-	pinctrl-0 = <&pwm0m2_pins>;
-	status = "okay";
-};
-
-&pwm1 {
-	pinctrl-0 = <&pwm1m2_pins>;
-	status = "okay";
-};
+};
\ No newline at end of file