soc: imx: gpcv2: use A_CORE instread of A7 for more i.MX platforms
authorAnson Huang <Anson.Huang@nxp.com>
Tue, 28 Aug 2018 08:36:45 +0000 (16:36 +0800)
committerShawn Guo <shawnguo@kernel.org>
Mon, 1 Oct 2018 05:24:05 +0000 (13:24 +0800)
gpcv2 driver is NOT just used on i.MX7D which has Cortex-A7
cores, but also on i.MX8MQ/i.MX8MM platforms which use Cortex-A53
cores, so let's use A_CORE instread of A7 to avoid confusion.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
drivers/soc/imx/gpcv2.c

index 6ef18cf..0e31465 100644 (file)
 #include <linux/regulator/consumer.h>
 #include <dt-bindings/power/imx7-power.h>
 
-#define GPC_LPCR_A7_BSC                        0x000
+#define GPC_LPCR_A_CORE_BSC                    0x000
 
 #define GPC_PGC_CPU_MAPPING            0x0ec
-#define USB_HSIC_PHY_A7_DOMAIN         BIT(6)
-#define USB_OTG2_PHY_A7_DOMAIN         BIT(5)
-#define USB_OTG1_PHY_A7_DOMAIN         BIT(4)
-#define PCIE_PHY_A7_DOMAIN             BIT(3)
-#define MIPI_PHY_A7_DOMAIN             BIT(2)
+#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)
+#define PCIE_PHY_A_CORE_DOMAIN         BIT(3)
+#define MIPI_PHY_A_CORE_DOMAIN         BIT(2)
 
 #define GPC_PU_PGC_SW_PUP_REQ          0x0f8
 #define GPC_PU_PGC_SW_PDN_REQ          0x104
@@ -167,7 +167,7 @@ static const struct imx7_pgc_domain imx7_pgc_domains[] = {
                },
                .bits  = {
                        .pxx = MIPI_PHY_SW_Pxx_REQ,
-                       .map = MIPI_PHY_A7_DOMAIN,
+                       .map = MIPI_PHY_A_CORE_DOMAIN,
                },
                .voltage   = 1000000,
                .pgc       = PGC_MIPI,
@@ -179,7 +179,7 @@ static const struct imx7_pgc_domain imx7_pgc_domains[] = {
                },
                .bits  = {
                        .pxx = PCIE_PHY_SW_Pxx_REQ,
-                       .map = PCIE_PHY_A7_DOMAIN,
+                       .map = PCIE_PHY_A_CORE_DOMAIN,
                },
                .voltage   = 1000000,
                .pgc       = PGC_PCIE,
@@ -191,7 +191,7 @@ static const struct imx7_pgc_domain imx7_pgc_domains[] = {
                },
                .bits  = {
                        .pxx = USB_HSIC_PHY_SW_Pxx_REQ,
-                       .map = USB_HSIC_PHY_A7_DOMAIN,
+                       .map = USB_HSIC_PHY_A_CORE_DOMAIN,
                },
                .voltage   = 1200000,
                .pgc       = PGC_USB_HSIC,
@@ -261,7 +261,7 @@ builtin_platform_driver(imx7_pgc_domain_driver)
 static int imx_gpcv2_probe(struct platform_device *pdev)
 {
        static const struct regmap_range yes_ranges[] = {
-               regmap_reg_range(GPC_LPCR_A7_BSC,
+               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)),