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

Commit 47035934 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman
Browse files

soundwire: fix regmap dependencies and align with other serial links 



[ Upstream commit 8676b3ca4673517650fd509d7fa586aff87b3c28 ]

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: default avatarPierre-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: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 322753c7

drivers/base/regmap/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

drivers/soundwire/Kconfig

+1 −6
Original line number Original line Diff line number Diff line
@@ -3,7 +3,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
@@ -16,17 +16,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.

drivers/soundwire/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,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