Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45fcac1a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Samuel Ortiz
Browse files

mfd: Move ssbi driver into drivers/mfd 



There is no reason for ssbi to have its own top-level driver directory
when the only users of this interface are all MFD drivers. The only
mainline driver using it at the moment (PM8921) is marked broken and in
fact does not compile. I have verified that fixing the trivial build
breakage in pm8921 links in the new ssbi code just fine, but that
can be a separate patch.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 317ddd25

drivers/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ source "drivers/i2c/Kconfig" 


source "drivers/spi/Kconfig"



source "drivers/ssbi/Kconfig"



source "drivers/hsi/Kconfig"



source "drivers/pps/Kconfig"

drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ obj-y += firmware/ 
obj-$(CONFIG_CRYPTO)		+= crypto/

obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/

obj-$(CONFIG_SSBI)		+= ssbi/

ifndef CONFIG_ARCH_USES_GETTIMEOFFSET

obj-y				+= clocksource/

endif

drivers/mfd/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -419,7 +419,8 @@ config MFD_PM8XXX 


config MFD_PM8921_CORE

	tristate "Qualcomm PM8921 PMIC chip"

	depends on SSBI && BROKEN

	depends on (ARCH_MSM || HEXAGON)

	depends on BROKEN

	select MFD_CORE

	select MFD_PM8XXX

	help

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ obj-$(CONFIG_MFD_SI476X_CORE) += si476x-core.o 


obj-$(CONFIG_MFD_CS5535)	+= cs5535-mfd.o

obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o omap-usb-tll.o

obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o

obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o ssbi.o

obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o

obj-$(CONFIG_TPS65911_COMPARATOR)	+= tps65911-comparator.o

obj-$(CONFIG_MFD_TPS65090)	+= tps65090.o

drivers/ssbi/ssbi.c→drivers/mfd/ssbi.c

+0 −0

File moved.

View file