From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
To: Brendan Higgins <brendanhiggins@google.com>,
Wolfram Sang <wsa@the-dreams.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Joel Stanley <joel@jms.id.au>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Andrew Jeffery <andrew@aj.id.au>,
linux-i2c@vger.kernel.org, openbmc@lists.ozlabs.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>,
James Feist <james.feist@linux.intel.com>,
Vernon Mauery <vernon.mauery@linux.intel.com>
Subject: Re: [PATCH i2c-next v5 2/5] i2c: Add support for 'timeout-ms' and '#retries' OF properties
Date: Thu, 4 Oct 2018 09:26:02 -0700 [thread overview]
Message-ID: <1832adbf-fa95-ccfc-00e5-63568059bcd1@linux.intel.com> (raw)
In-Reply-To: <20181003223107.16133-3-jae.hyun.yoo@linux.intel.com>
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -1214,6 +1214,7 @@ EXPORT_SYMBOL_GPL(i2c_handle_smbus_host_notify);
> static int i2c_register_adapter(struct i2c_adapter *adap)
> {
> int res = -EINVAL;
> + u32 timeout_ms;
Will change it to:
u32 timeout_ms = 0;
>
> /* Can't register until after driver model init */
> if (WARN_ON(!is_registered)) {
> @@ -1239,8 +1240,21 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> INIT_LIST_HEAD(&adap->userspace_clients);
>
> /* Set default timeout to 1 second if not already set */
> - if (adap->timeout == 0)
> - adap->timeout = HZ;
> + if (adap->timeout == 0) {
> + if (adap->dev.of_node)
> + res = of_property_read_u32(adap->dev.of_node,
> + "timeout-ms",
> + &timeout_ms);
> + if (res)
> + timeout_ms = 0;
> +
Also, it should be:
if (adap->dev.of_node)
of_property_read_u32(adap->dev.of_node, "timeout-ms",
&timeout_ms);
Will submit a new patch set.
Thanks,
Jae
> + adap->timeout = timeout_ms ? msecs_to_jiffies(timeout_ms) : HZ;
> + }
> +
> + /* Set retries value if it has the OF property */
> + if (adap->dev.of_node)
> + of_property_read_u32(adap->dev.of_node, "#retries",
> + &adap->retries);
>
> /* register soft irqs for Host Notify */
> res = i2c_setup_host_notify_irq_domain(adap);
>
next prev parent reply other threads:[~2018-10-04 16:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 22:31 [PATCH i2c-next v5 0/5] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
2018-10-03 22:31 ` [PATCH i2c-next v5 1/5] dt-bindings: i2c: Add 'timeout-ms' and '#retries' properties as common optional Jae Hyun Yoo
2018-10-03 22:31 ` [PATCH i2c-next v5 2/5] i2c: Add support for 'timeout-ms' and '#retries' OF properties Jae Hyun Yoo
2018-10-04 16:26 ` Jae Hyun Yoo [this message]
2018-10-03 22:31 ` [PATCH i2c-next v5 3/5] dt-bindings: i2c: aspeed: Add 'timeout-ms' property as an optional property Jae Hyun Yoo
2018-10-03 22:31 ` [PATCH i2c-next v5 4/5] i2c: aspeed: Remove hard-coded bus timeout value setting Jae Hyun Yoo
2018-10-04 8:32 ` Joel Stanley
2018-10-04 16:11 ` Jae Hyun Yoo
2018-10-03 22:31 ` [PATCH i2c-next v5 5/5] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
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=1832adbf-fa95-ccfc-00e5-63568059bcd1@linux.intel.com \
--to=jae.hyun.yoo@linux.intel.com \
--cc=andrew@aj.id.au \
--cc=benh@kernel.crashing.org \
--cc=brendanhiggins@google.com \
--cc=devicetree@vger.kernel.org \
--cc=james.feist@linux.intel.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=joel@jms.id.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=openbmc@lists.ozlabs.org \
--cc=robh+dt@kernel.org \
--cc=vernon.mauery@linux.intel.com \
--cc=wsa@the-dreams.de \
/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).