From patchwork Sat Aug 8 20:33:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 6975931 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@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 B71499F358 for ; Sat, 8 Aug 2015 20:34:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6A692062A for ; Sat, 8 Aug 2015 20:34:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03DDB20610 for ; Sat, 8 Aug 2015 20:34:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992687AbbHHUeA (ORCPT ); Sat, 8 Aug 2015 16:34:00 -0400 Received: from sauhun.de ([89.238.76.85]:55358 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992525AbbHHUeA (ORCPT ); Sat, 8 Aug 2015 16:34:00 -0400 Received: from p4fe257ec.dip0.t-ipconnect.de ([79.226.87.236]:35280 helo=localhost) by pokefinder.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZOAoY-0004Pl-Fq; Sat, 08 Aug 2015 22:33:58 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm , Simon Horman , Laurent Pinchart , Geert Uytterhoeven , Wolfram Sang , Andrey Danin , Stephen Warren , Stephen Warren Subject: [PATCH 06/10] i2c: apply DT flags when probing Date: Sat, 8 Aug 2015 22:33:23 +0200 Message-Id: <1439066007-13951-7-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439066007-13951-1-git-send-email-wsa@the-dreams.de> References: <1439066007-13951-1-git-send-email-wsa@the-dreams.de> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Check for slave and 10-bit flags when probing and mark the client when found. Improve the address validity check, too Tested-by: Andrey Danin Acked-by: Stephen Warren Signed-off-by: Wolfram Sang --- drivers/i2c/i2c-core.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 4a83d39a5aabe2..7638eb1a5998f8 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -27,6 +27,7 @@ I2C slave support (c) 2014 by Wolfram Sang */ +#include #include #include #include @@ -1286,7 +1287,8 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, struct i2c_client *result; struct i2c_board_info info = {}; struct dev_archdata dev_ad = {}; - const __be32 *addr; + const __be32 *addr_be; + u32 addr; int len; dev_dbg(&adap->dev, "of_i2c: register %s\n", node->full_name); @@ -1297,20 +1299,31 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, return ERR_PTR(-EINVAL); } - addr = of_get_property(node, "reg", &len); - if (!addr || (len < sizeof(*addr))) { + addr_be = of_get_property(node, "reg", &len); + if (!addr_be || (len < sizeof(*addr_be))) { dev_err(&adap->dev, "of_i2c: invalid reg on %s\n", node->full_name); return ERR_PTR(-EINVAL); } - info.addr = be32_to_cpup(addr); - if (info.addr > (1 << 10) - 1) { + addr = be32_to_cpup(addr_be); + if (addr & I2C_TEN_BIT_ADDRESS) { + addr &= ~I2C_TEN_BIT_ADDRESS; + info.flags |= I2C_CLIENT_TEN; + } + + if (addr & I2C_OWN_SLAVE_ADDRESS) { + addr &= ~I2C_OWN_SLAVE_ADDRESS; + info.flags |= I2C_CLIENT_SLAVE; + } + + if (i2c_check_addr_validity(addr, info.flags)) { dev_err(&adap->dev, "of_i2c: invalid addr=%x on %s\n", info.addr, node->full_name); return ERR_PTR(-EINVAL); } + info.addr = addr; info.of_node = of_node_get(node); info.archdata = &dev_ad;