Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1299257 > unrolled thread
| Started by | James Liao <jamesjj.liao@mediatek.com> |
|---|---|
| First post | 2015-12-30 07:50 +0100 |
| Last post | 2015-12-30 19:00 +0100 |
| Articles | 6 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH 0/4] Mediatek MT2701 SCPSYS power domain support James Liao <jamesjj.liao@mediatek.com> - 2015-12-30 07:50 +0100
[PATCH 3/4] soc: mediatek: Add MT2701 power dt-bindings James Liao <jamesjj.liao@mediatek.com> - 2015-12-30 07:50 +0100
[PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver James Liao <jamesjj.liao@mediatek.com> - 2015-12-30 07:50 +0100
Re: [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver Daniel Kurtz <djkurtz@chromium.org> - 2015-12-30 10:10 +0100
Re: [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver James Liao <jamesjj.liao@mediatek.com> - 2015-12-30 11:20 +0100
Re: [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver Matthias Brugger <matthias.bgg@gmail.com> - 2015-12-30 19:00 +0100
| From | James Liao <jamesjj.liao@mediatek.com> |
|---|---|
| Date | 2015-12-30 07:50 +0100 |
| Subject | [PATCH 0/4] Mediatek MT2701 SCPSYS power domain support |
| Message-ID | <qLiK5-33r-5@gated-at.bofh.it> |
This patchset is based on 4.4-rc7, add scpsys power domain support for Mediatek MT2701/MT7623. This patchset also separate MT8173 scpsys driver into common part (mtk-scpsys.c) and platform part (mtk-scpsys-mt8173.c), so that MT2701 scpsys driver can share most implementation with MT8173. James Liao (2): soc: mediatek: Separate scpsys driver common code soc: mediatek: Init MT8173 scpsys driver earlier Shunli Wang (2): soc: mediatek: Add MT2701 power dt-bindings soc: mediatek: Add MT2701/MT7623 scpsys driver drivers/soc/mediatek/Kconfig | 24 ++- drivers/soc/mediatek/Makefile | 2 + drivers/soc/mediatek/mtk-scpsys-mt2701.c | 161 +++++++++++++++++ drivers/soc/mediatek/mtk-scpsys-mt8173.c | 190 +++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 301 ++++++++----------------------- drivers/soc/mediatek/mtk-scpsys.h | 54 ++++++ include/dt-bindings/power/mt2701-power.h | 27 +++ 7 files changed, 531 insertions(+), 228 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-mt2701.c create mode 100644 drivers/soc/mediatek/mtk-scpsys-mt8173.c create mode 100644 drivers/soc/mediatek/mtk-scpsys.h create mode 100644 include/dt-bindings/power/mt2701-power.h -- 1.9.1 -- 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/
[toc] | [next] | [standalone]
| From | James Liao <jamesjj.liao@mediatek.com> |
|---|---|
| Date | 2015-12-30 07:50 +0100 |
| Subject | [PATCH 3/4] soc: mediatek: Add MT2701 power dt-bindings |
| Message-ID | <qLiK6-33r-15@gated-at.bofh.it> |
| In reply to | #1299257 |
From: Shunli Wang <shunli.wang@mediatek.com> Add power dt-bindings for MT2701. Signed-off-by: Shunli Wang <shunli.wang@mediatek.com> Signed-off-by: James Liao <jamesjj.liao@mediatek.com> --- include/dt-bindings/power/mt2701-power.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 include/dt-bindings/power/mt2701-power.h diff --git a/include/dt-bindings/power/mt2701-power.h b/include/dt-bindings/power/mt2701-power.h new file mode 100644 index 0000000..64cc826 --- /dev/null +++ b/include/dt-bindings/power/mt2701-power.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2015 MediaTek Inc. + * + * 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. + */ + +#ifndef _DT_BINDINGS_POWER_MT2701_POWER_H +#define _DT_BINDINGS_POWER_MT2701_POWER_H + +#define MT2701_POWER_DOMAIN_CONN 0 +#define MT2701_POWER_DOMAIN_DISP 1 +#define MT2701_POWER_DOMAIN_MFG 2 +#define MT2701_POWER_DOMAIN_VDEC 3 +#define MT2701_POWER_DOMAIN_ISP 4 +#define MT2701_POWER_DOMAIN_BDP 5 +#define MT2701_POWER_DOMAIN_ETH 6 +#define MT2701_POWER_DOMAIN_HIF 7 +#define MT2701_POWER_DOMAIN_IFR_MSC 8 + +#endif /* _DT_BINDINGS_POWER_MT2701_POWER_H */ -- 1.9.1 -- 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/
[toc] | [prev] | [next] | [standalone]
| From | James Liao <jamesjj.liao@mediatek.com> |
|---|---|
| Date | 2015-12-30 07:50 +0100 |
| Subject | [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver |
| Message-ID | <qLiK6-33r-13@gated-at.bofh.it> |
| In reply to | #1299257 |
From: Shunli Wang <shunli.wang@mediatek.com>
Add scpsys driver for MT2701 and MT7623.
Signed-off-by: Shunli Wang <shunli.wang@mediatek.com>
Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
drivers/soc/mediatek/Kconfig | 11 +++
drivers/soc/mediatek/Makefile | 1 +
drivers/soc/mediatek/mtk-scpsys-mt2701.c | 161 +++++++++++++++++++++++++++++++
3 files changed, 173 insertions(+)
create mode 100644 drivers/soc/mediatek/mtk-scpsys-mt2701.c
diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig
index eca6fb7..92cf838 100644
--- a/drivers/soc/mediatek/Kconfig
+++ b/drivers/soc/mediatek/Kconfig
@@ -39,3 +39,14 @@ config MTK_SCPSYS_MT8173
driver.
The System Control Processor System (SCPSYS) has several power
management related tasks in the system.
+
+config MTK_SCPSYS_MT2701
+ bool "SCPSYS Support MediaTek MT2701 and MT7623"
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ select MTK_SCPSYS
+ default ARCH_MEDIATEK
+ help
+ Say yes here to add support for the MT2701/MT7623 SCPSYS power
+ domain driver.
+ The System Control Processor System (SCPSYS) has several power
+ management related tasks in the system.
diff --git a/drivers/soc/mediatek/Makefile b/drivers/soc/mediatek/Makefile
index 3b22baa..822986d 100644
--- a/drivers/soc/mediatek/Makefile
+++ b/drivers/soc/mediatek/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o
obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o
obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o
obj-$(CONFIG_MTK_SCPSYS_MT8173) += mtk-scpsys-mt8173.o
+obj-$(CONFIG_MTK_SCPSYS_MT2701) += mtk-scpsys-mt2701.o
diff --git a/drivers/soc/mediatek/mtk-scpsys-mt2701.c b/drivers/soc/mediatek/mtk-scpsys-mt2701.c
new file mode 100644
index 0000000..339d5b8
--- /dev/null
+++ b/drivers/soc/mediatek/mtk-scpsys-mt2701.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2015 Mediatek, Shunli Wang <shunli.wang@mediatek.com>
+ *
+ * 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/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/pm_domain.h>
+#include <linux/soc/mediatek/infracfg.h>
+#include <dt-bindings/power/mt2701-power.h>
+
+#include "mtk-scpsys.h"
+
+#define SPM_VDE_PWR_CON 0x0210
+#define SPM_MFG_PWR_CON 0x0214
+#define SPM_ISP_PWR_CON 0x0238
+#define SPM_DIS_PWR_CON 0x023C
+#define SPM_CONN_PWR_CON 0x0280
+#define SPM_BDP_PWR_CON 0x029C
+#define SPM_ETH_PWR_CON 0x02A0
+#define SPM_HIF_PWR_CON 0x02A4
+#define SPM_IFR_MSC_PWR_CON 0x02A8
+#define SPM_PWR_STATUS 0x060c
+#define SPM_PWR_STATUS_2ND 0x0610
+
+#define CONN_PWR_STA_MASK BIT(1)
+#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 BDP_PWR_STA_MASK BIT(14)
+#define ETH_PWR_STA_MASK BIT(15)
+#define HIF_PWR_STA_MASK BIT(16)
+#define IFR_MSC_PWR_STA_MASK BIT(17)
+
+#define MT2701_TOP_AXI_PROT_EN_CONN 0x0104
+#define MT2701_TOP_AXI_PROT_EN_DISP 0x0002
+
+static const struct scp_domain_data scp_domain_data[] = {
+ [MT2701_POWER_DOMAIN_CONN] = {
+ .name = "conn",
+ .sta_mask = CONN_PWR_STA_MASK,
+ .ctl_offs = SPM_CONN_PWR_CON,
+ .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN,
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_DISP] = {
+ .name = "disp",
+ .sta_mask = DIS_PWR_STA_MASK,
+ .ctl_offs = SPM_DIS_PWR_CON,
+ .sram_pdn_bits = GENMASK(11, 8),
+ .clk_id = {CLK_MM},
+ .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_DISP,
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_MFG] = {
+ .name = "mfg",
+ .sta_mask = MFG_PWR_STA_MASK,
+ .ctl_offs = SPM_MFG_PWR_CON,
+ .sram_pdn_bits = GENMASK(11, 8),
+ .sram_pdn_ack_bits = GENMASK(12, 12),
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_VDEC] = {
+ .name = "vdec",
+ .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),
+ .clk_id = {CLK_MM},
+ .active_wakeup = true,
+ },
+ [MT2701_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),
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_BDP] = {
+ .name = "bdp",
+ .sta_mask = BDP_PWR_STA_MASK,
+ .ctl_offs = SPM_BDP_PWR_CON,
+ .sram_pdn_bits = GENMASK(11, 8),
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_ETH] = {
+ .name = "eth",
+ .sta_mask = ETH_PWR_STA_MASK,
+ .ctl_offs = SPM_ETH_PWR_CON,
+ .sram_pdn_bits = GENMASK(11, 8),
+ .sram_pdn_ack_bits = GENMASK(15, 12),
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_HIF] = {
+ .name = "hif",
+ .sta_mask = HIF_PWR_STA_MASK,
+ .ctl_offs = SPM_HIF_PWR_CON,
+ .sram_pdn_bits = GENMASK(11, 8),
+ .sram_pdn_ack_bits = GENMASK(15, 12),
+ .active_wakeup = true,
+ },
+ [MT2701_POWER_DOMAIN_IFR_MSC] = {
+ .name = "ifr_msc",
+ .sta_mask = IFR_MSC_PWR_STA_MASK,
+ .ctl_offs = SPM_IFR_MSC_PWR_CON,
+ .active_wakeup = true,
+ },
+};
+
+#define NUM_DOMAINS ARRAY_SIZE(scp_domain_data)
+
+static int __init scpsys_probe(struct platform_device *pdev)
+{
+ struct scp *scp;
+
+ scp = init_scp(pdev, scp_domain_data, NUM_DOMAINS);
+ if (IS_ERR(scp))
+ return PTR_ERR(scp);
+
+ mtk_register_power_domains(pdev, scp, NUM_DOMAINS);
+
+ return 0;
+}
+
+static const struct of_device_id of_scpsys_match_tbl[] = {
+ {
+ .compatible = "mediatek,mt2701-scpsys",
+ }, {
+ /* sentinel */
+ }
+};
+MODULE_DEVICE_TABLE(of, of_scpsys_match_tbl);
+
+static struct platform_driver scpsys_drv = {
+ .driver = {
+ .name = "mtk-scpsys-mt2701",
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(of_scpsys_match_tbl),
+ },
+ .probe = scpsys_probe,
+};
+
+static int __init scpsys_init(void)
+{
+ return platform_driver_register(&scpsys_drv);
+}
+
+subsys_initcall(scpsys_init);
+
+MODULE_DESCRIPTION("MediaTek MT2701 scpsys driver");
+MODULE_LICENSE("GPL v2");
--
1.9.1
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Daniel Kurtz <djkurtz@chromium.org> |
|---|---|
| Date | 2015-12-30 10:10 +0100 |
| Subject | Re: [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver |
| Message-ID | <qLkVA-4DJ-13@gated-at.bofh.it> |
| In reply to | #1299260 |
On Wed, Dec 30, 2015 at 2:41 PM, James Liao <jamesjj.liao@mediatek.com> wrote: > > From: Shunli Wang <shunli.wang@mediatek.com> > > Add scpsys driver for MT2701 and MT7623. > > Signed-off-by: Shunli Wang <shunli.wang@mediatek.com> > Signed-off-by: James Liao <jamesjj.liao@mediatek.com> > --- > drivers/soc/mediatek/Kconfig | 11 +++ > drivers/soc/mediatek/Makefile | 1 + > drivers/soc/mediatek/mtk-scpsys-mt2701.c | 161 +++++++++++++++++++++++++++++++ > 3 files changed, 173 insertions(+) > create mode 100644 drivers/soc/mediatek/mtk-scpsys-mt2701.c > > diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig > index eca6fb7..92cf838 100644 > --- a/drivers/soc/mediatek/Kconfig > +++ b/drivers/soc/mediatek/Kconfig > @@ -39,3 +39,14 @@ config MTK_SCPSYS_MT8173 > driver. > The System Control Processor System (SCPSYS) has several power > management related tasks in the system. > + > +config MTK_SCPSYS_MT2701 > + bool "SCPSYS Support MediaTek MT2701 and MT7623" > + depends on ARCH_MEDIATEK || COMPILE_TEST > + select MTK_SCPSYS > + default ARCH_MEDIATEK > + help > + Say yes here to add support for the MT2701/MT7623 SCPSYS power > + domain driver. > + The System Control Processor System (SCPSYS) has several power > + management related tasks in the system. I don't think we really want different drivers and Kconfig options. Can we just use different compatibles to select the appropriate scp_domain_data? -Dan -- 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/
[toc] | [prev] | [next] | [standalone]
| From | James Liao <jamesjj.liao@mediatek.com> |
|---|---|
| Date | 2015-12-30 11:20 +0100 |
| Subject | Re: [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver |
| Message-ID | <qLm1k-5j3-15@gated-at.bofh.it> |
| In reply to | #1299275 |
Hi Daniel, On Wed, 2015-12-30 at 17:01 +0800, Daniel Kurtz wrote: > On Wed, Dec 30, 2015 at 2:41 PM, James Liao <jamesjj.liao@mediatek.com> wrote: > > > > From: Shunli Wang <shunli.wang@mediatek.com> > > > > Add scpsys driver for MT2701 and MT7623. > > > > Signed-off-by: Shunli Wang <shunli.wang@mediatek.com> > > Signed-off-by: James Liao <jamesjj.liao@mediatek.com> > > --- > > drivers/soc/mediatek/Kconfig | 11 +++ > > drivers/soc/mediatek/Makefile | 1 + > > drivers/soc/mediatek/mtk-scpsys-mt2701.c | 161 +++++++++++++++++++++++++++++++ > > 3 files changed, 173 insertions(+) > > create mode 100644 drivers/soc/mediatek/mtk-scpsys-mt2701.c > > > > diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig > > index eca6fb7..92cf838 100644 > > --- a/drivers/soc/mediatek/Kconfig > > +++ b/drivers/soc/mediatek/Kconfig > > @@ -39,3 +39,14 @@ config MTK_SCPSYS_MT8173 > > driver. > > The System Control Processor System (SCPSYS) has several power > > management related tasks in the system. > > + > > +config MTK_SCPSYS_MT2701 > > + bool "SCPSYS Support MediaTek MT2701 and MT7623" > > + depends on ARCH_MEDIATEK || COMPILE_TEST > > + select MTK_SCPSYS > > + default ARCH_MEDIATEK > > + help > > + Say yes here to add support for the MT2701/MT7623 SCPSYS power > > + domain driver. > > + The System Control Processor System (SCPSYS) has several power > > + management related tasks in the system. > > I don't think we really want different drivers and Kconfig options. > > Can we just use different compatibles to select the appropriate scp_domain_data? Yes, we can. All scpsys drivers are built-in by default, and they will be activate by specific compatible string. But some projects don't want to build unused drivers into kernel to save code size. Use different Kconfig options for each SoC so that these projects can disable unused drivers. Best regards, James -- 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/
[toc] | [prev] | [next] | [standalone]
| From | Matthias Brugger <matthias.bgg@gmail.com> |
|---|---|
| Date | 2015-12-30 19:00 +0100 |
| Subject | Re: [PATCH 4/4] soc: mediatek: Add MT2701/MT7623 scpsys driver |
| Message-ID | <qLtcu-1he-7@gated-at.bofh.it> |
| In reply to | #1299295 |
On 30/12/15 11:18, James Liao wrote: > Hi Daniel, > > On Wed, 2015-12-30 at 17:01 +0800, Daniel Kurtz wrote: >> On Wed, Dec 30, 2015 at 2:41 PM, James Liao <jamesjj.liao@mediatek.com> wrote: >>> >>> From: Shunli Wang <shunli.wang@mediatek.com> >>> >>> Add scpsys driver for MT2701 and MT7623. >>> >>> Signed-off-by: Shunli Wang <shunli.wang@mediatek.com> >>> Signed-off-by: James Liao <jamesjj.liao@mediatek.com> >>> --- >>> drivers/soc/mediatek/Kconfig | 11 +++ >>> drivers/soc/mediatek/Makefile | 1 + >>> drivers/soc/mediatek/mtk-scpsys-mt2701.c | 161 +++++++++++++++++++++++++++++++ >>> 3 files changed, 173 insertions(+) >>> create mode 100644 drivers/soc/mediatek/mtk-scpsys-mt2701.c >>> >>> diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig >>> index eca6fb7..92cf838 100644 >>> --- a/drivers/soc/mediatek/Kconfig >>> +++ b/drivers/soc/mediatek/Kconfig >>> @@ -39,3 +39,14 @@ config MTK_SCPSYS_MT8173 >>> driver. >>> The System Control Processor System (SCPSYS) has several power >>> management related tasks in the system. >>> + >>> +config MTK_SCPSYS_MT2701 >>> + bool "SCPSYS Support MediaTek MT2701 and MT7623" >>> + depends on ARCH_MEDIATEK || COMPILE_TEST >>> + select MTK_SCPSYS >>> + default ARCH_MEDIATEK >>> + help >>> + Say yes here to add support for the MT2701/MT7623 SCPSYS power >>> + domain driver. >>> + The System Control Processor System (SCPSYS) has several power >>> + management related tasks in the system. >> >> I don't think we really want different drivers and Kconfig options. >> >> Can we just use different compatibles to select the appropriate scp_domain_data? > > Yes, we can. All scpsys drivers are built-in by default, and they will > be activate by specific compatible string. > > But some projects don't want to build unused drivers into kernel to save > code size. Use different Kconfig options for each SoC so that these > projects can disable unused drivers. > Scpsys is a bool right now, you can disable it if you don't need it for your project. I don't think the impact of adding scp_domain_data justifies adding SoC specific scpsys drivers and bloat the drivers/soc/mediatek folder. Best regards, Matthias -- 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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web