Add Khadas MCU and fan control support for Khadas Edge 2

index ba981a7886921..ca4bd6cf56994 100644
@@ -80,10 +80,6 @@ static struct mfd_cell khadas_mcu_fan_cells[] = {
 	{ .name = "khadas-mcu-fan-ctrl", },
 };
 
-static struct mfd_cell khadas_mcu_cells[] = {
-	{ .name = "khadas-mcu-user-mem", },
-};
-
 static int khadas_mcu_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;

@@ -105,13 +101,6 @@ static int khadas_mcu_probe(struct i2c_client *client)
 		return ret;
 	}
 
-	ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE,
-				   khadas_mcu_cells,
-				   ARRAY_SIZE(khadas_mcu_cells),
-				   NULL, 0, NULL);
-	if (ret)
-		return ret;
-
 	if (of_property_present(dev->of_node, "#cooling-cells"))
 		return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE,
 					    khadas_mcu_fan_cells,

index ca4bd6cf56994..8898f5ab6915a 100644
@@ -32,6 +32,20 @@ static bool khadas_mcu_reg_volatile(struct device *dev, unsigned int reg)
 	}
 }
 
+static bool khadas_mcu_reg_volatile_edge2(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case KHADAS_MCU_EDGE2_SLEEP_EN_REG:
+	case KHADAS_MCU_EDGE2_LED_ON_RAM_REG:
+	case KHADAS_MCU_EDGE2_FAN_CTRL_REG:
+	case KHADAS_MCU_EDGE2_WDT_EN_REG:
+	case KHADAS_MCU_EDGE2_SYS_RST_REG:
+		return true;
+	default:
+		return false;
+	}
+}
+
 static bool khadas_mcu_reg_writeable(struct device *dev, unsigned int reg)
 {
 	switch (reg) {

@@ -65,6 +79,17 @@ static bool khadas_mcu_reg_writeable(struct device *dev, unsigned int reg)
 	}
 }
 
+static bool khadas_mcu_reg_writeable_edge2(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case KHADAS_MCU_EDGE2_VERSION1_REG:
+	case KHADAS_MCU_EDGE2_VERSION2_REG:
+		return false;
+	default:
+		return true;
+	}
+}
+
 static const struct regmap_config khadas_mcu_regmap_config = {
 	.reg_bits	= 8,
 	.reg_stride	= 1,

@@ -75,8 +100,18 @@ static const struct regmap_config khadas_mcu_regmap_config = {
 	.cache_type	= REGCACHE_MAPLE,
 };
 
+static const struct regmap_config khadas_mcu_regmap_config_edge2 = {
+	.reg_bits	= 8,
+	.reg_stride	= 1,
+	.val_bits	= 8,
+	.max_register	= KHADAS_MCU_EDGE2_SYS_RST_REG,
+	.volatile_reg	= khadas_mcu_reg_volatile_edge2,
+	.writeable_reg	= khadas_mcu_reg_writeable_edge2,
+	.cache_type	= REGCACHE_MAPLE,
+};
+
 static struct mfd_cell khadas_mcu_fan_cells[] = {
-	/* VIM1/2 Rev13+ and VIM3 only */
+	/* VIM1/2 Rev13+, VIM3 and Edge2 only */
 	{ .name = "khadas-mcu-fan-ctrl", },
 };
 

@@ -84,6 +119,7 @@ static int khadas_mcu_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
 	struct khadas_mcu *ddata;
+	const struct regmap_config *regmap_config;
 	int ret;
 
 	ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);

@@ -94,7 +130,11 @@ static int khadas_mcu_probe(struct i2c_client *client)
 
 	ddata->dev = dev;
 
-	ddata->regmap = devm_regmap_init_i2c(client, &khadas_mcu_regmap_config);
+	regmap_config = of_device_get_match_data(dev);
+	if (!regmap_config)
+		return -EINVAL;
+
+	ddata->regmap = devm_regmap_init_i2c(client, regmap_config);
 	if (IS_ERR(ddata->regmap)) {
 		ret = PTR_ERR(ddata->regmap);
 		dev_err(dev, "Failed to allocate register map: %d\n", ret);

@@ -112,7 +152,8 @@ static int khadas_mcu_probe(struct i2c_client *client)
 
 #ifdef CONFIG_OF
 static const struct of_device_id khadas_mcu_of_match[] = {
-	{ .compatible = "khadas,mcu", },
+	{ .compatible = "khadas,mcu", .data = &khadas_mcu_regmap_config },
+	{ .compatible = "khadas,mcu-edge2", .data = &khadas_mcu_regmap_config_edge2 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, khadas_mcu_of_match);

index a99ba2ed0e4e0..e278326451df6 100644
@@ -10,6 +10,7 @@
 #ifndef MFD_KHADAS_MCU_H
 #define MFD_KHADAS_MCU_H
 
+/* Registers used by Khadas VIM2 rev14 and VIM3 */
 #define KHADAS_MCU_PASSWD_VEN_0_REG		0x00 /* RO */
 #define KHADAS_MCU_PASSWD_VEN_1_REG		0x01 /* RO */
 #define KHADAS_MCU_PASSWD_VEN_2_REG		0x02 /* RO */

@@ -70,12 +71,43 @@
 #define KHADAS_MCU_WOL_INIT_START_REG		0x87 /* WO */
 #define KHADAS_MCU_CMD_FAN_STATUS_CTRL_REG	0x88 /* WO */
 
+/* Registers used by Khadas Edge 2 */
+#define KHADAS_MCU_EDGE2_VERSION1_REG             0x12  /* RO */
+#define KHADAS_MCU_EDGE2_VERSION2_REG             0x13  /* RO */
+#define KHADAS_MCU_EDGE2_BOOT_MODE_REG            0x20  /* RW */
+#define KHADAS_MCU_EDGE2_BOOT_EN_DCIN_REG         0x21  /* RW */
+#define KHADAS_MCU_EDGE2_BOOT_EN_RTC_REG          0x22  /* RW */
+#define KHADAS_MCU_EDGE2_LED_MODE_ON_REG          0x23  /* RW */
+#define KHADAS_MCU_EDGE2_LED_MODE_OFF_REG         0x24  /* RW */
+#define KHADAS_MCU_EDGE2_RGB_ON_R_REG             0x25  /* RW */
+#define KHADAS_MCU_EDGE2_RGB_ON_G_REG             0x26  /* RW */
+#define KHADAS_MCU_EDGE2_RGB_ON_B_REG             0x27  /* RW */
+#define KHADAS_MCU_EDGE2_RGB_OFF_R_REG            0x28  /* RW */
+#define KHADAS_MCU_EDGE2_RGB_OFF_G_REG            0x29  /* RW */
+#define KHADAS_MCU_EDGE2_RGB_OFF_B_REG            0x2A  /* RW */
+#define KHADAS_MCU_EDGE2_REST_CONF_REG            0x2C  /* WO */
+#define KHADAS_MCU_EDGE2_SLEEP_EN_REG             0x2E  /* RW */
+#define KHADAS_MCU_EDGE2_BOOT_EN_IR_REG           0x2F  /* RW */
+#define KHADAS_MCU_EDGE2_IR1_CUST1_REG            0x30  /* RW */
+#define KHADAS_MCU_EDGE2_IR1_CUST2_REG            0x31  /* RW */
+#define KHADAS_MCU_EDGE2_IR1_ORDER1_REG           0x32  /* RW */
+#define KHADAS_MCU_EDGE2_IR1_ORDER2_REG           0x33  /* RW */
+#define KHADAS_MCU_EDGE2_IR2_CUST1_REG            0x34  /* RW */
+#define KHADAS_MCU_EDGE2_IR2_CUST2_REG            0x35  /* RW */
+#define KHADAS_MCU_EDGE2_IR2_ORDER1_REG           0x36  /* RW */
+#define KHADAS_MCU_EDGE2_IR2_ORDER2_REG           0x37  /* RW */
+#define KHADAS_MCU_EDGE2_LED_ON_RAM_REG           0x89  /* WO */
+#define KHADAS_MCU_EDGE2_FAN_CTRL_REG             0x8A  /* WO */
+#define KHADAS_MCU_EDGE2_WDT_EN_REG               0x8B  /* WO */
+#define KHADAS_MCU_EDGE2_SYS_RST_REG              0x91  /* WO */
+
 enum {
 	KHADAS_BOARD_VIM1 = 0x1,
 	KHADAS_BOARD_VIM2,
 	KHADAS_BOARD_VIM3,
 	KHADAS_BOARD_EDGE = 0x11,
 	KHADAS_BOARD_EDGE_V,
+	KHADAS_BOARD_EDGE2,
 };
 
 /**

index d35e5313bea41..e3ac4fb6d1f82 100644
@@ -15,10 +15,13 @@
 #include <linux/thermal.h>
 
 #define MAX_LEVEL 3
+#define MAX_LEVEL_EDGE2 100
 
 struct khadas_mcu_fan_ctx {
 	struct khadas_mcu *mcu;
 	unsigned int level;
+	unsigned int max_level;
+	unsigned int fan_ctrl_reg;
 	struct thermal_cooling_device *cdev;
 };
 

@@ -26,8 +29,7 @@ static int khadas_mcu_fan_set_level(struct khadas_mcu_fan_ctx *ctx,
 				    unsigned int level)
 {
 	int ret;
-
-	ret = regmap_write(ctx->mcu->regmap, KHADAS_MCU_CMD_FAN_STATUS_CTRL_REG,
+	ret = regmap_write(ctx->mcu->regmap, ctx->fan_ctrl_reg,
 			   level);
 	if (ret)
 		return ret;

@@ -40,7 +42,9 @@ static int khadas_mcu_fan_set_level(struct khadas_mcu_fan_ctx *ctx,
 static int khadas_mcu_fan_get_max_state(struct thermal_cooling_device *cdev,
 					unsigned long *state)
 {
-	*state = MAX_LEVEL;
+	struct khadas_mcu_fan_ctx *ctx = cdev->devdata;
+
+	*state = ctx->max_level;
 
 	return 0;
 }

@@ -61,7 +65,7 @@ khadas_mcu_fan_set_cur_state(struct thermal_cooling_device *cdev,
 {
 	struct khadas_mcu_fan_ctx *ctx = cdev->devdata;
 
-	if (state > MAX_LEVEL)
+	if (state > ctx->max_level)
 		return -EINVAL;
 
 	if (state == ctx->level)

@@ -88,6 +92,14 @@ static int khadas_mcu_fan_probe(struct platform_device *pdev)
 	if (!ctx)
 		return -ENOMEM;
 	ctx->mcu = mcu;
+	ctx->max_level = MAX_LEVEL;
+	ctx->fan_ctrl_reg = KHADAS_MCU_CMD_FAN_STATUS_CTRL_REG;
+
+	if (of_device_is_compatible(mcu->dev->of_node, "khadas,mcu-edge2")) {
+		ctx->fan_ctrl_reg = KHADAS_MCU_EDGE2_FAN_CTRL_REG;
+		ctx->max_level = MAX_LEVEL_EDGE2;
+	}
+
 	platform_set_drvdata(pdev, ctx);
 
 	cdev = devm_thermal_of_cooling_device_register(dev->parent,