78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
|
diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
|
||
|
|
index 9df513d12..83f5354ba 100644
|
||
|
|
--- a/drivers/soc/rockchip/io-domain.c
|
||
|
|
+++ b/drivers/soc/rockchip/io-domain.c
|
||
|
|
@@ -39,6 +39,10 @@
|
||
|
|
#define RK3288_SOC_CON2_FLASH0 BIT(7)
|
||
|
|
#define RK3288_SOC_FLASH_SUPPLY_NUM 2
|
||
|
|
|
||
|
|
+#define RK3308_SOC_CON0 0x300
|
||
|
|
+#define RK3308_SOC_CON0_VCCIO3 BIT(8)
|
||
|
|
+#define RK3308_SOC_VCCIO3_SUPPLY_NUM 3
|
||
|
|
+
|
||
|
|
#define RK3328_SOC_CON4 0x410
|
||
|
|
#define RK3328_SOC_CON4_VCCIO2 BIT(7)
|
||
|
|
#define RK3328_SOC_VCCIO2_SUPPLY_NUM 1
|
||
|
|
@@ -229,6 +233,30 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
|
||
|
|
dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void rk3308_iodomain_init(struct rockchip_iodomain *iod)
|
||
|
|
+{
|
||
|
|
+ int ret;
|
||
|
|
+ u32 val;
|
||
|
|
+
|
||
|
|
+ /* if no vccio3 supply we should leave things alone */
|
||
|
|
+ if (!iod->supplies[RK3308_SOC_VCCIO3_SUPPLY_NUM].reg)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
+ /*
|
||
|
|
+ * vccio3 iodomain voltage should be determined by GPIO4 input state
|
||
|
|
+ * RockPI-S uses this to drive the SDIO interface at 50Mhz
|
||
|
|
+ * (otherwise SDIO clock will be limited to 10Mhz)
|
||
|
|
+ *
|
||
|
|
+ * Note that setting vccio4 [rather than vccio3] is observed to reduce
|
||
|
|
+ * the rise time of SDIO-clk from 30ns to 5ns.
|
||
|
|
+ * The CON0_VCCIO3 control bit appears to influence vccio4.
|
||
|
|
+ */
|
||
|
|
+ val = RK3308_SOC_CON0_VCCIO3 | (RK3308_SOC_CON0_VCCIO3 << 16);
|
||
|
|
+ ret = regmap_write(iod->grf, RK3308_SOC_CON0, val);
|
||
|
|
+ if (ret < 0)
|
||
|
|
+ dev_warn(iod->dev, "couldn't update vccio3 vsel ctrl\n");
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
|
||
|
|
{
|
||
|
|
int ret;
|
||
|
|
@@ -376,6 +404,19 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
|
||
|
|
.init = rk3288_iodomain_init,
|
||
|
|
};
|
||
|
|
|
||
|
|
+static const struct rockchip_iodomain_soc_data soc_data_rk3308 = {
|
||
|
|
+ .grf_offset = 0x300,
|
||
|
|
+ .supply_names = {
|
||
|
|
+ "vccio0",
|
||
|
|
+ "vccio1",
|
||
|
|
+ "vccio2",
|
||
|
|
+ "vccio3",
|
||
|
|
+ "vccio4",
|
||
|
|
+ "vccio5",
|
||
|
|
+ },
|
||
|
|
+ .init = rk3308_iodomain_init,
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
|
||
|
|
.grf_offset = 0x410,
|
||
|
|
.supply_names = {
|
||
|
|
@@ -512,6 +553,10 @@ static const struct of_device_id rockchip_iodomain_match[] = {
|
||
|
|
.compatible = "rockchip,rk3288-io-voltage-domain",
|
||
|
|
.data = &soc_data_rk3288
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ .compatible = "rockchip,rk3308-io-voltage-domain",
|
||
|
|
+ .data = &soc_data_rk3308
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
.compatible = "rockchip,rk3328-io-voltage-domain",
|
||
|
|
.data = &soc_data_rk3328
|