From patchwork Wed Jun 4 12:09:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 355882 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 DE503140098 for ; Wed, 4 Jun 2014 22:11:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753128AbaFDMLg (ORCPT ); Wed, 4 Jun 2014 08:11:36 -0400 Received: from mail-ie0-f179.google.com ([209.85.223.179]:54000 "EHLO mail-ie0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857AbaFDMKW (ORCPT ); Wed, 4 Jun 2014 08:10:22 -0400 Received: by mail-ie0-f179.google.com with SMTP id rd18so7152383iec.38 for ; Wed, 04 Jun 2014 05:10:21 -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=SgKrFDbI5XvOJ4vCGvH9bJjaEKB5YqBx8Mi+zninKt4=; b=Yv5ugd1qo6A9k9a1fEbtyPYyQgYePPDDZIy99O1/T9NQzCfUpxh1kJLEMSWQNiSwU3 84nt7I4ROO1TTWTKXtx/wzp4svqbjYFcfAu0osY6D/f2Loda7Op8+0Him7AgQeFMq3jP DBA/e57vDV5oDh7wC9kKD5u+oFN3hy6nmE3fEN/wwwRZeQ19VS2z1zZb1eYXup+n+rlr ndZReY1WD6dcYWYtV8OH12LQIR5w96SznXZVuaOWFzoDL7b2UP2kkjlYHhBxB/fWnZz9 RlAT09LJd/xFUbxeQiDLIijibmX+AFz0UPeSNlV7AWA6hutC/AFxMec0JkGjT/gOAT3B 8gpA== X-Gm-Message-State: ALoCoQm1raDA9TwVRAakzeECtlWn/Ta+ZUqafHPC8LXjM3WWXeGROmmQszc2BwFDkwcIayczv1y6 X-Received: by 10.50.50.231 with SMTP id f7mr6389916igo.42.1401883821249; Wed, 04 Jun 2014 05:10:21 -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.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 05:10:20 -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 4/7] i2c: Match using traditional OF methods, then by vendor-less compatible strings Date: Wed, 4 Jun 2014 13:09:53 +0100 Message-Id: <1401883796-17841-5-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 This function provides a single call for all I2C devices which need to match firstly using traditional OF means i.e by of_node, then if that fails we attempt to match using the supplied I2C client name with a list of supplied compatible strings with the ',' string removed. The latter is required due to the unruly naming conventions used currently by I2C devices. Signed-off-by: Lee Jones --- drivers/i2c/i2c-core.c | 13 +++++++++++++ include/linux/i2c.h | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7dcd5c3..e8c2cba 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1115,6 +1115,19 @@ const struct of_device_id return NULL; } EXPORT_SYMBOL_GPL(i2c_of_match_device_strip_vendor); + +const struct of_device_id +*i2c_of_match_device(const struct of_device_id *matches, struct device *dev) +{ + const struct of_device_id *match; + + match = of_match_device(matches, dev); + if (match) + return match; + + return i2c_of_match_device_strip_vendor(matches, dev); +} +EXPORT_SYMBOL_GPL(i2c_of_match_device); #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 f7ec75b..ab5866f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -565,6 +565,9 @@ extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node); extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node); extern const struct of_device_id +*i2c_of_match_device(const struct of_device_id *matches, struct device *dev); + +extern const struct of_device_id *i2c_of_match_device_strip_vendor(const struct of_device_id *matches, struct device *dev); #else @@ -580,6 +583,12 @@ static inline struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node } const struct of_device_id +*i2c_of_match_device(const struct of_device_id *matches, struct device *dev) +{ + return NULL; +} + +const struct of_device_id *i2c_of_match_device_strip_vendor(const struct of_device_id *matches, struct device *dev) {