From 6f9fc2bffbdde922f64f01856855a028e2fb6e2c Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 6 Oct 2019 09:44:35 -0400 Subject: [PATCH] fixes for 4.19 Signed-off-by: Sasha Levin --- queue-4.19/series | 2 + ...gmap-dependencies-and-align-with-oth.patch | 92 +++++++++++++++++++ .../soundwire-kconfig-fix-help-format.patch | 35 +++++++ 3 files changed, 129 insertions(+) create mode 100644 queue-4.19/soundwire-fix-regmap-dependencies-and-align-with-oth.patch create mode 100644 queue-4.19/soundwire-kconfig-fix-help-format.patch diff --git a/queue-4.19/series b/queue-4.19/series index 60684272519..fd4b1e45561 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -97,3 +97,5 @@ net-rds-fix-error-handling-in-rds_ib_add_one.patch xen-netfront-do-not-use-0u-as-error-return-value-for-xennet_fill_frags.patch tipc-fix-unlimited-bundling-of-small-messages.patch sch_cbq-validate-tca_cbq_wrropt-to-avoid-crash.patch +soundwire-kconfig-fix-help-format.patch +soundwire-fix-regmap-dependencies-and-align-with-oth.patch diff --git a/queue-4.19/soundwire-fix-regmap-dependencies-and-align-with-oth.patch b/queue-4.19/soundwire-fix-regmap-dependencies-and-align-with-oth.patch new file mode 100644 index 00000000000..03d3e855c61 --- /dev/null +++ b/queue-4.19/soundwire-fix-regmap-dependencies-and-align-with-oth.patch @@ -0,0 +1,92 @@ +From 1205e905b0737c345038c5704a24a92c66ea2e95 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Jul 2019 18:02:15 -0500 +Subject: soundwire: fix regmap dependencies and align with other serial links + +From: Pierre-Louis Bossart + +[ 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: Pierre-Louis Bossart +Link: https://lore.kernel.org/r/20190718230215.18675-1-pierre-louis.bossart@linux.intel.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/base/regmap/Kconfig | 2 +- + drivers/soundwire/Kconfig | 7 +------ + drivers/soundwire/Makefile | 2 +- + 3 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig +index 6ad5ef48b61ee..8cd2ac650b505 100644 +--- a/drivers/base/regmap/Kconfig ++++ b/drivers/base/regmap/Kconfig +@@ -44,7 +44,7 @@ config REGMAP_IRQ + + config REGMAP_SOUNDWIRE + tristate +- depends on SOUNDWIRE_BUS ++ depends on SOUNDWIRE + + config REGMAP_SCCB + tristate +diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig +index 84876a74874fb..1ba1556f19878 100644 +--- a/drivers/soundwire/Kconfig ++++ b/drivers/soundwire/Kconfig +@@ -3,7 +3,7 @@ + # + + menuconfig SOUNDWIRE +- bool "SoundWire support" ++ tristate "SoundWire support" + help + SoundWire is a 2-Pin interface with data and clock line ratified + by the MIPI Alliance. SoundWire is used for transporting data +@@ -16,17 +16,12 @@ if SOUNDWIRE + + comment "SoundWire Devices" + +-config SOUNDWIRE_BUS +- tristate +- select REGMAP_SOUNDWIRE +- + config SOUNDWIRE_CADENCE + tristate + + config SOUNDWIRE_INTEL + tristate "Intel SoundWire Master driver" + select SOUNDWIRE_CADENCE +- select SOUNDWIRE_BUS + depends on X86 && ACPI && SND_SOC + ---help--- + SoundWire Intel Master driver. +diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile +index 5817beaca0e1f..1e2c00163142e 100644 +--- a/drivers/soundwire/Makefile ++++ b/drivers/soundwire/Makefile +@@ -4,7 +4,7 @@ + + #Bus Objs + 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 + soundwire-cadence-objs := cadence_master.o +-- +2.20.1 + diff --git a/queue-4.19/soundwire-kconfig-fix-help-format.patch b/queue-4.19/soundwire-kconfig-fix-help-format.patch new file mode 100644 index 00000000000..a1e95f755ae --- /dev/null +++ b/queue-4.19/soundwire-kconfig-fix-help-format.patch @@ -0,0 +1,35 @@ +From cb9825fdd65a3112c279db0f68cef88368f23ae5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 May 2019 10:57:24 -0500 +Subject: soundwire: Kconfig: fix help format + +From: Pierre-Louis Bossart + +[ Upstream commit 9d7cd9d500826a14fc68fb6994db375432866c6a ] + +Move to the regular help format, --help-- is no longer recommended. + +Reviewed-by: Takashi Iwai +Signed-off-by: Pierre-Louis Bossart +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/soundwire/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig +index 19c8efb9a5ee7..84876a74874fb 100644 +--- a/drivers/soundwire/Kconfig ++++ b/drivers/soundwire/Kconfig +@@ -4,7 +4,7 @@ + + menuconfig SOUNDWIRE + bool "SoundWire support" +- ---help--- ++ help + SoundWire is a 2-Pin interface with data and clock line ratified + by the MIPI Alliance. SoundWire is used for transporting data + typically related to audio functions. SoundWire interface is +-- +2.20.1 + -- 2.47.2