The mt6577 compatibility was introduced back in 2014 in commit 8452c80d5b4b
("I2C: mediatek: Add driver for MediaTek I2C controller") by Xudong Chen.
The i2c-mt65xx driver relies on DMA since it was first introduced. mt6577 does
not support DMA [1] for I2C and doesn't have dedicated DMA engines for I2C.
Moreover, the entire mt65xx Cortex-A9 SoC family (mt6515, mt6517, mt6575,
and mt6577) which share the same I2C IP doesn't support I2C DMA at all which
makes this particular driver incompatible with these SoCs.
The existing code used mt6577 as a "generic" configuration to be used with
other SoCs such as mt6589 (for quirks), and mt2701/mt6797/mt7623 (in general).
This patch makes mt2701 (which is *actually* supported by this driver) a new
placeholder for generic Mediatek I2C bus configuration.
[1] see references in
https://lists.infradead.org/pipermail/linux-mediatek/2021-October/030333.html
Signed-off-by: Boris Lysov <arzamas-16@xxxxxxx>
---
drivers/i2c/busses/i2c-mt65xx.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 9ea427f53083..24c94e58dc08 100644
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -298,7 +298,7 @@ static const struct i2c_spec_values fast_mode_plus_spec = {
.min_su_dat_ns = 50 + I2C_FAST_MODE_PLUS_BUFFER,
};
-static const struct i2c_adapter_quirks mt6577_i2c_quirks = {
+static const struct i2c_adapter_quirks mt2701_i2c_quirks = {
.flags = I2C_AQ_COMB_WRITE_THEN_READ,
.max_num_msgs = 1,
.max_write_len = 255,
@@ -315,35 +315,35 @@ static const struct i2c_adapter_quirks mt8183_i2c_quirks = {
.flags = I2C_AQ_NO_ZERO_LEN,
};
-static const struct mtk_i2c_compatible mt2712_compat = {
+static const struct mtk_i2c_compatible mt2701_compat = {
+ .quirks = &mt2701_i2c_quirks,
.regs = mt_i2c_regs_v1,
.pmic_i2c = 0,
.dcm = 1,
- .auto_restart = 1,
- .aux_len_reg = 1,
- .timing_adjust = 1,
+ .auto_restart = 0,
+ .aux_len_reg = 0,
+ .timing_adjust = 0,
.dma_sync = 0,
.ltiming_adjust = 0,
.apdma_sync = 0,
- .max_dma_support = 33,
+ .max_dma_support = 32,
};
-static const struct mtk_i2c_compatible mt6577_compat = {
- .quirks = &mt6577_i2c_quirks,
+static const struct mtk_i2c_compatible mt2712_compat = {
.regs = mt_i2c_regs_v1,
.pmic_i2c = 0,
.dcm = 1,
- .auto_restart = 0,
- .aux_len_reg = 0,
- .timing_adjust = 0,
+ .auto_restart = 1,
+ .aux_len_reg = 1,
+ .timing_adjust = 1,
.dma_sync = 0,
.ltiming_adjust = 0,
.apdma_sync = 0,
- .max_dma_support = 32,
+ .max_dma_support = 33,
};
static const struct mtk_i2c_compatible mt6589_compat = {
- .quirks = &mt6577_i2c_quirks,
+ .quirks = &mt2701_i2c_quirks,
.regs = mt_i2c_regs_v1,
.pmic_i2c = 1,
.dcm = 0,
@@ -412,8 +412,8 @@ static const struct mtk_i2c_compatible mt8192_compat = {
};
static const struct of_device_id mtk_i2c_of_match[] = {
+ { .compatible = "mediatek,mt2701-i2c", .data = &mt2701_compat },
{ .compatible = "mediatek,mt2712-i2c", .data = &mt2712_compat },
- { .compatible = "mediatek,mt6577-i2c", .data = &mt6577_compat },
{ .compatible = "mediatek,mt6589-i2c", .data = &mt6589_compat },
{ .compatible = "mediatek,mt7622-i2c", .data = &mt7622_compat },
{ .compatible = "mediatek,mt8173-i2c", .data = &mt8173_compat },
--
2.20.1
