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 5F225FA3745 for ; Tue, 1 Nov 2022 07:42:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229906AbiKAHl7 (ORCPT ); Tue, 1 Nov 2022 03:41:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiKAHl4 (ORCPT ); Tue, 1 Nov 2022 03:41:56 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64FE917073; Tue, 1 Nov 2022 00:41:55 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1hmB3dVfzHvVh; Tue, 1 Nov 2022 15:41:30 +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; Tue, 1 Nov 2022 15:41:48 +0800 CC: , , , , , , , , , Subject: Re: [PATCH next v2 1/2] gpio: hisi: Add initial device tree support To: Weilong Chen References: <20221028022453.163186-1-chenweilong@huawei.com> From: Yicong Yang Message-ID: <791619d1-a227-477a-99c6-7ba15b4a28df@huawei.com> Date: Tue, 1 Nov 2022 15:41:48 +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: <20221028022453.163186-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 Hi Weilong, On 2022/10/28 10:24, Weilong Chen wrote: > Add support for HiSilicon GPIO controller in embedded platform, which > boot from devicetree. > > Signed-off-by: Weilong Chen > --- > Change since v1: > - Rename gpio-ascend910 to ascend910-gpio > Link: https://lore.kernel.org/lkml/30b95e7b-b902-babc-ea78-a2112c80ec7e@linaro.org/t/#m39e195979c1f42a6327aba009428316607d033e2 > > drivers/gpio/Kconfig | 2 +- > drivers/gpio/gpio-hisi.c | 15 ++++++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig > index e034f752e7ce..71a7880af59d 100644 > --- a/drivers/gpio/Kconfig > +++ b/drivers/gpio/Kconfig > @@ -310,7 +310,7 @@ config GPIO_GRGPIO > > config GPIO_HISI > tristate "HiSilicon GPIO controller driver" > - depends on (ARM64 && ACPI) || COMPILE_TEST > + depends on ARM64 || COMPILE_TEST > select GPIO_GENERIC > select GPIOLIB_IRQCHIP > help > diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c > index 3caabef5c7a2..92cf575f2eab 100644 > --- a/drivers/gpio/gpio-hisi.c > +++ b/drivers/gpio/gpio-hisi.c > @@ -1,8 +1,10 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* Copyright (c) 2020 HiSilicon Limited. */ > +#include > #include > #include > #include > +#include > #include > #include > > @@ -215,11 +217,21 @@ static void hisi_gpio_init_irq(struct hisi_gpio *hisi_gpio) > hisi_gpio_write_reg(chip, HISI_GPIO_INTCOMB_MASK_WX, 1); > } > > +#ifdef CONFIG_ACPI > static const struct acpi_device_id hisi_gpio_acpi_match[] = { > {"HISI0184", 0}, > {} > }; > MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match); > +#endif > + > +#ifdef CONFIG_OF > +static const struct of_device_id hisi_gpio_dts_match[] = { > + { .compatible = "hisilicon,ascend910-gpio", }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match); > +#endif > > static void hisi_gpio_get_pdata(struct device *dev, > struct hisi_gpio *hisi_gpio) > @@ -310,7 +322,8 @@ static int hisi_gpio_probe(struct platform_device *pdev) > static struct platform_driver hisi_gpio_driver = { > .driver = { > .name = HISI_GPIO_DRIVER_NAME, > - .acpi_match_table = hisi_gpio_acpi_match, > + .acpi_match_table = ACPI_PTR(hisi_gpio_acpi_match), > + .of_match_table = of_match_ptr(hisi_gpio_dts_match), Andy has some comments about using of ACPI_PTR/of_match_ptr(), I think they also apply here. [*] The patch itself looks good to me. [*] https://lore.kernel.org/linux-i2c/d96beadb-5693-6c73-8fee-3ac3b4cb9a44@huawei.com/T/#m51adf2c1480a14ca0882784826f3168ddb83bf62 > }, > .probe = hisi_gpio_probe, > }; >