cleanup OPi5 Plus devicetree

arch/arm64/boot/dts/rockchip/overlay/Makefile

@@ -157,7 +157,8 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3588-uart8-m0-full.dtbo \
 	rk3588-uart8-m1.dtbo \
 	rk3588-w1-gpio3-b3.dtbo \
-	rk3588-w1-gpio4-b1.dtbo
+	rk3588-w1-gpio4-b1.dtbo \
+	rk3588-hdmirx.dtbo
 
 
 dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \

arch/arm64/boot/dts/rockchip/overlay/orangepi-5-plus-lcd.dts

@@ -1,24 +1,151 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/display/drm_mipi_dsi.h>
+
 / {
 	fragment@0 {
-		target = <&dsi1>;
+		target-path = "/";
+
 		__overlay__ {
-			status = "okay";
+			backlight: backlight {
+				compatible = "pwm-backlight";
+				brightness-levels = <
+					  0  20  20  21  21  22  22  23
+					 23  24  24  25  25  26  26  27
+					 27  28  28  29  29  30  30  31
+					 31  32  32  33  33  34  34  35
+					 35  36  36  37  37  38  38  39
+					 40  41  42  43  44  45  46  47
+					 48  49  50  51  52  53  54  55
+					 56  57  58  59  60  61  62  63
+					 64  65  66  67  68  69  70  71
+					 72  73  74  75  76  77  78  79
+					 80  81  82  83  84  85  86  87
+					 88  89  90  91  92  93  94  95
+					 96  97  98  99 100 101 102 103
+					104 105 106 107 108 109 110 111
+					112 113 114 115 116 117 118 119
+					120 121 122 123 124 125 126 127
+					128 129 130 131 132 133 134 135
+					136 137 138 139 140 141 142 143
+					144 145 146 147 148 149 150 151
+					152 153 154 155 156 157 158 159
+					160 161 162 163 164 165 166 167
+					168 169 170 171 172 173 174 175
+					176 177 178 179 180 181 182 183
+					184 185 186 187 188 189 190 191
+					192 193 194 195 196 197 198 199
+					200 201 202 203 204 205 206 207
+					208 209 210 211 212 213 214 215
+					216 217 218 219 220 221 222 223
+					224 225 226 227 228 229 230 231
+					232 233 234 235 236 237 238 239
+					240 241 242 243 244 245 246 247
+					248 249 250 251 252 253 254 255
+				>;
+				default-brightness-level = <200>;
+				pwms = <&pwm2 0 25000 0>;
+				status = "okay";
+			};
 		};
 	};
 
 	fragment@1 {
-		target = <&dsi1_panel>;
+		target = <&mipi_dcphy1>;
+
 		__overlay__ {
 			status = "okay";
 		};
 	};
 
 	fragment@2 {
-		target = <&dsi1_in_vp3>;
+		target = <&dsi1>;
+
+		__overlay__ {
+			pinctrl-names = "default";
+			pinctrl-0 = <&mipi_te1>;
+			status = "okay";
+			//rockchip,lane-rate = <1000>;
+
+			dsi1_panel: panel@0 {
+				status = "okay";
+				compatible = "innolux,afj101-ba2131";
+				reg = <0>;
+				backlight = <&backlight>;
+				reset-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_LOW>;
+				enable-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&lcd_rst_gpio>;
+
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					port@0 {
+						reg = <0>;
+						panel_in_dsi1: endpoint {
+							remote-endpoint = <&dsi1_out_panel>;
+						};
+					};
+				};
+			};
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@1 {
+					reg = <1>;
+					dsi1_out_panel: endpoint {
+						remote-endpoint = <&panel_in_dsi1>;
+					};
+				};
+			};		
+		};
+	};
+
+	fragment@3 {
+		target = <&route_dsi1>;
+
+		__overlay__ {
+			status = "disabled";
+			connect = <&vp3_out_dsi1>;		
+		};
+	};
+
+	fragment@4 {
+		target = <&i2c7>;
+
+		__overlay__ {
+			status = "okay";
+
+			gt9xx_0: touchscreen@14 {
+				compatible = "goodix,gt9271";
+				reg = <0x14>;
+				interrupt-parent = <&gpio2>;
+				interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+				irq-gpios = <&gpio2 RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+				reset-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
+				touchscreen-inverted-x;
+				//touchscreen-inverted-y;
+				touchscreen-swapped-x-y;
+				touchscreen-size-x = <1280>;
+				touchscreen-size-y = <800>;
+				status = "okay";
+			};		
+		};
+	};
+
+	fragment@5 {
+		target = <&pwm2>;
+
 		__overlay__ {
+			pinctrl-names = "active";
+			pinctrl-0 = <&pwm2m2_pins>;
 			status = "okay";
 		};
 	};

arch/arm64/boot/dts/rockchip/overlay/rk3588-hdmirx.dts

@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&hdmirx_ctrler>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus-camera1.dtsi

@@ -4,6 +4,10 @@
  *
  */
 
+&mipi_dcphy0 {
+    status = "okay";
+};
+
 &csi2_dphy0_hw {
 	status = "disabled";
 };
@@ -139,6 +143,14 @@
 	};
 };
 
+&rkcif {
+    status = "okay";
+};
+
+&rkcif_mmu {
+    status = "okay";
+};
+
 &rkcif_mipi_lvds2 {
 	status = "disabled";
 	port {
@@ -157,6 +169,14 @@
 	};
 };
 
+&rkisp0 {
+    status = "okay";
+};
+
+&isp0_mmu {
+    status = "okay";
+};
+
 &rkisp0_vir1 {
 	status = "disabled";
 	port {