From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Feb 2020 21:25:39 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.19.103~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bec839b825f25e67aeac5e56ce1258e87319bbc7;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	regulator-core-add-regulator_is_equal-helper.patch
---

diff --git a/queue-5.4/regulator-core-add-regulator_is_equal-helper.patch b/queue-5.4/regulator-core-add-regulator_is_equal-helper.patch
new file mode 100644
index 00000000000..05afc266941
--- /dev/null
+++ b/queue-5.4/regulator-core-add-regulator_is_equal-helper.patch
@@ -0,0 +1,79 @@
+From b059b7e0ec3208ff1e17cff6387d75a9fbab4e02 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex@denx.de>
+Date: Fri, 20 Dec 2019 17:44:49 +0100
+Subject: regulator: core: Add regulator_is_equal() helper
+
+From: Marek Vasut <marex@denx.de>
+
+commit b059b7e0ec3208ff1e17cff6387d75a9fbab4e02 upstream.
+
+Add regulator_is_equal() helper to compare whether two regulators are
+the same. This is useful for checking whether two separate regulators
+in a driver are actually the same supply.
+
+Signed-off-by: Marek Vasut <marex@denx.de>
+Cc: Fabio Estevam <festevam@gmail.com>
+Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
+Cc: Liam Girdwood <lgirdwood@gmail.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-1-marex@denx.de
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/regulator/helpers.c        |   14 ++++++++++++++
+ include/linux/regulator/consumer.h |    7 +++++++
+ 2 files changed, 21 insertions(+)
+
+--- a/drivers/regulator/helpers.c
++++ b/drivers/regulator/helpers.c
+@@ -13,6 +13,8 @@
+ #include <linux/regulator/driver.h>
+ #include <linux/module.h>
+ 
++#include "internal.h"
++
+ /**
+  * regulator_is_enabled_regmap - standard is_enabled() for regmap users
+  *
+@@ -881,3 +883,15 @@ void regulator_bulk_set_supply_names(str
+ 		consumers[i].supply = supply_names[i];
+ }
+ EXPORT_SYMBOL_GPL(regulator_bulk_set_supply_names);
++
++/**
++ * regulator_is_equal - test whether two regulators are the same
++ *
++ * @reg1: first regulator to operate on
++ * @reg2: second regulator to operate on
++ */
++bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
++{
++	return reg1->rdev == reg2->rdev;
++}
++EXPORT_SYMBOL_GPL(regulator_is_equal);
+--- a/include/linux/regulator/consumer.h
++++ b/include/linux/regulator/consumer.h
+@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(str
+ 				     const char *const *supply_names,
+ 				     unsigned int num_supplies);
+ 
++bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
++
+ #else
+ 
+ /*
+@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct r
+ {
+ }
+ 
++static inline bool
++regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
++{
++	return false;
++}
+ #endif
+ 
+ static inline int regulator_set_voltage_triplet(struct regulator *regulator,
diff --git a/queue-5.4/series b/queue-5.4/series
index 61b185412df..ac56613fff5 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -258,6 +258,7 @@ virtio_balloon-fix-memory-leaks-on-errors-in-virtballoon_probe.patch
 ubi-fastmap-fix-inverted-logic-in-seen-selfcheck.patch
 ubi-fix-an-error-pointer-dereference-in-error-handling-code.patch
 ubifs-fix-memory-leak-from-c-sup_node.patch
+regulator-core-add-regulator_is_equal-helper.patch
 asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch
 asoc-intel-skl_hda_dsp_common-fix-global-out-of-bounds-bug.patch
 mfd-da9062-fix-watchdog-compatible-string.patch