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: 10058377 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 E9FE1601D3 for ; Tue, 14 Nov 2017 21:44:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB15729A9E for ; Tue, 14 Nov 2017 21:44:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF67329AA1; Tue, 14 Nov 2017 21:44: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.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6ADF529A9E for ; Tue, 14 Nov 2017 21:44:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2nsKN8V/qwyo93Oh1ulMi18op2ieYejhcfDFKndNbus=; b=KYIhJlg5aOUZ8XN4NeTOcwPGuk Tlvb8nIAcz/94T7c/YZahofPTXnWvIJAhxmco6qluyCjB5oK85SZqX3V/QdlbSO1TMjBAFprItgJ3 NLD/1fEKyKlLb8rhBCJaPt2XpoeMh31FaJtTxT2z9ZwAtg5rhpbccFdgWo/aIls7EcfJIl+PVgdh9 Ys18pV6ni6eB8avh+YV4Vu8KtHWX7kusIYCNTd7g7wSYboxMDGWsRTwgYkxzWnvUGuVkAVLrOz7Gp yv7cZ+RtOicFoD+JlWlvLol9h3VQDZl7siYZm6QIbHpUFStaYfysjTiXZqISG6YdQVCFrbql32aJo p0nlJlqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eEizv-0000ts-5n; Tue, 14 Nov 2017 21:43:59 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eEiyJ-0007o4-6R; Tue, 14 Nov 2017 21:42:23 +0000 Received: by mail-wm0-x244.google.com with SMTP id v186so15745974wma.2; 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=S5TkGOQyc60kLiQn8XaCvky7vs49J69I8RBYwaa4nszYTBXiRBnwQy7e9grM8Ro98F Infbg3+tqbJbn3hnTHxZYk6lUGVtaTcysDO9yWFMp/KL8qXXamAnxzkIOeNBtGyKmlx1 SyiTqg2dF2pdieAs0kjnKmLFJutByxKGdd/gc6Neb1+BIOubWZFiXMUWqz0VICYzudlf DeaIHkWSLoEBbn0jW/LcG7RMHy1WSoceRDuAZCc+kT1Fq7tV+VDp5k+OuZBu3LJ2SftY 8wdpNCuKXplJa8f0Up3y/U9Eroi3atiCi5pL2MyKmneMNTUy3DodVSuzPRUuUiYjgtV3 KF+A== X-Gm-Message-State: AJaThX6MkFKGnjInvGOr268tuchlFOdaazBtTovuyr5GN1bi1WHu61TT sdQbkP2F3spS8BrDc50C2z8= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171114_134219_631238_78658298 X-CRM114-Status: GOOD ( 15.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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[] = {