From: Sasha Levin <sashal@kernel.org>
Date: Sun, 6 Oct 2019 13:44:34 +0000 (-0400)
Subject: fixes for 5.2
X-Git-Tag: v4.9.196~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76848daac70130ace2ec70af2909ce26678a66cc;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 5.2

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-5.2/series b/queue-5.2/series
index f89fc7045b6..cbbfb33d2c4 100644
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -126,3 +126,4 @@ arm64-consider-stack-randomization-for-mmap-base-onl.patch
 mips-properly-account-for-stack-randomization-and-st.patch
 arm-properly-account-for-stack-randomization-and-sta.patch
 arm-use-stack_top-when-computing-mmap-base-address.patch
+soundwire-fix-regmap-dependencies-and-align-with-oth.patch
diff --git a/queue-5.2/soundwire-fix-regmap-dependencies-and-align-with-oth.patch b/queue-5.2/soundwire-fix-regmap-dependencies-and-align-with-oth.patch
new file mode 100644
index 00000000000..0674645a629
--- /dev/null
+++ b/queue-5.2/soundwire-fix-regmap-dependencies-and-align-with-oth.patch
@@ -0,0 +1,92 @@
+From 3287dff699a585506096287541cc4414600899c7 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 18 Jul 2019 18:02:15 -0500
+Subject: soundwire: fix regmap dependencies and align with other serial links
+
+From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+
+[ 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 <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>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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 3a01cfd70fdcd..f518273cfbe3c 100644
+--- a/drivers/soundwire/Kconfig
++++ b/drivers/soundwire/Kconfig
+@@ -4,7 +4,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
+@@ -17,17 +17,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 fd99a831b92a0..45b7e50016539 100644
+--- a/drivers/soundwire/Makefile
++++ b/drivers/soundwire/Makefile
+@@ -5,7 +5,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
+