Merge linux-6.12-mchp into linux-6.12-mchp+fpga

ConchuOD · ConchuOD · commit 5b87b5c325a9 · 2025-07-11T11:45:15.000+01:00
Signed-off-by: Conor Dooley &lt;conor.dooley@microchip.com&gt;
diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
@@ -16,6 +16,14 @@
 	model = "BeagleBoard BeagleV-Fire";
 	compatible = "beagle,beaglev-fire", "microchip,mpfs";
 
+	soc {
+		dma-ranges = <0x14 0x0 0x0 0x80000000 0x0 0x4000000>,
+			     <0x14 0x4000000 0x0 0xc4000000 0x0 0x6000000>,
+			     <0x14 0xa000000 0x0 0x8a000000 0x0 0x8000000>,
+			     <0x14 0x12000000 0x14 0x12000000 0x0 0x10000000>,
+			     <0x14 0x22000000 0x10 0x22000000 0x0 0x5e000000>;
+	};
+
 	aliases {
 		serial0 = &mmuart0;
 		serial1 = &mmuart1;
@@ -34,10 +42,29 @@
 		timebase-frequency = <MTIMER_FREQ>;
 	};
 
-	ddrc_cache_lo: memory@80000000 {
+	kernel: memory@80000000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000 0x0 0x40000000>;
-		status = "okay";
+		reg = <0x0 0x80000000 0x0 0x4000000>;
+	};
+
+	ddr_cached_low: memory@8a000000 {
+		device_type = "memory";
+		reg = <0x0 0x8a000000 0x0 0x8000000>;
+	};
+
+	ddr_non_cached_low: memory@c4000000 {
+		device_type = "memory";
+		reg = <0x0 0xc4000000 0x0 0x6000000>;
+	};
+
+	ddr_cached_high: memory@1022000000 {
+		device_type = "memory";
+		reg = <0x10 0x22000000 0x0 0x5e000000>;
+	};
+
+	ddr_non_cached_high: memory@1412000000 {
+		device_type = "memory";
+		reg = <0x14 0x12000000 0x0 0x10000000>;
 	};
 
 	reserved-memory {
@@ -93,7 +120,6 @@
 		regulator-min-microvolt = <1200000>;
 		regulator-max-microvolt = <1200000>;
 	};
-
 };
 
 &gpio0 {
@@ -182,6 +208,7 @@
 };
 
 &mac0 {
+	dma-noncoherent;
 	status = "okay";
 	phy-mode = "sgmii";
 	phy-handle = <&phy0>;
@@ -195,6 +222,7 @@
 };
 
 &mmc {
+	dma-noncoherent;
 	bus-width = <4>;
 	disable-wp;
 	cap-sd-highspeed;
@@ -339,6 +367,23 @@
 };
 
 &usb {
+	dma-noncoherent;
 	status = "okay";
 	dr_mode = "otg";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-disco-kit.dts b/arch/riscv/boot/dts/microchip/mpfs-disco-kit.dts
@@ -276,3 +276,19 @@
 &syscontroller {
 	status = "okay";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-common.dtsi b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-common.dtsi
@@ -355,3 +355,19 @@
 	status = "okay";
 	dr_mode = "otg";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-m100pfsevp.dtsi b/arch/riscv/boot/dts/microchip/mpfs-m100pfsevp.dtsi
@@ -141,3 +141,19 @@
 	status = "okay";
 	dr_mode = "host";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-polarberry.dts b/arch/riscv/boot/dts/microchip/mpfs-polarberry.dts
@@ -91,3 +91,19 @@
 &syscontroller {
 	status = "okay";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts b/arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts
@@ -150,3 +150,19 @@
 	status = "okay";
 	dr_mode = "host";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-video-kit.dts b/arch/riscv/boot/dts/microchip/mpfs-video-kit.dts
@@ -229,3 +229,19 @@
 	status = "okay";
 	dr_mode = "otg";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts b/arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts
@@ -135,3 +135,19 @@
 &syscontroller {
 	status = "okay";
 };
+
+&wdt1 {
+	status = "okay";
+};
+
+&wdt2 {
+	status = "okay";
+};
+
+&wdt3 {
+	status = "okay";
+};
+
+&wdt4 {
+	status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/pic64gx.dtsi b/arch/riscv/boot/dts/microchip/pic64gx.dtsi
@@ -381,6 +381,56 @@
 			status = "disabled";
 		};
 
+		wdt0: watchdog@20001000 {
+			compatible = "microchip,mpfs-wdt";
+			reg = <0x0 0x20001000 0x0 0x1000>;
+			clocks = <&clkcfg CLK_AHB>;
+			interrupt-parent = <&plic>;
+			interrupts = <100>, <105>;
+			interrupt-names = "mvrp", "trig";
+			status = "disabled";
+		};
+
+		wdt1: watchdog@20101000 {
+			compatible = "microchip,mpfs-wdt";
+			reg = <0x0 0x20101000 0x0 0x1000>;
+			clocks = <&clkcfg CLK_AHB>;
+			interrupt-parent = <&plic>;
+			interrupts = <101>, <106>;
+			interrupt-names = "mvrp", "trig";
+			status = "disabled";
+		};
+
+		wdt2: watchdog@20103000 {
+			compatible = "microchip,mpfs-wdt";
+			reg = <0x0 0x20103000 0x0 0x1000>;
+			clocks = <&clkcfg CLK_AHB>;
+			interrupt-parent = <&plic>;
+			interrupts = <102>, <107>;
+			interrupt-names = "mvrp", "trig";
+			status = "disabled";
+		};
+
+		wdt3: watchdog@20105000 {
+			compatible = "microchip,mpfs-wdt";
+			reg = <0x0 0x20105000 0x0 0x1000>;
+			clocks = <&clkcfg CLK_AHB>;
+			interrupt-parent = <&plic>;
+			interrupts = <103>, <108>;
+			interrupt-names = "mvrp", "trig";
+			status = "disabled";
+		};
+
+		wdt4: watchdog@20107000 {
+			compatible = "microchip,mpfs-wdt";
+			reg = <0x0 0x20107000 0x0 0x1000>;
+			clocks = <&clkcfg CLK_AHB>;
+			interrupt-parent = <&plic>;
+			interrupts = <105>, <109>;
+			interrupt-names = "mvrp", "trig";
+			status = "disabled";
+		};
+
 		spi0: spi@20108000 {
 			compatible = "microchip,pic64gx-spi", "microchip,mpfs-spi";
 			#address-cells = <1>;
