mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: muhammed.efecetin.67@gmail.com
To: linux-rockchip@lists.infradead.org
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, robh+dt@kernel.org,
	krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de,
	neil.armstrong@linaro.org, lee@kernel.org, rafael@kernel.org,
	efectn@protonmail.com, daniel.lezcano@linaro.org
Subject: [PATCH v2 3/5] mfd: add Khadas Edge 2 registers to khadas-mcu.
Date: Tue, 22 Jul 2025 15:38:13 +0300	[thread overview]
Message-ID: <41993cb8130fc206ee6820866154baef7db804e8.1753179491.git.efectn@protonmail.com> (raw)
In-Reply-To: <cover.1753179491.git.efectn@protonmail.com>

From: Muhammed Efe Cetin <efectn@protonmail.com>

Add Khadas Edge 2 MCU registers to khadas-mcu.h with KHADAS_MCU_V2 register.
New "khadas,mcu-v2" compatible added as it is quite different compared to older MCU variants
and there are no way to distinguish them using any register.

Signed-off-by: Muhammed Efe Cetin <efectn@protonmail.com>
---
 drivers/mfd/khadas-mcu.c       | 45 ++++++++++++++++++++++++++++++++--
 include/linux/mfd/khadas-mcu.h | 32 ++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/khadas-mcu.c b/drivers/mfd/khadas-mcu.c
index ca4bd6cf5..bc94de51d 100644
--- a/drivers/mfd/khadas-mcu.c
+++ b/drivers/mfd/khadas-mcu.c
@@ -32,6 +32,20 @@ static bool khadas_mcu_reg_volatile(struct device *dev, unsigned int reg)
 	}
 }
 
+static bool khadas_mcu_reg_volatile_v2(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case KHADAS_MCU_V2_SLEEP_EN_REG:
+	case KHADAS_MCU_V2_LED_ON_RAM_REG:
+	case KHADAS_MCU_V2_FAN_CTRL_REG:
+	case KHADAS_MCU_V2_WDT_EN_REG:
+	case KHADAS_MCU_V2_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_v2(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case KHADAS_MCU_V2_VERSION1_REG:
+	case KHADAS_MCU_V2_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_v2 = {
+	.reg_bits	= 8,
+	.reg_stride	= 1,
+	.val_bits	= 8,
+	.max_register	= KHADAS_MCU_V2_SYS_RST_REG,
+	.volatile_reg	= khadas_mcu_reg_volatile_v2,
+	.writeable_reg	= khadas_mcu_reg_writeable_v2,
+	.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);
+	if (of_device_is_compatible(dev->of_node, "khadas,mcu-v2"))
+		regmap_config = &khadas_mcu_regmap_config_v2;
+	else
+		regmap_config = &khadas_mcu_regmap_config;
+	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);
@@ -113,6 +153,7 @@ 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-v2", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, khadas_mcu_of_match);
diff --git a/include/linux/mfd/khadas-mcu.h b/include/linux/mfd/khadas-mcu.h
index a99ba2ed0..077f18b52 100644
--- a/include/linux/mfd/khadas-mcu.h
+++ b/include/linux/mfd/khadas-mcu.h
@@ -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_V2_VERSION1_REG             0x12  /* RO */
+#define KHADAS_MCU_V2_VERSION2_REG             0x13  /* RO */
+#define KHADAS_MCU_V2_BOOT_MODE_REG            0x20  /* RW */
+#define KHADAS_MCU_V2_BOOT_EN_DCIN_REG         0x21  /* RW */
+#define KHADAS_MCU_V2_BOOT_EN_RTC_REG          0x22  /* RW */
+#define KHADAS_MCU_V2_LED_MODE_ON_REG          0x23  /* RW */
+#define KHADAS_MCU_V2_LED_MODE_OFF_REG         0x24  /* RW */
+#define KHADAS_MCU_V2_RGB_ON_R_REG             0x25  /* RW */
+#define KHADAS_MCU_V2_RGB_ON_G_REG             0x26  /* RW */
+#define KHADAS_MCU_V2_RGB_ON_B_REG             0x27  /* RW */
+#define KHADAS_MCU_V2_RGB_OFF_R_REG            0x28  /* RW */
+#define KHADAS_MCU_V2_RGB_OFF_G_REG            0x29  /* RW */
+#define KHADAS_MCU_V2_RGB_OFF_B_REG            0x2A  /* RW */
+#define KHADAS_MCU_V2_REST_CONF_REG            0x2C  /* WO */
+#define KHADAS_MCU_V2_SLEEP_EN_REG             0x2E  /* RW */
+#define KHADAS_MCU_V2_BOOT_EN_IR_REG           0x2F  /* RW */
+#define KHADAS_MCU_V2_IR1_CUST1_REG            0x30  /* RW */
+#define KHADAS_MCU_V2_IR1_CUST2_REG            0x31  /* RW */
+#define KHADAS_MCU_V2_IR1_ORDER1_REG           0x32  /* RW */
+#define KHADAS_MCU_V2_IR1_ORDER2_REG           0x33  /* RW */
+#define KHADAS_MCU_V2_IR2_CUST1_REG            0x34  /* RW */
+#define KHADAS_MCU_V2_IR2_CUST2_REG            0x35  /* RW */
+#define KHADAS_MCU_V2_IR2_ORDER1_REG           0x36  /* RW */
+#define KHADAS_MCU_V2_IR2_ORDER2_REG           0x37  /* RW */
+#define KHADAS_MCU_V2_LED_ON_RAM_REG           0x89  /* WO */
+#define KHADAS_MCU_V2_FAN_CTRL_REG             0x8A  /* WO */
+#define KHADAS_MCU_V2_WDT_EN_REG               0x8B  /* WO */
+#define KHADAS_MCU_V2_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,
 };
 
 /**
-- 
2.50.1


  parent reply	other threads:[~2025-07-22 12:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-22 12:38 [PATCH v2 0/5] Add Khadas MCU and fan control support for Khadas Edge 2 muhammed.efecetin.67
2025-07-22 12:38 ` [PATCH v2 1/5] dt-bindings: mfd: khadas-mcu: add new compatible " muhammed.efecetin.67
2025-07-23  7:46   ` Krzysztof Kozlowski
2025-07-22 12:38 ` [PATCH v2 2/5] mfd: khadas-mcu: drop unused nvmem code muhammed.efecetin.67
2025-07-22 12:38 ` muhammed.efecetin.67 [this message]
2025-07-23  7:47   ` [PATCH v2 3/5] mfd: add Khadas Edge 2 registers to khadas-mcu Krzysztof Kozlowski
2025-07-22 12:38 ` [PATCH v2 4/5] thermal: khadas_mcu_fan: add support for Khadas Edge 2 muhammed.efecetin.67
2025-07-22 12:38 ` [PATCH v2 5/5] arm64: dts: rockchip: add Khadas MCU and fan control nodes muhammed.efecetin.67

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=41993cb8130fc206ee6820866154baef7db804e8.1753179491.git.efectn@protonmail.com \
    --to=muhammed.efecetin.67@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=efectn@protonmail.com \
    --cc=heiko@sntech.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lee@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=neil.armstrong@linaro.org \
    --cc=rafael@kernel.org \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®