From patchwork Tue Nov 14 21:41:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 10058985 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 E30AA6023A for ; Wed, 15 Nov 2017 08:32:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D109B29E3A for ; Wed, 15 Nov 2017 08:32:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C565C29E3C; Wed, 15 Nov 2017 08:32:07 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9C98D29E3A for ; Wed, 15 Nov 2017 08:32:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA8976E39C; Wed, 15 Nov 2017 08:31:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA2816E2F6 for ; Tue, 14 Nov 2017 21:41:58 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id l8so18760339wmg.4 for ; Tue, 14 Nov 2017 13:41:58 -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:in-reply-to:references; bh=cMNVBOS6b1BIIwhJugO4iH6CQEqCR7KNgqkKet5NWkw=; b=T7L09kxBQktSiDLDDResRDpueAtF5ecx5r43FwcYvdL0q+Q5OZCb/tJOdDSVp9mmvi czSzW7l/Y0dJBb1zN8K4iSDNVxsvSoZk+mrBNEoKrl0iV9mZB9NnV+wISug1jjSfBMp4 Ih5309Kcukpl8C2cp59PdCYyuKGrhYTDMTwPpJpI+GsfL26voU4HOABQxH9W+z+qAoC6 znQTATpCNPa/RKBE3dWBu+0epLHGZ84um73MyUuBh/nGu/AGguYdXe55VaRIyf9lB4nb nBKpXBuBLb4qOjcAZ7YPFQfwG42LpFdkdFGheOak1G3Nhgvvt4AjgTXfIzzSj+O2cVL8 6nzA== 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:in-reply-to :references; bh=cMNVBOS6b1BIIwhJugO4iH6CQEqCR7KNgqkKet5NWkw=; b=KRlqHOjfzP+W9XmtpeoIoR31rOsK0m1sB2VlBKtrSQrM+Js6C2Suu8DWT34ic9/eMo AmLC+m9j6aRD+bMw4ZHZ7lnjLGBjiT6sfqQ9qPfYELkeG/V8S+isvpe1+q9lIqSkQNkm 1hHzSiw5PoKExMSf13ua5xBrjthd+WHGvKEDfxgCyA2BZhg+YjC5A25rEEOU4w5s5N4V sUcu60zcwMwzDYrGFO8346mhSztJMWx3J6DHzPCbX1+QvpXr01eiFBUvHi9OyWiOIvT+ tD63URNRnq3N9C8R/ak+NogWqGy+wmsvD3Ye5fc8IQngF9fMxlTcw35Hk8v4wr9o3iIu rJPw== X-Gm-Message-State: AJaThX6IiwxY7u2NuTEoZ/PruT8vNBTeGU+Rv5/vjW24f9tI8cGgRPU9 FDN1WaSbO9NYKffCI/IIzvA= X-Google-Smtp-Source: AGs4zMYJtDwxUP67dnE3nIwXV6X79xXRH2WCUhGCLjaaACBXCN7en7KGYwM+/glz7cWCdrOmmyBzrQ== X-Received: by 10.28.48.143 with SMTP id w137mr10578695wmw.3.1510695717260; Tue, 14 Nov 2017 13:41:57 -0800 (PST) Received: from localhost.localdomain ([92.57.80.122]) by smtp.gmail.com with ESMTPSA id s12sm46706369wrc.89.2017.11.14.13.41.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 13:41:56 -0800 (PST) From: Matthias Brugger X-Google-Original-From: Matthias Brugger To: ulrich.hecht+renesas@gmail.com, laurent.pinchart@ideasonboard.com, ck.hu@mediatek.com, p.zabel@pengutronix.de, airlied@linux.ie, robh+dt@kernel.org, mark.rutland@arm.com, mturquette@baylibre.com, sboyd@codeaurora.org, lee.jones@linaro.org Subject: [PATCH 3/8] drm/mediatek: mt2701: switch to mfd probing. Date: Tue, 14 Nov 2017 22:41:09 +0100 Message-Id: <20171114214114.15793-4-mbrugger@suse.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171114214114.15793-1-mbrugger@suse.com> References: <20171114214114.15793-1-mbrugger@suse.com> X-Mailman-Approved-At: Wed, 15 Nov 2017 08:31:51 +0000 Cc: sean.wang@mediatek.com, gregkh@linuxfoundation.org, rdunlap@infradead.org, linux@armlinux.org.uk, dri-devel@lists.freedesktop.org, linux-clk@vger.kernel.org, Matthias Brugger , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, matthias.bgg@gmail.com, mchehab@kernel.org, pi-cheng.chen@linaro.org, davem@davemloft.net, linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP With the mtk-mmsys MFD device in place, we switch the probing for mt2701 from device-tree to mfd. Signed-off-by: Matthias Brugger Acked-by: CK Hu --- 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; + } else { + private->config_regs = syscon_node_to_regmap(dev->of_node); + if (IS_ERR(private->config_regs)) + return PTR_ERR(private->config_regs); + parent_node = dev->of_node->parent; + } /* Iterate over sibling DISP function blocks */ - for_each_child_of_node(dev->of_node->parent, node) { + for_each_child_of_node(parent_node, node) { const struct of_device_id *of_id; enum mtk_ddp_comp_type comp_type; int comp_id; @@ -553,13 +566,17 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, mtk_drm_sys_resume); static const struct of_device_id mtk_drm_of_ids[] = { - { .compatible = "mediatek,mt2701-mmsys", - .data = &mt2701_mmsys_driver_data}, { .compatible = "mediatek,mt8173-mmsys", .data = &mt8173_mmsys_driver_data}, { } }; +static const struct platform_device_id mtk_drm_ids[] = { + { "drm-mt2701-mm", (kernel_ulong_t)&mt2701_mmsys_driver_data }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(platform, mtk_drm_ids); + static struct platform_driver mtk_drm_platform_driver = { .probe = mtk_drm_probe, .remove = mtk_drm_remove, @@ -568,6 +585,7 @@ static struct platform_driver mtk_drm_platform_driver = { .of_match_table = mtk_drm_of_ids, .pm = &mtk_drm_pm_ops, }, + .id_table = mtk_drm_ids, }; static struct platform_driver * const mtk_drm_drivers[] = {