Skip to contentSkip to conversation

i2c: mediatek: remove mt6577 support

PATCH Applied Boris Lysov 2 participants 8 messages Jan 20, 2022 – Apr 17, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover i2c: mediatek: remove mt6577 support

This small patch series removes mt6577 support from the i2c-mt65xx driver and devicectree binding documentation.

The existing i2c-mt65xx driver relies on DMA since it was first introduced. mt6577 does not support DMA [1] for I2C and SoC's Generic DMA engine cannot be used for this purpose, too, which makes this particular driver incompatible with mt6577 and other similar SoCs with same I2C IP.

[1] see references in
https://lists.infradead.org/pipermail/linux-mediatek/2021-October/030333.html

Boris Lysov (2):
dt-bindings: i2c: i2c-mt65xx: remove compatibility with mt6577
i2c: mediatek: remove compatibility with mt6577

 .../devicetree/bindings/i2c/i2c-mt65xx.txt    |  9 +++---
 drivers/i2c/busses/i2c-mt65xx.c               | 28 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 dt-bindings: i2c: i2c-mt65xx: remove mt6577 support

Remove mentions of mt6577 from the dt-binding doc because the existing driver doesn't support this SoC. mt6577 was used in this driver as some sort of a "generic" configuration and it is now replaced with mt2701.

Update the dt-binding example to replace mt6577 with mt6589, as the example uses [1] register addresses of the latter SoC.

[1] https://marc.info/?l=devicetree&m=159949247901831&w=2

---
 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt +4 -5
index 5ea216ae7084..d1d0c5d2b9e9 100644
@@ -4,13 +4,12 @@ The MediaTek's I2C controller is used to interface with I2C devices.
 
 Required properties:
   - compatible: value should be either of the following.
-      "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for MediaTek MT2701
+      "mediatek,mt2701-i2c": for MediaTek MT2701
       "mediatek,mt2712-i2c": for MediaTek MT2712
-      "mediatek,mt6577-i2c": for MediaTek MT6577
       "mediatek,mt6589-i2c": for MediaTek MT6589
-      "mediatek,mt6797-i2c", "mediatek,mt6577-i2c": for MediaTek MT6797
+      "mediatek,mt6797-i2c", "mediatek,mt2701-i2c": for MediaTek MT6797
       "mediatek,mt7622-i2c": for MediaTek MT7622
-      "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for MediaTek MT7623
+      "mediatek,mt7623-i2c", "mediatek,mt2701-i2c": for MediaTek MT7623
       "mediatek,mt7629-i2c", "mediatek,mt2712-i2c": for MediaTek MT7629
       "mediatek,mt8173-i2c": for MediaTek MT8173
       "mediatek,mt8183-i2c": for MediaTek MT8183
@@ -38,7 +37,7 @@ Optional properties:
 Example:
 
 	i2c0: i2c@1100d000 {
-			compatible = "mediatek,mt6577-i2c";
+			compatible = "mediatek,mt6589-i2c";
 			reg = <0x1100d000 0x70>,
 			      <0x11000300 0x80>;
 			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
Signature · 1 line
2.20.1
Applied
#2 lore raw

Re: [PATCH 1/2] dt-bindings: i2c: i2c-mt65xx: remove mt6577 support

Quoted 10 lines · Boris Lysov

Remove mentions of mt6577 from the dt-binding doc because the existing driver doesn't support this SoC. mt6577 was used in this driver as some sort of a "generic" configuration and it is now replaced with mt2701.

Update the dt-binding example to replace mt6577 with mt6589, as the example uses [1] register addresses of the latter SoC.

[1] https://marc.info/?l=devicetree&m=159949247901831&w=2

Applied to for-next, thanks!

#3 lore raw

PATCH 2/2 i2c: mediatek: remove mt6577 support

In reply to Boris Lysov

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

---
 drivers/i2c/busses/i2c-mt65xx.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/i2c/busses/i2c-mt65xx.c +14 -14
index 9ea427f53083..24c94e58dc08 100644
@@ -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 },
Signature · 1 line
2.20.1
Applied
#4 lore raw
Quoted 12 lines · Boris Lysov

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).

Quoted 7 lines

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

Applied to for-next, thanks!

#5 lore raw
In reply to Boris Lysov
Quoted 7 lines · Boris Lysov

This small patch series removes mt6577 support from the i2c-mt65xx driver and devicectree binding documentation.

The existing i2c-mt65xx driver relies on DMA since it was first introduced. mt6577 does not support DMA [1] for I2C and SoC's Generic DMA engine cannot be used for this purpose, too, which makes this particular driver incompatible with mt6577 and other similar SoCs with same I2C IP.

Qii Wang, what do you think about this series?

Quoted 15 lines

[1] see references in
https://lists.infradead.org/pipermail/linux-mediatek/2021-October/030333.html

Boris Lysov (2):
dt-bindings: i2c: i2c-mt65xx: remove compatibility with mt6577
i2c: mediatek: remove compatibility with mt6577

 .../devicetree/bindings/i2c/i2c-mt65xx.txt    |  9 +++---
 drivers/i2c/busses/i2c-mt65xx.c               | 28 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)
Signature · 1 line
2.20.1
#6 lore raw
Quoted 10 lines · Wolfram Sang
Quoted 7 lines · Boris Lysov

This small patch series removes mt6577 support from the i2c-mt65xx driver and devicectree binding documentation.

The existing i2c-mt65xx driver relies on DMA since it was first introduced. mt6577 does not support DMA [1] for I2C and SoC's Generic DMA engine cannot be used for this purpose, too, which makes this particular driver incompatible with mt6577 and other similar SoCs with same I2C IP.

Qii Wang, what do you think about this series?

This series makes sense to me. If you do not disagree, Qii Wang, I will apply it soon. All the best, everyone.

Quoted 16 lines
Quoted 16 lines

[1] see references in
https://lists.infradead.org/pipermail/linux-mediatek/2021-October/030333.html

Boris Lysov (2):
dt-bindings: i2c: i2c-mt65xx: remove compatibility with mt6577
i2c: mediatek: remove compatibility with mt6577

 .../devicetree/bindings/i2c/i2c-mt65xx.txt    |  9 +++---
 drivers/i2c/busses/i2c-mt65xx.c               | 28 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)
Signature · 1 line
2.20.1
#7 lore raw
Quoted 10 lines · On Fri, 18 Mar 2022 12:09:42 +0100 Wolfram Sang <[email protected]> wrote:
Quoted 9 lines · Wolfram Sang
Quoted 7 lines · Boris Lysov

This small patch series removes mt6577 support from the i2c-mt65xx driver and devicectree binding documentation.

The existing i2c-mt65xx driver relies on DMA since it was first introduced. mt6577 does not support DMA [1] for I2C and SoC's Generic DMA engine cannot be used for this purpose, too, which makes this particular driver incompatible with mt6577 and other similar SoCs with same I2C IP.

Quoted 4 lines
Quoted 1 line

Qii Wang, what do you think about this series?

This series makes sense to me. If you do not disagree, Qii Wang, I will apply it soon. All the best, everyone.

Hello! I'm kindly pinging you on this series. Has it been applied?

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek