diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index a7ecfb188..8294deecc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -167,19 +167,6 @@ vcc5v0_otg: vcc5v0-otg {
 		pinctrl-0 = <&otg_vbus_drv>;
 		vin-supply = <&vcc5v0_sys>;
 	};
-
-  // wireless-wlan {
-  //   compatible = "wlan-platdata";
-  //   rockchip,grf = <&grf>;
-  //   clocks = <&cru SCLK_WIFI>;
-  //   clock-names = "clk_wifi";
-  //   ref-clock-frequency = <24000000>;
-  //   pinctrl-names = "default";
-  //   pinctrl-0 = <&wifi_host_wake>;
-  //   wifi_chip_type = "rtl8723ds";
-  //   WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
-  //   status = "okay";
-  // };
 };
 
 &acodec {
@@ -195,13 +182,6 @@ &emmc {
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	non-removable;
-	/* please provide actual vmmc and vqmmc supplies
-	vin is not a valid supply for emmcs */
-	vin-supply = <&vcc_io>;
-	status = "okay";
-};
-
-&i2c1 {
 	status = "okay";
 };
 
@@ -214,6 +194,26 @@ &sdmmc {
 	status = "okay";
 };
 
+&sdio {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	cap-sd-highspeed;
+	cap-sdio-irq;
+	keep-power-in-suspend;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	no-mmc;
+	status = "okay";
+
+	rtl8723ds: wifi@1 {
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+		interrupt-names = "host-wake";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_host_wake>;
+	};
+};
+
 &gmac {
 	phy-supply = <&vcc_phy>;
 	clock_in_out = "output";
@@ -225,16 +225,6 @@ &gmac {
 	status = "okay";
 };
 
-&io_domains {
-	vccio0-supply = <&vcc_io>;
-	vccio1-supply = <&vcc_io>;
-	vccio2-supply = <&vcc_io>;
-	vccio3-supply = <&vcc_io>;
-	vccio4-supply = <&vcc_1v8>;
-	vccio5-supply = <&vcc_io>;
-	status = "okay";
-};
-
 &i2s_8ch_0 {
 	assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
 	assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>;
@@ -247,11 +237,6 @@ &i2s_8ch_2 {
 	#sound-dai-cells = <0>;
 };
 
-&spi2 {
-//	status = "okay";  //conflicts with UART2
-	max-freq = <10000000>;
-};
-
 &pinctrl {
 	pinctrl-names = "default";
 	pinctrl-0 = <&rtc_32k>;
@@ -295,32 +280,21 @@ &saradc {
 	status = "okay";
 };
 
-&sdio {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	cap-sd-highspeed;
-	cap-sdio-irq;
-	keep-power-in-suspend;
-	mmc-pwrseq = <&sdio_pwrseq>;
-	non-removable;
-	no-mmc;
-	status = "okay";
-
-	rtl8723ds: wifi@1 {
-		interrupt-parent = <&gpio0>;
-		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
-		interrupt-names = "host-wake";
-		pinctrl-names = "default";
-		pinctrl-0 = <&wifi_host_wake>;
-	};
-};
-
 &tsadc {
 	rockchip,hw-tshut-mode = <0>;		/* 0:CRU */
 	rockchip,hw-tshut-polarity = <1>;	/* 1:HIGH */
 	status = "okay";
 };
 
+&i2c1 {
+	status = "okay";
+};
+
+&spi2 {
+//	status = "okay";  //conflicts with UART2
+	max-freq = <10000000>;
+};
+
 &uart0 {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index b1cf9fa77..fd8685d7c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -216,11 +216,6 @@ grf: grf@ff000000 {
 		compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd";
 		reg = <0x0 0xff000000 0x0 0x08000>;
 
-		io_domains: io-domains {
-			compatible = "rockchip,rk3308-io-voltage-domain";
-			status = "disabled";
-		};
-
 		reboot-mode {
 			compatible = "syscon-reboot-mode";
 			offset = <0x500>;