[V3,2/4] i2c: busses: xgene: add acpi support for i2c xgene SLIMpro driver

Commit Message

Feng Kan April 23, 2015, 6:07 p.m. UTC

This adds support for ACPI for the APM X-Gene I2C SLIMpro proxy
driver.

Signed-off-by: Feng Kan <[e-mail]>
---
 drivers/i2c/busses/i2c-xgene-slimpro.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Arnd Bergmann April 24, 2015, 7:28 a.m. UTC | #1

On Thursday 23 April 2015 11:07:08 Feng Kan wrote:
> 
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id xgene_slimpro_i2c_acpi_ids[] = {
> +       {"PRP0001", 0},
> +       {}
> +};
> +MODULE_DEVICE_TABLE(acpi, slimpro_acpi_ids);
> +#endif
> 

Sorry, but this is wrong: The PRP0001 name is meant for embedded
devices that just use the generic properties API for loading, and
does not require specifying an ACPI device ID.

	Arnd

Patch

diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c
index afe4cf2..0035760 100644
--- a/drivers/i2c/busses/i2c-xgene-slimpro.c
+++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
@@ -22,6 +22,7 @@ 
  * using the APM X-Gene SLIMpro mailbox driver.
  *
  */
+#include <linux/acpi.h>
 #include <linux/dma-mapping.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
@@ -442,12 +443,21 @@  static const struct of_device_id xgene_slimpro_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(of, xgene_slimpro_i2c_dt_ids);
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id xgene_slimpro_i2c_acpi_ids[] = {
+	{"PRP0001", 0},
+	{}
+};
+MODULE_DEVICE_TABLE(acpi, slimpro_acpi_ids);
+#endif
+
 static struct platform_driver xgene_slimpro_i2c_driver = {
 	.probe	= xgene_slimpro_i2c_probe,
 	.remove	= xgene_slimpro_i2c_remove,
 	.driver	= {
 		.name	= "xgene-slimpro-i2c",
-		.of_match_table = of_match_ptr(xgene_slimpro_i2c_id)
+		.of_match_table = of_match_ptr(xgene_slimpro_i2c_id),
+		.acpi_match_table = ACPI_PTR(xgene_slimpro_i2c_acpi_ids)
 	},
 };