[Bugfix][API-470]fix board shutdown because of adc read error
Change-Id: I3c4a03bf2b79258e7a27f4b2218c7c23ddfb85d4
diff --git a/prebuilt/firmware/sspm/mt2735/sspm.img b/prebuilt/firmware/sspm/mt2735/sspm.img
index 8f5ae5c..f95cc8b 100644
--- a/prebuilt/firmware/sspm/mt2735/sspm.img
+++ b/prebuilt/firmware/sspm/mt2735/sspm.img
Binary files differ
diff --git a/src/kernel/linux/v4.19/drivers/mfd/mt6330-core.c b/src/kernel/linux/v4.19/drivers/mfd/mt6330-core.c
index 04f75d9..0da7dc7 100644
--- a/src/kernel/linux/v4.19/drivers/mfd/mt6330-core.c
+++ b/src/kernel/linux/v4.19/drivers/mfd/mt6330-core.c
@@ -134,42 +134,44 @@
.cid_shift = 0,
};
-static int mt6330_spmi_reg_read(void *context,
- unsigned int reg, unsigned int *val)
-{
- struct mt6330_chip *data = context;
- u8 regval = 0;
- int ret;
-
- ret = spmi_ext_register_readl(data->sdev, reg, ®val, 1);
- if (ret < 0)
- return ret;
- *val = regval;
-
- return 0;
-}
-
-static int mt6330_spmi_reg_write(void *context,
- unsigned int reg, unsigned int val)
+static int mt6330_spmi_read(void *context, const void *reg, size_t reg_size,
+ void *val, size_t val_size)
{
struct mt6330_chip *data = context;
int ret;
+ u16 addr = cpu_to_be16(*(u16 *)reg);
- ret = spmi_ext_register_writel(data->sdev, reg, (u8 *)&val, 1);
- if (ret)
- return ret;
+ ret = spmi_ext_register_readl(data->sdev, addr, val, val_size);
- return 0;
+ return ret;
}
+static int mt6330_spmi_write(void *context, const void *data, size_t count)
+{
+ struct mt6330_chip *ddata = context;
+ u16 addr = cpu_to_be16(*(u16 *)data);
+ u8 *val = (u8 *)data + 2;
+ int val_size = count - 2;
+ int ret;
+
+ ret = spmi_ext_register_writel(ddata->sdev, addr, (u8 *)val, val_size);
+
+ return ret;
+}
+
+static struct regmap_bus mt6330_regmap_bus = {
+ .read = mt6330_spmi_read,
+ .write = mt6330_spmi_write,
+ .max_raw_read = 2,
+ .max_raw_write = 2,
+};
+
static const struct regmap_config spmi_regmap_config = {
.reg_bits = 16,
.val_bits = 8,
.max_register = 0x22ff,
.fast_io = true,
- .use_single_rw = true,
- .reg_read = mt6330_spmi_reg_read,
- .reg_write = mt6330_spmi_reg_write,
+ .use_single_rw = false,
};
static int mt6330_probe(struct spmi_device *sdev)
{
@@ -195,7 +197,8 @@
* mt6330 MFD is child device of soc pmic spmi.
* Regmap is set from its parent.
*/
- regmap = devm_regmap_init(&sdev->dev, NULL, pmic, &spmi_regmap_config);
+ regmap = devm_regmap_init(&sdev->dev, &mt6330_regmap_bus,
+ pmic, &spmi_regmap_config);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
pmic->regmap = regmap;
diff --git a/src/kernel/linux/v4.19/drivers/thermal/mediatek/mtk_thermal_ipi.c b/src/kernel/linux/v4.19/drivers/thermal/mediatek/mtk_thermal_ipi.c
index ea46a10..f7c076f 100644
--- a/src/kernel/linux/v4.19/drivers/thermal/mediatek/mtk_thermal_ipi.c
+++ b/src/kernel/linux/v4.19/drivers/thermal/mediatek/mtk_thermal_ipi.c
@@ -51,7 +51,7 @@
}
while (!kthread_should_stop()) {
- mtk_ipi_recv_reply(&sspm_ipidev, IPIR_C_THERMAL, (void *)&g_ipi_reply, 1);
+ mtk_ipi_recv(&sspm_ipidev, IPIR_C_THERMAL);
}
return 0;