From: hs@denx•de (Heiko Schocher)
To: linux-arm-kernel@lists•infradead.org
Subject: [RFC PATCH 5/7] ARM: davinci: i2c: add OF support
Date: Tue, 14 Feb 2012 08:16:40 +0100 [thread overview]
Message-ID: <4F3A0A58.5030707@denx.de> (raw)
In-Reply-To: <20120213233726.GK2999@freya.fluff.org>
Hello Ben,
Ben Dooks wrote:
> On Mon, Jan 23, 2012 at 09:56:05AM +0100, Heiko Schocher wrote:
>> add of support for the davinci i2c driver.
>>
>> Signed-off-by: Heiko Schocher <hs@denx•de>
>> Cc: davinci-linux-open-source at linux.davincidsp.com
>> Cc: linux-arm-kernel at lists.infradead.org
>> Cc: devicetree-discuss at lists.ozlabs.org
>> Cc: linux-i2c at vger.kernel.org
>> Cc: Ben Dooks <ben-linux@fluff•org>
>> Cc: Wolfram Sang <w.sang@pengutronix•de>
>> Cc: Grant Likely <grant.likely@secretlab•ca>
>> Cc: Sekhar Nori <nsekhar@ti•com>
>> Cc: Wolfgang Denk <wd@denx•de>
>> ---
>> .../devicetree/bindings/arm/davinci/i2c.txt | 39 ++++++++++++++++++
>> drivers/i2c/busses/i2c-davinci.c | 43 ++++++++++++++++++++
>> 2 files changed, 82 insertions(+), 0 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/arm/davinci/i2c.txt
>>
>> diff --git a/Documentation/devicetree/bindings/arm/davinci/i2c.txt b/Documentation/devicetree/bindings/arm/davinci/i2c.txt
>> new file mode 100644
>> index 0000000..94ec670
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/arm/davinci/i2c.txt
[...]
>> +Optional properties:
>> +- bus-delay: bus delay in usec
>
> bus_delay sounds rather like frequency in a different name, what is it for?
from drivers/i2c/busses/i2c-davinci.c i2c_davinci_xfer_msg():
/* Introduce a delay, required for some boards (e.g Davinci EVM) */
if (pdata->bus_delay)
udelay(pdata->bus_delay);
so I added this option to OF support too, but I do not know more about
this "feature" ...
[...]
>> diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
>> index a76d85f..6f59fae 100644
>> --- a/drivers/i2c/busses/i2c-davinci.c
>> +++ b/drivers/i2c/busses/i2c-davinci.c
>> @@ -38,9 +38,12 @@
[...]
>> +MODULE_DEVICE_TABLE(of, davinci_i2c_of_match);
>> +#else
>> +#define davinci_i2c_of_match NULL
>> +#endif
>
> see of_match_ptr() and you won't need the #else.
Yep, already fixed, as Grant Likely commented.
>> static int davinci_i2c_probe(struct platform_device *pdev)
>> {
>> struct davinci_i2c_dev *dev;
>> @@ -676,7 +689,34 @@ static int davinci_i2c_probe(struct platform_device *pdev)
>> dev->irq = irq->start;
>> platform_set_drvdata(pdev, dev);
>>
>> + if ((dev->dev->platform_data == NULL) &&
>> + (pdev->dev.of_node)) {
>
> If there's platform_data an of_node, what happens then?
Then platform_data is used.
>> + struct device_node *pinmux_np;
>> + struct davinci_i2c_platform_data *pdata;
>> + u32 prop;
>> +
>> + dev->dev->platform_data = &davinci_i2c_platform_data_default;
>> + pdata = &davinci_i2c_platform_data_default;
>> + if (!of_property_read_u32(pdev->dev.of_node, "clock-frequency",
>> + &prop))
>> + pdata->bus_freq = prop / 1000;
>> + if (!of_property_read_u32(pdev->dev.of_node, "bus-delay",
>> + &prop))
>> + pdata->bus_delay = prop;
>> + if (!of_property_read_u32(pdev->dev.of_node, "id",
>> + &prop)) {
>> + pdev->id = prop;
>> + pdev->dev.init_name = kzalloc(20, GFP_KERNEL);
>> + sprintf((char *)pdev->dev.init_name,
>> + "i2c_davinci.%d", pdev->id);
>> + }
>
> Is this _really_ necessary, looks a bit of a hack to me.
Yep, "id" completely removed, as Grant Likely commented too.
[...]
Thanks for looking through this. Posting v2 soon.
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
next prev parent reply other threads:[~2012-02-14 7:16 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 8:56 [RFC PATCH 0/7] ARM: davinci: add support for the am1808 based enbw_cmc board Heiko Schocher
2012-01-23 8:56 ` [RFC PATCH 1/7] ARM: davinci, intc: Add OF support for TI interrupt controller Heiko Schocher
2012-02-02 4:54 ` Grant Likely
2012-02-06 6:36 ` Heiko Schocher
2012-02-14 7:15 ` Heiko Schocher
2012-01-23 8:56 ` [RFC PATCH 2/7 v2] ARM: davinci: configure davinci aemif chipselects through OF Heiko Schocher
2012-01-23 8:56 ` [RFC PATCH 3/7] ARM: davinci: mux: add OF support Heiko Schocher
2012-01-23 8:56 ` [RFC PATCH 4/7] ARM: davinci: net: davinci_emac: " Heiko Schocher
2012-01-23 19:20 ` Anatoly Sivov
2012-01-24 6:14 ` Heiko Schocher
2012-01-30 20:22 ` Grant Likely
2012-01-31 11:27 ` Heiko Schocher
2012-02-02 0:19 ` Grant Likely
2012-01-23 8:56 ` [RFC PATCH 5/7] ARM: davinci: i2c: " Heiko Schocher
2012-01-23 20:35 ` Sylwester Nawrocki
2012-01-24 7:18 ` Heiko Schocher
2012-01-24 9:51 ` Sylwester Nawrocki
2012-01-30 20:13 ` Grant Likely
2012-01-31 7:31 ` Heiko Schocher
2012-02-05 20:44 ` Sylwester Nawrocki
2012-01-30 20:04 ` Grant Likely
2012-01-31 7:14 ` Heiko Schocher
2012-02-13 23:37 ` Ben Dooks
2012-02-14 7:16 ` Heiko Schocher [this message]
2012-01-23 8:56 ` [RFC PATCH 6/7] ARM: mtd: nand: davinci: add OF support for davinci nand controller Heiko Schocher
2012-01-23 23:59 ` Scott Wood
2012-01-24 7:23 ` Heiko Schocher
2012-01-24 19:45 ` Scott Wood
2012-01-25 7:09 ` Heiko Schocher
2012-01-26 20:33 ` Scott Wood
2012-01-27 6:40 ` Heiko Schocher
2012-01-27 17:02 ` Scott Wood
2012-01-23 8:56 ` [RFC PATCH 7/7] ARM: davinci: add support for the am1808 based enbw_cmc board Heiko Schocher
2012-01-30 20:32 ` Grant Likely
2012-01-31 13:04 ` Heiko Schocher
2012-02-01 10:20 ` Sergei Shtylyov
2012-02-02 0:17 ` Grant Likely
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=4F3A0A58.5030707@denx.de \
--to=hs@denx$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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