Revert "dtoverlays: Convert SenseHAT overlays to use MFD and upstream…

… drivers" This reverts commit a958e15.
raspberrypi · Oct 1, 2024 · 82a50e4 · 82a50e4
1 parent e6493e2
commit 82a50e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 50 deletions.
diff --git a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
@@ -12,23 +12,11 @@
 			#size-cells = <0>;
 			status = "okay";
 
-			sensehat@46 {
-				compatible = "raspberrypi,sensehat";
+			rpi-sense@46 {
+				compatible = "rpi,rpi-sense";
 				reg = <0x46>;
-				interrupt-parent = <&gpio>;
+				keys-int-gpios = <&gpio 23 1>;
 				status = "okay";
-
-				display {
-					compatible = "raspberrypi,rpi-sense-fb";
-					status = "okay";
-				};
-				joystick {
-					compatible = "raspberrypi,sensehat-joystick";
-					interrupts = <23 1>;
-					pinctrl-names = "default";
-					pinctrl-0 = <&sensehat_pins>;
-					status = "okay";
-				};
 			};
 
 			lsm9ds1-magn@1c {
@@ -56,14 +44,4 @@
 			};
 		};
 	};
-
-	fragment@1 {
-		target = <&gpio>;
-		__overlay__ {
-			sensehat_pins: sensehat_pins {
-				brcm,pins = <23>;
-				brcm,function = <0>;
-			};
-		};
-	};
 };
diff --git a/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts
@@ -12,23 +12,11 @@
 			#size-cells = <0>;
 			status = "okay";
 
-			sensehat@46 {
-				compatible = "raspberrypi,sensehat";
+			rpi-sense@46 {
+				compatible = "rpi,rpi-sense";
 				reg = <0x46>;
-				interrupt-parent = <&gpio>;
+				keys-int-gpios = <&gpio 23 1>;
 				status = "okay";
-
-				display {
-					compatible = "raspberrypi,rpi-sense-fb";
-					status = "okay";
-				};
-				joystick {
-					compatible = "raspberrypi,sensehat-joystick";
-					interrupts = <23 1>;
-					pinctrl-names = "default";
-					pinctrl-0 = <&sensehat_pins>;
-					status = "okay";
-				};
 			};
 
 			lsm9ds1-magn@1c {
@@ -56,14 +44,4 @@
 			};
 		};
 	};
-
-	fragment@1 {
-		target = <&gpio>;
-		__overlay__ {
-			sensehat_pins: sensehat_pins {
-				brcm,pins = <23>;
-				brcm,function = <0>;
-			};
-		};
-	};
 };