Merge pull request 'linux-6.6.18-EIC7X' (#7) from linmineswinncomputing/linux-stable:linux-6.6.18-EIC7X into linux-6.6.18-EIC7X

Reviewed-on: http://10.100.130.109:3000/Upstream/linux-stable/pulls/7
Reviewed-by: ningyu <ningyu@eswincomputing.com>
Reviewed-by: Joey Zheng <zhengyu@eswincomputing.com>

Author: NingYu00

arch/riscv/boot/dts/eswin/Makefile

@@ -11,5 +11,6 @@ dtb-$(CONFIG_SOC_ESWIN) += eswin-win2030.dtb \
 							eic7702-tb.dtb \
 							eic7700-sbc-a1.dtb \
 							eic7700-vpu7702.dtb \
-							eic7700-osm.dtb
+							eic7700-osm.dtb \
+							eic7702-d560.dtb
 obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/riscv/boot/dts/eswin/eic7700-evb-a2.dts

@@ -30,6 +30,7 @@
 
 #include "eswin-win2030-die0-soc.dtsi"
 #include "eic7700-pinctrl.dtsi"
+#include "eic7700-evb-camera.dtsi"
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
@@ -85,10 +86,12 @@
 			reusable;
 			size = <0x0 CMA_SIZE>;
 			alignment = <0x0 0x1000>;
+			//alloc-ranges = <0x0 0x80000000 MEMORY_SIZE_H MEMORY_SIZE_L>;
 			alloc-ranges = <0x0 0x80000000 MEMORY_SIZE_H MEMORY_SIZE_L>;
 			linux,cma-default;
 		};
 
+
 		npu0_reserved: sprammemory@59000000 {
 			no-map;
 			reg = <0x0 0x59000000 0x0 0x400000>;
@@ -114,8 +117,15 @@
 			reg = <0x3 0x0 0x1 0x80000000>;
 			no-map;
 		};
+		
+		dvp2axi_mem: dvp2axi-mem@90000000 {
+			compatible = "shared-dma-pool";
+			reg = <0x0 0x90000000 0x0 0x10000000>;
+			no-map;
+		};
 	};
 
+
 	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
@@ -157,8 +167,11 @@
 			gpios = <&porta 6 GPIO_ACTIVE_LOW>;
 		};
 	};
+
 };
 
+
+
 &d0_clock {
 	status = "okay";
 };
@@ -280,7 +293,7 @@
 };
 
 &pcie {
-	status = "okay";
+	status = "disabled";
 };
 
 &d0_npu{
@@ -494,25 +507,25 @@
 	status = "okay";
 };
 
-&mipi_dphy_rx {
-	status = "okay";
-};
+// &mipi_dphy_rx {
+// 	status = "okay";
+// };
 
-&csi_dma0 {
-	status = "okay";
-};
+// &csi_dma0 {
+// 	status = "okay";
+// };
 
 &csi_dma1 {
 	status = "disabled";
 };
 
-&csi2_0 {
-	status = "okay";
-};
+// &csi2_0 {
+// 	status = "okay";
+// };
 
-&csi2_1 {
-	status = "disabled";
-};
+// &csi2_1 {
+// 	status = "disabled";
+// };
 
 &sdhci_emmc {
 	/* emmc */
@@ -785,6 +798,7 @@
 		eswin,regulator_default-microvolt=<1000000>;
 		eswin,regulator_label = "supply vdd1", "npu vdd1", "npu current1", "npu temperature1";
 		label = "npu_vdd";
+		status = "okay";
 		regulators{
 			npu_vcc1:npu_svcc{
 				regulator-name="NPU_SVCC";
@@ -794,6 +808,7 @@
 				regulator-max-microamp=<40000000>;
 				regulator-ov-protection-microvolt=<1100000>;
 			};
+			
 		};
 	};
 };
@@ -813,19 +828,19 @@
 	};
 };
 
-&d0_i2c3 {
-	/* mipi csi0/csi1 */
-	status = "okay";
-};
+// &d0_i2c3 {
+// 	/* mipi csi0/csi1 */
+// 	status = "okay";
+// };
 
 &d0_i2c4 {
 	/* mipi csi2/csi3 */
-	status = "disabled";
+	status = "okay";
 };
 
 &d0_i2c5 {
 	/* mipi csi4/csi5 */
-	status = "disabled";
+	status = "okay";
 };
 
 &d0_i2c6 {
@@ -841,27 +856,6 @@
 &d0_i2c8 {
 	/* io extended for mipi csi */
 	status = "okay";
-	tca6416_0: gpio@20 {
-		compatible = "ti,tca6416";
-		reg = <0x20>;
-		gpio-controller; /* IRQ not connected */
-		#gpio-cells = <2>;
-		gpio-line-names = "MIPI_CSI0_PWDN", "MIPI_CSI0_RESET", "MIPI_CSI1_FBC", "MIPI_CSI1_ENB",
-				"MIPI_CSI1_RESET", "MIPI_CSI1_PWDN", "FREX_GP0", "",
-				"MIPI_CSI0_ENB", "MIPI_CSI0_FBC", "FREX_GP2", "MIPI_CSI2_FBC",
-				"MIPI_CSI2_ENB", "FREX_GP1", "MIPI_CSI2_RESET", "MIPI_CSI2_PWDN";
-	};
-	tca6416_1: gpio@21 {
-		compatible = "ti,tca6416";
-		reg = <0x21>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		/* IRQ not connected */
-		gpio-line-names = "MIPI_CSI3_PWDN", "MIPI_CSI3_RESET", "MIPI_CSI3_ENB", "MIPI_CSI3_FBC",
-				"MIPI_CSI4_PWDN", "MIPI_CSI4_RESET", "MIPI_CSI4_ENB", "MIPI_CSI4_FBC",
-				"MIPI_CSI5_FBC", "MIPI_CSI5_ENB", "MIPI_CSI5_RESET", "MIPI_CSI5_PWDN",
-				"", "", "", "";
-	};
 };
 
 &d0_i2c9 {
@@ -996,3 +990,9 @@
 	npu-supply=<&npu_vcc1>;
 	status = "okay";
 };
+
+&dvp2axi {
+	memory-region = <&dvp2axi_mem>;
+};
+
+//#include "eic7700-evb-camera.dtsi"