On 2022/9/20 15:22, Weilong Chen wrote: > The HiSilicon I2C controller can be used on embedded platform, which > boot from devicetree. > > Signed-off-by: Weilong Chen <chenweilong@xxxxxxxxxx> > --- > Change since v4: > - Remove the protection for the headers for ACPI/OF > Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@xxxxxxxxxx/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 0c48d8a9f44a..81f6936c312f 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..67031024217c 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,hisi-i2c", }, The patch itself looks good to me: Acked-by: Yicong Yang <yangyicong@xxxxxxxxxxxxx> It's better to have a tag from xuwei for HiSilicon's DTS stuff. Thanks. > + { } > +}; > +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); >
