From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752289AbdKWJNU (ORCPT ); Thu, 23 Nov 2017 04:13:20 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:59655 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751914AbdKWJNR (ORCPT ); Thu, 23 Nov 2017 04:13:17 -0500 Message-ID: <1511428377.7685.9.camel@pengutronix.de> Subject: Re: [PATCH 3/8] drm/mediatek: mt2701: switch to mfd probing. From: Philipp Zabel To: Matthias Brugger , ulrich.hecht+renesas@gmail.com, laurent.pinchart@ideasonboard.com, ck.hu@mediatek.com, airlied@linux.ie, robh+dt@kernel.org, mark.rutland@arm.com, mturquette@baylibre.com, sboyd@codeaurora.org, lee.jones@linaro.org Cc: davem@davemloft.net, gregkh@linuxfoundation.org, mchehab@kernel.org, rdunlap@infradead.org, pi-cheng.chen@linaro.org, sean.wang@mediatek.com, linux-clk@vger.kernel.org, linux@armlinux.org.uk, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Matthias Brugger Date: Thu, 23 Nov 2017 10:12:57 +0100 In-Reply-To: <20171114214114.15793-4-mbrugger@suse.com> References: <20171114214114.15793-1-mbrugger@suse.com> <20171114214114.15793-4-mbrugger@suse.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2017-11-14 at 22:41 +0100, Matthias Brugger wrote: > With the mtk-mmsys MFD device in place, we switch the probing for > mt2701 from device-tree to mfd. > > Signed-off-by: Matthias Brugger > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 32 +++++++++++++++++++++++++------- > 1 file changed, 25 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index dd249cf5121e..5a263aa3ab6e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -392,9 +393,10 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { > > static int mtk_drm_probe(struct platform_device *pdev) > { > + struct mmsys_dev *mmsys_private; > struct device *dev = &pdev->dev; > struct mtk_drm_private *private; > - struct device_node *node; > + struct device_node *node, *parent_node; > struct component_match *match = NULL; > int ret; > int i; > @@ -407,12 +409,23 @@ static int mtk_drm_probe(struct platform_device *pdev) > INIT_WORK(&private->commit.work, mtk_atomic_work); > private->data = of_device_get_match_data(dev); > > - private->config_regs = syscon_node_to_regmap(dev->of_node); > - if (IS_ERR(private->config_regs)) > - return PTR_ERR(private->config_regs); > + /* Check if called from mfd */ > + if (!dev->of_node) { > + mmsys_private = dev_get_drvdata(pdev->dev.parent); > + private->data = (struct mtk_mmsys_driver_data *) > + platform_get_device_id(pdev)->driver_data; > + private->config_regs = > + syscon_node_to_regmap(mmsys_private->of_node); > + parent_node = mmsys_private->of_node->parent; I think this could be just: mmsys_node = pdev->dev.parent->of_node; private->data = (struct mtk_mmsys_driver_data *)> + platform_get_device_id(pdev)->driver_data; private->config_regs = syscon_node_to_regmap(mmsys_node); parent_node = mmsys_node->parent; regards Philipp