Thread (23 messages) 23 messages, 3 authors, 2014-01-08

[PATCH v2 6/7] mfd: pm8921: Add DT match table

From: Lee Jones <hidden>
Date: 2014-01-06 11:52:56
Also in: linux-arm-msm, lkml

quoted hunk ↗ jump to hunk
Allow this driver to probe based on devicetree.

Signed-off-by: Stephen Boyd <redacted>
---
 drivers/mfd/pm8921-core.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index d13cb6e..290f0da 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -420,6 +420,13 @@ static const struct regmap_config ssbi_regmap_config = {
 	.reg_write = ssbi_reg_write
 };
 
+static const struct of_device_id pm8921_id_table[] = {
+	{ .compatible = "qcom,pm8058", },
+	{ .compatible = "qcom,pm8921", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pm8921_id_table);
+
 static int pm8921_probe(struct platform_device *pdev)
 {
 	struct pm8921 *pmic;
@@ -429,7 +436,6 @@ static int pm8921_probe(struct platform_device *pdev)
 	unsigned int irq;
 	u32 rev;
 
-
Sneaky!
quoted hunk ↗ jump to hunk
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
 		return irq;
@@ -494,6 +500,7 @@ static struct platform_driver pm8921_driver = {
 	.driver		= {
 		.name	= "pm8921-core",
 		.owner	= THIS_MODULE,
+		.of_match_table = pm8921_id_table,
 	},
 };
Patch fine:
  Acked-by: Lee Jones [off-list ref]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help