From mboxrd@z Thu Jan 1 00:00:00 1970 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 D8B61C4332F for ; Thu, 20 Oct 2022 01:45:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231376AbiJTBpk (ORCPT ); Wed, 19 Oct 2022 21:45:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230456AbiJTBph (ORCPT ); Wed, 19 Oct 2022 21:45:37 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A7BA16727B; Wed, 19 Oct 2022 18:45:36 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mt9MC0PQQzpVj1; Thu, 20 Oct 2022 09:42:15 +0800 (CST) Received: from [10.67.102.169] (10.67.102.169) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 20 Oct 2022 09:45:33 +0800 CC: , , , , , , , Subject: Re: [PATCH next v6 1/2] i2c: hisi: Add initial device tree support To: Weilong Chen References: <20221018073012.309355-1-chenweilong@huawei.com> From: Yicong Yang Message-ID: Date: Thu, 20 Oct 2022 09:45:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <20221018073012.309355-1-chenweilong@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.102.169] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/10/18 15:30, Weilong Chen wrote: > The HiSilicon I2C controller can be used on embedded platform, which > boot from devicetree. > Still looks good to me: Acked-by: Yicong Yang > Signed-off-by: Weilong Chen > --- > Change since v5: > - Use hisilicon,i2c-ascend910 as compatible string. For more information about > the SoC at https://e.huawei.com/en/products/cloud-computing-dc/atlas/ascend-910 > Link: https://lore.kernel.org/linux-i2c/20220920072215.161331-1-chenweilong@huawei.com/ > > 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 264e780ae32e..a2081c03f3c4 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..d58a6d2f1bc6 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,i2c-ascend910", }, > + { } > +}; > +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); >