fixup! WIP: mfd: Add support for Flipper One's MCU

Author: alchark

drivers/mfd/flipper-one-mcu.c

@@ -18,6 +18,9 @@ static const struct regmap_range fomcu_writeable_reg_ranges[] = {
 	regmap_reg_range(FOMCU_REG_LEDS_BR_LINK,
 			 FOMCU_REG_LEDS_COLOR_LINK4),
 	regmap_reg_range(FOMCU_REG_HAPTIC, FOMCU_REG_HAPTIC),
+	regmap_reg_range(FOMCU_REG_UCSI_CONTROL,
+			 FOMCU_REG_UCSI_CONTROL + 6),
+	regmap_reg_range(FOMCU_REG_UCSI_MESSAGE_OUT, FOMCU_REG_MAX),
 };
 
 static const struct regmap_access_table fomcu_writeable_regs = {
@@ -68,12 +71,15 @@ static const struct regmap_irq fomcu_irqs[] = {
 	FOMCU_IRQ_REG(INPUT, BTN),
 	FOMCU_IRQ_REG(INPUT, TOUCH),
 	FOMCU_IRQ_REG(INPUT, HEADSET),
+	FOMCU_IRQ_REG(UCSI, EVENT),
 };
 
 static unsigned int irq_input_offsets[] = { FOMCU_INTOFF_INPUT };
+static unsigned int irq_ucsi_offsets[] = { FOMCU_INTOFF_UCSI };
 
 static const struct regmap_irq_sub_irq_map fomcu_sub_irqs[] = {
 	REGMAP_IRQ_MAIN_REG_OFFSET(irq_input_offsets),
+	REGMAP_IRQ_MAIN_REG_OFFSET(irq_ucsi_offsets),
 };
 
 static const struct regmap_irq_chip fomcu_irq_chip = {
@@ -94,14 +100,19 @@ static const struct resource fo_input_irqs[] = {
 	DEFINE_RES_IRQ_NAMED(FOMCU_INT_INPUT_HEADSET, "flipper-one-input-headset"),
 };
 
+static const struct resource fo_ucsi_irqs[] = {
+	DEFINE_RES_IRQ_NAMED(FOMCU_INT_UCSI_EVENT, "flipper-one-ucsi"),
+};
+
 static const struct mfd_cell cells[] = {
 	MFD_CELL_NAME("flipper-one-haptic"),
 	MFD_CELL_RES("flipper-one-input", fo_input_irqs),
 	MFD_CELL_NAME("flipper-one-leds"),
 	MFD_CELL_NAME("flipper-one-power"),
 	MFD_CELL_NAME("flipper-one-regulators"),
 	MFD_CELL_NAME("flipper-one-thermal"),
-	MFD_CELL_NAME("flipper-one-typec"),
+	MFD_CELL_OF("flipper-one-typec", fo_ucsi_irqs, NULL, 0, 0,
+		    "flipper,one-typec"),
 };
 
 static int fomcu_probe(struct i2c_client *client)

include/linux/mfd/flipper-one-mcu.h

@@ -14,6 +14,7 @@ enum fomcu_interrupts {
 	FOMCU_INT_INPUT_BTN,
 	FOMCU_INT_INPUT_TOUCH,
 	FOMCU_INT_INPUT_HEADSET,
+	FOMCU_INT_UCSI_EVENT,
 };
 
 #define FOMCU_REG_INTSTS		0x0000
@@ -26,7 +27,12 @@ enum fomcu_interrupts {
 #define FOMCU_INTSTS_INPUT_TOUCH	BIT(1)
 #define FOMCU_INTSTS_INPUT_HEADSET	BIT(2)
 
+#define FOMCU_REG_INTSTS_UCSI		0x0102
+#define FOMCU_INTOFF_UCSI		0x2
+#define FOMCU_INTSTS_UCSI_EVENT		BIT(0)
+
 #define FOMCU_REG_INTMSK_INPUT		0x0180
+#define FOMCU_REG_INTMSK_UCSI		0x0182
 
 #define FOMCU_REG_INPUT_BTNS		0x0200
 #define FOMCU_REG_INPUT_TOUCH_X		0x0202
@@ -49,7 +55,16 @@ enum fomcu_interrupts {
 #define FOMCU_HAPTIC_EFFECT		GENMASK(14, 8)
 #define FOMCU_HAPTIC_DURATION		GENMASK(7, 0)
 
-#define FOMCU_REG_MAX			(FOMCU_REG_HAPTIC + 1)
+#define FOMCU_REG_UCSI			0x0500
+#define FOMCU_REG_UCSI_VERSION		(FOMCU_REG_UCSI + 0x00)
+#define FOMCU_REG_UCSI_CCI		(FOMCU_REG_UCSI + 0x04)
+#define FOMCU_REG_UCSI_CONTROL		(FOMCU_REG_UCSI + 0x08)
+#define FOMCU_REG_UCSI_MESSAGE_IN	0x0600
+#define FOMCU_REG_UCSI_MESSAGE_OUT	0x0700
+#define FOMCU_UCSI_MESSAGE_LEN		256
+
+#define FOMCU_REG_MAX			(FOMCU_REG_UCSI_MESSAGE_OUT + \
+					 FOMCU_UCSI_MESSAGE_LEN - 1)
 
 struct fomcu_device {
 	struct i2c_client *client;