The HiSilicon I2C controller can be used on embedded platform, which
boot from devicetree.
Signed-off-by: Weilong Chen <[email protected]>
---
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
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 <linux/platform_device.h>
#include <linux/property.h>
#include <linux/units.h>
+#include <linux/acpi.h>
+#include <linux/of.h>
#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 *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
+
+static const struct of_device_id hisi_i2c_dts_ids[] = {
+ { .compatible = "hisilicon,hisi-i2c", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, hisi_i2c_dts_ids);
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
Hi Weilong,
Thanks for the patch.
It'll be more straightforward for me to make the subject as
"[PATCH] i2c: hisi: Add initial device tree support".
On 2022/8/22 9:00, Weilong Chen wrote:
> The HiSilicon I2C controller can be used on embedded platform, which
> boot from devicetree.
>
> Signed-off-by: Weilong Chen <[email protected]>
> ---
> 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
>
> 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 <linux/platform_device.h>
> #include <linux/property.h>
> #include <linux/units.h>
> +#include <linux/acpi.h>
> +#include <linux/of.h>
>
The headers should be in alphabetical order.
> #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 *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
> +
> +static const struct of_device_id hisi_i2c_dts_ids[] = {
> + { .compatible = "hisilicon,hisi-i2c", },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, hisi_i2c_dts_ids);
>
This should be protected by CONFIG_OF as well, just like ACPI ids.
hisi_i2c_of_ids should be better according to the convention.
Thanks,
Yicong
> 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);
>
On Mon, Aug 22, 2022 at 09:00:31AM +0800, Weilong Chen wrote:
> The HiSilicon I2C controller can be used on embedded platform, which
> boot from devicetree.
>
> Signed-off-by: Weilong Chen <[email protected]>
We also need the DT bindings documented in
'Documentation/devicetree/bindings/i2c'.