From patchwork Wed Oct 26 03:42:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenweilong X-Patchwork-Id: 11054 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp36299wru; Tue, 25 Oct 2022 20:40:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4owx3eeYX0kBWhaQPPZrF6YYn5B10UTCQusP/aWx0msg/DQAnE7fc5IhL21z9QwBDQWUQc X-Received: by 2002:a17:906:d54d:b0:78e:f130:7099 with SMTP id cr13-20020a170906d54d00b0078ef1307099mr36668771ejc.142.1666755627464; Tue, 25 Oct 2022 20:40:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666755627; cv=none; d=google.com; s=arc-20160816; b=zfXJ8zaWGvC3GqQxf/HSHSiRRGpkIF0iHdM+ezNNxhtNlbxNs1N7Vls5VlrdPEWEBd ReMhtj0C1EiO/djZvLpinDc4Ox/bsX14cUKhi4j578UDZB+N6IPLKzLpUPAcVdIdZJl/ yO1PzwZEY58Y+3iv617PcuWCdRTFXJNaJvijQ2/oBtrjma4VjtwY96BN0hAlWdTR15QH LPT5Jmpm6t6WjCCjCZPKS8Aw3nlnyG8xHjra3Qg9Xv2bTT7uSAuoUUJEPakIBk3PVjU+ nNAFa2Qb0nrcoWHY0I/7UVvsVkSlJhWt5Wszem1R3JMszSI3fC2GLANt0V/TJTNv239v +6jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=PTbzr4/htzSNRJnHIMHK3eUcEN9nYIJhJ7xux6o9C4A=; b=hp0iFaRcI7krrs02pntgq2HDHK1TSAbOL70u8+MceIuTRo1NAYY2SMalFFmKbFrfhC i5vUMBnyvb7zYz3pa7DzS+p+67eMC3AHTKLHhKt8X/El1to8BBapfM66bCJ/nMQxMJ0q LSW0zf8rQKYp55WLvTZdapflVh9kT5sN6+Gt+B683VVlO1UjMx7bwki6Szd5Er7TZxcO y3douoivtHrPwOixnMAjQ2Kc/t3Fbm8SLYbDT1yvDBZnXbRTevQc+08MSuBOXuq28lCt hcn/VR7iVHqIPndcyag856BSrFIiB5UaErpPVBngvXaeInqGYN2kynychEpObAMj8e6V WWPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ho7-20020a1709070e8700b0078dbd939dacsi5326539ejc.545.2022.10.25.20.39.58; Tue, 25 Oct 2022 20:40:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232530AbiJZDeu (ORCPT + 99 others); Tue, 25 Oct 2022 23:34:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbiJZDeq (ORCPT ); Tue, 25 Oct 2022 23:34:46 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AC392A432; Tue, 25 Oct 2022 20:34:40 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MxvYs3wtlzHvFM; Wed, 26 Oct 2022 11:34:25 +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; Wed, 26 Oct 2022 11:34:38 +0800 From: Weilong Chen To: , , , , , , , CC: , , Subject: [PATCH next 1/2] gpio: hisi: Add initial device tree support Date: Wed, 26 Oct 2022 11:42:18 +0800 Message-ID: <20221026034219.172880-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: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747719948642975966?= X-GMAIL-MSGID: =?utf-8?q?1747719948642975966?= Add support for HiSilicon GPIO controller in embedded platform, which boot from devicetree. Signed-off-by: Weilong Chen --- 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..813c0c1d4e49 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,gpio-ascend910", }, + { } +}; +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), }, .probe = hisi_gpio_probe, };