From patchwork Thu Jan 20 18:58:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Lysov X-Patchwork-Id: 534164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D92CBC433EF for ; Thu, 20 Jan 2022 18:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243589AbiATS7B (ORCPT ); Thu, 20 Jan 2022 13:59:01 -0500 Received: from eu-shark1.inbox.eu ([195.216.236.81]:54546 "EHLO eu-shark1.inbox.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346851AbiATS7B (ORCPT ); Thu, 20 Jan 2022 13:59:01 -0500 Received: from eu-shark1.inbox.eu (localhost [127.0.0.1]) by eu-shark1-out.inbox.eu (Postfix) with ESMTP id C20D36C0049B; Thu, 20 Jan 2022 20:58:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.ee; s=20150108; t=1642705139; bh=Mp9kGuVBlC0Ago6NIpMWZJ/WkxFZQYYgpDvOpyIAg5E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:X-ESPOL: from:date:to:cc; b=kOahGYNXe1hp47zHoxdJOaLh99tH16xgsH/a5Hs5F3BB3Ude1riRim5g3vKVkWMzU cnk0nd2+BIr0qVCEbCakwZ5WBrAQer7MFMpVYf7CbjAHzmYsU8lC2CfsS8VkVf/1oA wP9CfupCGVAtX9PctP24vpwhgH3iIOFRn2jC7Cgo= Received: from localhost (localhost [127.0.0.1]) by eu-shark1-in.inbox.eu (Postfix) with ESMTP id B1E936C006AE; Thu, 20 Jan 2022 20:58:59 +0200 (EET) Received: from eu-shark1.inbox.eu ([127.0.0.1]) by localhost (eu-shark1.inbox.eu [127.0.0.1]) (spamfilter, port 35) with ESMTP id zrkmbK32Y5_z; Thu, 20 Jan 2022 20:58:59 +0200 (EET) Received: from mail.inbox.eu (eu-pop1 [127.0.0.1]) by eu-shark1-in.inbox.eu (Postfix) with ESMTP id 5C4CA6C0049B; Thu, 20 Jan 2022 20:58:59 +0200 (EET) From: Boris Lysov To: linux-i2c@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: qii.wang@mediatek.com Subject: [PATCH 1/2] dt-bindings: i2c: i2c-mt65xx: remove mt6577 support Date: Thu, 20 Jan 2022 21:58:52 +0300 Message-Id: <20220120185853.24266-2-arzamas-16@mail.ee> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220120185853.24266-1-arzamas-16@mail.ee> References: <20220120185853.24266-1-arzamas-16@mail.ee> MIME-Version: 1.0 X-Virus-Scanned: OK X-ESPOL: +dBm1NUOBlzQh1+kSn3cDQIzqylVJY3o+OCk0Rhfgnn7NzCFekARMmO6mXAFPnHC3iM= Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 Signed-off-by: Boris Lysov --- Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt index 5ea216ae7084..d1d0c5d2b9e9 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt @@ -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 = ; From patchwork Thu Jan 20 18:58:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Lysov X-Patchwork-Id: 533739 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC143C433FE for ; Thu, 20 Jan 2022 18:59:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346851AbiATS7C (ORCPT ); Thu, 20 Jan 2022 13:59:02 -0500 Received: from eu-shark1.inbox.eu ([195.216.236.81]:54560 "EHLO eu-shark1.inbox.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346922AbiATS7B (ORCPT ); Thu, 20 Jan 2022 13:59:01 -0500 Received: from eu-shark1.inbox.eu (localhost [127.0.0.1]) by eu-shark1-out.inbox.eu (Postfix) with ESMTP id C85E46C006AE; Thu, 20 Jan 2022 20:59:00 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.ee; s=20150108; t=1642705140; bh=YS/yJ57EWPEjZWHReNFdWuAZ6M+DzTo6MREgxyD6rKU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:X-ESPOL: from:date:to:cc; b=PIs4T7wFqbr/TkH1rfoB4IOe/ENUh6SGcZ1ZTqygmsO3/1tw4tfTeo0LNt2R8NJ9V cG6d1+Us/RCihN3O3MaawuN8+/FfjODeCUNuU96a8aDGYfJeWj6ENdQ/sqDS1JI0zJ 91+o7nAzxtp/Hdba8mXhIe9IzmVxt3ewW4J/ewoA= Received: from localhost (localhost [127.0.0.1]) by eu-shark1-in.inbox.eu (Postfix) with ESMTP id B15736C00771; Thu, 20 Jan 2022 20:59:00 +0200 (EET) Received: from eu-shark1.inbox.eu ([127.0.0.1]) by localhost (eu-shark1.inbox.eu [127.0.0.1]) (spamfilter, port 35) with ESMTP id XGejEganWRFR; Thu, 20 Jan 2022 20:59:00 +0200 (EET) Received: from mail.inbox.eu (eu-pop1 [127.0.0.1]) by eu-shark1-in.inbox.eu (Postfix) with ESMTP id 5B1736C006AE; Thu, 20 Jan 2022 20:59:00 +0200 (EET) From: Boris Lysov To: linux-i2c@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: qii.wang@mediatek.com Subject: [PATCH 2/2] i2c: mediatek: remove mt6577 support Date: Thu, 20 Jan 2022 21:58:53 +0300 Message-Id: <20220120185853.24266-3-arzamas-16@mail.ee> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220120185853.24266-1-arzamas-16@mail.ee> References: <20220120185853.24266-1-arzamas-16@mail.ee> MIME-Version: 1.0 X-Virus-Scanned: OK X-ESPOL: +d1m7upSeE2pjkLDN3bfAA8xrSJNWOnm557a3R5egnr/NzCGf04TURS/gR8IQDzn/iM= Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 --- 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 },