dt: hack: temporary revert some files back to 6.9 due to duplicate symbols

Author: popcornmix

arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts

@@ -3,15 +3,14 @@
 #define BCM2711
 #define i2c0 i2c0if
 #include "bcm2711.dtsi"
-#include "bcm2711-rpi.dtsi"
-#include "bcm283x-rpi-led-deprecated.dtsi"
-//#include "bcm283x-rpi-usb-peripheral.dtsi"
 #include "bcm283x-rpi-wifi-bt.dtsi"
-#include <dt-bindings/leds/common.h>
 #undef i2c0
 #include "bcm270x.dtsi"
 #define i2c0 i2c0mux
+#include "bcm2711-rpi.dtsi"
 #undef i2c0
+#include "bcm283x-rpi-led-deprecated.dtsi"
+//#include "bcm283x-rpi-usb-peripheral.dtsi"
 
 / {
 	compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
@@ -22,13 +21,6 @@
 		stdout-path = "serial1:115200n8";
 	};
 
-	cam1_reg: regulator-cam1 {
-		compatible = "regulator-fixed";
-		regulator-name = "cam1-reg";
-		enable-active-high;
-		gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
-	};
-
 	sd_io_1v8_reg: regulator-sd-io-1v8 {
 		compatible = "regulator-gpio";
 		regulator-name = "vdd-sd-io";
@@ -211,27 +203,6 @@
 	phy1: ethernet-phy@1 {
 		/* No PHY interrupt */
 		reg = <0x1>;
-
-		leds {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			/* LED1 */
-			led@0 {
-				reg = <0>;
-				color = <LED_COLOR_ID_GREEN>;
-				function = LED_FUNCTION_LAN;
-				default-state = "keep";
-			};
-
-			/* LED2 */
-			led@1 {
-				reg = <1>;
-				color = <LED_COLOR_ID_AMBER>;
-				function = LED_FUNCTION_LAN;
-				default-state = "keep";
-			};
-		};
 	};
 };
 

arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts

@@ -30,7 +30,6 @@
 
 &genet_mdio {
 	clock-frequency = <1950000>;
-	/delete-node/ leds;
 };
 
 &led_pwr {

arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
-#include <dt-bindings/leds/common.h>
 #include "bcm2711-rpi-cm4.dtsi"
 #include "bcm283x-rpi-led-deprecated.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
@@ -102,38 +101,6 @@
 	status = "okay";
 };
 
-&i2c0_1 {
-	rtc@51 {
-		/* Attention: An alarm resets the machine */
-		compatible = "nxp,pcf85063a";
-		reg = <0x51>;
-		quartz-load-femtofarads = <7000>;
-	};
-};
-
-&phy1 {
-	leds {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		/* LED2 */
-		led@1 {
-			reg = <1>;
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_LAN;
-			default-state = "keep";
-		};
-
-		/* LED3 */
-		led@2 {
-			reg = <2>;
-			color = <LED_COLOR_ID_AMBER>;
-			function = LED_FUNCTION_LAN;
-			default-state = "keep";
-		};
-	};
-};
-
 &led_act {
 	gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 };

arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi

@@ -17,33 +17,14 @@
 		blconfig = &blconfig;
 		blpubkey = &blpubkey;
 	};
-
-	i2c0mux: i2c-mux0 {
-		compatible = "i2c-mux-pinctrl";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		i2c-parent = <&i2c0>;
-
-		pinctrl-names = "i2c0", "i2c0-vc";
-		pinctrl-0 = <&i2c0_gpio0>;
-		pinctrl-1 = <&i2c0_gpio44>;
-
-		i2c0_0: i2c@0 {
-			reg = <0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		i2c0_1: i2c@1 {
-			reg = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-	};
 };
 
 &firmware {
+	firmware_clocks: clocks {
+		compatible = "raspberrypi,firmware-clocks";
+		#clock-cells = <1>;
+	};
+
 	expgpio: gpio {
 		compatible = "raspberrypi,firmware-gpio";
 		gpio-controller;
@@ -73,11 +54,6 @@
 	clocks = <&firmware_clocks 4>;
 };
 
-&i2c0 {
-	/delete-property/ pinctrl-names;
-	/delete-property/ pinctrl-0;
-};
-
 &rmem {
 	/*
 	 * RPi4's co-processor will copy the board's bootloader configuration

arch/arm/boot/dts/broadcom/bcm2711.dtsi

@@ -1100,14 +1100,6 @@
 	#address-cells = <2>;
 };
 
-&csi0 {
-	interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-};
-
-&csi1 {
-	interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-};
-
 &cma {
 	/*
 	 * arm64 reserves the CMA by default somewhere in ZONE_DMA32,