From patchwork Thu Dec 3 15:51:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 7761531 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CCEBC9FC45 for ; Thu, 3 Dec 2015 15:52:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5B4B2049E for ; Thu, 3 Dec 2015 15:52:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1F482054C for ; Thu, 3 Dec 2015 15:52:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4WBI-0002rd-H9; Thu, 03 Dec 2015 15:52:28 +0000 Received: from sauhun.de ([89.238.76.85] helo=pokefinder.org) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4WB9-0002fV-Ly for linux-rockchip@lists.infradead.org; Thu, 03 Dec 2015 15:52:24 +0000 Received: from p4fe25b0c.dip0.t-ipconnect.de ([79.226.91.12]:55007 helo=localhost) by pokefinder.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1a4WAf-00028R-QX; Thu, 03 Dec 2015 16:51:50 +0100 From: Wolfram Sang To: linux-i2c@vger.kernel.org Subject: [PATCH 2/9] i2c: add generic routine to parse DT for timing information Date: Thu, 3 Dec 2015 16:51:32 +0100 Message-Id: <1449157899-6572-3-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449157899-6572-1-git-send-email-wsa@the-dreams.de> References: <1449157899-6572-1-git-send-email-wsa@the-dreams.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151203_075220_029931_14896A68 X-CRM114-Status: GOOD ( 13.80 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wolfram Sang , Yoshihiro Shimoda , linux-sh@vger.kernel.org, Magnus Damm , linux-rockchip@lists.infradead.org, Simon Horman , Geert Uytterhoeven , Laurent Pinchart , Jarkko Nikula , Andy Shevchenko , Mika Westerberg MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wolfram Sang Inspired from the i2c-rk3x driver (thanks guys!) but refactored and extended. See built-in docs for further information. Signed-off-by: Wolfram Sang --- drivers/i2c/i2c-core.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/i2c.h | 22 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index ba8eb087f22465..5c269dd51b2de7 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1438,6 +1438,56 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) } } +/** + * of_i2c_parse_timings - get I2C related timing parameters from DT + * @node: The DT node to scan for I2C timing properties + * @t: the i2c_timings struct to be filled with values + * @use_defaults: bool to use sane defaults derived from the I2C specification + * when properties are not found, otherwise use 0 + * + * Scan the node pointer for the generic I2C DT properties describing timing + * parameters for the signal and fill the given struct with the results. If a + * property was not found and use_defaults was true, then maximum timings are + * assumed which are derived from the I2C specification. If use_defaults is not + * used, the result will be 0, so drivers can apply their own defaults later. + * The latter is mainly intended for avoiding regressions of existing drivers + * which want to switch to this function. New drivers almost always should use + * the defaults. + */ +void of_i2c_parse_timings(struct device_node *node, struct i2c_timings *t, bool use_defaults) +{ + memset(t, 0, sizeof(*t)); + + if (of_property_read_u32(node, "clock-frequency", &t->bus_freq_hz) && use_defaults) + t->bus_freq_hz = 100000; + + /* + * Read rise and fall time from device tree. If not available, use + * the default maximum timing from the specification. + */ + if (of_property_read_u32(node, "i2c-scl-rising-time-ns", &t->scl_rise_ns) && use_defaults) { + if (t->bus_freq_hz <= 100000) + t->scl_rise_ns = 1000; + else if (t->bus_freq_hz <= 400000) + t->scl_rise_ns = 300; + else + t->scl_rise_ns = 120; + } + + if (of_property_read_u32(node, "i2c-scl-falling-time-ns", &t->scl_fall_ns) && use_defaults) { + if (t->bus_freq_hz <= 400000) + t->scl_fall_ns = 300; + else + t->scl_fall_ns = 120; + } + + of_property_read_u32(node, "i2c-scl-internal-delay-ns", &t->scl_int_delay_ns); + + if (of_property_read_u32(node, "i2c-sda-falling-time-ns", &t->sda_fall_ns) && use_defaults) + t->sda_fall_ns = t->scl_fall_ns; +} +EXPORT_SYMBOL_GPL(of_i2c_parse_timings); + static int of_dev_node_match(struct device *dev, void *data) { return dev->of_node == data; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 768063baafbf5e..c3f53666df117e 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -414,6 +414,22 @@ struct i2c_algorithm { }; /** + * struct i2c_timings - I2C timing information + * @bus_freq_hz: the bus frequency in Hz + * @scl_rise_ns: time SCL signal takes to rise in ns; t(r) in the I2C specification + * @scl_fall_ns: time SCL signal takes to fall in ns; t(f) in the I2C specification + * @scl_int_delay_ns: time IP core additionally needs to setup SCL in ns + * @sda_fall_ns: time SDA signal takes to fall in ns; t(f) in the I2C specification + */ +struct i2c_timings { + u32 bus_freq_hz; + u32 scl_rise_ns; + u32 scl_fall_ns; + u32 scl_int_delay_ns; + u32 sda_fall_ns; +}; + +/** * struct i2c_bus_recovery_info - I2C bus recovery information * @recover_bus: Recover routine. Either pass driver's recover_bus() routine, or * i2c_generic_scl_recovery() or i2c_generic_gpio_recovery(). @@ -644,6 +660,8 @@ extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) /* must call i2c_put_adapter() when done with returned i2c_adapter device */ struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node *node); + +void of_i2c_parse_timings(struct device_node *node, struct i2c_timings *t, bool use_defaults); #else static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) @@ -660,6 +678,10 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node { return NULL; } + +static inline void of_i2c_parse_timings(struct device_node *node, struct i2c_timings *t, bool use_defaults) +{ +} #endif /* CONFIG_OF */ #endif /* _LINUX_I2C_H */