mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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: Arnd Bergmann <arnd@arndb.de> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: David Brown <davidb@codeaurora.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
317ddd256b
commit
45fcac1aad
7 changed files with 3 additions and 22 deletions
|
@ -52,8 +52,6 @@ source "drivers/i2c/Kconfig"
|
||||||
|
|
||||||
source "drivers/spi/Kconfig"
|
source "drivers/spi/Kconfig"
|
||||||
|
|
||||||
source "drivers/ssbi/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/hsi/Kconfig"
|
source "drivers/hsi/Kconfig"
|
||||||
|
|
||||||
source "drivers/pps/Kconfig"
|
source "drivers/pps/Kconfig"
|
||||||
|
|
|
@ -117,7 +117,6 @@ obj-y += firmware/
|
||||||
obj-$(CONFIG_CRYPTO) += crypto/
|
obj-$(CONFIG_CRYPTO) += crypto/
|
||||||
obj-$(CONFIG_SUPERH) += sh/
|
obj-$(CONFIG_SUPERH) += sh/
|
||||||
obj-$(CONFIG_ARCH_SHMOBILE) += sh/
|
obj-$(CONFIG_ARCH_SHMOBILE) += sh/
|
||||||
obj-$(CONFIG_SSBI) += ssbi/
|
|
||||||
ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
|
ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
|
||||||
obj-y += clocksource/
|
obj-y += clocksource/
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -419,7 +419,8 @@ config MFD_PM8XXX
|
||||||
|
|
||||||
config MFD_PM8921_CORE
|
config MFD_PM8921_CORE
|
||||||
tristate "Qualcomm PM8921 PMIC chip"
|
tristate "Qualcomm PM8921 PMIC chip"
|
||||||
depends on SSBI && BROKEN
|
depends on (ARCH_MSM || HEXAGON)
|
||||||
|
depends on BROKEN
|
||||||
select MFD_CORE
|
select MFD_CORE
|
||||||
select MFD_PM8XXX
|
select MFD_PM8XXX
|
||||||
help
|
help
|
||||||
|
|
|
@ -140,7 +140,7 @@ obj-$(CONFIG_MFD_SI476X_CORE) += si476x-core.o
|
||||||
|
|
||||||
obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.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_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_MFD_PM8XXX_IRQ) += pm8xxx-irq.o
|
||||||
obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o
|
obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o
|
||||||
obj-$(CONFIG_MFD_TPS65090) += tps65090.o
|
obj-$(CONFIG_MFD_TPS65090) += tps65090.o
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
#
|
|
||||||
# SSBI bus support
|
|
||||||
#
|
|
||||||
|
|
||||||
menu "Qualcomm MSM SSBI bus support"
|
|
||||||
|
|
||||||
config SSBI
|
|
||||||
tristate "Qualcomm Single-wire Serial Bus Interface (SSBI)"
|
|
||||||
help
|
|
||||||
If you say yes to this option, support will be included for the
|
|
||||||
built-in SSBI interface on Qualcomm MSM family processors.
|
|
||||||
|
|
||||||
This is required for communicating with Qualcomm PMICs and
|
|
||||||
other devices that have the SSBI interface.
|
|
||||||
|
|
||||||
endmenu
|
|
|
@ -1 +0,0 @@
|
||||||
obj-$(CONFIG_SSBI) += ssbi.o
|
|
Loading…
Reference in a new issue