From patchwork Fri Oct 21 03:56:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenweilong X-Patchwork-Id: 6500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp467971wrr; Thu, 20 Oct 2022 20:54:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Vzcof7bpL1rGCjUte6kAz5a5mwJ3bKDl8uGtWXga3Ybyda55yi3JRBDZKV/y1HDzZ3yiw X-Received: by 2002:aa7:d348:0:b0:45b:8ae3:ee3d with SMTP id m8-20020aa7d348000000b0045b8ae3ee3dmr15335180edr.428.1666324475251; Thu, 20 Oct 2022 20:54:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666324475; cv=none; d=google.com; s=arc-20160816; b=VKoeFEvWpA7dYtv8zvtLtCYS6fbQxLTCLiJfhGoUzYtFmWU4sEyI+L5CkkkLccR2Jp cF1RiBxgbZI1N+t71H4NVrcRJm4w1zUU0P2HW4w41s+/0/kU9G5ZEMgEodg8dZje2fUg zcHpv8yHAiJOcB/30HEUxWqOlEqk2c/zxnfnWjnO/BZ+Fc8Uvax5ynIthQVGgYuDQm6G VC/0UTydl1zYuyVflb4WrfwVAXeGAJct28OTK44DvtxMvFZfJjmljsZWY9ektsaR6jz8 KRkoyKK0THITzdsM9F6nnsEsHOImS4cSUszXOIhKA9RGd/QsslvuO+0/bM4DD1kJ8yir GiEQ== 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=5jv/bJvxhDCBxjIPzcoZznIF7SdYV7QR2e8w1wf9I5w=; b=rvAfMOAzoD2NFP0dZUYhVzBWrrPAobW2XLRNljB1Oer5mUtA5ZusOV7etNKaWUPlUb cQZdykyn6evxh9RlLdONZir2DWz9yodwmRxm1WQgG2YW86JIz4VcXlPGTqngymIJ/adw shOtwWgUmGt0wj/HeVvof+yNDcGnAKbPxCcFusgjpZUsgRmDoEoDQ9Pw8tcdzYyckEjx U+HONel/U1m4syUUYRo6yLZVej0WUNHkxICElpw/2LnMQvx4Chg0qyc76qsDpt7bRRqA DukZkPT/QiVZQySRSFYNdwJeYvZ41Kr0//LpdvtpzxYC0Nl9jM2oBI5abS+peN26cJe8 UJEQ== 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 hb43-20020a170907162b00b0078d25d59f62si17181837ejc.21.2022.10.20.20.54.09; Thu, 20 Oct 2022 20:54:35 -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 S229920AbiJUDs5 (ORCPT + 99 others); Thu, 20 Oct 2022 23:48:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230085AbiJUDsr (ORCPT ); Thu, 20 Oct 2022 23:48:47 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9992C1D556F; Thu, 20 Oct 2022 20:48:46 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mtr1B3cTfzmVH9; Fri, 21 Oct 2022 11:43:58 +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; Fri, 21 Oct 2022 11:48:44 +0800 From: Weilong Chen To: , , , , , CC: , , Subject: [PATCH next v7 1/2] i2c: hisi: Add initial device tree support Date: Fri, 21 Oct 2022 11:56:37 +0800 Message-ID: <20221021035638.203929-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: dggems702-chm.china.huawei.com (10.3.19.179) 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?1747267852587921112?= X-GMAIL-MSGID: =?utf-8?q?1747267852587921112?= 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 v6: - No change Link: https://lore.kernel.org/lkml/7520818b-de40-7f2a-1b03-b1dcd29a2023@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);