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 04/10] drm/mediatek: mt2701: switch to mfd probing.
Date: Fri, 27 Apr 2018 11:23:56 +0200 [thread overview]
Message-ID: <b50d32fb140dcf25ac467f0b5e7a84353c8d31d3.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>
With the mtk-mmsys MFD device in place, we switch the probing for
mt2701 from device-tree to mfd.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index a48e28adad09..88ee35907744 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -386,7 +386,7 @@ static int mtk_drm_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct mtk_drm_private *private;
- struct device_node *node;
+ struct device_node *node, *parent_node, *mmsys_node;
struct component_match *match = NULL;
int ret;
int i;
@@ -399,12 +399,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_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;
+ }
/* 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;
@@ -545,13 +556,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,
@@ -560,6 +575,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[] = {
--
2.16.3
next prev parent reply other threads:[~2018-04-27 9:23 UTC|newest]
Thread overview: 27+ 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 ` [v3 01/10] dt-bindings: mediatek: mmsys: Add support for mfd matthias.bgg
2018-04-30 10:30 ` Lee Jones
2018-06-25 15:39 ` Matthias Brugger
2018-06-26 18:32 ` Rob Herring
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 ` [v3 03/10] mfd: mtk-mmsys: Add mmsys driver matthias.bgg
2018-04-30 10:18 ` Lee Jones
2018-05-24 2:52 ` Sean Wang
2018-06-25 15:33 ` Matthias Brugger
2018-07-03 7:11 ` Lee Jones
2018-07-04 16:17 ` Matthias Brugger
2018-07-04 16:45 ` Lee Jones
2018-07-05 11:25 ` Matthias Brugger
2018-07-05 12:22 ` Lee Jones
2018-07-06 13:18 ` Matthias Brugger
2018-07-04 16:52 ` Chen-Yu Tsai
2018-04-27 9:23 ` matthias.bgg [this message]
2018-04-30 10:42 ` [v3 04/10] drm/mediatek: mt2701: switch to mfd probing 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 ` [v3 06/10] mfd: mtk-mmsys: Add mt8173 nodes matthias.bgg
2018-04-27 9:23 ` [v3 07/10] drm/mediatek: Add mfd support for mt8173 matthias.bgg
2018-04-27 9:24 ` [v3 08/10] clk: mediatek: mt8173-mm: switch to mfd device matthias.bgg
2018-04-27 9:24 ` [v3 09/10] drm: mediatek: Omit warning on probe defers matthias.bgg
2018-04-30 10:58 ` CK Hu
2018-04-27 9:24 ` [v3 10/10] MAINTAINERS: update Mediatek Soc entry matthias.bgg
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=b50d32fb140dcf25ac467f0b5e7a84353c8d31d3.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®