| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20181117181206.10267-4-andrew.smirnov@gmail.com>
Date: Sat, 17 Nov 2018 10:12:06 -0800
From: Andrey Smirnov <andrew.smirnov@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@...il.com>,
Shawn Guo <shawnguo@...nel.org>,
Fabio Estevam <fabio.estevam@....com>, cphealy@...il.com,
l.stach@...gutronix.de, Leonard Crestez <leonard.crestez@....com>,
"A.s. Dong" <aisheng.dong@....com>,
Richard Zhu <hongxing.zhu@....com>, linux-imx@....com,
linux-arm-kernel@...ts.infradead.org
Subject: [PATCH 3/3] soc: imx: gpcv2: Add support for i.MX8MQ
GPCv2 IP block found on i.MX7D can also be found on i.MX8MQ. Add the
code needed to support the latter as well as the former.
Cc: Shawn Guo <shawnguo@...nel.org>
Cc: Fabio Estevam <fabio.estevam@....com>
Cc: cphealy@...il.com
Cc: l.stach@...gutronix.de
Cc: Leonard Crestez <leonard.crestez@....com>
Cc: "A.s. Dong" <aisheng.dong@....com>
Cc: Richard Zhu <hongxing.zhu@....com>
Cc: linux-imx@....com
Cc: linux-arm-kernel@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@...il.com>
---
drivers/soc/imx/Kconfig | 4 +-
drivers/soc/imx/gpcv2.c | 195 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 197 insertions(+), 2 deletions(-)
diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
index a5b86a28f343..8d0072e7c359 100644
--- a/drivers/soc/imx/Kconfig
+++ b/drivers/soc/imx/Kconfig
@@ -2,9 +2,9 @@ menu "i.MX SoC drivers"
config IMX7_PM_DOMAINS
bool "i.MX7 PM domains"
- depends on SOC_IMX7D || (COMPILE_TEST && OF)
+ depends on SOC_IMX8MQ || SOC_IMX7D || (COMPILE_TEST && OF)
depends on PM
select PM_GENERIC_DOMAINS
- default y if SOC_IMX7D
+ default y if SOC_IMX7D || SOC_IMX8MQ
endmenu
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index 184ffd4cc9aa..b464f2caa76d 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -15,9 +15,28 @@
#include <linux/regulator/consumer.h>
#include <dt-bindings/power/imx7-power.h>
+#define IMX8M_POWER_DOMAIN_MIPI_DSI_PHY 0
+#define IMX8M_POWER_DOMAIN_PCIE1_PHY 1
+#define IMX8M_POWER_DOMAIN_USB_OTG1 2
+#define IMX8M_POWER_DOMAIN_USB_OTG2 3
+#define IMX8M_POWER_DOMAIN_GPU 4
+#define IMX8M_POWER_DOMAIN_VPU 5
+#define IMX8M_POWER_DOMAIN_HDMI 6
+#define IMX8M_POWER_DOMAIN_DISP 7
+#define IMX8M_POWER_DOMAIN_MIPI_CSI1_PHY 8
+#define IMX8M_POWER_DOMAIN_MIPI_CSI2_PHY 9
+#define IMX8M_POWER_DOMAIN_PCIE2_PHY 10
+
#define GPC_LPCR_A_CORE_BSC 0x000
#define GPC_PGC_CPU_MAPPING 0x0ec
+#define PCIE2_A_CORE_DOMAIN BIT(15)
+#define MIPI_CSI2_A_CORE_DOMAIN BIT(14)
+#define MIPI_CSI1_A_CORE_DOMAIN BIT(13)
+#define DISP_A_CORE_DOMAIN BIT(12)
+#define HDMI_A_CORE_DOMAIN BIT(11)
+#define VPU_A_CORE_DOMAIN BIT(10)
+#define GPU_A_CORE_DOMAIN BIT(9)
#define USB_HSIC_PHY_A_CORE_DOMAIN BIT(6)
#define USB_OTG2_PHY_A_CORE_DOMAIN BIT(5)
#define USB_OTG1_PHY_A_CORE_DOMAIN BIT(4)
@@ -26,6 +45,13 @@
#define GPC_PU_PGC_SW_PUP_REQ 0x0f8
#define GPC_PU_PGC_SW_PDN_REQ 0x104
+#define PCIE2_SW_Pxx_REQ BIT(13)
+#define MIPI_CSI2_SW_Pxx_REQ BIT(12)
+#define MIPI_CSI1_SW_Pxx_REQ BIT(11)
+#define DISP_SW_Pxx_REQ BIT(10)
+#define HDMI_SW_Pxx_REQ BIT(9)
+#define VPU_SW_Pxx_REQ BIT(8)
+#define GPU_SW_Pxx_REQ BIT(7)
#define USB_HSIC_PHY_SW_Pxx_REQ BIT(4)
#define USB_OTG2_PHY_SW_Pxx_REQ BIT(3)
#define USB_OTG1_PHY_SW_Pxx_REQ BIT(2)
@@ -42,7 +68,16 @@
*/
#define PGC_MIPI 16
#define PGC_PCIE 17
+#define PGC_USB_OTG1 18
+#define PGC_USB_OTG2 19
#define PGC_USB_HSIC 20
+#define PGC_GPU 23
+#define PGC_VPU 24
+#define PGC_HDMI 25
+#define PGC_DISP 26
+#define PGC_MIPI_CSI1 27
+#define PGC_MIPI_CSI2 28
+#define PGC_PCIE2 29
#define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40)
#define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc)
@@ -219,6 +254,165 @@ static const struct imx_pgc_domain_data imx7_pgc_domain_data = {
},
};
+static const struct imx_pgc_domain imx8m_pgc_domains[] = {
+ [IMX8M_POWER_DOMAIN_MIPI_DSI_PHY] = {
+ .genpd = {
+ .name = "mipi-phy",
+ },
+ .bits = {
+ .pxx = MIPI_PHY_SW_Pxx_REQ,
+ .map = MIPI_PHY_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_MIPI,
+ },
+
+ [IMX8M_POWER_DOMAIN_PCIE1_PHY] = {
+ .genpd = {
+ .name = "pcie1-phy",
+ },
+ .bits = {
+ .pxx = PCIE_PHY_SW_Pxx_REQ,
+ .map = PCIE_PHY_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_PCIE,
+ },
+
+ [IMX8M_POWER_DOMAIN_USB_OTG1] = {
+ .genpd = {
+ .name = "usb-otg1",
+ },
+ .bits = {
+ .pxx = USB_OTG1_PHY_SW_Pxx_REQ,
+ .map = USB_OTG1_PHY_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_USB_OTG1,
+ },
+
+ [IMX8M_POWER_DOMAIN_USB_OTG2] = {
+ .genpd = {
+ .name = "usb-otg2",
+ },
+ .bits = {
+ .pxx = USB_OTG2_PHY_SW_Pxx_REQ,
+ .map = USB_OTG2_PHY_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_USB_OTG2,
+ },
+
+ [IMX8M_POWER_DOMAIN_GPU] = {
+ .genpd = {
+ .name = "gpu",
+ },
+ .bits = {
+ .pxx = GPU_SW_Pxx_REQ,
+ .map = GPU_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_GPU,
+ },
+
+ [IMX8M_POWER_DOMAIN_VPU] = {
+ .genpd = {
+ .name = "vpu",
+ },
+ .bits = {
+ .pxx = VPU_SW_Pxx_REQ,
+ .map = VPU_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_VPU,
+ },
+
+ [IMX8M_POWER_DOMAIN_HDMI] = {
+ .genpd = {
+ .name = "hdmi",
+ },
+ .bits = {
+ .pxx = HDMI_SW_Pxx_REQ,
+ .map = HDMI_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_HDMI,
+ },
+
+ [IMX8M_POWER_DOMAIN_DISP] = {
+ .genpd = {
+ .name = "disp",
+ },
+ .bits = {
+ .pxx = DISP_SW_Pxx_REQ,
+ .map = DISP_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_DISP,
+ },
+
+ [IMX8M_POWER_DOMAIN_MIPI_CSI1_PHY] = {
+ .genpd = {
+ .name = "mipi-csi1-phy",
+ },
+ .bits = {
+ .pxx = MIPI_CSI1_SW_Pxx_REQ,
+ .map = MIPI_CSI1_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_MIPI_CSI1,
+ },
+
+ [IMX8M_POWER_DOMAIN_MIPI_CSI2_PHY] = {
+ .genpd = {
+ .name = "mipi-csi2-phy",
+ },
+ .bits = {
+ .pxx = MIPI_CSI2_SW_Pxx_REQ,
+ .map = MIPI_CSI2_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_MIPI_CSI2,
+ },
+
+ [IMX8M_POWER_DOMAIN_PCIE2_PHY] = {
+ .genpd = {
+ .name = "pcie2-phy",
+ },
+ .bits = {
+ .pxx = PCIE2_SW_Pxx_REQ,
+ .map = PCIE2_A_CORE_DOMAIN,
+ },
+ .pgc = PGC_PCIE2,
+ },
+};
+
+static const struct regmap_range imx8m_pgc_yes_ranges[] = {
+ regmap_reg_range(GPC_LPCR_A_CORE_BSC,
+ GPC_M4_PU_PDN_FLG),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_MIPI),
+ GPC_PGC_SR(PGC_MIPI)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_PCIE),
+ GPC_PGC_SR(PGC_PCIE)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_USB_OTG1),
+ GPC_PGC_SR(PGC_USB_OTG1)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_USB_OTG2),
+ GPC_PGC_SR(PGC_USB_OTG2)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_GPU),
+ GPC_PGC_SR(PGC_GPU)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_VPU),
+ GPC_PGC_SR(PGC_VPU)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_HDMI),
+ GPC_PGC_SR(PGC_HDMI)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_DISP),
+ GPC_PGC_SR(PGC_DISP)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_MIPI_CSI1),
+ GPC_PGC_SR(PGC_MIPI_CSI1)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_MIPI_CSI2),
+ GPC_PGC_SR(PGC_MIPI_CSI2)),
+ regmap_reg_range(GPC_PGC_CTRL(PGC_PCIE2),
+ GPC_PGC_SR(PGC_PCIE2)),
+};
+
+static const struct imx_pgc_domain_data imx8m_pgc_domain_data = {
+ .domains = imx8m_pgc_domains,
+ .domains_num = ARRAY_SIZE(imx8m_pgc_domains),
+ .access_table = {
+ .yes_ranges = imx8m_pgc_yes_ranges,
+ .n_yes_ranges = ARRAY_SIZE(imx8m_pgc_yes_ranges),
+ },
+};
+
static int imx_pgc_domain_probe(struct platform_device *pdev)
{
struct imx_pgc_domain *domain = pdev->dev.platform_data;
@@ -373,6 +567,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
static const struct of_device_id imx_gpcv2_dt_ids[] = {
{ .compatible = "fsl,imx7d-gpc", .data = &imx7_pgc_domain_data, },
+ { .compatible = "fsl,imx8m-gpc", .data = &imx8m_pgc_domain_data, },
{ }
};
--
2.19.1
Powered by blists - more mailing lists