mmc: core: use default generic cmd6 timeout for flushing cache

[firefly-linux-kernel-4.4.55.git] / drivers / power / avs / rockchip-io-domain.c

diff --git a/drivers/power/avs/rockchip-io-domain.c b/drivers/power/avs/rockchip-io-domain.c
index 80994566a1c8f7594fceb3fd323e90e922ab666b..610f1049f2981700307584dd5cfeed6bf52e49db 100644 (file)
--- a/drivers/power/avs/rockchip-io-domain.c
+++ b/drivers/power/avs/rockchip-io-domain.c
@@ -43,10 +43,22 @@
 #define RK3288_SOC_CON2_FLASH0         BIT(7)
 #define RK3288_SOC_FLASH_SUPPLY_NUM    2
 
+#define RK3328_SOC_CON4                        0x410
+#define RK3328_SOC_CON4_VCCIO2         BIT(7)
+#define RK3328_SOC_VCCIO2_SUPPLY_NUM   1
+
+#define RK3366_SOC_CON6                        0x418
+#define RK3366_SOC_CON6_FLASH0         BIT(14)
+#define RK3366_SOC_FLASH_SUPPLY_NUM    2
+
 #define RK3368_SOC_CON15               0x43c
 #define RK3368_SOC_CON15_FLASH0                BIT(14)
 #define RK3368_SOC_FLASH_SUPPLY_NUM    2
 
+#define RK3399_PMUGRF_CON0             0x180
+#define RK3399_PMUGRF_CON0_VSEL                BIT(8)
+#define RK3399_PMUGRF_VSEL_SUPPLY_NUM  9
+
 struct rockchip_iodomain;
 
 /**
@@ -162,6 +174,44 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
                dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
 }
 
+static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
+{
+       int ret;
+       u32 val;
+
+       /* if no vccio2 supply we should leave things alone */
+       if (!iod->supplies[RK3328_SOC_VCCIO2_SUPPLY_NUM].reg)
+               return;
+
+       /*
+        * set vccio2 iodomain to also use this framework
+        * instead of a special gpio.
+        */
+       val = RK3328_SOC_CON4_VCCIO2 | (RK3328_SOC_CON4_VCCIO2 << 16);
+       ret = regmap_write(iod->grf, RK3328_SOC_CON4, val);
+       if (ret < 0)
+               dev_warn(iod->dev, "couldn't update vccio2 vsel ctrl\n");
+}
+
+static void rk3366_iodomain_init(struct rockchip_iodomain *iod)
+{
+       int ret;
+       u32 val;
+
+       /* if no flash supply we should leave things alone */
+       if (!iod->supplies[RK3366_SOC_FLASH_SUPPLY_NUM].reg)
+               return;
+
+       /*
+        * set flash0 iodomain to also use this framework
+        * instead of a special gpio.
+        */
+       val = RK3366_SOC_CON6_FLASH0 | (RK3366_SOC_CON6_FLASH0 << 16);
+       ret = regmap_write(iod->grf, RK3368_SOC_CON15, val);
+       if (ret < 0)
+               dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
+}
+
 static void rk3368_iodomain_init(struct rockchip_iodomain *iod)
 {
        int ret;
@@ -181,6 +231,25 @@ static void rk3368_iodomain_init(struct rockchip_iodomain *iod)
                dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
 }
 
+static void rk3399_pmu_iodomain_init(struct rockchip_iodomain *iod)
+{
+       int ret;
+       u32 val;
+
+       /* if no pmu io supply we should leave things alone */
+       if (!iod->supplies[RK3399_PMUGRF_VSEL_SUPPLY_NUM].reg)
+               return;
+
+       /*
+        * set pmu io iodomain to also use this framework
+        * instead of a special gpio.
+        */
+       val = RK3399_PMUGRF_CON0_VSEL | (RK3399_PMUGRF_CON0_VSEL << 16);
+       ret = regmap_write(iod->grf, RK3399_PMUGRF_CON0, val);
+       if (ret < 0)
+               dev_warn(iod->dev, "couldn't update pmu io iodomain ctrl\n");
+}
+
 /*
  * On the rk3188 the io-domains are handled by a shared register with the
  * lower 8 bits being still being continuing drive-strength settings.
@@ -224,6 +293,35 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
        .init = rk3288_iodomain_init,
 };
 
+static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
+       .grf_offset = 0x410,
+       .supply_names = {
+               "vccio1",
+               "vccio2",
+               "vccio3",
+               "vccio4",
+               "vccio5",
+               "vccio6",
+               "pmuio",
+       },
+       .init = rk3328_iodomain_init,
+};
+
+static const struct rockchip_iodomain_soc_data soc_data_rk3366 = {
+       .grf_offset = 0x900,
+       .supply_names = {
+               "lcdc",         /* LCDC_IOVDD */
+               "dvpts",        /* DVP_IOVDD */
+               "flash",        /* FLASH_IOVDD (emmc) */
+               "wifibt",       /* APIO1_IOVDD */
+               NULL,
+               "audio",        /* AUDIO_IODVDD */
+               "sdcard",       /* SDMMC_IOVDD (sdmmc) */
+               "tphdsor",      /* APIO2_IOVDD */
+       },
+       .init = rk3366_iodomain_init,
+};
+
 static const struct rockchip_iodomain_soc_data soc_data_rk3368 = {
        .grf_offset = 0x900,
        .supply_names = {
@@ -252,6 +350,33 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3368_pmu = {
        },
 };
 
+static const struct rockchip_iodomain_soc_data soc_data_rk3399 = {
+       .grf_offset = 0xe640,
+       .supply_names = {
+               "bt656",                /* APIO2_VDD */
+               "audio",                /* APIO5_VDD */
+               "sdmmc",                /* SDMMC0_VDD */
+               "gpio1830",             /* APIO4_VDD */
+       },
+};
+
+static const struct rockchip_iodomain_soc_data soc_data_rk3399_pmu = {
+       .grf_offset = 0x180,
+       .supply_names = {
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               "pmu1830",              /* PMUIO2_VDD */
+       },
+       .init = rk3399_pmu_iodomain_init,
+};
+
 static const struct of_device_id rockchip_iodomain_match[] = {
        {
                .compatible = "rockchip,rk3188-io-voltage-domain",
@@ -261,6 +386,14 @@ static const struct of_device_id rockchip_iodomain_match[] = {
                .compatible = "rockchip,rk3288-io-voltage-domain",
                .data = (void *)&soc_data_rk3288
        },
+       {
+               .compatible = "rockchip,rk3328-io-voltage-domain",
+               .data = (void *)&soc_data_rk3328
+       },
+       {
+               .compatible = "rockchip,rk3366-io-voltage-domain",
+               .data = (void *)&soc_data_rk3366
+       },
        {
                .compatible = "rockchip,rk3368-io-voltage-domain",
                .data = (void *)&soc_data_rk3368
@@ -269,6 +402,14 @@ static const struct of_device_id rockchip_iodomain_match[] = {
                .compatible = "rockchip,rk3368-pmu-io-voltage-domain",
                .data = (void *)&soc_data_rk3368_pmu
        },
+       {
+               .compatible = "rockchip,rk3399-io-voltage-domain",
+               .data = (void *)&soc_data_rk3399
+       },
+       {
+               .compatible = "rockchip,rk3399-pmu-io-voltage-domain",
+               .data = (void *)&soc_data_rk3399_pmu
+       },
        { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, rockchip_iodomain_match);
@@ -278,6 +419,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev)
        struct device_node *np = pdev->dev.of_node;
        const struct of_device_id *match;
        struct rockchip_iodomain *iod;
+       struct device *parent;
        int i, ret = 0;
 
        if (!np)
@@ -293,7 +435,14 @@ static int rockchip_iodomain_probe(struct platform_device *pdev)
        match = of_match_node(rockchip_iodomain_match, np);
        iod->soc_data = (struct rockchip_iodomain_soc_data *)match->data;
 
-       iod->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+       parent = pdev->dev.parent;
+       if (parent && parent->of_node) {
+               iod->grf = syscon_node_to_regmap(parent->of_node);
+       } else {
+               dev_dbg(&pdev->dev, "falling back to old binding\n");
+               iod->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+       }
+
        if (IS_ERR(iod->grf)) {
                dev_err(&pdev->dev, "couldn't find grf regmap\n");
                return PTR_ERR(iod->grf);