From c8c7494100e99ee05b11aaa4f0588a223a63d1af Mon Sep 17 00:00:00 2001
From: Dom Cobley <popcornmix@gmail.com>
Date: Thu, 4 Jun 2026 16:18:22 +0100
Subject: [PATCH] Revert "arm64: dts: Revert to upstream"

This reverts commit 5c635c793591bb06bc51c4ac464bde529382ab43.
---
 arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 65 +----------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

--- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
@@ -38,13 +38,6 @@
 			clock-frequency = <200000000>;
 			clock-output-names = "emmc2-clock";
 		};
-
-		clk_sw_baud: clk-sw-baud {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <96000000>;
-			clock-output-names = "sw-baud";
-		};
 	};
 
 	cpus: cpus {
@@ -250,48 +243,6 @@
 			status = "disabled";
 		};
 
-		pm: watchdog@7d200000 {
-			compatible = "brcm,bcm2712-pm", "brcm,bcm2835-pm-wdt";
-			reg = <0x7d200000 0x604>;
-			reg-names = "pm";
-			#power-domain-cells = <1>;
-			#reset-cells = <1>;
-			system-power-controller;
-		};
-
-		pinctrl: pinctrl@7d504100 {
-			compatible = "brcm,bcm2712c0-pinctrl";
-			reg = <0x7d504100 0x30>;
-		};
-
-		gio: gpio@7d508500 {
-			compatible = "brcm,bcm7445-gpio", "brcm,brcmstb-gpio";
-			reg = <0x7d508500 0x40>;
-			interrupt-parent = <&main_irq>;
-			interrupts = <0>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-			brcm,gpio-bank-widths = <32 22>;
-		};
-
-		uarta: serial@7d50c000 {
-			compatible = "brcm,bcm7271-uart";
-			reg = <0x7d50c000 0x20>;
-			reg-names = "uart";
-			clocks = <&clk_sw_baud>;
-			clock-names = "sw_baud";
-			interrupts = <GIC_SPI 276 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "uart";
-			status = "disabled";
-		};
-
-		pinctrl_aon: pinctrl@7d510700 {
-			compatible = "brcm,bcm2712c0-aon-pinctrl";
-			reg = <0x7d510700 0x20>;
-		};
-
 		interrupt-controller@7d517000 {
 			compatible = "brcm,bcm7271-l2-intc";
 			reg = <0x7d517000 0x10>;
@@ -312,21 +263,6 @@
 			 */
 		};
 
-		sdio2: mmc@1100000 {
-			compatible = "brcm,bcm2712-sdhci",
-				     "brcm,sdhci-brcmstb";
-			reg = <0x01100000  0x260>,
-			      <0x01100400  0x200>;
-			reg-names = "host", "cfg";
-			interrupts = <GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&clk_emmc2>;
-			clock-names = "sw_sdio";
-			sdhci-caps-mask = <0x0000C000 0x0>;
-			sdhci-caps = <0x0 0x0>;
-			mmc-ddr-3_3v;
-			status = "disabled";
-		};
-
 		gicv2: interrupt-controller@7fff9000 {
 			compatible = "arm,gic-400";
 			reg = <0x7fff9000 0x1000>,
@@ -676,5 +612,6 @@
 		interrupt-parent = <&disp_intr>;
 		interrupts = <2>, <9>, <16>;
 		interrupt-names = "ch0-eof", "ch1-eof", "ch2-eof";
+		iommus = <&iommu4>;
 	};
 };
