From 2a49abd4458bb6cf92f3bdebf466ae7113f41c8c Mon Sep 17 00:00:00 2001
From: kalous12 <2797795537@qq.com>
Date: Thu, 8 Jun 2023 00:42:41 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=A0=91=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=842iocan=E7=9A=84=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boot/dts/rockchip/rk3568-lubancat-2io.dts |  4 ---
 .../dts/rockchip/rk3568-lubancat-2m-port.dtsi | 36 +++----------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io.dts
index 2e4821f2d94b..82a9ac7cb16c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io.dts
@@ -694,10 +694,6 @@
 	};
 };
 
-&can1 {
-	status = "disabled"; //Default to use DTBO
-};
-
 &uart3 {
 	status = "disabled"; //Default to use DTBO
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2m-port.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2m-port.dtsi
index 451a24e4b686..481966d7f00a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2m-port.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2m-port.dtsi
@@ -174,24 +174,6 @@ else
 	vref-supply = <&vcca_1v8>;
 };
 
-#if 0 //CAN1
-&can1 {
-	status = "disabled"; //Default to use DTBO
-	compatible = "rockchip,can-1.0";
-	pinctrl-names = "default";
-	pinctrl-0 = <&can1m1_pins>;
-};
-else
-&can1 {
-	status = "disabled"; //Default to use DTBO
-	compatible = "rockchip,canfd-1.0";
-	pinctrl-names = "default";
-	assigned-clocks = <&cru CLK_CAN1>;
-	assigned-clock-rates = <150000000>;
-	pinctrl-0 = <&can1m1_pins>;
-};
-#endif //CAN1
-
 &uart9 {
 	status = "disabled"; //Default to use DTBO
 	pinctrl-names = "default";
@@ -241,23 +223,13 @@ else
 	status = "disabled";
 };
 
-#if 0 //CAN2
-&can2 {
-	status = "disabled"; //Default to use DTBO
-	compatible = "rockchip,can-1.0";
-	pinctrl-names = "default";
-	pinctrl-0 = <&can2m0_pins>;
+&can1 {
+	status = "disabled";
 };
-else
+
 &can2 {
-	status = "disabled"; //Default to use DTBO
-	compatible = "rockchip,canfd-1.0";
-	pinctrl-names = "default";
-	assigned-clocks = <&cru CLK_CAN1>;
-	assigned-clock-rates = <150000000>;
-	pinctrl-0 = <&can2m0_pins>;
+	status = "disabled"; 
 };
-#endif //CAN2
 
 &i2s3_2ch {
 	status = "disabled";