From: dianders@chromium.org (Doug Anderson)
To: linux-arm-kernel@lists.infradead.org
Subject: [REPOST PATCH 2/2] i2c: pxa: Use i2c-core to get bus number now
Date: Fri, 11 Jan 2013 09:57:07 -0800 [thread overview]
Message-ID: <1357927027-4857-3-git-send-email-dianders@chromium.org> (raw)
In-Reply-To: <1357927027-4857-1-git-send-email-dianders@chromium.org>
The commit: "i2c-core: dt: Pick i2c bus number from i2c alias if
present" adds support for automatically picking the bus number based
on the alias ID. Remove the now unnecessary code from i2c-pxa that
did the same thing.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
---
drivers/i2c/busses/i2c-pxa.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 1034d93..8ee9fa0 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1053,16 +1053,10 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id =
of_match_device(i2c_pxa_dt_ids, &pdev->dev);
- int ret;
if (!of_id)
return 1;
- ret = of_alias_get_id(np, "i2c");
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
- return ret;
- }
- pdev->id = ret;
+ pdev->id = -1;
if (of_get_property(np, "mrvl,i2c-polling", NULL))
i2c->use_pio = 1;
if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
--
1.7.7.3
next prev parent reply other threads:[~2013-01-11 17:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-20 22:27 [PATCH 1/2] ARM: EXYNOS: Add aliases for i2c controller for exynos4 Doug Anderson
2012-11-20 22:27 ` [PATCH 2/2] i2c: s3c2410: Get the i2c bus number from alias id Doug Anderson
2012-11-21 4:09 ` Mark Brown
2012-11-21 18:33 ` Doug Anderson
2012-11-22 6:56 ` Kukjin Kim
2012-11-21 9:43 ` Kukjin Kim
2012-11-21 18:26 ` [PATCH 0/2] Add automatic bus number support for i2c busses with device tree Doug Anderson
2012-11-21 18:26 ` [PATCH 1/2] i2c-core: dt: Pick i2c bus number from i2c alias if present Doug Anderson
2012-12-05 1:45 ` Haojian Zhuang
2013-01-11 17:57 ` [REPOST PATCH 0/2] Add automatic bus number support for i2c busses with device tree Doug Anderson
2013-01-11 17:57 ` [REPOST PATCH 1/2] i2c-core: dt: Pick i2c bus number from i2c alias if present Doug Anderson
2013-01-14 18:53 ` [PATCH v2 0/2] Add automatic bus number support for i2c busses with device tree Doug Anderson
2013-01-14 18:53 ` [PATCH v2 1/2] i2c-core: dt: Pick i2c bus number from i2c alias if present Doug Anderson
2013-01-15 6:34 ` Olof Johansson
2013-02-10 12:19 ` Wolfram Sang
2013-02-12 0:48 ` Doug Anderson
2013-01-14 18:53 ` [PATCH v2 2/2] i2c: pxa: Use i2c-core to get bus number now Doug Anderson
2013-01-11 17:57 ` Doug Anderson [this message]
2013-01-11 22:12 ` [REPOST PATCH " Sylwester Nawrocki
2013-01-14 18:52 ` Doug Anderson
2012-11-21 18:26 ` [PATCH " Doug Anderson
2012-12-05 1:45 ` Haojian Zhuang
2012-12-05 1:48 ` [PATCH 0/2] Add automatic bus number support for i2c busses with device tree Haojian Zhuang
2012-11-21 7:25 ` [PATCH 1/2] ARM: EXYNOS: Add aliases for i2c controller for exynos4 Olof Johansson
2012-11-21 9:43 ` Kukjin Kim
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=1357927027-4857-3-git-send-email-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).