From: Weilong Chen <chenweilong@huawei.com>
To: <chenweilong@huawei.com>, <yangyicong@hisilicon.com>,
<robh+dt@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>,
<wsa@kernel.org>, <andriy.shevchenko@linux.intel.com>,
<f.fainelli@gmail.com>, <jarkko.nikula@linux.intel.com>,
<jdelvare@suse.de>, <william.zhang@broadcom.com>,
<jsd@semihalf.com>, <conor.dooley@microchip.com>,
<phil.edworthy@renesas.com>,
<tharunkumar.pasumarthi@microchip.com>,
<semen.protsenko@linaro.org>, <kfting@nuvoton.com>
Cc: <linux-i2c@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH next v9 1/4] i2c: hisi: Add initial device tree support
Date: Sat, 29 Oct 2022 19:59:36 +0800 [thread overview]
Message-ID: <20221029115937.179788-1-chenweilong@huawei.com> (raw)
The HiSilicon I2C controller can be used on embedded platform, which
boot from devicetree.
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Acked-by: Yicong Yang <yangyicong@hisilicon.com>
---
Change since v8:
- Change hisilicon,i2c-ascend910 to hisilicon,ascend910-i2c
as the normal convention is: vendor,soc-ipblock
Link: https://lore.kernel.org/lkml/20221024015151.342651-1-chenweilong@huawei.com/
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 e50f9603d189..a7bfddf08fa7 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..0fc9400e9e92 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 <linux/acpi.h>
#include <linux/bits.h>
#include <linux/bitfield.h>
#include <linux/completion.h>
@@ -13,6 +14,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/units.h>
@@ -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,ascend910-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);
--
2.31.GIT
next reply other threads:[~2022-10-29 11:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-29 11:59 Weilong Chen [this message]
2022-10-29 11:59 ` [PATCH next v9 2/4] dt-bindings: i2c: add entry for hisilicon,ascend910-i2c Weilong Chen
2022-10-30 22:01 ` [PATCH next v9 1/4] i2c: hisi: Add initial device tree support Andy Shevchenko
2022-10-31 1:57 ` chenweilong
2022-10-31 15:42 ` Andy Shevchenko
2022-11-01 7:23 ` chenweilong
2022-11-01 14:43 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221029115937.179788-1-chenweilong@huawei.com \
--to=chenweilong@huawei.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=conor.dooley@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=jdelvare@suse.de \
--cc=jsd@semihalf.com \
--cc=kfting@nuvoton.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=phil.edworthy@renesas.com \
--cc=robh+dt@kernel.org \
--cc=semen.protsenko@linaro.org \
--cc=tharunkumar.pasumarthi@microchip.com \
--cc=william.zhang@broadcom.com \
--cc=wsa@kernel.org \
--cc=yangyicong@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).