| Message ID | 20220909074842.281232-1-chenweilong@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [next,v4,1/2] i2c: hisi: Add initial device tree support | expand |
On 2022/9/9 15:48, Weilong Chen wrote: > The HiSilicon I2C controller can be used on embedded platform, which > boot from devicetree. > > Signed-off-by: Weilong Chen <chenweilong@huawei.com> > --- > drivers/i2c/busses/Kconfig | 2 +- > drivers/i2c/busses/i2c-hisi.c | 19 ++++++++++++++++++- > 2 files changed, 19 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..7a77f306d05f 100644 > --- a/drivers/i2c/busses/i2c-hisi.c > +++ b/drivers/i2c/busses/i2c-hisi.c > @@ -5,6 +5,9 @@ > * Copyright (c) 2021 HiSilicon Technologies Co., Ltd. > */ > > +#ifdef CONFIG_ACPI > +#include <linux/acpi.h> > +#endif > #include <linux/bits.h> > #include <linux/bitfield.h> > #include <linux/completion.h> > @@ -13,6 +16,9 @@ > #include <linux/io.h> > #include <linux/module.h> > #include <linux/mod_devicetable.h> > +#ifdef CONFIG_OF > +#include <linux/of.h> > +#endif I don't think the protection for the headers is necessary and common. The ACPI/OF specific functions should have already been handled well with{out} ACPI/OF config. Have you met some problems without these? BTW, it's better to have a changelog when updating the patches. > #include <linux/platform_device.h> > #include <linux/property.h> > #include <linux/units.h> > @@ -483,17 +489,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", }, > + { } > +}; > +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); >
On 2022/9/13 15:48, Yicong Yang wrote: > On 2022/9/9 15:48, Weilong Chen wrote: >> The HiSilicon I2C controller can be used on embedded platform, which >> boot from devicetree. >> >> Signed-off-by: Weilong Chen <chenweilong@huawei.com> >> --- >> drivers/i2c/busses/Kconfig | 2 +- >> drivers/i2c/busses/i2c-hisi.c | 19 ++++++++++++++++++- >> 2 files changed, 19 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..7a77f306d05f 100644 >> --- a/drivers/i2c/busses/i2c-hisi.c >> +++ b/drivers/i2c/busses/i2c-hisi.c >> @@ -5,6 +5,9 @@ >> * Copyright (c) 2021 HiSilicon Technologies Co., Ltd. >> */ >> >> +#ifdef CONFIG_ACPI >> +#include <linux/acpi.h> >> +#endif >> #include <linux/bits.h> >> #include <linux/bitfield.h> >> #include <linux/completion.h> >> @@ -13,6 +16,9 @@ >> #include <linux/io.h> >> #include <linux/module.h> >> #include <linux/mod_devicetable.h> >> +#ifdef CONFIG_OF >> +#include <linux/of.h> >> +#endif > I don't think the protection for the headers is necessary and common. The > ACPI/OF specific functions should have already been handled well with{out} > ACPI/OF config. Have you met some problems without these? > > BTW, it's better to have a changelog when updating the patches. This kind usage does exist in the kernel, for example: drivers/rtc/rtc-mc146818-lib.c. It can be consistent with the protection below MODULE_DEVICE_TABLE. >> #include <linux/platform_device.h> >> #include <linux/property.h> >> #include <linux/units.h> >> @@ -483,17 +489,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", }, >> + { } >> +}; >> +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); >> > .
On 2022/9/13 17:01, chenweilong wrote: > On 2022/9/13 15:48, Yicong Yang wrote: >> On 2022/9/9 15:48, Weilong Chen wrote: >>> The HiSilicon I2C controller can be used on embedded platform, which >>> boot from devicetree. >>> >>> Signed-off-by: Weilong Chen <chenweilong@huawei.com> >>> --- >>> drivers/i2c/busses/Kconfig | 2 +- >>> drivers/i2c/busses/i2c-hisi.c | 19 ++++++++++++++++++- >>> 2 files changed, 19 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..7a77f306d05f 100644 >>> --- a/drivers/i2c/busses/i2c-hisi.c >>> +++ b/drivers/i2c/busses/i2c-hisi.c >>> @@ -5,6 +5,9 @@ >>> * Copyright (c) 2021 HiSilicon Technologies Co., Ltd. >>> */ >>> >>> +#ifdef CONFIG_ACPI >>> +#include <linux/acpi.h> >>> +#endif >>> #include <linux/bits.h> >>> #include <linux/bitfield.h> >>> #include <linux/completion.h> >>> @@ -13,6 +16,9 @@ >>> #include <linux/io.h> >>> #include <linux/module.h> >>> #include <linux/mod_devicetable.h> >>> +#ifdef CONFIG_OF >>> +#include <linux/of.h> >>> +#endif >> I don't think the protection for the headers is necessary and common. The >> ACPI/OF specific functions should have already been handled well with{out} >> ACPI/OF config. Have you met some problems without these? >> >> BTW, it's better to have a changelog when updating the patches. > > This kind usage does exist in the kernel, for example: drivers/rtc/rtc-mc146818-lib.c. > The protection for acpi.h used in that driver may also be unnecessary I think, but may need test. > It can be consistent with the protection below MODULE_DEVICE_TABLE. > MODULE_DEVICE_TABLE is defined in module.h, so not depend on these two headers. >>> #include <linux/platform_device.h> >>> #include <linux/property.h> >>> #include <linux/units.h> >>> @@ -483,17 +489,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", }, >>> + { } >>> +}; >>> +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); >>> >> . > > > . >
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..7a77f306d05f 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -5,6 +5,9 @@ * Copyright (c) 2021 HiSilicon Technologies Co., Ltd. */ +#ifdef CONFIG_ACPI +#include <linux/acpi.h> +#endif #include <linux/bits.h> #include <linux/bitfield.h> #include <linux/completion.h> @@ -13,6 +16,9 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/mod_devicetable.h> +#ifdef CONFIG_OF +#include <linux/of.h> +#endif #include <linux/platform_device.h> #include <linux/property.h> #include <linux/units.h> @@ -483,17 +489,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", }, + { } +}; +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);
The HiSilicon I2C controller can be used on embedded platform, which boot from devicetree. Signed-off-by: Weilong Chen <chenweilong@huawei.com> --- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-hisi.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-)