All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rhyland Klein <rklein@nvidia.com>
To: Anton Vorontsov <cbou@mail.ru>
Cc: devicetree-discuss@lists.ozlabs.org,
	linux-kernel@vger.kernel.org, Rhyland Klein <rklein@nvidia.com>
Subject: [PATCH 2/2] power_supply: tps65090: Setup compatible property for dt
Date: Thu, 21 Mar 2013 16:33:05 -0400	[thread overview]
Message-ID: <1363897985-19980-2-git-send-email-rklein@nvidia.com> (raw)
In-Reply-To: <1363897985-19980-1-git-send-email-rklein@nvidia.com>

Setup the compatible property so that when this device is registered
through device tree, it can match the expected compatiblity string
used in the tps65090 driver.

Signed-off-by: Rhyland Klein <rklein@nvidia.com>
---
 drivers/power/tps65090-charger.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 0c66c66..3b3dafd 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -168,7 +168,7 @@ static struct tps65090_platform_data *
 		tps65090_parse_dt_charger_data(struct platform_device *pdev)
 {
 	struct tps65090_platform_data *pdata;
-	struct device_node *np = pdev->dev.parent->of_node;
+	struct device_node *np = pdev->dev.of_node;
 	unsigned int prop;
 
 	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
@@ -204,7 +204,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
 
 	pdata = dev_get_platdata(pdev->dev.parent);
 
-	if (!pdata && tps65090_mfd->dev->of_node)
+	if (!pdata && pdev->dev.of_node)
 		pdata = tps65090_parse_dt_charger_data(pdev);
 
 	if (!pdata) {
@@ -300,9 +300,15 @@ static int tps65090_charger_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static struct of_device_id of_tps65090_charger_match[] = {
+	{ .compatible = "ti,tps65090-charger", },
+	{ /* end */ }
+};
+
 static struct platform_driver tps65090_charger_driver = {
 	.driver	= {
 		.name	= "tps65090-charger",
+		.of_match_table = of_tps65090_charger_match,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= tps65090_charger_probe,
-- 
1.7.9.5

WARNING: multiple messages have this Message-ID (diff)
From: Rhyland Klein <rklein@nvidia.com>
To: Anton Vorontsov <cbou@mail.ru>
Cc: <devicetree-discuss@lists.ozlabs.org>,
	<linux-kernel@vger.kernel.org>, Rhyland Klein <rklein@nvidia.com>
Subject: [PATCH 2/2] power_supply: tps65090: Setup compatible property for dt
Date: Thu, 21 Mar 2013 16:33:05 -0400	[thread overview]
Message-ID: <1363897985-19980-2-git-send-email-rklein@nvidia.com> (raw)
In-Reply-To: <1363897985-19980-1-git-send-email-rklein@nvidia.com>

Setup the compatible property so that when this device is registered
through device tree, it can match the expected compatiblity string
used in the tps65090 driver.

Signed-off-by: Rhyland Klein <rklein@nvidia.com>
---
 drivers/power/tps65090-charger.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 0c66c66..3b3dafd 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -168,7 +168,7 @@ static struct tps65090_platform_data *
 		tps65090_parse_dt_charger_data(struct platform_device *pdev)
 {
 	struct tps65090_platform_data *pdata;
-	struct device_node *np = pdev->dev.parent->of_node;
+	struct device_node *np = pdev->dev.of_node;
 	unsigned int prop;
 
 	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
@@ -204,7 +204,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
 
 	pdata = dev_get_platdata(pdev->dev.parent);
 
-	if (!pdata && tps65090_mfd->dev->of_node)
+	if (!pdata && pdev->dev.of_node)
 		pdata = tps65090_parse_dt_charger_data(pdev);
 
 	if (!pdata) {
@@ -300,9 +300,15 @@ static int tps65090_charger_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static struct of_device_id of_tps65090_charger_match[] = {
+	{ .compatible = "ti,tps65090-charger", },
+	{ /* end */ }
+};
+
 static struct platform_driver tps65090_charger_driver = {
 	.driver	= {
 		.name	= "tps65090-charger",
+		.of_match_table = of_tps65090_charger_match,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= tps65090_charger_probe,
-- 
1.7.9.5


  reply	other threads:[~2013-03-21 20:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-21 20:33 [PATCH 1/2] power_supply: tps65090: Update bindings for subnode Rhyland Klein
2013-03-21 20:33 ` Rhyland Klein
2013-03-21 20:33 ` Rhyland Klein [this message]
2013-03-21 20:33   ` [PATCH 2/2] power_supply: tps65090: Setup compatible property for dt Rhyland Klein
2013-04-01  6:18   ` Anton Vorontsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1363897985-19980-2-git-send-email-rklein@nvidia.com \
    --to=rklein@nvidia.com \
    --cc=cbou@mail.ru \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.