From patchwork Wed Jun 4 12:09:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 355881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B7D16140098 for ; Wed, 4 Jun 2014 22:11:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbaFDMKX (ORCPT ); Wed, 4 Jun 2014 08:10:23 -0400 Received: from mail-ig0-f169.google.com ([209.85.213.169]:53798 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752847AbaFDMKT (ORCPT ); Wed, 4 Jun 2014 08:10:19 -0400 Received: by mail-ig0-f169.google.com with SMTP id a13so1788953igq.4 for ; Wed, 04 Jun 2014 05:10:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5wBHSWIMNrm1pZfSDlLOBtYvE3M+ZSLt6K4Tc3YEJfw=; b=LOVqqefZfZTL5CA+g9mFiv4etLxmj7rH7RM8FibVmQsHsJWSA42LFzwlpj6RD6dKNM sP0DeSpM3pOtQWLjNNs5ICezQcVtluqPbvEsGa21uZuL6WlU7N/TCzjK26rm9UgcS5cA 59UGd8j9GQmsK/bbVCk2gcGgcTxnJOw7+oBv/eueYqdbhXxsqlxiVkdabiDrz9zTWWmH mBBEilSyJZptWsw5A94g1X6kSR7vsF0eNNdVob4aWgFlHBsjAI5/uk3+iMGZQ5yDBBa0 uFBq6GIveLVK3EwbvuvW5/Iw3u5y38elr3oCVZZ2XXsM5ybeMFk4p3f4JeaDxqoJepH9 SmOA== X-Gm-Message-State: ALoCoQnhjRqG3ML09zo0Wyum6s9Tp1et7M4rt922P8fs1mP9Zxwy2efjbl4sC7SkdeaUsWsW/YO9 X-Received: by 10.50.43.167 with SMTP id x7mr6662425igl.36.1401883818791; Wed, 04 Jun 2014 05:10:18 -0700 (PDT) Received: from localhost.localdomain (host109-148-113-200.range109-148.btcentralplus.com. [109.148.113.200]) by mx.google.com with ESMTPSA id on9sm10028136igb.11.2014.06.04.05.10.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 05:10:18 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: wsa@the-dreams.de, grant.likely@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 3/7] i2c: Add the ability to match device to compatible string without an of_node Date: Wed, 4 Jun 2014 13:09:52 +0100 Message-Id: <1401883796-17841-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401883796-17841-1-git-send-email-lee.jones@linaro.org> References: <1401883796-17841-1-git-send-email-lee.jones@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org A great deal of I2C devices are currently matched via DT node name, and as such the compatible naming convention of ',' has gone somewhat awry - some nodes don't supply one, some supply an arbitrary string and others the correct device name with an arbitrary vendor prefix. In an effort to correct this problem we have to supply a mechanism to match a device by compatible string AND by simple device name. This function strips off the ',' part of a supplied compatible string and attempts to match without it. The plan is to remove this function once all of the compatible strings for each device have been brought into line. Signed-off-by: Lee Jones --- drivers/i2c/i2c-core.c | 25 +++++++++++++++++++++++++ include/linux/i2c.h | 10 ++++++++++ 2 files changed, 35 insertions(+) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index d3802dc..7dcd5c3 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1090,6 +1090,31 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) return i2c_verify_adapter(dev); } EXPORT_SYMBOL(of_find_i2c_adapter_by_node); + +const struct of_device_id +*i2c_of_match_device_strip_vendor(const struct of_device_id *matches, + struct device *dev) +{ + const struct i2c_client *client = i2c_verify_client(dev); + const char *name; + + if (!(client && matches)) + return NULL; + + for (; matches->compatible[0]; matches++) { + name = strchr(matches->compatible, ','); + if (!name) + name = matches->compatible; + else + name++; + + if (!strncmp(client->name, name, strlen(client->name))) + return matches; + } + + return NULL; +} +EXPORT_SYMBOL_GPL(i2c_of_match_device_strip_vendor); #else static void of_i2c_register_devices(struct i2c_adapter *adap) { } #endif /* CONFIG_OF */ diff --git a/include/linux/i2c.h b/include/linux/i2c.h index b556e0a..f7ec75b 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -564,6 +564,9 @@ extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node); /* must call put_device() when done with returned i2c_adapter device */ extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node); +extern const struct of_device_id +*i2c_of_match_device_strip_vendor(const struct of_device_id *matches, + struct device *dev); #else static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) @@ -575,6 +578,13 @@ static inline struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node { return NULL; } + +const struct of_device_id +*i2c_of_match_device_strip_vendor(const struct of_device_id *matches, + struct device *dev) +{ + return NULL; +} #endif /* CONFIG_OF */ #endif /* _LINUX_I2C_H */