From patchwork Fri Jan 25 13:11:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1031073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B1WUrYgY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43mKDP5wnfz9s9h for ; Sat, 26 Jan 2019 00:11:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726311AbfAYNLr (ORCPT ); Fri, 25 Jan 2019 08:11:47 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53253 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726108AbfAYNLr (ORCPT ); Fri, 25 Jan 2019 08:11:47 -0500 Received: by mail-wm1-f68.google.com with SMTP id d15so6733013wmb.3; Fri, 25 Jan 2019 05:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aQn5vfGBJuPihT9+lVxG/EDhj6eto8PXg4ptWHreGII=; b=B1WUrYgYJB55uiI/B1AfCIGObqvciB8TWChLnmCmICJo+ir0gX5OVUHn8SZhinX9QS fUbbXq0dNQWUvvDryoh/kp0OpSvbAC9+m0HUPjYJBLenX19AuQT9aUZsXhJhdCrUhmMf OH47Jibd3+7RPaQe2kcV7jyOSrYFv47eH8Ipe+jQwwiJjzi2GvvABAp85Y214A0K1wgi 9OpU2m+YhX/JgoGDU3qyp9Q9j+xkX9aJA+ik3xCbmCeebUu5XuzSXhkUDi+HnW8G9mhG 2tThfuH+K9dTzXJhZuTobFwsgsgtgjB6BJtQhYlvsUuYPCaDIzoAMTGNmfG/npWkRK6c 4HPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aQn5vfGBJuPihT9+lVxG/EDhj6eto8PXg4ptWHreGII=; b=JQYWvA9VwukmSPtor4gtbvJMx1XW68gZh8Pa73RQyT7IkzNDfVosiPpfRRiMNc0Nj7 4f8B+j9ztghL8mhyKi58bFEBKW9OgBmkRUWqX3OGTRhtMVHboMBBloE4wLpX4wmqHnEU LDmsWlBklti3a0dqt+c/h7kLAQcWWpIsl01dt2B715VD8YyetWajXxnC5ZmUBixT2TUf XBG6BUsoR9iP78K4vJ9FCnyYV/YFiyDb2Dys8l0zQPX+PAJiUq9UTPzPUjgFKed8OcgB sr/7JTx6T4dFCWipQ/vvumdIzp+6IWYAi80W+yEj7nh0DOp+izrU6iRYhuoZlj6TA6OW yttg== X-Gm-Message-State: AJcUukenjO61JWFsIx2mgzIvLQPhpegIy6dXU2HtXulrEgCM3J8llqyh qyyR5QxV0JmHwIe6drYl4ps= X-Google-Smtp-Source: ALg8bN42oFi2lrRphOCRoBA7Ydbzmljk7DsTZ65sf0MxjHJgqG1LKm0Clm8/WS/kZQcWzrDfSDe3Ug== X-Received: by 2002:a1c:4301:: with SMTP id q1mr6821577wma.44.1548421904824; Fri, 25 Jan 2019 05:11:44 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id t76sm68373501wme.33.2019.01.25.05.11.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jan 2019 05:11:44 -0800 (PST) From: Thierry Reding To: Wolfram Sang Cc: Rob Herring , Lucas Stach , Andrzej Hajda , Vlado Plaga , Tristan Bastian , linux-i2c@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH v2] i2c: of: Try to find an I2C adapter matching the parent Date: Fri, 25 Jan 2019 14:11:42 +0100 Message-Id: <20190125131142.26837-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Thierry Reding If an I2C adapter doesn't match the provided device tree node, also try matching the parent's device tree node. This allows finding an adapter based on the device node of the parent device that was used to register it. This fixes a regression on Tegra124-based Chromebooks (Nyan) where the eDP controller registers an I2C adapter that is used to read to EDID. After commit 993a815dcbb2 ("dt-bindings: panel: Add missing .txt suffix") this stopped working because the I2C adapter could no longer be found. The approach in this patch fixes the regression without introducing the issues that the above commit solved. Fixes: 17ab7806de0c ("drm: don't link DP aux i2c adapter to the hardware device node") Signed-off-by: Thierry Reding Tested-by: Tristan Bastian Tested-by: Tristan Bastian --- Changes in v2: - check for both device and parent device tree nodes for each device instead of looping through the list of devices twice drivers/i2c/i2c-core-of.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6cb7ad608bcd..0f01cdba9d2c 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -121,6 +121,17 @@ static int of_dev_node_match(struct device *dev, void *data) return dev->of_node == data; } +static int of_dev_or_parent_node_match(struct device *dev, void *data) +{ + if (dev->of_node == data) + return 1; + + if (dev->parent) + return dev->parent->of_node == data; + + return 0; +} + /* must call put_device() when done with returned i2c_client device */ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) { @@ -145,7 +156,8 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) struct device *dev; struct i2c_adapter *adapter; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device(&i2c_bus_type, NULL, node, + of_dev_or_parent_node_match); if (!dev) return NULL;