p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

soundwire: fix regmap dependencies and align with other serial links 

The existing code has a mixed select/depend usage which makes no sense.

config SOUNDWIRE_BUS
       tristate
       select REGMAP_SOUNDWIRE

config REGMAP_SOUNDWIRE
        tristate
        depends on SOUNDWIRE_BUS

Let's remove one layer of Kconfig definitions and align with the
solutions used by all other serial links.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190718230215.18675-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2019-07-18 18:02:15 -05:00 committed by Vinod Koul
parent 664b16589f
commit 8676b3ca46
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/regmap/Kconfig
View File

@ -44,7 +44,7 @@ config REGMAP_IRQ
config REGMAP_SOUNDWIRE config REGMAP_SOUNDWIRE
tristate tristate
depends on SOUNDWIRE_BUS depends on SOUNDWIRE
config REGMAP_SCCB config REGMAP_SCCB
tristate tristate

7
drivers/soundwire/Kconfig
View File

@ -4,7 +4,7 @@
# #
menuconfig SOUNDWIRE menuconfig SOUNDWIRE
bool "SoundWire support" tristate "SoundWire support"
help help
SoundWire is a 2-Pin interface with data and clock line ratified SoundWire is a 2-Pin interface with data and clock line ratified
by the MIPI Alliance. SoundWire is used for transporting data by the MIPI Alliance. SoundWire is used for transporting data
@ -17,17 +17,12 @@ if SOUNDWIRE
comment "SoundWire Devices" comment "SoundWire Devices"
config SOUNDWIRE_BUS
tristate
select REGMAP_SOUNDWIRE
config SOUNDWIRE_CADENCE config SOUNDWIRE_CADENCE
tristate tristate
config SOUNDWIRE_INTEL config SOUNDWIRE_INTEL
tristate "Intel SoundWire Master driver" tristate "Intel SoundWire Master driver"
select SOUNDWIRE_CADENCE select SOUNDWIRE_CADENCE
select SOUNDWIRE_BUS
depends on X86 && ACPI && SND_SOC depends on X86 && ACPI && SND_SOC
help help
SoundWire Intel Master driver. SoundWire Intel Master driver.

2
drivers/soundwire/Makefile
View File

@ -5,7 +5,7 @@
#Bus Objs #Bus Objs
soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o
obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o
#Cadence Objs #Cadence Objs
soundwire-cadence-objs := cadence_master.o soundwire-cadence-objs := cadence_master.o