From patchwork Tue May 30 08:54:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 9754089 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 649B3602F0 for ; Tue, 30 May 2017 08:54:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57E6C274B4 for ; Tue, 30 May 2017 08:54:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CCF927F89; Tue, 30 May 2017 08:54:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30310274B4 for ; Tue, 30 May 2017 08:54:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346AbdE3Iye (ORCPT ); Tue, 30 May 2017 04:54:34 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:38091 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751310AbdE3Iyc (ORCPT ); Tue, 30 May 2017 04:54:32 -0400 X-Greylist: delayed 2450 seconds by postgrey-1.27 at vger.kernel.org; Tue, 30 May 2017 04:54:31 EDT Received: from mfilter48-d.gandi.net (mfilter48-d.gandi.net [217.70.178.179]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 8E31841C0CC; Tue, 30 May 2017 10:54:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter48-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter48-d.gandi.net (mfilter48-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id UoFF-4GC6AzP; Tue, 30 May 2017 10:54:29 +0200 (CEST) X-Originating-IP: 111.239.91.22 Received: from w540.lan (KD111239091022.au-net.ne.jp [111.239.91.22]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 2DD5441C0B8; Tue, 30 May 2017 10:54:25 +0200 (CEST) From: Jacopo Mondi To: peda@axentia.se, laurent.pinchart@ideasonboard.com, wsa@the-dreams.de Cc: linux-i2c@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v2] i2c: i2c-mux: Fix channel parent node assignment Date: Tue, 30 May 2017 17:54:17 +0900 Message-Id: <1496134457-19573-1-git-send-email-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.7.4 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I2c-mux channels are created as mux siblings while they should be children of the mux itself. Fix it. Signed-off-by: Jacopo Mondi Suggested-by: Laurent Pinchart --- Hello, while inspecting child nodes of an i2c adapter it has been noted that child devices of an i2c-mux are listed as children of the i2c adapter itself, and not of the i2c-mux. The hierarchy of devices looked like -- i2c-04 --- eeprom@57 --- video_receiver@70 --- video_receiver@34 --- gmsl-deserializer@0 <-- MUX --- gmsl-deserializer@0/i2c@0 <-- MUX CHANNEL It now looks like -- i2c-04 --- eeprom@57 --- video_receiver@70 --- video_receiver@34 --- gmsl-deserializer@0 ---- gmsl-deserializer@0/i2c@0 v1 -> v2: - change commit message as suggested by Geert drivers/i2c/i2c-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 83768e8..37b7804 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -324,7 +324,7 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, priv->adap.owner = THIS_MODULE; priv->adap.algo = &priv->algo; priv->adap.algo_data = priv; - priv->adap.dev.parent = &parent->dev; + priv->adap.dev.parent = muxc->dev; priv->adap.retries = parent->retries; priv->adap.timeout = parent->timeout; priv->adap.quirks = parent->quirks;