From: matthias.bgg@kernel.org 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 Cc: davem@davemloft.net, gregkh@linuxfoundation.org, mchehab@kernel.org, rdunlap@infradead.org, sean.wang@mediatek.com, linux-clk@vger.kernel.org, linux@armlinux.org.uk, matthias.bgg@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Matthias Brugger <mbrugger@suse.com> Subject: [v3 07/10] drm/mediatek: Add mfd support for mt8173 Date: Fri, 27 Apr 2018 11:23:59 +0200 [thread overview] Message-ID: <caba94bee1fefa6eb507c6c91c25ed085f996b9a.1524820923.git.mbrugger@suse.com> (raw) In-Reply-To: <cover.1524820923.git.mbrugger@suse.com> In-Reply-To: <cover.1524820923.git.mbrugger@suse.com> From: Matthias Brugger <mbrugger@suse.com> Use the MFD device for SoC mt8173. Probing via devicetree is no longer needed for any SoC, so delete it. Signed-off-by: Matthias Brugger <mbrugger@suse.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 88ee35907744..3cc433ebfa8f 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -399,20 +399,12 @@ 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); - /* Check if called from mfd */ - if (!dev->of_node) { - 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; - } 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; - } + 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; /* Iterate over sibling DISP function blocks */ for_each_child_of_node(parent_node, node) { @@ -555,14 +547,9 @@ static int mtk_drm_sys_resume(struct device *dev) 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,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 }, + { "drm-mt8173-mm", (kernel_ulong_t)&mt8173_mmsys_driver_data }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(platform, mtk_drm_ids); @@ -572,7 +559,6 @@ static struct platform_driver mtk_drm_platform_driver = { .remove = mtk_drm_remove, .driver = { .name = "mediatek-drm", - .of_match_table = mtk_drm_of_ids, .pm = &mtk_drm_pm_ops, }, .id_table = mtk_drm_ids, -- 2.16.3
WARNING: multiple messages have this Message-ID (diff)
From: matthias.bgg@kernel.org (matthias.bgg at kernel.org) To: linux-arm-kernel@lists.infradead.org Subject: [v3 07/10] drm/mediatek: Add mfd support for mt8173 Date: Fri, 27 Apr 2018 11:23:59 +0200 [thread overview] Message-ID: <caba94bee1fefa6eb507c6c91c25ed085f996b9a.1524820923.git.mbrugger@suse.com> (raw) In-Reply-To: <cover.1524820923.git.mbrugger@suse.com> From: Matthias Brugger <mbrugger@suse.com> Use the MFD device for SoC mt8173. Probing via devicetree is no longer needed for any SoC, so delete it. Signed-off-by: Matthias Brugger <mbrugger@suse.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 88ee35907744..3cc433ebfa8f 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -399,20 +399,12 @@ 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); - /* Check if called from mfd */ - if (!dev->of_node) { - 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; - } 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; - } + 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; /* Iterate over sibling DISP function blocks */ for_each_child_of_node(parent_node, node) { @@ -555,14 +547,9 @@ static int mtk_drm_sys_resume(struct device *dev) 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,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 }, + { "drm-mt8173-mm", (kernel_ulong_t)&mt8173_mmsys_driver_data }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(platform, mtk_drm_ids); @@ -572,7 +559,6 @@ static struct platform_driver mtk_drm_platform_driver = { .remove = mtk_drm_remove, .driver = { .name = "mediatek-drm", - .of_match_table = mtk_drm_of_ids, .pm = &mtk_drm_pm_ops, }, .id_table = mtk_drm_ids, -- 2.16.3
next prev parent reply other threads:[~2018-04-27 9:23 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-27 9:23 [v3 00/10] arm/arm64: mediatek: Fix mmsys device probing matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-27 9:23 ` [v3 01/10] dt-bindings: mediatek: mmsys: Add support for mfd matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-30 10:30 ` Lee Jones 2018-04-30 10:30 ` Lee Jones 2018-04-30 10:30 ` Lee Jones 2018-06-25 15:39 ` Matthias Brugger 2018-06-25 15:39 ` Matthias Brugger 2018-06-26 18:32 ` Rob Herring 2018-06-26 18:32 ` Rob Herring 2018-06-26 18:32 ` Rob Herring 2018-06-26 18:32 ` Rob Herring 2018-07-03 7:04 ` Lee Jones 2018-07-03 7:04 ` Lee Jones 2018-07-03 7:04 ` Lee Jones 2018-04-27 9:23 ` [v3 02/10] drm/mediatek: Use regmap for register access matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-27 9:23 ` [v3 03/10] mfd: mtk-mmsys: Add mmsys driver matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-30 10:18 ` Lee Jones 2018-04-30 10:18 ` Lee Jones 2018-04-30 10:18 ` Lee Jones 2018-05-24 2:52 ` Sean Wang 2018-05-24 2:52 ` Sean Wang 2018-05-24 2:52 ` Sean Wang 2018-06-25 15:33 ` Matthias Brugger 2018-06-25 15:33 ` Matthias Brugger 2018-07-03 7:11 ` Lee Jones 2018-07-03 7:11 ` Lee Jones 2018-07-03 7:11 ` Lee Jones 2018-07-04 16:17 ` Matthias Brugger 2018-07-04 16:17 ` Matthias Brugger 2018-07-04 16:45 ` Lee Jones 2018-07-04 16:45 ` Lee Jones 2018-07-04 16:45 ` Lee Jones 2018-07-05 11:25 ` Matthias Brugger 2018-07-05 11:25 ` Matthias Brugger 2018-07-05 12:22 ` Lee Jones 2018-07-05 12:22 ` Lee Jones 2018-07-05 12:22 ` Lee Jones 2018-07-06 13:18 ` Matthias Brugger 2018-07-06 13:18 ` Matthias Brugger 2018-07-04 16:52 ` Chen-Yu Tsai 2018-07-04 16:52 ` Chen-Yu Tsai 2018-07-04 16:52 ` Chen-Yu Tsai 2018-07-04 16:52 ` Chen-Yu Tsai 2018-04-27 9:23 ` [v3 04/10] drm/mediatek: mt2701: switch to mfd probing matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-30 10:42 ` CK Hu 2018-04-30 10:42 ` CK Hu 2018-04-30 10:42 ` CK Hu 2018-04-27 9:23 ` [v3 05/10] clk: mediatek: mt2701-mm: switch to mfd device matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-27 9:23 ` [v3 06/10] mfd: mtk-mmsys: Add mt8173 nodes matthias.bgg 2018-04-27 9:23 ` matthias.bgg at kernel.org 2018-04-27 9:23 ` matthias.bgg 2018-04-27 9:23 ` matthias.bgg [this message] 2018-04-27 9:23 ` [v3 07/10] drm/mediatek: Add mfd support for mt8173 matthias.bgg at kernel.org 2018-04-27 9:24 ` [v3 08/10] clk: mediatek: mt8173-mm: switch to mfd device matthias.bgg 2018-04-27 9:24 ` matthias.bgg at kernel.org 2018-04-27 9:24 ` matthias.bgg 2018-04-27 9:24 ` [v3 09/10] drm: mediatek: Omit warning on probe defers matthias.bgg 2018-04-27 9:24 ` matthias.bgg at kernel.org 2018-04-27 9:24 ` matthias.bgg 2018-04-30 10:58 ` CK Hu 2018-04-30 10:58 ` CK Hu 2018-04-30 10:58 ` CK Hu 2018-04-27 9:24 ` [v3 10/10] MAINTAINERS: update Mediatek Soc entry matthias.bgg 2018-04-27 9:24 ` matthias.bgg at kernel.org
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=caba94bee1fefa6eb507c6c91c25ed085f996b9a.1524820923.git.mbrugger@suse.com \ --to=matthias.bgg@kernel.org \ --cc=airlied@linux.ie \ --cc=ck.hu@mediatek.com \ --cc=davem@davemloft.net \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=matthias.bgg@gmail.com \ --cc=mbrugger@suse.com \ --cc=mchehab@kernel.org \ --cc=mturquette@baylibre.com \ --cc=p.zabel@pengutronix.de \ --cc=rdunlap@infradead.org \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=sean.wang@mediatek.com \ --cc=ulrich.hecht+renesas@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.