From: Wolfgang Grandegger <wg@grandegger•com>
To: Wolfram Sang <w.sang@pengutronix•de>
Cc: linuxppc-dev@ozlabs•org, devicetree-discuss@ozlabs•org,
linux-i2c@vger•kernel.org
Subject: Re: [PATCH 1/2] powerpc: i2c-mpc: preserve I2C clocking
Date: Tue, 31 Mar 2009 15:47:29 +0200 [thread overview]
Message-ID: <49D21EF1.9050200@grandegger.com> (raw)
In-Reply-To: <20090331133953.GB3044@pengutronix.de>
Wolfram Sang wrote:
> On Tue, Mar 31, 2009 at 02:50:29PM +0200, Wolfgang Grandegger wrote:
>> The I2c node property "fsl,preserve-clocking" allows to overtake the
>> clock settings from the boot loader and avoids the hard-coded setting.
>>
>> Signed-off-by: Wolfgang Grandegger <wg@grandegger•com>
>> ---
>> drivers/i2c/busses/i2c-mpc.c | 24 ++++++++++++++++--------
>> 1 file changed, 16 insertions(+), 8 deletions(-)
>>
>> Index: linux-2.6/drivers/i2c/busses/i2c-mpc.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/i2c/busses/i2c-mpc.c 2009-03-31 13:25:08.000000000 +0200
>> +++ linux-2.6/drivers/i2c/busses/i2c-mpc.c 2009-03-31 13:28:03.000000000 +0200
>> @@ -318,17 +318,24 @@
>> {
>> int result = 0;
>> struct mpc_i2c *i2c;
>> + int set_clock;
>>
>> i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);
>> if (!i2c)
>> return -ENOMEM;
>>
>> - if (of_get_property(op->node, "dfsrr", NULL))
>> - i2c->flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
>> -
>> - if (of_device_is_compatible(op->node, "fsl,mpc5200-i2c") ||
>> - of_device_is_compatible(op->node, "mpc5200-i2c"))
>> - i2c->flags |= FSL_I2C_DEV_CLOCK_5200;
>> + if (of_get_property(op->node, "fsl,preserve-clocking", NULL)) {
>> + set_clock = 0;
>> + } else {
>> + set_clock = 1;
>> +
>> + if (of_get_property(op->node, "dfsrr", NULL))
>> + i2c->flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
>> +
>> + if (of_device_is_compatible(op->node, "fsl,mpc5200-i2c") ||
>> + of_device_is_compatible(op->node, "mpc5200-i2c"))
>> + i2c->flags |= FSL_I2C_DEV_CLOCK_5200;
>> + }
>>
>> init_waitqueue_head(&i2c->queue);
>>
>> @@ -348,8 +355,9 @@
>> goto fail_request;
>> }
>> }
>> -
>> - mpc_i2c_setclock(i2c);
>> +
>> + if (set_clock)
>> + mpc_i2c_setclock(i2c);
>
> Can't we drop 'set_clock' with something like this here?
>
> + if (!of_get_property(op->node, "fsl,preserve-clocking", NULL)) {
> +
> + if (of_get_property(op->node, "dfsrr", NULL))
> + i2c->flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
> +
> + if (of_device_is_compatible(op->node, "fsl,mpc5200-i2c") ||
> + of_device_is_compatible(op->node, "mpc5200-i2c"))
> + i2c->flags |= FSL_I2C_DEV_CLOCK_5200;
> +
> + mpc_i2c_setclock(i2c);
> + }
No, because the I2C registers are not yet mapped.
Wolfgang.
next prev parent reply other threads:[~2009-03-31 13:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-31 12:50 [PATCH 0/2] powerpc: i2c-mpc: make I2C bus speed configurable Wolfgang Grandegger
2009-03-31 12:50 ` [PATCH 1/2] powerpc: i2c-mpc: preserve I2C clocking Wolfgang Grandegger
2009-03-31 13:39 ` Wolfram Sang
2009-03-31 13:47 ` Wolfgang Grandegger [this message]
2009-03-31 13:56 ` Wolfram Sang
2009-03-31 15:44 ` Grant Likely
2009-03-31 20:05 ` Wolfgang Grandegger
2009-04-01 0:41 ` PowerPC 460EX AD7416 Temperature Sensor Henry Bausley
2009-04-01 2:10 ` Tirumala Reddy Marri
2009-03-31 12:50 ` [PATCH 2/2] powerpc: i2c-mpc: make I2C bus speed configurable Wolfgang Grandegger
-- strict thread matches above, loose matches on Subject: below --
2009-03-31 12:43 [PATCH 0/2] test Wolfgang Grandegger
2009-03-31 12:43 ` [PATCH 1/2] powerpc: i2c-mpc: preserve I2C clocking Wolfgang Grandegger
2009-03-31 23:06 ` David Gibson
2009-04-01 7:40 ` Wolfgang Grandegger
2009-04-02 0:07 ` David Gibson
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=49D21EF1.9050200@grandegger.com \
--to=wg@grandegger$(echo .)com \
--cc=devicetree-discuss@ozlabs$(echo .)org \
--cc=linux-i2c@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=w.sang@pengutronix$(echo .)de \
/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