4.4-stable patches

added patches:
	asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch
	mfd-da9062-fix-watchdog-compatible-string.patch
	mfd-rn5t618-mark-adc-control-register-volatile.patch

diff --git a/queue-4.4/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch b/queue-4.4/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch
new file mode 100644 (file)
index 0000000..69e8c66
--- /dev/null
+++ b/queue-4.4/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch
@@ -0,0 +1,43 @@
+From e19ecbf105b236a6334fab64d8fd5437b12ee019 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex@denx.de>
+Date: Fri, 20 Dec 2019 17:44:50 +0100
+Subject: ASoC: sgtl5000: Fix VDDA and VDDIO comparison
+
+From: Marek Vasut <marex@denx.de>
+
+commit e19ecbf105b236a6334fab64d8fd5437b12ee019 upstream.
+
+Comparing the voltage of VDDA and VDDIO to determine whether or not to
+enable VDDC manual override is insufficient. This is a problem in case
+the VDDA is supplied from different regulator than VDDIO, while both
+report the same voltage to the regulator framework. In that case where
+VDDA and VDDIO is supplied by different regulators, the VDDC manual
+override must not be applied.
+
+Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment")
+Signed-off-by: Marek Vasut <marex@denx.de>
+Cc: Fabio Estevam <festevam@gmail.com>
+Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
+Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Cc: Mark Brown <broonie@kernel.org>
+Cc: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
+Link: https://lore.kernel.org/r/20191220164450.1395038-2-marex@denx.de
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/sgtl5000.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/sgtl5000.c
++++ b/sound/soc/codecs/sgtl5000.c
+@@ -1344,7 +1344,8 @@ static int sgtl5000_set_power_regs(struc
+                * if vddio == vdda the source of charge pump should be
+                * assigned manually to VDDIO
+                */
+-              if (vddio == vdda) {
++              if (regulator_is_equal(sgtl5000->supplies[VDDA].consumer,
++                                     sgtl5000->supplies[VDDIO].consumer)) {
+                       lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;
+                       lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<
+                                   SGTL5000_VDDC_MAN_ASSN_SHIFT;

diff --git a/queue-4.4/mfd-da9062-fix-watchdog-compatible-string.patch b/queue-4.4/mfd-da9062-fix-watchdog-compatible-string.patch
new file mode 100644 (file)
index 0000000..48aa0ab
--- /dev/null
+++ b/queue-4.4/mfd-da9062-fix-watchdog-compatible-string.patch
@@ -0,0 +1,35 @@
+From 1112ba02ff1190ca9c15a912f9269e54b46d2d82 Mon Sep 17 00:00:00 2001
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Wed, 8 Jan 2020 10:57:02 +0100
+Subject: mfd: da9062: Fix watchdog compatible string
+
+From: Marco Felsch <m.felsch@pengutronix.de>
+
+commit 1112ba02ff1190ca9c15a912f9269e54b46d2d82 upstream.
+
+The watchdog driver compatible is "dlg,da9062-watchdog" and not
+"dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
+fwnode. As result the watchdog driver can't parse the devicetree.
+
+Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
+Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
+Acked-by: Guenter Roeck <linux@roeck-us.net>
+Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mfd/da9062-core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mfd/da9062-core.c
++++ b/drivers/mfd/da9062-core.c
+@@ -142,7 +142,7 @@ static const struct mfd_cell da9062_devs
+               .name           = "da9062-watchdog",
+               .num_resources  = ARRAY_SIZE(da9062_wdt_resources),
+               .resources      = da9062_wdt_resources,
+-              .of_compatible  = "dlg,da9062-wdt",
++              .of_compatible  = "dlg,da9062-watchdog",
+       },
+       {
+               .name           = "da9062-thermal",

diff --git a/queue-4.4/mfd-rn5t618-mark-adc-control-register-volatile.patch b/queue-4.4/mfd-rn5t618-mark-adc-control-register-volatile.patch
new file mode 100644 (file)
index 0000000..8f55fca
--- /dev/null
+++ b/queue-4.4/mfd-rn5t618-mark-adc-control-register-volatile.patch
@@ -0,0 +1,30 @@
+From 2f3dc25c0118de03a00ddc88b61f7216854f534d Mon Sep 17 00:00:00 2001
+From: Andreas Kemnade <andreas@kemnade.info>
+Date: Fri, 17 Jan 2020 22:59:22 +0100
+Subject: mfd: rn5t618: Mark ADC control register volatile
+
+From: Andreas Kemnade <andreas@kemnade.info>
+
+commit 2f3dc25c0118de03a00ddc88b61f7216854f534d upstream.
+
+There is a bit which gets cleared after conversion.
+
+Fixes: 9bb9e29c78f8 ("mfd: Add Ricoh RN5T618 PMIC core driver")
+Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mfd/rn5t618.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mfd/rn5t618.c
++++ b/drivers/mfd/rn5t618.c
+@@ -28,6 +28,7 @@ static bool rn5t618_volatile_reg(struct
+       case RN5T618_WATCHDOGCNT:
+       case RN5T618_DCIRQ:
+       case RN5T618_ILIMDATAH ... RN5T618_AIN0DATAL:
++      case RN5T618_ADCCNT3:
+       case RN5T618_IR_ADC1 ... RN5T618_IR_ADC3:
+       case RN5T618_IR_GPR:
+       case RN5T618_IR_GPF:

diff --git a/queue-4.4/series b/queue-4.4/series
index 6a784750b9b1418731425ddd711241c385d7e39b..932defe1081454f69d59abd74db436cb12f9394f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -54,3 +54,6 @@ nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch
 ppp-adjust-indentation-into-ppp_async_input.patch
 net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch
 net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch
+asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch
+mfd-da9062-fix-watchdog-compatible-string.patch
+mfd-rn5t618-mark-adc-control-register-volatile.patch