From patchwork Mon Apr 14 10:36:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 3979271 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4388E9F2BA for ; Mon, 14 Apr 2014 10:36:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FFBB201E4 for ; Mon, 14 Apr 2014 10:36:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 432C020148 for ; Mon, 14 Apr 2014 10:36:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803AbaDNKgx (ORCPT ); Mon, 14 Apr 2014 06:36:53 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:33557 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751519AbaDNKgw (ORCPT ); Mon, 14 Apr 2014 06:36:52 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 06B144671D5; Mon, 14 Apr 2014 11:36:51 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EG1h1i1tIE65; Mon, 14 Apr 2014 11:36:44 +0100 (BST) Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [10.24.1.133]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id D40A246620E; Mon, 14 Apr 2014 11:36:44 +0100 (BST) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WZeFo-00075n-GR; Mon, 14 Apr 2014 11:36:44 +0100 From: Ben Dooks To: linux-sh@vger.kernel.org, linux-kernel@lists.codethink.co.uk Cc: g.liakhovetski@gmx.de, josh.wu@atmel.com, cooloney@gmail.com, laurent.pinchart@ideasonboard.com, magnus.damm@opensource.se, ian.molton@codethink.co.uk, Ben Dooks Subject: [PATCH v3 2/7] adv7180: add of match table Date: Mon, 14 Apr 2014 11:36:37 +0100 Message-Id: <1397471802-27216-3-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397471802-27216-1-git-send-email-ben.dooks@codethink.co.uk> References: <1397471802-27216-1-git-send-email-ben.dooks@codethink.co.uk> 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.9 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 Add a proper of match id for use when the device is being bound via device tree, to avoid having to use the i2c old-style binding of the device. Signed-off-by: Ben Dooks --- drivers/media/i2c/adv7180.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 215afa0..687d97b 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -695,11 +696,21 @@ static SIMPLE_DEV_PM_OPS(adv7180_pm_ops, adv7180_suspend, adv7180_resume); MODULE_DEVICE_TABLE(i2c, adv7180_id); +#ifdef CONFIG_OF +static const struct of_device_id adv7180_of_id[] = { + { .compatible = "adi,adv7180", }, + { }, +}; + +MODULE_DEVICE_TABLE(of, adv7180_of_id) +#endif + static struct i2c_driver adv7180_driver = { .driver = { .owner = THIS_MODULE, .name = KBUILD_MODNAME, .pm = ADV7180_PM_OPS, + .of_match = of_match_ptr(adv7180_of_id), }, .probe = adv7180_probe, .remove = adv7180_remove,