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 36D31C54EE9 for ; Tue, 13 Sep 2022 09:03:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231486AbiIMJDB (ORCPT ); Tue, 13 Sep 2022 05:03:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbiIMJCV (ORCPT ); Tue, 13 Sep 2022 05:02:21 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 947331DA45; Tue, 13 Sep 2022 02:02:00 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MRcmM4P5YzNmJv; Tue, 13 Sep 2022 16:57:23 +0800 (CST) Received: from [10.174.179.106] (10.174.179.106) 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, 13 Sep 2022 17:01:58 +0800 Subject: Re: [PATCH next v4 1/2] i2c: hisi: Add initial device tree support To: Yicong Yang , , , , CC: , , References: <20220909074842.281232-1-chenweilong@huawei.com> From: chenweilong Message-ID: <64721a3f-8fa4-45b4-1045-544cdd021bd8@huawei.com> Date: Tue, 13 Sep 2022 17:01:57 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.174.179.106] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/9/13 15:48, Yicong Yang wrote: > On 2022/9/9 15:48, Weilong Chen wrote: >> The HiSilicon I2C controller can be used on embedded platform, which >> boot from devicetree. >> >> Signed-off-by: Weilong Chen >> --- >> drivers/i2c/busses/Kconfig | 2 +- >> drivers/i2c/busses/i2c-hisi.c | 19 ++++++++++++++++++- >> 2 files changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig >> index 7284206b278b..6d0fdf48e97d 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..7a77f306d05f 100644 >> --- a/drivers/i2c/busses/i2c-hisi.c >> +++ b/drivers/i2c/busses/i2c-hisi.c >> @@ -5,6 +5,9 @@ >> * Copyright (c) 2021 HiSilicon Technologies Co., Ltd. >> */ >> >> +#ifdef CONFIG_ACPI >> +#include >> +#endif >> #include >> #include >> #include >> @@ -13,6 +16,9 @@ >> #include >> #include >> #include >> +#ifdef CONFIG_OF >> +#include >> +#endif > I don't think the protection for the headers is necessary and common. The > ACPI/OF specific functions should have already been handled well with{out} > ACPI/OF config. Have you met some problems without these? > > BTW, it's better to have a changelog when updating the patches. This kind usage does exist in the kernel, for example: drivers/rtc/rtc-mc146818-lib.c. It can be consistent with the protection below MODULE_DEVICE_TABLE. >> #include >> #include >> #include >> @@ -483,17 +489,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); >> > .