Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1433469

[PATCH v5 4/5] mfd: rn5t618: register power off callback optionally

Show all headers | View raw

Only register power off if the PMIC is defined as system power
controller (see Documentation/devicetree/bindings/power/
power-controller.txt).

Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/rn5t618.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c
index c86160d..1831740 100644
--- a/drivers/mfd/rn5t618.c
+++ b/drivers/mfd/rn5t618.c
@@ -102,9 +102,13 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c,
 		return ret;
 	}
 
-	if (!pm_power_off) {
-		rn5t618_pm_power_off = priv;
-		pm_power_off = rn5t618_power_off;
+	if (of_device_is_system_power_controller(i2c->dev.of_node)) {
+		if (!pm_power_off) {
+			rn5t618_pm_power_off = priv;
+			pm_power_off = rn5t618_power_off;
+		} else {
+			dev_warn(&i2c->dev, "Poweroff callback already assigned\n");
+		}
 	}
 
 	return 0;
-- 
2.9.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 0/5] regulator: add Ricoh RN5T567 PMIC support Stefan Agner <stefan@agner.ch> - 2016-06-29 08:00 +0200
  [PATCH v5 5/5] mfd: rn5t618: register restart handler Stefan Agner <stefan@agner.ch> - 2016-06-29 08:00 +0200
    Applied "mfd: rn5t618: Register restart handler" to the regulator tree Mark Brown <broonie@kernel.org> - 2016-06-29 20:10 +0200
  [PATCH v5 3/5] regulator: rn5t618: add RN5T567 PMIC support Stefan Agner <stefan@agner.ch> - 2016-06-29 08:00 +0200
  [PATCH v5 2/5] mfd: add Ricoh RN5T567 PMIC support Stefan Agner <stefan@agner.ch> - 2016-06-29 08:00 +0200
  [PATCH v5 1/5] ARM: dts: meson: minix-neo-x8: define PMIC as power controller Stefan Agner <stefan@agner.ch> - 2016-06-29 08:00 +0200
  [PATCH v5 4/5] mfd: rn5t618: register power off callback optionally Stefan Agner <stefan@agner.ch> - 2016-06-29 08:00 +0200
  Re: [PATCH v5 0/5] regulator: add Ricoh RN5T567 PMIC support Lee Jones <lee.jones@linaro.org> - 2016-06-29 10:20 +0200
    Re: [PATCH v5 0/5] regulator: add Ricoh RN5T567 PMIC support Stefan Agner <stefan@agner.ch> - 2016-06-29 10:30 +0200
  [GIT PULL] Immutable branch between MFD, Regulator and ARM for v4.8 Lee Jones <lee.jones@linaro.org> - 2016-06-29 18:30 +0200

csiph-web