drivers: Remove downstream SenseHAT core and joystick drivers

Parts of a SenseHAT driver have been submitted upstream using the simple-i2c-mfd framework. The joystick driver has been merged. It's been noted that there are several issues with the downstream joystick and core drivers, so remove these in favour of the upstream approach, and fix up the FB driver to match. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
popcornmix · Sep 24, 2024 · e698db3 · e698db3
1 parent a958e15
commit e698db3
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 411 deletions.
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
@@ -412,12 +412,4 @@ config JOYSTICK_SENSEHAT
 	  To compile this driver as a module, choose M here: the
 	  module will be called sensehat_joystick.
 
-config JOYSTICK_RPISENSE
-	tristate "Raspberry Pi Sense HAT joystick"
-	depends on GPIOLIB && INPUT
-	select MFD_RPISENSE_CORE
-
-	help
-	  This is the joystick driver for the Raspberry Pi Sense HAT
-
 endif
diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
@@ -40,4 +40,3 @@ obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o
 obj-$(CONFIG_JOYSTICK_WALKERA0701)	+= walkera0701.o
 obj-$(CONFIG_JOYSTICK_XPAD)		+= xpad.o
 obj-$(CONFIG_JOYSTICK_ZHENHUA)		+= zhenhua.o
-obj-$(CONFIG_JOYSTICK_RPISENSE)		+= rpisense-js.o
diff --git a/drivers/input/joystick/rpisense-js.c b/drivers/input/joystick/rpisense-js.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
@@ -11,14 +11,6 @@ config MFD_CORE
 	select IRQ_DOMAIN
 	default n
 
-config MFD_RPISENSE_CORE
-	tristate "Raspberry Pi Sense HAT core functions"
-	depends on I2C
-	select MFD_CORE
-	help
-	  This is the core driver for the Raspberry Pi Sense HAT. This provides
-	  the necessary functions to communicate with the hardware.
-
 config MFD_CS5535
 	tristate "AMD CS5535 and CS5536 southbridge core functions"
 	select MFD_CORE

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
@@ -268,7 +268,6 @@ obj-$(CONFIG_MFD_STMFX) 	+= stmfx.o
 obj-$(CONFIG_MFD_KHADAS_MCU) 	+= khadas-mcu.o
 obj-$(CONFIG_MFD_ACER_A500_EC)	+= acer-ec-a500.o
 obj-$(CONFIG_MFD_QCOM_PM8008)	+= qcom-pm8008.o
-obj-$(CONFIG_MFD_RPISENSE_CORE)	+= rpisense-core.o
 
 obj-$(CONFIG_SGI_MFD_IOC3)	+= ioc3.o
 obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)	+= simple-mfd-i2c.o

diff --git a/drivers/mfd/rpisense-core.c b/drivers/mfd/rpisense-core.c
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
@@ -1967,8 +1967,8 @@ config FB_SM712
 
 config FB_RPISENSE
 	tristate "Raspberry Pi Sense HAT framebuffer"
-	depends on FB
-	select MFD_RPISENSE_CORE
+	depends on FB && I2C
+	select MFD_SIMPLE_MFD_I2C
 	select FB_SYS_FOPS
 	select FB_SYS_FILLRECT
 	select FB_SYS_COPYAREA