From 886d5e06b79ac6af9841b377724b9e30d478f52e Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Tue, 18 Mar 2025 13:09:11 +0000
Subject: [PATCH] overlays: Fix some unusable fragments

A forthcoming overlaycheck update looks for dormant fragments with no
parameters to enable them. The test discovered some real errors, which
this patch fixes, and one case where some fragments aren't yet being
used, which this comments out until they are.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
 arch/arm/boot/dts/overlays/rpi-poe-overlay.dts           | 2 +-
 arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts      | 2 +-
 arch/arm/boot/dts/overlays/sx150x-overlay.dts            | 2 +-
 arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

--- a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
+++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
@@ -145,7 +145,7 @@
 		poe_fan_temp2_hyst =	<&trip2>,"hysteresis:0";
 		poe_fan_temp3 =		<&trip3>,"temperature:0";
 		poe_fan_temp3_hyst =	<&trip3>,"hysteresis:0";
-		i2c =			<0>, "+5+6",
+		i2c =			<0>, "+7+8",
 					<&fwpwm>,"status=disabled",
 					<&i2c_bus>,"status=okay",
 					<&poe_mfd>,"status=okay",
--- a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
+++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
@@ -28,7 +28,7 @@
 	};
 
 	__overrides__ {
-		i2c =	<0>, "+5+6",
+		i2c =	<0>, "+7+8",
 			<&fwpwm>,"status=disabled",
 			<&rpi_poe_power_supply>,"status=disabled",
 			<&i2c_bus>,"status=okay",
--- a/arch/arm/boot/dts/overlays/sx150x-overlay.dts
+++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
@@ -1681,7 +1681,7 @@
 		sx1507-1-3E-int-gpio = <0>,"+67+99",  <&sx150x_1_3E_pins>,"brcm,pins:0", <&sx1507_1_3E>,"interrupts:0";
 		sx1507-0-3F-int-gpio = <0>,"+68+100", <&sx150x_0_3F_pins>,"brcm,pins:0", <&sx1507_0_3F>,"interrupts:0";
 		sx1507-1-3F-int-gpio = <0>,"+69+101", <&sx150x_1_3F_pins>,"brcm,pins:0", <&sx1507_1_3F>,"interrupts:0";
-		sx1507-0-70-int-gpio = <0>,"+60+102", <&sx150x_0_70_pins>,"brcm,pins:0", <&sx1507_0_70>,"interrupts:0";
+		sx1507-0-70-int-gpio = <0>,"+70+102", <&sx150x_0_70_pins>,"brcm,pins:0", <&sx1507_0_70>,"interrupts:0";
 		sx1507-1-70-int-gpio = <0>,"+71+103", <&sx150x_1_70_pins>,"brcm,pins:0", <&sx1507_1_70>,"interrupts:0";
 		sx1507-0-71-int-gpio = <0>,"+72+104", <&sx150x_0_71_pins>,"brcm,pins:0", <&sx1507_0_71>,"interrupts:0";
 		sx1507-1-71-int-gpio = <0>,"+73+105", <&sx150x_1_71_pins>,"brcm,pins:0", <&sx1507_1_71>,"interrupts:0";
--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
@@ -42,24 +42,28 @@
 			pinctrl-0 = <&dpi_18bit_gpio0>;
 		};
 	};
+#if 0
 	fragment@92 {
 		target = <&dpi>;
 		__dormant__  {
 			pinctrl-0 = <&dpi_gpio0>;
 		};
 	};
+#endif
 	fragment@93 {
 		target = <&dpi>;
 		__dormant__  {
 			pinctrl-0 = <&dpi_16bit_cpadhi_gpio0>;
 		};
 	};
+#if 0
 	fragment@94 {
 		target = <&dpi>;
 		__dormant__  {
 			pinctrl-0 = <&dpi_16bit_gpio0>;
 		};
 	};
+#endif
 
 	__overrides__ {
 		at056tn53v1 = <0>, "+0+90";
