From 87804508eb8eae3aebaca1797bb501c26dabaaf4 Mon Sep 17 00:00:00 2001
From: Liangbin Lian <jjm2473@gmail.com>
Date: Sun, 31 May 2026 12:36:55 +0800
Subject: [PATCH] target/rockchip: easepi r1/a2 device tree clean up

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
---
 .../rockchip/dts/rk3568/rk3568-easepi-a2.dts     | 16 ++--------------
 .../rockchip/dts/rk3568/rk3568-easepi-r1.dts     |  1 -
 .../rockchip/dts/rk3568/rk3568-roc-k40pro.dts    | 14 +++++---------
 .../rockchip/dts/rk3568/rk3568-roc-k40pro.dtsi   |  6 +++---
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/target/linux/rockchip/dts/rk3568/rk3568-easepi-a2.dts b/target/linux/rockchip/dts/rk3568/rk3568-easepi-a2.dts
index e5b9f82b81..224ba5cca2 100644
--- a/target/linux/rockchip/dts/rk3568/rk3568-easepi-a2.dts
+++ b/target/linux/rockchip/dts/rk3568/rk3568-easepi-a2.dts
@@ -6,9 +6,6 @@
 	compatible = "easepi,a2", "rockchip,rk3568";
 	model = "EasePi A2";
 	eth_order = "0000:01:00.0";
-	kdebug = "0";
-	hwmodel_id = "A2";
-	hw_support = "hdmi";
 
 	aliases {
 		ethernet0 = &pcie_eth0;
@@ -41,10 +38,6 @@
 	status = "disabled";
 };
 
-&sata0 {
-	status = "disabled";
-};
-
 //配置WL_REG_ON引脚
 &sdio_pwrseq {
 	status = "okay";
@@ -93,21 +86,16 @@
 	status = "okay";
 };
 
-/* fix mali warning */
-&gpu {
-	power-off-delay-ms = <200>;
-};
-
 &pcie2x1 {
 	reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 
-	pcie@10 {
+	pcie@0,0 {
 		reg = <0x00100000 0 0 0 0>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		pcie_eth0: pcie-eth@10,0 {
+		pcie_eth0: pcie@10,0 {
 			compatible = "pci10ec,8125";
 			reg = <0x000000 0 0 0 0>;
 
diff --git a/target/linux/rockchip/dts/rk3568/rk3568-easepi-r1.dts b/target/linux/rockchip/dts/rk3568/rk3568-easepi-r1.dts
index d9892d7931..0d7bb71085 100644
--- a/target/linux/rockchip/dts/rk3568/rk3568-easepi-r1.dts
+++ b/target/linux/rockchip/dts/rk3568/rk3568-easepi-r1.dts
@@ -7,7 +7,6 @@
 / {
 	compatible = "easepi,r1", "rockchip,rk3568";
 	model = "EasePi R1";
-	hwmodel_id = "R1";
 
 	chosen {
 		default-firewall = "dual";
diff --git a/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dts b/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dts
index bc9a43495d..a8bc35c70b 100644
--- a/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dts
+++ b/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
- * Copyright (c) 2022 Flippy <flippy@sina.com>
+ *
  */
 
 /dts-v1/;
@@ -12,10 +12,6 @@
 	compatible = "roceos,k40prov3", "rockchip,rk3568";
 	model = "ROCEOS K40PRO V3";
 	eth_order =  "fe010000.ethernet,fe2a0000.ethernet,0001:11:00.0,0000:01:00.0";
-	kdebug = "0";
-	hwmodel_id = "K40PROV3";
-	r8168_led = <0x708>;
-	hw_support = "hdmi";
 
 	aliases {
 		ethernet2 = &pcie_eth2;
@@ -97,12 +93,12 @@
 	reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 
-	pcie@00 {
+	pcie@0,0 {
 		reg = <0x00000000 0 0 0 0>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		pcie_eth3: pcie-eth@00,0 {
+		pcie_eth3: pcie@00,0 {
 			compatible = "pci10ec,8125";
 			reg = <0x000000 0 0 0 0>;
 
@@ -116,12 +112,12 @@
 	reset-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 
-	pcie@10 {
+	pcie@0,0 {
 		reg = <0x00100000 0 0 0 0>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		pcie_eth2: pcie-eth@10,0 {
+		pcie_eth2: pcie@10,0 {
 			compatible = "pci10ec,8125";
 			reg = <0x000000 0 0 0 0>;
 
diff --git a/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dtsi b/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dtsi
index 39e968258a..9e9cf75353 100644
--- a/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dtsi
+++ b/target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dtsi
@@ -25,21 +25,21 @@
 		ethernet0 = &gmac0;
 		ethernet1 = &gmac1;
 
-		led-boot 	 = &led_green;
+		led-boot     = &led_green;
 		led-failsafe = &led_green;
 		led-running  = &led_green;
 		led-upgrade  = &led_green;
 	};
 
 	chosen: chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 rootpart=mmcblk1p3 rw rootwait autoresize=mmcblk1p4";
+		bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0";
 	};
 
 	adc_keys: adc-keys {
 		compatible = "adc-keys";
 		io-channels = <&saradc 0>;
 		io-channel-names = "buttons";
-		keyup-threshold-microvolt = <1800000>;
+		keyup-threshold-microvolt = <1750000>;
 		poll-interval = <100>;
 
 		vol-up-key {