From nobody Fri Apr 10 17:07:05 2026 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 A33DBC32774 for ; Mon, 22 Aug 2022 00:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232170AbiHVA5o (ORCPT ); Sun, 21 Aug 2022 20:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230378AbiHVA5m (ORCPT ); Sun, 21 Aug 2022 20:57:42 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9933A205EB; Sun, 21 Aug 2022 17:57:39 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4M9v416DlyzXdbp; Mon, 22 Aug 2022 08:53:21 +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.24; Mon, 22 Aug 2022 08:57:37 +0800 From: Weilong Chen To: , , CC: , Subject: [PATCH next] i2c: i2c-hisi: Add support for initializing control module via DT Date: Mon, 22 Aug 2022 09:00:31 +0800 Message-ID: <20220822010031.97769-1-chenweilong@huawei.com> X-Mailer: git-send-email 2.31.GIT MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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 Content-Type: text/plain; charset="utf-8" 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 | 13 ++++++++++++- 2 files changed, 13 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 =20 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..cba9a6830b23 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include =20 #define HISI_I2C_FRAME_CTRL 0x0000 #define HISI_I2C_FRAME_CTRL_SPEED_MODE GENMASK(1, 0) @@ -483,17 +485,26 @@ static int hisi_i2c_probe(struct platform_device *pde= v) return 0; } =20 +#ifdef CONFIG_ACPI static const struct acpi_device_id hisi_i2c_acpi_ids[] =3D { { "HISI03D1", 0 }, { } }; MODULE_DEVICE_TABLE(acpi, hisi_i2c_acpi_ids); +#endif + +static const struct of_device_id hisi_i2c_dts_ids[] =3D { + { .compatible =3D "hisilicon,hisi-i2c", }, + { } +}; +MODULE_DEVICE_TABLE(of, hisi_i2c_dts_ids); =20 static struct platform_driver hisi_i2c_driver =3D { .probe =3D hisi_i2c_probe, .driver =3D { .name =3D "hisi-i2c", - .acpi_match_table =3D hisi_i2c_acpi_ids, + .acpi_match_table =3D ACPI_PTR(hisi_i2c_acpi_ids), + .of_match_table =3D of_match_ptr(hisi_i2c_dts_ids), }, }; module_platform_driver(hisi_i2c_driver); --=20 2.31.GIT