From: Tero Kristo <t-kristo@ti.com> To: ssantosh@kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, robh+dt@kernel.org Cc: tony@atomide.com, devicetree@vger.kernel.org Subject: [PATCH 4/8] soc: ti: omap-prm: add support for denying idle for reset clockdomain Date: Wed, 7 Aug 2019 10:48:55 +0300 [thread overview] Message-ID: <1565164139-21886-5-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1565164139-21886-1-git-send-email-t-kristo@ti.com> TI SoCs hardware reset signals require the parent clockdomain to be in force wakeup mode while de-asserting the reset, otherwise it may never complete. To support this, add pdata hooks to control the clockdomain directly. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/soc/ti/omap_prm.c | 32 ++++++++++++++++++++++++++++---- include/linux/platform_data/ti-prm.h | 21 +++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 include/linux/platform_data/ti-prm.h diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c index d412af3..870515e3 100644 --- a/drivers/soc/ti/omap_prm.c +++ b/drivers/soc/ti/omap_prm.c @@ -16,6 +16,8 @@ #include <linux/reset-controller.h> #include <linux/delay.h> +#include <linux/platform_data/ti-prm.h> + struct omap_rst_map { s8 rst; s8 st; @@ -24,6 +26,7 @@ struct omap_rst_map { struct omap_prm_data { u32 base; const char *name; + const char *clkdm_name; u16 pwstctrl; u16 pwstst; u16 rstctl; @@ -40,6 +43,8 @@ struct omap_prm { struct omap_reset_data { struct reset_controller_dev rcdev; struct omap_prm *prm; + struct clockdomain *clkdm; + struct device *dev; }; #define to_omap_reset_data(p) container_of((p), struct omap_reset_data, rcdev) @@ -108,6 +113,8 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, int st_bit = id; bool has_rstst; int timeout = 0; + struct ti_prm_platform_data *pdata = dev_get_platdata(reset->dev); + int ret = 0; /* check the current status to avoid de-asserting the line twice */ v = readl_relaxed(reset->prm->base + reset->prm->data->rstctl); @@ -125,13 +132,16 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, writel_relaxed(v, reset->prm->base + reset->prm->data->rstst); } + if (pdata->clkdm_deny_idle && reset->clkdm) + pdata->clkdm_deny_idle(reset->clkdm); + /* de-assert the reset control line */ v = readl_relaxed(reset->prm->base + reset->prm->data->rstctl); v &= ~(1 << id); writel_relaxed(v, reset->prm->base + reset->prm->data->rstctl); if (!has_rstst) - return 0; + goto exit; /* wait for the status to be set */ while (1) { @@ -140,13 +150,19 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, if (v) break; timeout++; - if (timeout > OMAP_RESET_MAX_WAIT) - return -EBUSY; + if (timeout > OMAP_RESET_MAX_WAIT) { + ret = -EBUSY; + goto exit; + } udelay(1); } - return 0; +exit: + if (pdata->clkdm_allow_idle && reset->clkdm) + pdata->clkdm_allow_idle(reset->clkdm); + + return ret; } static const struct reset_control_ops omap_reset_ops = { @@ -159,6 +175,8 @@ static int omap_prm_reset_probe(struct platform_device *pdev, struct omap_prm *prm) { struct omap_reset_data *reset; + struct ti_prm_platform_data *pdata = dev_get_platdata(&pdev->dev); + char buf[32]; /* * Check if we have resets. If either rstctl or rstst is @@ -177,9 +195,15 @@ static int omap_prm_reset_probe(struct platform_device *pdev, reset->rcdev.ops = &omap_reset_ops; reset->rcdev.of_node = pdev->dev.of_node; reset->rcdev.nr_resets = OMAP_MAX_RESETS; + reset->dev = &pdev->dev; reset->prm = prm; + sprintf(buf, "%s_clkdm", prm->data->clkdm_name ? prm->data->clkdm_name : + prm->data->name); + + reset->clkdm = pdata->clkdm_lookup(buf); + return devm_reset_controller_register(&pdev->dev, &reset->rcdev); } diff --git a/include/linux/platform_data/ti-prm.h b/include/linux/platform_data/ti-prm.h new file mode 100644 index 0000000..28154c3 --- /dev/null +++ b/include/linux/platform_data/ti-prm.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * TI PRM (Power & Reset Manager) platform data + * + * Copyright (C) 2019 Texas Instruments, Inc. + * + * Tero Kristo <t-kristo@ti.com> + */ + +#ifndef _LINUX_PLATFORM_DATA_TI_PRM_H +#define _LINUX_PLATFORM_DATA_TI_PRM_H + +struct clockdomain; + +struct ti_prm_platform_data { + void (*clkdm_deny_idle)(struct clockdomain *clkdm); + void (*clkdm_allow_idle)(struct clockdomain *clkdm); + struct clockdomain * (*clkdm_lookup)(const char *name); +}; + +#endif /* _LINUX_PLATFORM_DATA_TI_PRM_H */ -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
WARNING: multiple messages have this Message-ID (diff)
From: Tero Kristo <t-kristo@ti.com> To: <ssantosh@kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-omap@vger.kernel.org>, <robh+dt@kernel.org> Cc: tony@atomide.com, devicetree@vger.kernel.org Subject: [PATCH 4/8] soc: ti: omap-prm: add support for denying idle for reset clockdomain Date: Wed, 7 Aug 2019 10:48:55 +0300 [thread overview] Message-ID: <1565164139-21886-5-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1565164139-21886-1-git-send-email-t-kristo@ti.com> TI SoCs hardware reset signals require the parent clockdomain to be in force wakeup mode while de-asserting the reset, otherwise it may never complete. To support this, add pdata hooks to control the clockdomain directly. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/soc/ti/omap_prm.c | 32 ++++++++++++++++++++++++++++---- include/linux/platform_data/ti-prm.h | 21 +++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 include/linux/platform_data/ti-prm.h diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c index d412af3..870515e3 100644 --- a/drivers/soc/ti/omap_prm.c +++ b/drivers/soc/ti/omap_prm.c @@ -16,6 +16,8 @@ #include <linux/reset-controller.h> #include <linux/delay.h> +#include <linux/platform_data/ti-prm.h> + struct omap_rst_map { s8 rst; s8 st; @@ -24,6 +26,7 @@ struct omap_rst_map { struct omap_prm_data { u32 base; const char *name; + const char *clkdm_name; u16 pwstctrl; u16 pwstst; u16 rstctl; @@ -40,6 +43,8 @@ struct omap_prm { struct omap_reset_data { struct reset_controller_dev rcdev; struct omap_prm *prm; + struct clockdomain *clkdm; + struct device *dev; }; #define to_omap_reset_data(p) container_of((p), struct omap_reset_data, rcdev) @@ -108,6 +113,8 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, int st_bit = id; bool has_rstst; int timeout = 0; + struct ti_prm_platform_data *pdata = dev_get_platdata(reset->dev); + int ret = 0; /* check the current status to avoid de-asserting the line twice */ v = readl_relaxed(reset->prm->base + reset->prm->data->rstctl); @@ -125,13 +132,16 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, writel_relaxed(v, reset->prm->base + reset->prm->data->rstst); } + if (pdata->clkdm_deny_idle && reset->clkdm) + pdata->clkdm_deny_idle(reset->clkdm); + /* de-assert the reset control line */ v = readl_relaxed(reset->prm->base + reset->prm->data->rstctl); v &= ~(1 << id); writel_relaxed(v, reset->prm->base + reset->prm->data->rstctl); if (!has_rstst) - return 0; + goto exit; /* wait for the status to be set */ while (1) { @@ -140,13 +150,19 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, if (v) break; timeout++; - if (timeout > OMAP_RESET_MAX_WAIT) - return -EBUSY; + if (timeout > OMAP_RESET_MAX_WAIT) { + ret = -EBUSY; + goto exit; + } udelay(1); } - return 0; +exit: + if (pdata->clkdm_allow_idle && reset->clkdm) + pdata->clkdm_allow_idle(reset->clkdm); + + return ret; } static const struct reset_control_ops omap_reset_ops = { @@ -159,6 +175,8 @@ static int omap_prm_reset_probe(struct platform_device *pdev, struct omap_prm *prm) { struct omap_reset_data *reset; + struct ti_prm_platform_data *pdata = dev_get_platdata(&pdev->dev); + char buf[32]; /* * Check if we have resets. If either rstctl or rstst is @@ -177,9 +195,15 @@ static int omap_prm_reset_probe(struct platform_device *pdev, reset->rcdev.ops = &omap_reset_ops; reset->rcdev.of_node = pdev->dev.of_node; reset->rcdev.nr_resets = OMAP_MAX_RESETS; + reset->dev = &pdev->dev; reset->prm = prm; + sprintf(buf, "%s_clkdm", prm->data->clkdm_name ? prm->data->clkdm_name : + prm->data->name); + + reset->clkdm = pdata->clkdm_lookup(buf); + return devm_reset_controller_register(&pdev->dev, &reset->rcdev); } diff --git a/include/linux/platform_data/ti-prm.h b/include/linux/platform_data/ti-prm.h new file mode 100644 index 0000000..28154c3 --- /dev/null +++ b/include/linux/platform_data/ti-prm.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * TI PRM (Power & Reset Manager) platform data + * + * Copyright (C) 2019 Texas Instruments, Inc. + * + * Tero Kristo <t-kristo@ti.com> + */ + +#ifndef _LINUX_PLATFORM_DATA_TI_PRM_H +#define _LINUX_PLATFORM_DATA_TI_PRM_H + +struct clockdomain; + +struct ti_prm_platform_data { + void (*clkdm_deny_idle)(struct clockdomain *clkdm); + void (*clkdm_allow_idle)(struct clockdomain *clkdm); + struct clockdomain * (*clkdm_lookup)(const char *name); +}; + +#endif /* _LINUX_PLATFORM_DATA_TI_PRM_H */ -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-07 7:48 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-07 7:48 [PATCH 0/8] soc: ti: Add OMAP PRM driver Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-07 7:48 ` [PATCH 1/8] dt-bindings: omap: add new binding for PRM instances Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-08 4:35 ` Keerthy 2019-08-08 4:35 ` Keerthy 2019-08-19 9:28 ` Tero Kristo 2019-08-19 9:28 ` Tero Kristo 2019-08-19 21:28 ` Suman Anna 2019-08-19 21:28 ` Suman Anna 2019-08-20 7:45 ` Tero Kristo 2019-08-20 7:45 ` Tero Kristo 2019-08-07 7:48 ` [PATCH 2/8] soc: ti: add initial PRM driver with reset control support Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-08 5:26 ` Keerthy 2019-08-08 5:26 ` Keerthy 2019-08-19 9:32 ` Tero Kristo 2019-08-19 9:32 ` Tero Kristo 2019-08-19 23:01 ` Suman Anna 2019-08-19 23:01 ` Suman Anna 2019-08-20 7:37 ` Tero Kristo 2019-08-20 7:37 ` Tero Kristo 2019-08-20 16:47 ` Suman Anna 2019-08-20 16:47 ` Suman Anna 2019-08-21 15:10 ` Philipp Zabel 2019-08-21 15:10 ` Philipp Zabel 2019-08-21 15:45 ` Suman Anna 2019-08-21 15:45 ` Suman Anna 2019-08-21 18:15 ` Tero Kristo 2019-08-21 18:15 ` Tero Kristo 2019-08-23 8:50 ` Philipp Zabel 2019-08-23 8:50 ` Philipp Zabel 2019-08-23 11:27 ` Tero Kristo 2019-08-23 11:27 ` Tero Kristo 2019-08-07 7:48 ` [PATCH 3/8] soc: ti: omap-prm: poll for reset complete during de-assert Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-07 7:48 ` Tero Kristo [this message] 2019-08-07 7:48 ` [PATCH 4/8] soc: ti: omap-prm: add support for denying idle for reset clockdomain Tero Kristo 2019-08-19 23:16 ` Suman Anna 2019-08-19 23:16 ` Suman Anna 2019-08-20 7:51 ` Tero Kristo 2019-08-20 7:51 ` Tero Kristo 2019-08-07 7:48 ` [PATCH 5/8] soc: ti: omap-prm: add omap4 PRM data Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-08 5:30 ` Keerthy 2019-08-08 5:30 ` Keerthy 2019-08-19 9:32 ` Tero Kristo 2019-08-19 9:32 ` Tero Kristo 2019-08-19 23:08 ` Suman Anna 2019-08-19 23:08 ` Suman Anna 2019-08-20 7:52 ` Tero Kristo 2019-08-20 7:52 ` Tero Kristo 2019-08-20 17:23 ` Suman Anna 2019-08-20 17:23 ` Suman Anna 2019-08-21 6:38 ` Tero Kristo 2019-08-21 6:38 ` Tero Kristo 2019-08-07 7:48 ` [PATCH 6/8] soc: ti: omap_prm: add data for am33xx Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-19 23:11 ` Suman Anna 2019-08-19 23:11 ` Suman Anna 2019-08-20 18:48 ` Suman Anna 2019-08-20 18:48 ` Suman Anna 2019-08-21 7:23 ` Tero Kristo 2019-08-21 7:23 ` Tero Kristo 2019-08-21 15:49 ` Suman Anna 2019-08-21 15:49 ` Suman Anna 2019-08-07 7:48 ` [PATCH 7/8] soc: ti: omap-prm: add dra7 PRM data Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-19 23:12 ` Suman Anna 2019-08-19 23:12 ` Suman Anna 2019-08-20 19:03 ` Suman Anna 2019-08-20 19:03 ` Suman Anna 2019-08-21 7:36 ` Tero Kristo 2019-08-21 7:36 ` Tero Kristo 2019-08-07 7:48 ` [PATCH 8/8] ARM: OMAP2+: pdata-quirks: add PRM data for reset support Tero Kristo 2019-08-07 7:48 ` Tero Kristo 2019-08-19 23:20 ` [PATCH 0/8] soc: ti: Add OMAP PRM driver Suman Anna 2019-08-19 23:20 ` Suman Anna 2019-08-20 7:54 ` Tero Kristo 2019-08-20 7:54 ` Tero Kristo 2019-08-20 16:51 ` Suman Anna 2019-08-20 16:51 ` Suman Anna
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1565164139-21886-5-git-send-email-t-kristo@ti.com \ --to=t-kristo@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=ssantosh@kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.