From patchwork Tue Sep 20 07:22:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weilong Chen X-Patchwork-Id: 607826 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 C6189C6FA82 for ; Tue, 20 Sep 2022 07:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229670AbiITHUi (ORCPT ); Tue, 20 Sep 2022 03:20:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbiITHUi (ORCPT ); Tue, 20 Sep 2022 03:20:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B6054DF37; Tue, 20 Sep 2022 00:20:36 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MWtBx2H3CzmVZ7; Tue, 20 Sep 2022 15:16:41 +0800 (CST) Received: from localhost (10.175.101.6) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 20 Sep 2022 15:20:35 +0800 From: Weilong Chen To: , , , , , CC: , , Subject: [PATCH next v5 1/2] i2c: hisi: Add initial device tree support Date: Tue, 20 Sep 2022 15:22:14 +0800 Message-ID: <20220920072215.161331-1-chenweilong@huawei.com> X-Mailer: git-send-email 2.31.GIT MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The HiSilicon I2C controller can be used on embedded platform, which boot from devicetree. Signed-off-by: Weilong Chen Acked-by: Yicong Yang --- Change since v4: - Remove the protection for the headers for ACPI/OF Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/ drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-hisi.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 0c48d8a9f44a..81f6936c312f 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -673,7 +673,7 @@ config I2C_HIGHLANDER config I2C_HISI tristate "HiSilicon I2C controller" - depends on (ARM64 && ACPI) || COMPILE_TEST + depends on ARM64 || COMPILE_TEST help Say Y here if you want to have Hisilicon I2C controller support available on the Kunpeng Server. diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index 76c3d8f6fc3c..67031024217c 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -5,6 +5,7 @@ * Copyright (c) 2021 HiSilicon Technologies Co., Ltd. */ +#include #include #include #include @@ -13,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -483,17 +485,28 @@ static int hisi_i2c_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_ACPI static const struct acpi_device_id hisi_i2c_acpi_ids[] = { { "HISI03D1", 0 }, { } }; MODULE_DEVICE_TABLE(acpi, hisi_i2c_acpi_ids); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id hisi_i2c_dts_ids[] = { + { .compatible = "hisilicon,hisi-i2c", }, + { } +}; +MODULE_DEVICE_TABLE(of, hisi_i2c_dts_ids); +#endif static struct platform_driver hisi_i2c_driver = { .probe = hisi_i2c_probe, .driver = { .name = "hisi-i2c", - .acpi_match_table = hisi_i2c_acpi_ids, + .acpi_match_table = ACPI_PTR(hisi_i2c_acpi_ids), + .of_match_table = of_match_ptr(hisi_i2c_dts_ids), }, }; module_platform_driver(hisi_i2c_driver); From patchwork Tue Sep 20 07:22:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weilong Chen X-Patchwork-Id: 608482 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 0FA1AC6FA82 for ; Tue, 20 Sep 2022 07:20:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbiITHUl (ORCPT ); Tue, 20 Sep 2022 03:20:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230039AbiITHUk (ORCPT ); Tue, 20 Sep 2022 03:20:40 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 102B53F1EC; Tue, 20 Sep 2022 00:20:39 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MWtB31HmfzMmw1; Tue, 20 Sep 2022 15:15:55 +0800 (CST) Received: from localhost (10.175.101.6) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 20 Sep 2022 15:20:35 +0800 From: Weilong Chen To: , , , , , CC: , , Subject: [PATCH next v5 2/2] dt-bindings: i2c: add entry for hisilicon,hisi-i2c Date: Tue, 20 Sep 2022 15:22:15 +0800 Message-ID: <20220920072215.161331-2-chenweilong@huawei.com> X-Mailer: git-send-email 2.31.GIT In-Reply-To: <20220920072215.161331-1-chenweilong@huawei.com> References: <20220920072215.161331-1-chenweilong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add the new compatible for HiSilicon common i2c. Signed-off-by: Weilong Chen Reviewed-by: Yicong Yang --- Change since v4: - Add description for SoC specific compatibles. - Use the clock binding. - Fix decimal, space, case, unused labels. Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/#m4e1c915ead04f4e2e48d69131053a966801625db .../bindings/i2c/hisilicon,hisi-i2c.yaml | 72 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 73 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/hisilicon,hisi-i2c.yaml diff --git a/Documentation/devicetree/bindings/i2c/hisilicon,hisi-i2c.yaml b/Documentation/devicetree/bindings/i2c/hisilicon,hisi-i2c.yaml new file mode 100644 index 000000000000..b06eb8cb88bc --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/hisilicon,hisi-i2c.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/i2c/hisilicon,hisi-i2c.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: HiSilicon common IIC controller Device Tree Bindings + +maintainers: + - yangyicong@huawei.com + +allOf: + - $ref: /schemas/i2c/i2c-controller.yaml# + +properties: + compatible: + const: hisilicon,hisi-i2c + description: + The HiSilicon common IIC controller can be used for many different + types of SoC such as Huawei Ascend AI series chips. We use the common + string (hisi) for specific compatibles to avoid confusion caused by a + lot of different names. + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-frequency: + default: 400000 + + i2c-sda-falling-time-ns: + default: 343 + + i2c-scl-falling-time-ns: + default: 203 + + i2c-sda-hold-time-ns: + default: 830 + + i2c-scl-rising-time-ns: + default: 365 + + i2c-digital-filter-width-ns: + default: 0 + +required: + - compatible + - reg + - interrupts + +unevaluatedProperties: false + +examples: + - | + i2c@5038b0000 { + compatible = "hisilicon,hisi-i2c"; + reg = <0x38b0000 0x10000>; + interrupts = <0x0 120 0x4>; + i2c-sda-falling-time-ns = <56>; + i2c-scl-falling-time-ns = <56>; + i2c-sda-hold-time-ns = <56>; + i2c-scl-rising-time-ns = <56>; + i2c-digital-filter; + i2c-digital-filter-width-ns = <0x0>; + clocks = <&alg_clk>; + clock-frequency = <400000>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index d213a831133f..4c928a444e4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9155,6 +9155,7 @@ L: linux-i2c@vger.kernel.org S: Maintained W: https://www.hisilicon.com F: drivers/i2c/busses/i2c-hisi.c +F: Documentation/devicetree/bindings/i2c/hisilicon,hisi-i2c.yaml HISILICON LPC BUS DRIVER M: john.garry@huawei.com