LKML Archive on lore.kernel.org help / color / mirror / Atom feed
* [PATCH v2] Mediatek SCPSYS power domain support @ 2015-05-11 13:11 Sascha Hauer 2015-05-11 13:11 ` [PATCH 1/4] dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit Sascha Hauer ` (4 more replies) 0 siblings, 5 replies; 16+ messages in thread From: Sascha Hauer @ 2015-05-11 13:11 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger This series adds support for the MediaTek SCPSYS unit. The SCPSYS unit handles several power management related tasks such as thermal measurement, DVFS, interrupt filter and low level sleep control. The initial support only contains the generic power domain handling. This is needed to turn on power to the different power domains. The driver is quite straight forward now. Due to the lack of a better place I have put it to drivers/soc/mediatek. As the SCPSYS unit has several other tasks that also do not fit into some specific subsystem this probably is a good place for this driver. Please review, any input welcome. Sascha changes since v1: - make MFG_ASYNC a subdomain of MFG_2D and MFG_2D a subdomain of MFG - Add (now hopefully properly) infracfg register handling again - Add clock handling - Fix on/off mixup in error message - Make readonly data const - Fix MODULE_LICENSE to GPL v2 changes since RFC: - add a commit log to driver patch - drop manipulating infracfg registers for now, can be added (properly) later - Add warning messages when errors occur - add NULL pointer check for kmalloc - Enable all power domains when PM is disabled to allow consumers to work ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/4] dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit 2015-05-11 13:11 [PATCH v2] Mediatek SCPSYS power domain support Sascha Hauer @ 2015-05-11 13:11 ` Sascha Hauer 2015-05-11 13:11 ` [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver Sascha Hauer ` (3 subsequent siblings) 4 siblings, 0 replies; 16+ messages in thread From: Sascha Hauer @ 2015-05-11 13:11 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger, Sascha Hauer This adds documentation for the MediaTek SCPSYS unit found in MT8173 SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- .../devicetree/bindings/soc/mediatek/scpsys.txt | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/mediatek/scpsys.txt diff --git a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt new file mode 100644 index 0000000..4764a03 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt @@ -0,0 +1,32 @@ +MediaTek SCPSYS +=============== + +The System Control Processor System (SCPSYS) has several power management +related tasks in the system. The tasks include thermal measurement, dynamic +voltage frequency scaling (DVFS), interrupt filter and lowlevel sleep control. +The System Power Manager (SPM) inside the SCPSYS is for the MTCMOS power +domain control. + +The driver implements the Generic PM domain bindings described in +power/power_domain.txt. It provides the power domains defined in +include/dt-bindings/power/mt8173-power.h. + +Required properties: +- compatible: Must be "mediatek,mt8173-scpsys" +- #power-domain-cells: Must be 1 +- reg: Address range of the SCPSYS unit + +Example: + + scpsys: scpsys@10006000 { + #power-domain-cells = <1>; + compatible = "mediatek,mt8173-scpsys"; + reg = <0 0x10006000 0 0x1000>; + }; + +Example consumer: + + afe: mt8173-afe-pcm@11220000 { + compatible = "mediatek,mt8173-afe-pcm"; + power-domains = <&scpsys MT8173_POWER_DOMAIN_AUDIO>; + }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver 2015-05-11 13:11 [PATCH v2] Mediatek SCPSYS power domain support Sascha Hauer 2015-05-11 13:11 ` [PATCH 1/4] dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit Sascha Hauer @ 2015-05-11 13:11 ` Sascha Hauer 2015-05-26 22:35 ` Kevin Hilman 2015-05-11 13:11 ` [PATCH 3/4] ARM64: MediaTek: Add generic pm domain support Sascha Hauer ` (2 subsequent siblings) 4 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-05-11 13:11 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger, Sascha Hauer This adds a power domain driver for the Mediatek SCPSYS unit. The System Control Processor System (SCPSYS) has several power management related tasks in the system. The tasks include thermal measurement, dynamic voltage frequency scaling (DVFS), interrupt filter and lowlevel sleep control. The System Power Manager (SPM) inside the SCPSYS is for the MTCMOS power domain control. For now this driver only adds power domain support, the more advanced features are not yet supported. The driver implements the generic PM domain device tree bindings, the first user will most likely be the Mediatek AFE audio driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/soc/mediatek/Kconfig | 6 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-scpsys.c | 345 +++++++++++++++++++++++++++++++ include/dt-bindings/power/mt8173-power.h | 15 ++ 4 files changed, 367 insertions(+) create mode 100644 drivers/soc/mediatek/mtk-scpsys.c create mode 100644 include/dt-bindings/power/mt8173-power.h diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig index bcdb22d..1d34819 100644 --- a/drivers/soc/mediatek/Kconfig +++ b/drivers/soc/mediatek/Kconfig @@ -9,3 +9,9 @@ config MTK_PMIC_WRAP Say yes here to add support for MediaTek PMIC Wrapper found on different MediaTek SoCs. The PMIC wrapper is a proprietary hardware to connect the PMIC. + +config MTK_SCPSYS + tristate "MediaTek SCPSYS Support" + help + Say yes here to add support for the MediaTek SCPSYS power domain + driver. diff --git a/drivers/soc/mediatek/Makefile b/drivers/soc/mediatek/Makefile index ecaf4de..ce88693 100644 --- a/drivers/soc/mediatek/Makefile +++ b/drivers/soc/mediatek/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o +obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c new file mode 100644 index 0000000..a72ac51 --- /dev/null +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -0,0 +1,345 @@ +/* + * Copyright (c) 2015 Pengutronix, Sascha Hauer <kernel@pengutronix.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/pm_domain.h> +#include <linux/delay.h> +#include <dt-bindings/power/mt8173-power.h> +#include <linux/mfd/syscon.h> + +#define SPM_VDE_PWR_CON 0x0210 +#define SPM_MFG_PWR_CON 0x0214 +#define SPM_VEN_PWR_CON 0x0230 +#define SPM_ISP_PWR_CON 0x0238 +#define SPM_DIS_PWR_CON 0x023c +#define SPM_VEN2_PWR_CON 0x0298 +#define SPM_AUDIO_PWR_CON 0x029c +#define SPM_MFG_2D_PWR_CON 0x02c0 +#define SPM_MFG_ASYNC_PWR_CON 0x02c4 +#define SPM_USB_PWR_CON 0x02cc +#define SPM_PWR_STATUS 0x060c +#define SPM_PWR_STATUS_2ND 0x0610 + +#define PWR_RST_B_BIT BIT(0) +#define PWR_ISO_BIT BIT(1) +#define PWR_ON_BIT BIT(2) +#define PWR_ON_2ND_BIT BIT(3) +#define PWR_CLK_DIS_BIT BIT(4) + +#define DIS_PWR_STA_MASK BIT(3) +#define MFG_PWR_STA_MASK BIT(4) +#define ISP_PWR_STA_MASK BIT(5) +#define VDE_PWR_STA_MASK BIT(7) +#define VEN2_PWR_STA_MASK BIT(20) +#define VEN_PWR_STA_MASK BIT(21) +#define MFG_2D_PWR_STA_MASK BIT(22) +#define MFG_ASYNC_PWR_STA_MASK BIT(23) +#define AUDIO_PWR_STA_MASK BIT(24) +#define USB_PWR_STA_MASK BIT(25) + +struct scp_domain_data { + const char *name; + u32 sta_mask; + int ctl_offs; + u32 sram_pdn_bits; + u32 sram_pdn_ack_bits; + int id; +}; + +static struct scp_domain_data scp_domain_data[] = { + { + .id = MT8173_POWER_DOMAIN_VDE, + .name = "vde", + .sta_mask = VDE_PWR_STA_MASK, + .ctl_offs = SPM_VDE_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(12, 12), + }, { + .id = MT8173_POWER_DOMAIN_MFG, + .name = "mfg", + .sta_mask = MFG_PWR_STA_MASK, + .ctl_offs = SPM_MFG_PWR_CON, + .sram_pdn_bits = GENMASK(13, 8), + .sram_pdn_ack_bits = GENMASK(21, 16), + }, { + .id = MT8173_POWER_DOMAIN_VEN, + .name = "ven", + .sta_mask = VEN_PWR_STA_MASK, + .ctl_offs = SPM_VEN_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(15, 12), + }, { + .id = MT8173_POWER_DOMAIN_ISP, + .name = "isp", + .sta_mask = ISP_PWR_STA_MASK, + .ctl_offs = SPM_ISP_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(13, 12), + }, { + .id = MT8173_POWER_DOMAIN_DIS, + .name = "dis", + .sta_mask = DIS_PWR_STA_MASK, + .ctl_offs = SPM_DIS_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(12, 12), + }, { + .id = MT8173_POWER_DOMAIN_VEN2, + .name = "ven2", + .sta_mask = VEN2_PWR_STA_MASK, + .ctl_offs = SPM_VEN2_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(15, 12), + }, { + .id = MT8173_POWER_DOMAIN_AUDIO, + .name = "audio", + .sta_mask = AUDIO_PWR_STA_MASK, + .ctl_offs = SPM_AUDIO_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(15, 12), + }, { + .id = MT8173_POWER_DOMAIN_MFG_2D, + .name = "mfg_2d", + .sta_mask = MFG_2D_PWR_STA_MASK, + .ctl_offs = SPM_MFG_2D_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(13, 12), + }, { + .id = MT8173_POWER_DOMAIN_MFG_ASYNC, + .name = "mfg_async", + .sta_mask = MFG_ASYNC_PWR_STA_MASK, + .ctl_offs = SPM_MFG_ASYNC_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = 0, + }, { + .id = MT8173_POWER_DOMAIN_USB, + .name = "usb", + .sta_mask = USB_PWR_STA_MASK, + .ctl_offs = SPM_USB_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(15, 12), + }, +}; + +#define NUM_DOMAINS ARRAY_SIZE(scp_domain_data) + +struct scp; + +struct scp_domain { + struct generic_pm_domain pmd; + struct scp_domain_data *data; + struct scp *scp; +}; + +struct scp { + struct scp_domain domains[NUM_DOMAINS]; + struct generic_pm_domain *pmd[NUM_DOMAINS]; + struct genpd_onecell_data pd_data; + struct device *dev; + void __iomem *base; +}; + +static int scpsys_power_on(struct generic_pm_domain *genpd) +{ + struct scp_domain *scpd = container_of(genpd, struct scp_domain, pmd); + struct scp *scp = scpd->scp; + struct scp_domain_data *data = scpd->data; + unsigned long expired; + void __iomem *ctl_addr = scpd->scp->base + data->ctl_offs; + u32 sram_pdn_ack = data->sram_pdn_ack_bits; + u32 val; + int ret; + + val = readl(ctl_addr); + val |= PWR_ON_BIT; + writel(val, ctl_addr); + val |= PWR_ON_2ND_BIT; + writel(val, ctl_addr); + + /* wait until PWR_ACK = 1 */ + expired = jiffies + HZ; + while (!(readl(scp->base + SPM_PWR_STATUS) & data->sta_mask) || + !(readl(scp->base + SPM_PWR_STATUS_2ND) & data->sta_mask)) { + cpu_relax(); + if (time_after(jiffies, expired)) { + ret = -EIO; + goto out; + } + } + + val &= ~PWR_CLK_DIS_BIT; + writel(val, ctl_addr); + + val &= ~PWR_ISO_BIT; + writel(val, ctl_addr); + + val |= PWR_RST_B_BIT; + writel(val, ctl_addr); + + val &= ~data->sram_pdn_bits; + writel(val, ctl_addr); + + /* wait until SRAM_PDN_ACK all 0 */ + expired = jiffies + HZ; + while (sram_pdn_ack && (readl(ctl_addr) & sram_pdn_ack)) { + cpu_relax(); + if (time_after(jiffies, expired)) { + ret = -EIO; + goto out; + } + } + + return 0; +out: + dev_err(scp->dev, "Failed to power on domain %s\n", scpd->data->name); + + return ret; +} + +static int scpsys_power_off(struct generic_pm_domain *genpd) +{ + struct scp_domain *scpd = container_of(genpd, struct scp_domain, pmd); + struct scp *scp = scpd->scp; + struct scp_domain_data *data = scpd->data; + unsigned long expired; + void __iomem *ctl_addr = scpd->scp->base + data->ctl_offs; + u32 sram_pdn_ack = data->sram_pdn_ack_bits; + u32 val; + int ret; + + val = readl(ctl_addr); + val |= data->sram_pdn_bits; + writel(val, ctl_addr); + + /* wait until SRAM_PDN_ACK all 1 */ + expired = jiffies + HZ; + while ((readl(ctl_addr) & sram_pdn_ack) != sram_pdn_ack) { + cpu_relax(); + if (time_after(jiffies, expired)) { + ret = -EIO; + goto out; + } + } + + val |= PWR_ISO_BIT; + writel(val, ctl_addr); + + val &= ~PWR_RST_B_BIT; + writel(val, ctl_addr); + + val |= PWR_CLK_DIS_BIT; + writel(val, ctl_addr); + + val &= ~PWR_ON_BIT; + writel(val, ctl_addr); + + val &= ~PWR_ON_2ND_BIT; + writel(val, ctl_addr); + + /* wait until PWR_ACK = 0 */ + expired = jiffies + HZ; + while ((readl(scp->base + SPM_PWR_STATUS) & data->sta_mask) || + (readl(scp->base + SPM_PWR_STATUS_2ND) & data->sta_mask)) { + cpu_relax(); + if (time_after(jiffies, expired)) { + ret = -EIO; + goto out; + } + } + + return 0; + +out: + dev_err(scp->dev, "Failed to power on domain %s\n", scpd->data->name); + + return ret; +} + +static int scpsys_probe(struct platform_device *pdev) +{ + struct genpd_onecell_data *pd_data; + struct resource *res; + int i; + struct scp *scp; + + scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL); + if (!scp) + return -ENOMEM; + + scp->dev = &pdev->dev; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + scp->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(scp->base)) + return PTR_ERR(scp->base); + + pd_data = &scp->pd_data; + + pd_data->domains = scp->pmd; + pd_data->num_domains = NUM_DOMAINS; + + for (i = 0; i < NUM_DOMAINS; i++) { + struct scp_domain *scpd = &scp->domains[i]; + struct generic_pm_domain *pmd = &scpd->pmd; + + scp->pmd[i] = pmd; + scpd->data = &scp_domain_data[i]; + scpd->scp = scp; + + pmd->name = scp_domain_data[i].name; + pmd->power_off = scpsys_power_off; + pmd->power_on = scpsys_power_on; + pmd->power_off_latency_ns = 20000; + pmd->power_on_latency_ns = 20000; + + pd_data->domains[i] = pmd; + pm_genpd_init(pmd, NULL, 1); + + /* + * If PM is disabled turn on all domains by default so that + * consumers can work. + */ + if (!IS_ENABLED(CONFIG_PM)) + pmd->power_on(pmd); + } + + return of_genpd_add_provider_onecell(pdev->dev.of_node, pd_data); +} + +static struct of_device_id of_scpsys_match_tbl[] = { + { + .compatible = "mediatek,mt8173-scpsys", + }, { + /* sentinel */ + } +}; +MODULE_DEVICE_TABLE(of, of_scpsys_match_tbl); + +static struct platform_driver scpsys_drv = { + .driver = { + .name = "mtk-scpsys", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(of_scpsys_match_tbl), + }, + .probe = scpsys_probe, +}; + +module_platform_driver(scpsys_drv); + +MODULE_AUTHOR("Sascha Hauer, Pengutronix"); +MODULE_DESCRIPTION("MediaTek MT8173 scpsys driver"); +MODULE_LICENSE("GPL"); diff --git a/include/dt-bindings/power/mt8173-power.h b/include/dt-bindings/power/mt8173-power.h new file mode 100644 index 0000000..88715f2 --- /dev/null +++ b/include/dt-bindings/power/mt8173-power.h @@ -0,0 +1,15 @@ +#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H +#define _DT_BINDINGS_POWER_MT8183_POWER_H + +#define MT8173_POWER_DOMAIN_VDE 0 +#define MT8173_POWER_DOMAIN_MFG 1 +#define MT8173_POWER_DOMAIN_VEN 2 +#define MT8173_POWER_DOMAIN_ISP 3 +#define MT8173_POWER_DOMAIN_DIS 4 +#define MT8173_POWER_DOMAIN_VEN2 5 +#define MT8173_POWER_DOMAIN_AUDIO 6 +#define MT8173_POWER_DOMAIN_MFG_2D 7 +#define MT8173_POWER_DOMAIN_MFG_ASYNC 8 +#define MT8173_POWER_DOMAIN_USB 9 + +#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */ -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver 2015-05-11 13:11 ` [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver Sascha Hauer @ 2015-05-26 22:35 ` Kevin Hilman 2015-05-27 6:24 ` Sascha Hauer 0 siblings, 1 reply; 16+ messages in thread From: Kevin Hilman @ 2015-05-26 22:35 UTC (permalink / raw) To: Sascha Hauer Cc: linux-arm-kernel, devicetree, linux-kernel, linux-mediatek, kernel, Matthias Brugger Sascha Hauer <s.hauer@pengutronix.de> writes: > This adds a power domain driver for the Mediatek SCPSYS unit. > > The System Control Processor System (SCPSYS) has several power > management related tasks in the system. The tasks include thermal > measurement, dynamic voltage frequency scaling (DVFS), interrupt > filter and lowlevel sleep control. The System Power Manager (SPM) > inside the SCPSYS is for the MTCMOS power domain control. > > For now this driver only adds power domain support, the more > advanced features are not yet supported. The driver implements > the generic PM domain device tree bindings, the first user will > most likely be the Mediatek AFE audio driver. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > drivers/soc/mediatek/Kconfig | 6 + > drivers/soc/mediatek/Makefile | 1 + > drivers/soc/mediatek/mtk-scpsys.c | 345 +++++++++++++++++++++++++++++++ > include/dt-bindings/power/mt8173-power.h | 15 ++ > 4 files changed, 367 insertions(+) > create mode 100644 drivers/soc/mediatek/mtk-scpsys.c > create mode 100644 include/dt-bindings/power/mt8173-power.h > > diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig > index bcdb22d..1d34819 100644 > --- a/drivers/soc/mediatek/Kconfig > +++ b/drivers/soc/mediatek/Kconfig > @@ -9,3 +9,9 @@ config MTK_PMIC_WRAP > Say yes here to add support for MediaTek PMIC Wrapper found > on different MediaTek SoCs. The PMIC wrapper is a proprietary > hardware to connect the PMIC. > + > +config MTK_SCPSYS > + tristate "MediaTek SCPSYS Support" depends on ARCH_MEDIATEK ? > + help > + Say yes here to add support for the MediaTek SCPSYS power domain > + driver. [...] > +static int scpsys_probe(struct platform_device *pdev) > +{ > + struct genpd_onecell_data *pd_data; > + struct resource *res; > + int i; > + struct scp *scp; > + > + scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL); > + if (!scp) > + return -ENOMEM; > + > + scp->dev = &pdev->dev; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + scp->base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(scp->base)) > + return PTR_ERR(scp->base); > + > + pd_data = &scp->pd_data; > + > + pd_data->domains = scp->pmd; > + pd_data->num_domains = NUM_DOMAINS; > + > + for (i = 0; i < NUM_DOMAINS; i++) { > + struct scp_domain *scpd = &scp->domains[i]; > + struct generic_pm_domain *pmd = &scpd->pmd; > + > + scp->pmd[i] = pmd; > + scpd->data = &scp_domain_data[i]; > + scpd->scp = scp; > + > + pmd->name = scp_domain_data[i].name; > + pmd->power_off = scpsys_power_off; > + pmd->power_on = scpsys_power_on; > + pmd->power_off_latency_ns = 20000; > + pmd->power_on_latency_ns = 20000; I think I mentioned this before... are these numbers really identical for all domains? I suggest you make these each a field in the domain data so they can be different for each domain, and eventually come from DT data. > + pd_data->domains[i] = pmd; > + pm_genpd_init(pmd, NULL, 1); > + > + /* > + * If PM is disabled turn on all domains by default so that > + * consumers can work. > + */ > + if (!IS_ENABLED(CONFIG_PM)) > + pmd->power_on(pmd); > + } > + > + return of_genpd_add_provider_onecell(pdev->dev.of_node, pd_data); > +} Kevin ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver 2015-05-26 22:35 ` Kevin Hilman @ 2015-05-27 6:24 ` Sascha Hauer 2015-05-28 17:22 ` Kevin Hilman 0 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-05-27 6:24 UTC (permalink / raw) To: Kevin Hilman Cc: linux-arm-kernel, devicetree, linux-kernel, linux-mediatek, kernel, Matthias Brugger On Tue, May 26, 2015 at 03:35:14PM -0700, Kevin Hilman wrote: > Sascha Hauer <s.hauer@pengutronix.de> writes: > > > This adds a power domain driver for the Mediatek SCPSYS unit. > > > > The System Control Processor System (SCPSYS) has several power > > management related tasks in the system. The tasks include thermal > > measurement, dynamic voltage frequency scaling (DVFS), interrupt > > filter and lowlevel sleep control. The System Power Manager (SPM) > > inside the SCPSYS is for the MTCMOS power domain control. > > > > For now this driver only adds power domain support, the more > > advanced features are not yet supported. The driver implements > > the generic PM domain device tree bindings, the first user will > > most likely be the Mediatek AFE audio driver. > > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > > --- > > drivers/soc/mediatek/Kconfig | 6 + > > drivers/soc/mediatek/Makefile | 1 + > > drivers/soc/mediatek/mtk-scpsys.c | 345 +++++++++++++++++++++++++++++++ > > include/dt-bindings/power/mt8173-power.h | 15 ++ > > 4 files changed, 367 insertions(+) > > create mode 100644 drivers/soc/mediatek/mtk-scpsys.c > > create mode 100644 include/dt-bindings/power/mt8173-power.h > > > > diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig > > index bcdb22d..1d34819 100644 > > --- a/drivers/soc/mediatek/Kconfig > > +++ b/drivers/soc/mediatek/Kconfig > > @@ -9,3 +9,9 @@ config MTK_PMIC_WRAP > > Say yes here to add support for MediaTek PMIC Wrapper found > > on different MediaTek SoCs. The PMIC wrapper is a proprietary > > hardware to connect the PMIC. > > + > > +config MTK_SCPSYS > > + tristate "MediaTek SCPSYS Support" > > depends on ARCH_MEDIATEK ? You are reviewing v2 of this series. This is already fixed in v3 sent out last wednesday. > > + for (i = 0; i < NUM_DOMAINS; i++) { > > + struct scp_domain *scpd = &scp->domains[i]; > > + struct generic_pm_domain *pmd = &scpd->pmd; > > + > > + scp->pmd[i] = pmd; > > + scpd->data = &scp_domain_data[i]; > > + scpd->scp = scp; > > + > > + pmd->name = scp_domain_data[i].name; > > + pmd->power_off = scpsys_power_off; > > + pmd->power_on = scpsys_power_on; > > + pmd->power_off_latency_ns = 20000; > > + pmd->power_on_latency_ns = 20000; > > I think I mentioned this before... are these numbers really identical > for all domains? I suggest you make these each a field in the domain > data so they can be different for each domain, and eventually come from > DT data. For the record, here are the numbers I just measured: mtk-scpsys 10006000.scpsys: vdec on: 31000 off: 10769 mtk-scpsys 10006000.scpsys: venc on: 6000 off: 5923 mtk-scpsys 10006000.scpsys: isp on: 5923 off: 5923 mtk-scpsys 10006000.scpsys: mm on: 7616 off: 7692 mtk-scpsys 10006000.scpsys: venc_lt on: 5924 off: 6000 mtk-scpsys 10006000.scpsys: audio on: 5462 off: 5615 mtk-scpsys 10006000.scpsys: usb on: 5461 off: 5462 mtk-scpsys 10006000.scpsys: mfg_async on: 29923 off: 11077 mtk-scpsys 10006000.scpsys: mfg_2d on: 5923 off: 5616 mtk-scpsys 10006000.scpsys: mfg on: 11231 off: 16153 Anyway, the pm domain core measures these times itself, so there should not be a need to fill in anything here. I was irritated by the warning message I got each time when the times were exceeded. This message seemed to imply that something was wrong and I had to fill in sane values in the latency fields. Since we now have [1] I'll just drop the initialisation of these fields. Sascha [1] commit 6d7d5c3266aa946b2049d9fed02186c1a378621b Author: Russell King <rmk+kernel@arm.linux.org.uk> Date: Fri Mar 20 17:20:28 2015 +0000 PM / domains: quieten down generic pm domains -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver 2015-05-27 6:24 ` Sascha Hauer @ 2015-05-28 17:22 ` Kevin Hilman 0 siblings, 0 replies; 16+ messages in thread From: Kevin Hilman @ 2015-05-28 17:22 UTC (permalink / raw) To: Sascha Hauer Cc: linux-arm-kernel, devicetree, linux-kernel, linux-mediatek, kernel, Matthias Brugger Sascha Hauer <s.hauer@pengutronix.de> writes: > On Tue, May 26, 2015 at 03:35:14PM -0700, Kevin Hilman wrote: >> Sascha Hauer <s.hauer@pengutronix.de> writes: >> >> > This adds a power domain driver for the Mediatek SCPSYS unit. >> > >> > The System Control Processor System (SCPSYS) has several power >> > management related tasks in the system. The tasks include thermal >> > measurement, dynamic voltage frequency scaling (DVFS), interrupt >> > filter and lowlevel sleep control. The System Power Manager (SPM) >> > inside the SCPSYS is for the MTCMOS power domain control. >> > >> > For now this driver only adds power domain support, the more >> > advanced features are not yet supported. The driver implements >> > the generic PM domain device tree bindings, the first user will >> > most likely be the Mediatek AFE audio driver. >> > >> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> >> > --- >> > drivers/soc/mediatek/Kconfig | 6 + >> > drivers/soc/mediatek/Makefile | 1 + >> > drivers/soc/mediatek/mtk-scpsys.c | 345 +++++++++++++++++++++++++++++++ >> > include/dt-bindings/power/mt8173-power.h | 15 ++ >> > 4 files changed, 367 insertions(+) >> > create mode 100644 drivers/soc/mediatek/mtk-scpsys.c >> > create mode 100644 include/dt-bindings/power/mt8173-power.h >> > >> > diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig >> > index bcdb22d..1d34819 100644 >> > --- a/drivers/soc/mediatek/Kconfig >> > +++ b/drivers/soc/mediatek/Kconfig >> > @@ -9,3 +9,9 @@ config MTK_PMIC_WRAP >> > Say yes here to add support for MediaTek PMIC Wrapper found >> > on different MediaTek SoCs. The PMIC wrapper is a proprietary >> > hardware to connect the PMIC. >> > + >> > +config MTK_SCPSYS >> > + tristate "MediaTek SCPSYS Support" >> >> depends on ARCH_MEDIATEK ? > > You are reviewing v2 of this series. This is already fixed in v3 sent > out last wednesday. Yeah, sorry about that. I noticed that after sending. >> > + for (i = 0; i < NUM_DOMAINS; i++) { >> > + struct scp_domain *scpd = &scp->domains[i]; >> > + struct generic_pm_domain *pmd = &scpd->pmd; >> > + >> > + scp->pmd[i] = pmd; >> > + scpd->data = &scp_domain_data[i]; >> > + scpd->scp = scp; >> > + >> > + pmd->name = scp_domain_data[i].name; >> > + pmd->power_off = scpsys_power_off; >> > + pmd->power_on = scpsys_power_on; >> > + pmd->power_off_latency_ns = 20000; >> > + pmd->power_on_latency_ns = 20000; >> >> I think I mentioned this before... are these numbers really identical >> for all domains? I suggest you make these each a field in the domain >> data so they can be different for each domain, and eventually come from >> DT data. > > For the record, here are the numbers I just measured: > > mtk-scpsys 10006000.scpsys: vdec on: 31000 off: 10769 > mtk-scpsys 10006000.scpsys: venc on: 6000 off: 5923 > mtk-scpsys 10006000.scpsys: isp on: 5923 off: 5923 > mtk-scpsys 10006000.scpsys: mm on: 7616 off: 7692 > mtk-scpsys 10006000.scpsys: venc_lt on: 5924 off: 6000 > mtk-scpsys 10006000.scpsys: audio on: 5462 off: 5615 > mtk-scpsys 10006000.scpsys: usb on: 5461 off: 5462 > mtk-scpsys 10006000.scpsys: mfg_async on: 29923 off: 11077 > mtk-scpsys 10006000.scpsys: mfg_2d on: 5923 off: 5616 > mtk-scpsys 10006000.scpsys: mfg on: 11231 off: 16153 > > Anyway, the pm domain core measures these times itself, so there > should not be a need to fill in anything here. I was irritated by the > warning message I got each time when the times were exceeded. This > message seemed to imply that something was wrong and I had to fill > in sane values in the latency fields. Since we now have [1] I'll just > drop the initialisation of these fields. OK. However, I suspect you will still want these numbers on a per-domain basis eventually when you consider having genpd governors that want to make decisions. But that can always be added later also. Kevin ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/4] ARM64: MediaTek: Add generic pm domain support 2015-05-11 13:11 [PATCH v2] Mediatek SCPSYS power domain support Sascha Hauer 2015-05-11 13:11 ` [PATCH 1/4] dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit Sascha Hauer 2015-05-11 13:11 ` [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver Sascha Hauer @ 2015-05-11 13:11 ` Sascha Hauer 2015-05-11 13:11 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 2015-05-11 16:05 ` [PATCH v2] Mediatek SCPSYS power domain support Matthias Brugger_0 4 siblings, 0 replies; 16+ messages in thread From: Sascha Hauer @ 2015-05-11 13:11 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger, Sascha Hauer Enable support for generic power domains in the config. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm64/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7796af4..ba8469c 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -185,6 +185,7 @@ config ARCH_MEDIATEK bool "Mediatek MT65xx & MT81xx ARMv8 SoC" select ARM_GIC select PINCTRL + select PM_GENERIC_DOMAINS if PM help Support for Mediatek MT65xx & MT81xx ARMv8 SoCs -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-05-11 13:11 [PATCH v2] Mediatek SCPSYS power domain support Sascha Hauer ` (2 preceding siblings ...) 2015-05-11 13:11 ` [PATCH 3/4] ARM64: MediaTek: Add generic pm domain support Sascha Hauer @ 2015-05-11 13:11 ` Sascha Hauer 2015-05-15 14:17 ` Daniel Kurtz 2015-05-11 16:05 ` [PATCH v2] Mediatek SCPSYS power domain support Matthias Brugger_0 4 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-05-11 13:11 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger, Sascha Hauer This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 924fdb6..3c569b5 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -125,6 +125,18 @@ <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; }; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + clocks = <&topckgen CLK_TOP_VDEC_SEL>, + <&topckgen CLK_TOP_MFG_SEL>, + <&topckgen CLK_TOP_VENC_SEL>, + <&topckgen CLK_TOP_MM_SEL>, + <&topckgen CLK_TOP_VENC_LT_SEL>; + clock-names = "vdec", "mfg", "venc", "disp", "ven2"; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-05-11 13:11 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer @ 2015-05-15 14:17 ` Daniel Kurtz 0 siblings, 0 replies; 16+ messages in thread From: Daniel Kurtz @ 2015-05-15 14:17 UTC (permalink / raw) To: Sascha Hauer Cc: linux-arm-kernel, open list:OPEN FIRMWARE AND..., Kevin Hilman, linux-kernel, linux-mediatek, Sasha Hauer, Matthias Brugger On Mon, May 11, 2015 at 9:11 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > This adds the SCPSYS device node to the MT8173 dtsi file. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi > index 924fdb6..3c569b5 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi > @@ -125,6 +125,18 @@ > <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; > }; > > + scpsys: scpsys@10006000 { > + compatible = "mediatek,mt8173-scpsys"; > + #power-domain-cells = <1>; > + reg = <0 0x10006000 0 0x1000>; > + clocks = <&topckgen CLK_TOP_VDEC_SEL>, > + <&topckgen CLK_TOP_MFG_SEL>, > + <&topckgen CLK_TOP_VENC_SEL>, > + <&topckgen CLK_TOP_MM_SEL>, > + <&topckgen CLK_TOP_VENC_LT_SEL>; > + clock-names = "vdec", "mfg", "venc", "disp", "ven2"; (1) I think people like to align multi-line dts field values, so there should be one more ' ' before each <&topckgen ...>. (2) it is a bit awkward that these names do not match their clock names. This seems more straightforward: clock-names = "vdec", "mfg", "venc", "mm", "venc_lt"; (3) the scpsys binding patch does not list the clock fields. (4) I don't think a patch with these CLK_TOP_* has been sent to the list for review yet. Thanks, -Dan > + }; > + > sysirq: intpol-controller@10200620 { > compatible = "mediatek,mt8173-sysirq", > "mediatek,mt6577-sysirq"; > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v2] Mediatek SCPSYS power domain support 2015-05-11 13:11 [PATCH v2] Mediatek SCPSYS power domain support Sascha Hauer ` (3 preceding siblings ...) 2015-05-11 13:11 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer @ 2015-05-11 16:05 ` Matthias Brugger_0 2015-05-11 19:24 ` Sascha Hauer 4 siblings, 1 reply; 16+ messages in thread From: Matthias Brugger_0 @ 2015-05-11 16:05 UTC (permalink / raw) To: Sascha Hauer Cc: linux-arm-kernel, devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel On Monday, May 11, 2015 03:11:18 PM Sascha Hauer wrote: > This series adds support for the MediaTek SCPSYS unit. > > The SCPSYS unit handles several power management related tasks such > as thermal measurement, DVFS, interrupt filter and low level sleep > control. > > The initial support only contains the generic power domain handling. > This is needed to turn on power to the different power domains. > > The driver is quite straight forward now. Due to the lack of a better > place I have put it to drivers/soc/mediatek. As the SCPSYS unit has > several other tasks that also do not fit into some specific subsystem > this probably is a good place for this driver. > > Please review, any input welcome. > > Sascha > > changes since v1: > - make MFG_ASYNC a subdomain of MFG_2D and MFG_2D a subdomain of MFG > - Add (now hopefully properly) infracfg register handling again > - Add clock handling > - Fix on/off mixup in error message > - Make readonly data const > - Fix MODULE_LICENSE to GPL v2 I can't find this changes. It looks like you send the wrong patches. Please resend. Cheers, Matthias ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v2] Mediatek SCPSYS power domain support 2015-05-11 16:05 ` [PATCH v2] Mediatek SCPSYS power domain support Matthias Brugger_0 @ 2015-05-11 19:24 ` Sascha Hauer 0 siblings, 0 replies; 16+ messages in thread From: Sascha Hauer @ 2015-05-11 19:24 UTC (permalink / raw) To: Matthias Brugger_0 Cc: linux-arm-kernel, devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel On Mon, May 11, 2015 at 06:05:20PM +0200, Matthias Brugger_0 wrote: > On Monday, May 11, 2015 03:11:18 PM Sascha Hauer wrote: > > This series adds support for the MediaTek SCPSYS unit. > > > > The SCPSYS unit handles several power management related tasks such > > as thermal measurement, DVFS, interrupt filter and low level sleep > > control. > > > > The initial support only contains the generic power domain handling. > > This is needed to turn on power to the different power domains. > > > > The driver is quite straight forward now. Due to the lack of a better > > place I have put it to drivers/soc/mediatek. As the SCPSYS unit has > > several other tasks that also do not fit into some specific subsystem > > this probably is a good place for this driver. > > > > Please review, any input welcome. > > > > Sascha > > > > changes since v1: > > - make MFG_ASYNC a subdomain of MFG_2D and MFG_2D a subdomain of MFG > > - Add (now hopefully properly) infracfg register handling again > > - Add clock handling > > - Fix on/off mixup in error message > > - Make readonly data const > > - Fix MODULE_LICENSE to GPL v2 > > I can't find this changes. It looks like you send the wrong patches. > Please resend. Damn, I just proved that changelogs are useful ;) I have just resent this series. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v6] Mediatek SCPSYS power domain support @ 2015-06-24 6:17 Sascha Hauer 2015-06-24 6:17 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 0 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-06-24 6:17 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger Just a small update to this series with a memory corruption bug fixed. This series adds support for the MediaTek SCPSYS unit. The SCPSYS unit handles several power management related tasks such as thermal measurement, DVFS, interrupt filter and low level sleep control. The initial support only contains the generic power domain handling. This is needed to turn on power to the different power domains. The driver is quite straight forward now. Due to the lack of a better place I have put it to drivers/soc/mediatek. As the SCPSYS unit has several other tasks that also do not fit into some specific subsystem this probably is a good place for this driver. Please review, any input welcome. Sascha changes since v5: - Fix array out of bounds access - Fix typo Changes since v4: - move Kconfig dependency "select PM_GENERIC_DOMAINS if PM" from arch/arm64 next to the driver which needs this dependency - drop unnecessary clk[] array from struct scp and make the array local to the function which needs it. - Disable clock when enabling the domain fails - Drop error message when devm_clk_get fails. The core already issues a similar warning - Add clocks/clock-names description to the binding doc Changes since v3: - Drop unnecessary MODULE_* macros for builtin code - introduce scpsys_domain_is_on() function instead of open coding this twice - Drop unnecessary initialisation of power_o[ff|n]_latencies. The kernel updates them with the measured values anyway. changes since v2: - Add missing include/linux/soc/mediatek/infracfg.h file - rename VDE -> VDEC, VEN -> VENC, DIS -> DISP and VEN2 -> VENC_LT to make the abbreviatons more clear - make of_device_id const - remove double loop - fix hunk in wrong patch - Fix order of domains. Some domains depend on other domains. Reorder the domains so that all domains can be turned on in order when CONFIG_PM is disabled. Also fixes earlier mixups in the domain array - Do not allow compilation as modules. pm_domains cannot be removed, so compilation as module is not that useful - reorder Kconfig items alphabetically - reorder #includes alphabetically - select MTK_INFRACFG instead of depending on it - Use only two clocks as dependencies for the domains. The previously used 5 clocks are not necessary as confirmed by the hardware designers - use 'genpd' as variable name for struct generic_pm_domain like done in other pm code changes since v1: - make MFG_ASYNC a subdomain of MFG_2D and MFG_2D a subdomain of MFG - Add (now hopefully properly) infracfg register handling again - Add clock handling - Fix on/off mixup in error message - Make readonly data const - Fix MODULE_LICENSE to GPL v2 changes since RFC: - add a commit log to driver patch - drop manipulating infracfg registers for now, can be added (properly) later - Add warning messages when errors occur - add NULL pointer check for kmalloc ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-06-24 6:17 [PATCH v6] " Sascha Hauer @ 2015-06-24 6:17 ` Sascha Hauer 2015-06-24 20:13 ` Matthias Brugger 0 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-06-24 6:17 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger, Sascha Hauer This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 924fdb6..12430f0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -125,6 +125,16 @@ <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; }; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + clocks = <&clk26m>, + <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mfg", "mm"; + infracfg = <&infracfg>; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-06-24 6:17 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer @ 2015-06-24 20:13 ` Matthias Brugger 0 siblings, 0 replies; 16+ messages in thread From: Matthias Brugger @ 2015-06-24 20:13 UTC (permalink / raw) To: Sascha Hauer Cc: linux-arm-kernel, devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel On Wednesday, June 24, 2015 08:17:05 AM Sascha Hauer wrote: > This adds the SCPSYS device node to the MT8173 dtsi file. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- Applied to v4.2-next/arm64 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v5] Mediatek SCPSYS power domain support @ 2015-06-22 6:35 Sascha Hauer 2015-06-22 6:35 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 0 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-06-22 6:35 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger This series adds support for the MediaTek SCPSYS unit. The SCPSYS unit handles several power management related tasks such as thermal measurement, DVFS, interrupt filter and low level sleep control. The initial support only contains the generic power domain handling. This is needed to turn on power to the different power domains. The driver is quite straight forward now. Due to the lack of a better place I have put it to drivers/soc/mediatek. As the SCPSYS unit has several other tasks that also do not fit into some specific subsystem this probably is a good place for this driver. Please review, any input welcome. Sascha Changes since v4: - move Kconfig dependency "select PM_GENERIC_DOMAINS if PM" from arch/arm64 next to the driver which needs this dependency - drop unnecessary clk[] array from struct scp and make the array local to the function which needs it. - Disable clock when enabling the domain fails - Drop error message when devm_clk_get fails. The core already issues a similar warning - Add clocks/clock-names description to the binding doc Changes since v3: - Drop unnecessary MODULE_* macros for builtin code - introduce scpsys_domain_is_on() function instead of open coding this twice - Drop unnecessary initialisation of power_o[ff|n]_latencies. The kernel updates them with the measured values anyway. changes since v2: - Add missing include/linux/soc/mediatek/infracfg.h file - rename VDE -> VDEC, VEN -> VENC, DIS -> DISP and VEN2 -> VENC_LT to make the abbreviatons more clear - make of_device_id const - remove double loop - fix hunk in wrong patch - Fix order of domains. Some domains depend on other domains. Reorder the domains so that all domains can be turned on in order when CONFIG_PM is disabled. Also fixes earlier mixups in the domain array - Do not allow compilation as modules. pm_domains cannot be removed, so compilation as module is not that useful - reorder Kconfig items alphabetically - reorder #includes alphabetically - select MTK_INFRACFG instead of depending on it - Use only two clocks as dependencies for the domains. The previously used 5 clocks are not necessary as confirmed by the hardware designers - use 'genpd' as variable name for struct generic_pm_domain like done in other pm code changes since v1: - make MFG_ASYNC a subdomain of MFG_2D and MFG_2D a subdomain of MFG - Add (now hopefully properly) infracfg register handling again - Add clock handling - Fix on/off mixup in error message - Make readonly data const - Fix MODULE_LICENSE to GPL v2 changes since RFC: - add a commit log to driver patch - drop manipulating infracfg registers for now, can be added (properly) later - Add warning messages when errors occur - add NULL pointer check for kmalloc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJVdqbqAAoJEPFlmONMx+ezvloP/jpQ1JBTkYvivy4oB+t8GuxU J6xLeo5k4uBKHNbTVm/2YbpROwwxA8Q+B/S4iG5mKNSydW6pf9jfA05XFpto0yKr CXkbSoWWS2emP3HlnObnW5DYf6ggSq349E5Sopl5G4nW+tOBc1GceND4k9HoRNSu MRRlZE0YK+QZ0Mz2x+RVNBnfiI8EU4gXcNdPq/aMEXIj+gSHtMeg2s7Zlg7zzyTQ x4ambA2DiGSumqYMWscJUGxJT1GLH7cMmfe5pKDFu9P0z11Og/8A7ix00x0UTdto DKqxOyGE4qdQ3Ma8Fb7j15VZ56Y21e7EKkSrv1FK5qSKcfzXnoOWu1xmBL2q0Jht X/kfEShfoeU8AMDf89zwxmUTqNx3nPuhsPpQeuVEIiO70cWvJ0dchL4Kp0t8a+xs nTmnS6S6Mm8MEUfhYmkJJ7p8WR4roQ+b+W5yeVFPWL9ft81CuioLrAEr/57GeIdR bhd4MgWlatNprBRvv/I6aBhFklWoSY87ERKJC9w9vvogZ7of/TEv1lMOI91qKMNL eg9y4Pw/FWkZyK0bIysykGHwQcNGLxqlKX52QLbefAM0jzdaljtbyHr3u7SnvpZS AikPoSJ+RC3jbP15Fx7IuD/XUCFt3fuSmUbyODpZJZM9MNo6xgmfsqmtwGUoTsbP DAFexU9wsU/2Xny1Ygjk =UL1E -----END PGP SIGNATURE----- commit 5e33965ca0b265401349229773ee7a3732a63388 Author: Sascha Hauer <s.hauer@pengutronix.de> Date: Mon Mar 9 08:41:36 2015 +0100 ARM64: MediaTek MT8173: Add SCPSYS device node This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 924fdb6..12430f0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -125,6 +125,16 @@ <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; }; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + clocks = <&clk26m>, + <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mfg", "mm"; + infracfg = <&infracfg>; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJVh6xeAAoJEPFlmONMx+ezuAQP/3OsxylPoreCDqeqJ/JMToPw WUp9Yrxu9BJPg7zV56nZAf+3gKNXgMkV5wyb6WpCYT0rRRabX6iALs0taPysYoRY IUkq57w8bl+oWS0rJwagXx6BclH2uzjlBor9DTLU7PKjRRmPBvfiLwqJjiGABxf3 yz4AFptnKkaj6IAudQDl1d2xJevmnzDDL3dMYhZy/VddaC8Gi/CmP86Pxnmr1Vt/ dTzwDsw3NSF0Hhuy601OFnwRiLDH+8C8xwg+j68kYfWbftrhHrTJZLCeJ+WvCSPL aCyrM0MZN+RkBzBgg1ZcdMAJPkjnxie4jERofafiEusLNEmiNln47bIPECMs7/7U IVVyCTLFuHljnVC/7Kf5t6RStlohzSgs3FdOs0raV9ObbnEb9Tg9mwSLHJIk6wmr xO6X5gqIURHkAODBvmi6MDWTTKmVv0Ep/N6c/HqLaEJEkeS5bP/gge3/l6O7LN9t 1ZGAjvGQwELszivh0YcFXsN+g1iDjIFSzwvXCCbeCmE1pZoa4JQsKCgLxQWJw3d/ dtWGtVt4IEX9qAb2UCIwU3HREP6JPn3Zd9QfOOXV2A9Lt0gfFqO7tiKrG4T4QBcx 4f9h48W4MmygCkNu87jG/3QLpn2p40MzNtvK3ffvP5acaoUtuQL1z1bCoEktDQ58 MIZ0jg9h66cFyJumlwbm =ZIEi -----END PGP SIGNATURE----- commit 4aa48202b3f22a71685f66d66beff0f040781bfd Author: Sascha Hauer <s.hauer@pengutronix.de> Date: Mon Mar 9 08:41:36 2015 +0100 ARM64: MediaTek MT8173: Add SCPSYS device node This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 924fdb6..12430f0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -125,6 +125,16 @@ <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; }; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + clocks = <&clk26m>, + <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mfg", "mm"; + infracfg = <&infracfg>; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-06-22 6:35 [PATCH v5] Mediatek SCPSYS power domain support Sascha Hauer @ 2015-06-22 6:35 ` Sascha Hauer 0 siblings, 0 replies; 16+ messages in thread From: Sascha Hauer @ 2015-06-22 6:35 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Kevin Hilman, linux-kernel, linux-mediatek, kernel, Matthias Brugger, Sascha Hauer This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 924fdb6..12430f0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -125,6 +125,16 @@ <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; }; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + clocks = <&clk26m>, + <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mfg", "mm"; + infracfg = <&infracfg>; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v1] Mediatek SCPSYS power domain support @ 2015-03-10 15:40 Sascha Hauer 2015-03-10 15:41 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 0 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-03-10 15:40 UTC (permalink / raw) To: linux-arm-kernel Cc: Matthias Brugger, devicetree, linux-mediatek, linux-kernel, kernel, Kevin Hilman This series adds support for the MediaTek SCPSYS unit. The SCPSYS unit handles several power management related tasks such as thermal measurement, DVFS, interrupt filter and low level sleep control. The initial support only contains the generic power domain handling. This is needed to turn on power to the different power domains. The driver is quite straight forward now. Due to the lack of a better place I have put it to drivers/soc/mediatek. As the SCPSYS unit has several other tasks that also do not fit into some specific subsystem this probably is a good place for this driver. Please review, any input welcome. Sascha changes since RFC: - add a commit log to driver patch - drop manipulating infracfg registers for now, can be added (properly) later - Add warning messages when errors occur - add NULL pointer check for kmalloc - Enable all power domains when PM is disabled to allow consumers to work ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-03-10 15:40 [PATCH v1] Mediatek SCPSYS power domain support Sascha Hauer @ 2015-03-10 15:41 ` Sascha Hauer 0 siblings, 0 replies; 16+ messages in thread From: Sascha Hauer @ 2015-03-10 15:41 UTC (permalink / raw) To: linux-arm-kernel Cc: Matthias Brugger, devicetree, linux-mediatek, linux-kernel, kernel, Kevin Hilman, Sascha Hauer This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 8554ec3..9fa64ac 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -105,6 +105,12 @@ compatible = "simple-bus"; ranges; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC] Mediatek SCPSYS power domain support @ 2015-03-09 8:09 Sascha Hauer 2015-03-09 8:10 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 0 siblings, 1 reply; 16+ messages in thread From: Sascha Hauer @ 2015-03-09 8:09 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, linux-kernel, Matthias Brugger, linux-mediatek, kernel s series adds support for the MediaTek SCPSYS unit. The SCPSYS unit handles several power management related tasks such as thermal measurement, DVFS, interrupt filter and low level sleep control. The initial support only contains the generic power domain handling. This is needed to turn on power to the different power domains. The driver is quite straight forward now. Due to the lack of a better place I have put it to drivers/soc/mediatek. As the SCPSYS unit has several other tasks that also do not fit into some specific subsystem this probably is a good place for this driver. What is not clear to me is how the Kconfig dependencies should be handled. Some domains are disabled by bootloader default, so without this driver for example sound won't work. So should PM, PM_GENERIC_DOMAINS and this driver be made mandatory for MT8173? Or should this driver when PM is disabled be compiled as a stub which only enables all domains? I don't have a good idea how things should work out here. Please review, any input welcome. Sascha ---------------------------------------------------------------- Sascha Hauer (4): soc: Mediatek: Add SCPSYS power domain driver dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit ARM64: MediaTek: Add generic pm domain support ARM64: MediaTek MT8173: Add SCPSYS device node .../devicetree/bindings/soc/mediatek/scpsys.txt | 32 ++ arch/arm64/Kconfig | 1 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 + drivers/soc/mediatek/Kconfig | 6 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-scpsys.c | 398 +++++++++++++++++++++ include/dt-bindings/power/mt8173-power.h | 15 + 7 files changed, 459 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/mediatek/scpsys.txt create mode 100644 drivers/soc/mediatek/mtk-scpsys.c create mode 100644 include/dt-bindings/power/mt8173-power.h ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node 2015-03-09 8:09 [RFC] Mediatek SCPSYS power domain support Sascha Hauer @ 2015-03-09 8:10 ` Sascha Hauer 0 siblings, 0 replies; 16+ messages in thread From: Sascha Hauer @ 2015-03-09 8:10 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, linux-kernel, Matthias Brugger, linux-mediatek, kernel, Sascha Hauer This adds the SCPSYS device node to the MT8173 dtsi file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 8554ec3..9fa64ac 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -105,6 +105,12 @@ compatible = "simple-bus"; ranges; + scpsys: scpsys@10006000 { + compatible = "mediatek,mt8173-scpsys"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + }; + sysirq: intpol-controller@10200620 { compatible = "mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-06-24 20:14 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-05-11 13:11 [PATCH v2] Mediatek SCPSYS power domain support Sascha Hauer 2015-05-11 13:11 ` [PATCH 1/4] dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit Sascha Hauer 2015-05-11 13:11 ` [PATCH 2/4] soc: Mediatek: Add SCPSYS power domain driver Sascha Hauer 2015-05-26 22:35 ` Kevin Hilman 2015-05-27 6:24 ` Sascha Hauer 2015-05-28 17:22 ` Kevin Hilman 2015-05-11 13:11 ` [PATCH 3/4] ARM64: MediaTek: Add generic pm domain support Sascha Hauer 2015-05-11 13:11 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 2015-05-15 14:17 ` Daniel Kurtz 2015-05-11 16:05 ` [PATCH v2] Mediatek SCPSYS power domain support Matthias Brugger_0 2015-05-11 19:24 ` Sascha Hauer -- strict thread matches above, loose matches on Subject: below -- 2015-06-24 6:17 [PATCH v6] " Sascha Hauer 2015-06-24 6:17 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 2015-06-24 20:13 ` Matthias Brugger 2015-06-22 6:35 [PATCH v5] Mediatek SCPSYS power domain support Sascha Hauer 2015-06-22 6:35 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 2015-03-10 15:40 [PATCH v1] Mediatek SCPSYS power domain support Sascha Hauer 2015-03-10 15:41 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer 2015-03-09 8:09 [RFC] Mediatek SCPSYS power domain support Sascha Hauer 2015-03-09 8:10 ` [PATCH 4/4] ARM64: MediaTek MT8173: Add SCPSYS device node Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).