From 0fcdebff4c145f69355994db7a716a5aedac9d51 Mon Sep 17 00:00:00 2001
From: Shunqing Chen <csq@rock-chips.com>
Date: Tue, 8 Jun 2021 11:25:14 +0800
Subject: [PATCH] clk/rockchip/regmap: rk628: compatible with MCU mode

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I85f2c97ac23c585fc136eb5efa4e01fde979f883
---
 drivers/clk/rockchip/regmap/clk-rk628.c | 56 +++++++++++++++----------
 include/linux/mfd/rk628.h               |  2 +
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/drivers/clk/rockchip/regmap/clk-rk628.c b/drivers/clk/rockchip/regmap/clk-rk628.c
index 800136283548..f840164d203d 100644
--- a/drivers/clk/rockchip/regmap/clk-rk628.c
+++ b/drivers/clk/rockchip/regmap/clk-rk628.c
@@ -491,26 +491,15 @@ static const struct regmap_config rk628_cru_regmap_config = {
 	.rd_table = &rk628_cru_readable_table,
 };
 
-static int rk628_cru_probe(struct platform_device *pdev)
+static void rk628_cru_init(struct rk628_cru *cru)
 {
-	struct rk628 *rk628 = dev_get_drvdata(pdev->dev.parent);
-	struct device *dev = &pdev->dev;
-	struct rk628_cru *cru;
-	struct clk **clk_table;
-	unsigned int i;
-	int ret;
+	u32 val = 0;
+	u8 mcu_mode;
 
-	cru = devm_kzalloc(dev, sizeof(*cru), GFP_KERNEL);
-	if (!cru)
-		return -ENOMEM;
-
-	cru->regmap = devm_regmap_init_i2c(rk628->client,
-					   &rk628_cru_regmap_config);
-	if (IS_ERR(cru->regmap)) {
-		ret = PTR_ERR(cru->regmap);
-		dev_err(dev, "failed to allocate register map: %d\n", ret);
-		return ret;
-	}
+	regmap_read(cru->parent->grf, GRF_SYSTEM_STATUS0, &val);
+	mcu_mode = (val & I2C_ONLY_FLAG) ? 0 : 1;
+	if (mcu_mode)
+		return;
 
 	/* clock switch and first set gpll almost 99MHz */
 	regmap_write(cru->regmap, CRU_GPLL_CON0, 0xffff701d);
@@ -540,6 +529,34 @@ static int rk628_cru_probe(struct platform_device *pdev)
 	usleep_range(1000, 1100);
 	/* set pclk use cpll, and set pclk 99MHz */
 	regmap_write(cru->regmap, CRU_CLKSEL_CON00, 0xff000b);
+}
+
+static int rk628_cru_probe(struct platform_device *pdev)
+{
+	struct rk628 *rk628 = dev_get_drvdata(pdev->dev.parent);
+	struct device *dev = &pdev->dev;
+	struct rk628_cru *cru;
+	struct clk **clk_table;
+	unsigned int i;
+	int ret;
+
+	cru = devm_kzalloc(dev, sizeof(*cru), GFP_KERNEL);
+	if (!cru)
+		return -ENOMEM;
+
+	cru->dev = dev;
+	cru->parent = rk628;
+	platform_set_drvdata(pdev, cru);
+
+	cru->regmap = devm_regmap_init_i2c(rk628->client,
+					   &rk628_cru_regmap_config);
+	if (IS_ERR(cru->regmap)) {
+		ret = PTR_ERR(cru->regmap);
+		dev_err(dev, "failed to allocate register map: %d\n", ret);
+		return ret;
+	}
+
+	rk628_cru_init(cru);
 
 	clk_table = devm_kcalloc(dev, CGU_NR_CLKS, sizeof(struct clk *),
 				 GFP_KERNEL);
@@ -549,11 +566,8 @@ static int rk628_cru_probe(struct platform_device *pdev)
 	for (i = 0; i < CGU_NR_CLKS; i++)
 		clk_table[i] = ERR_PTR(-ENOENT);
 
-	cru->dev = dev;
-	cru->parent = rk628;
 	cru->clk_data.clks = clk_table;
 	cru->clk_data.clk_num = CGU_NR_CLKS;
-	platform_set_drvdata(pdev, cru);
 
 	rk628_clk_register_plls(cru);
 	rk628_clk_register_muxes(cru);
diff --git a/include/linux/mfd/rk628.h b/include/linux/mfd/rk628.h
index 37706444abc3..3e2a9d8f3a3a 100755
--- a/include/linux/mfd/rk628.h
+++ b/include/linux/mfd/rk628.h
@@ -184,6 +184,8 @@
 #define GRF_INTR1_STATUS		0x0118
 #define GRF_INTR1_RAW_STATUS		0x011c
 #define GRF_SYSTEM_STATUS0		0x0120
+/* 0: i2c mode and mcu mode; 1: i2c mode only */
+#define I2C_ONLY_FLAG			BIT(6)
 #define GRF_SYSTEM_STATUS3		0x012c
 #define GRF_SYSTEM_STATUS4		0x0130
 #define GRF_OS_REG0			0x0140