From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752332AbcF1G2w (ORCPT ); Tue, 28 Jun 2016 02:28:52 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:39400 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288AbcF1G2t (ORCPT ); Tue, 28 Jun 2016 02:28:49 -0400 From: Stefan Agner To: lee.jones@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, khilman@baylibre.com, carlo@caione.org Cc: b.galvani@gmail.com, max.oss.09@gmail.com, marcel@ziswiler.com, linux@armlinux.org.uk, galak@codeaurora.org, ijc+devicetree@hellion.org.uk, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org, linux@roeck-us.net, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, Stefan Agner Subject: [PATCH v4 5/5] mfd: rn5t618: register restart handler Date: Mon, 27 Jun 2016 23:27:57 -0700 Message-Id: <20160628062757.24490-6-stefan@agner.ch> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160628062757.24490-1-stefan@agner.ch> References: <20160628062757.24490-1-stefan@agner.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the PMIC's repower capability for reboots. Register a restart handler and use a slightly elevated priority of 192 since the PMIC has suprior reset capability (causing a system wide reset). Signed-off-by: Stefan Agner Reviewed-by: Marcel Ziswiler --- drivers/mfd/rn5t618.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index 1831740..b3ca6df 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -12,11 +12,13 @@ * along with this program. If not, see . */ +#include #include #include #include #include #include +#include #include static const struct mfd_cell rn5t618_cells[] = { @@ -50,17 +52,38 @@ static const struct regmap_config rn5t618_regmap_config = { }; static struct rn5t618 *rn5t618_pm_power_off; +static struct notifier_block rn5t618_restart_handler; -static void rn5t618_power_off(void) +static void rn5t618_trigger_poweroff_sequence(bool repower) { /* disable automatic repower-on */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_REPCNT, - RN5T618_REPCNT_REPWRON, 0); + RN5T618_REPCNT_REPWRON, + repower ? RN5T618_REPCNT_REPWRON : 0); /* start power-off sequence */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_SLPCNT, RN5T618_SLPCNT_SWPWROFF, RN5T618_SLPCNT_SWPWROFF); } +static void rn5t618_power_off(void) +{ + rn5t618_trigger_poweroff_sequence(false); +} + +static int rn5t618_restart(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + rn5t618_trigger_poweroff_sequence(true); + + /* + * Repower factor detection on PMIC side is not instant. 1ms + * proved to be enouth time until reset takes effect. + */ + mdelay(1); + + return NOTIFY_DONE; +} + static const struct of_device_id rn5t618_of_match[] = { { .compatible = "ricoh,rn5t567", .data = (void *)RN5T567 }, { .compatible = "ricoh,rn5t618", .data = (void *)RN5T618 }, @@ -102,13 +125,21 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c, return ret; } + rn5t618_pm_power_off = priv; if (of_device_is_system_power_controller(i2c->dev.of_node)) { - if (!pm_power_off) { - rn5t618_pm_power_off = priv; + if (!pm_power_off) pm_power_off = rn5t618_power_off; - } else { + else dev_warn(&i2c->dev, "Poweroff callback already assigned\n"); - } + } + + rn5t618_restart_handler.notifier_call = rn5t618_restart; + rn5t618_restart_handler.priority = 192; + + ret = register_restart_handler(&rn5t618_restart_handler); + if (ret) { + dev_err(&i2c->dev, "cannot register restart handler, %d\n", ret); + return ret; } return 0; -- 2.8.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Agner Subject: [PATCH v4 5/5] mfd: rn5t618: register restart handler Date: Mon, 27 Jun 2016 23:27:57 -0700 Message-ID: <20160628062757.24490-6-stefan@agner.ch> References: <20160628062757.24490-1-stefan@agner.ch> Return-path: In-Reply-To: <20160628062757.24490-1-stefan-XLVq0VzYD2Y@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org Cc: b.galvani-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, max.oss.09-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, marcel-mitwqZ+T+m9Wk0Htik3J/w@public.gmane.org, linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org, galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, pawel.moll-5wv7dgnIgG8@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Stefan Agner List-Id: devicetree@vger.kernel.org Use the PMIC's repower capability for reboots. Register a restart handler and use a slightly elevated priority of 192 since the PMIC has suprior reset capability (causing a system wide reset). Signed-off-by: Stefan Agner Reviewed-by: Marcel Ziswiler --- drivers/mfd/rn5t618.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index 1831740..b3ca6df 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -12,11 +12,13 @@ * along with this program. If not, see . */ +#include #include #include #include #include #include +#include #include static const struct mfd_cell rn5t618_cells[] = { @@ -50,17 +52,38 @@ static const struct regmap_config rn5t618_regmap_config = { }; static struct rn5t618 *rn5t618_pm_power_off; +static struct notifier_block rn5t618_restart_handler; -static void rn5t618_power_off(void) +static void rn5t618_trigger_poweroff_sequence(bool repower) { /* disable automatic repower-on */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_REPCNT, - RN5T618_REPCNT_REPWRON, 0); + RN5T618_REPCNT_REPWRON, + repower ? RN5T618_REPCNT_REPWRON : 0); /* start power-off sequence */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_SLPCNT, RN5T618_SLPCNT_SWPWROFF, RN5T618_SLPCNT_SWPWROFF); } +static void rn5t618_power_off(void) +{ + rn5t618_trigger_poweroff_sequence(false); +} + +static int rn5t618_restart(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + rn5t618_trigger_poweroff_sequence(true); + + /* + * Repower factor detection on PMIC side is not instant. 1ms + * proved to be enouth time until reset takes effect. + */ + mdelay(1); + + return NOTIFY_DONE; +} + static const struct of_device_id rn5t618_of_match[] = { { .compatible = "ricoh,rn5t567", .data = (void *)RN5T567 }, { .compatible = "ricoh,rn5t618", .data = (void *)RN5T618 }, @@ -102,13 +125,21 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c, return ret; } + rn5t618_pm_power_off = priv; if (of_device_is_system_power_controller(i2c->dev.of_node)) { - if (!pm_power_off) { - rn5t618_pm_power_off = priv; + if (!pm_power_off) pm_power_off = rn5t618_power_off; - } else { + else dev_warn(&i2c->dev, "Poweroff callback already assigned\n"); - } + } + + rn5t618_restart_handler.notifier_call = rn5t618_restart; + rn5t618_restart_handler.priority = 192; + + ret = register_restart_handler(&rn5t618_restart_handler); + if (ret) { + dev_err(&i2c->dev, "cannot register restart handler, %d\n", ret); + return ret; } return 0; -- 2.8.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: stefan@agner.ch (Stefan Agner) Date: Mon, 27 Jun 2016 23:27:57 -0700 Subject: [PATCH v4 5/5] mfd: rn5t618: register restart handler In-Reply-To: <20160628062757.24490-1-stefan@agner.ch> References: <20160628062757.24490-1-stefan@agner.ch> Message-ID: <20160628062757.24490-6-stefan@agner.ch> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Use the PMIC's repower capability for reboots. Register a restart handler and use a slightly elevated priority of 192 since the PMIC has suprior reset capability (causing a system wide reset). Signed-off-by: Stefan Agner Reviewed-by: Marcel Ziswiler --- drivers/mfd/rn5t618.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index 1831740..b3ca6df 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -12,11 +12,13 @@ * along with this program. If not, see . */ +#include #include #include #include #include #include +#include #include static const struct mfd_cell rn5t618_cells[] = { @@ -50,17 +52,38 @@ static const struct regmap_config rn5t618_regmap_config = { }; static struct rn5t618 *rn5t618_pm_power_off; +static struct notifier_block rn5t618_restart_handler; -static void rn5t618_power_off(void) +static void rn5t618_trigger_poweroff_sequence(bool repower) { /* disable automatic repower-on */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_REPCNT, - RN5T618_REPCNT_REPWRON, 0); + RN5T618_REPCNT_REPWRON, + repower ? RN5T618_REPCNT_REPWRON : 0); /* start power-off sequence */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_SLPCNT, RN5T618_SLPCNT_SWPWROFF, RN5T618_SLPCNT_SWPWROFF); } +static void rn5t618_power_off(void) +{ + rn5t618_trigger_poweroff_sequence(false); +} + +static int rn5t618_restart(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + rn5t618_trigger_poweroff_sequence(true); + + /* + * Repower factor detection on PMIC side is not instant. 1ms + * proved to be enouth time until reset takes effect. + */ + mdelay(1); + + return NOTIFY_DONE; +} + static const struct of_device_id rn5t618_of_match[] = { { .compatible = "ricoh,rn5t567", .data = (void *)RN5T567 }, { .compatible = "ricoh,rn5t618", .data = (void *)RN5T618 }, @@ -102,13 +125,21 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c, return ret; } + rn5t618_pm_power_off = priv; if (of_device_is_system_power_controller(i2c->dev.of_node)) { - if (!pm_power_off) { - rn5t618_pm_power_off = priv; + if (!pm_power_off) pm_power_off = rn5t618_power_off; - } else { + else dev_warn(&i2c->dev, "Poweroff callback already assigned\n"); - } + } + + rn5t618_restart_handler.notifier_call = rn5t618_restart; + rn5t618_restart_handler.priority = 192; + + ret = register_restart_handler(&rn5t618_restart_handler); + if (ret) { + dev_err(&i2c->dev, "cannot register restart handler, %d\n", ret); + return ret; } return 0; -- 2.8.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: stefan@agner.ch (Stefan Agner) Date: Mon, 27 Jun 2016 23:27:57 -0700 Subject: [PATCH v4 5/5] mfd: rn5t618: register restart handler In-Reply-To: <20160628062757.24490-1-stefan@agner.ch> References: <20160628062757.24490-1-stefan@agner.ch> Message-ID: <20160628062757.24490-6-stefan@agner.ch> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Use the PMIC's repower capability for reboots. Register a restart handler and use a slightly elevated priority of 192 since the PMIC has suprior reset capability (causing a system wide reset). Signed-off-by: Stefan Agner Reviewed-by: Marcel Ziswiler --- drivers/mfd/rn5t618.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index 1831740..b3ca6df 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -12,11 +12,13 @@ * along with this program. If not, see . */ +#include #include #include #include #include #include +#include #include static const struct mfd_cell rn5t618_cells[] = { @@ -50,17 +52,38 @@ static const struct regmap_config rn5t618_regmap_config = { }; static struct rn5t618 *rn5t618_pm_power_off; +static struct notifier_block rn5t618_restart_handler; -static void rn5t618_power_off(void) +static void rn5t618_trigger_poweroff_sequence(bool repower) { /* disable automatic repower-on */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_REPCNT, - RN5T618_REPCNT_REPWRON, 0); + RN5T618_REPCNT_REPWRON, + repower ? RN5T618_REPCNT_REPWRON : 0); /* start power-off sequence */ regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_SLPCNT, RN5T618_SLPCNT_SWPWROFF, RN5T618_SLPCNT_SWPWROFF); } +static void rn5t618_power_off(void) +{ + rn5t618_trigger_poweroff_sequence(false); +} + +static int rn5t618_restart(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + rn5t618_trigger_poweroff_sequence(true); + + /* + * Repower factor detection on PMIC side is not instant. 1ms + * proved to be enouth time until reset takes effect. + */ + mdelay(1); + + return NOTIFY_DONE; +} + static const struct of_device_id rn5t618_of_match[] = { { .compatible = "ricoh,rn5t567", .data = (void *)RN5T567 }, { .compatible = "ricoh,rn5t618", .data = (void *)RN5T618 }, @@ -102,13 +125,21 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c, return ret; } + rn5t618_pm_power_off = priv; if (of_device_is_system_power_controller(i2c->dev.of_node)) { - if (!pm_power_off) { - rn5t618_pm_power_off = priv; + if (!pm_power_off) pm_power_off = rn5t618_power_off; - } else { + else dev_warn(&i2c->dev, "Poweroff callback already assigned\n"); - } + } + + rn5t618_restart_handler.notifier_call = rn5t618_restart; + rn5t618_restart_handler.priority = 192; + + ret = register_restart_handler(&rn5t618_restart_handler); + if (ret) { + dev_err(&i2c->dev, "cannot register restart handler, %d\n", ret); + return ret; } return 0; -- 2.8.3