From patchwork Tue Nov 14 21:41:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 10058989 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 B201F6023A for ; Wed, 15 Nov 2017 08:32:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FB7429E3A for ; Wed, 15 Nov 2017 08:32:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9457929E3C; Wed, 15 Nov 2017 08:32:28 +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 2076429E3A for ; Wed, 15 Nov 2017 08:32:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE4486E3A6; 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 E9EB26E31B for ; Tue, 14 Nov 2017 21:42:05 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id v186so15746474wma.2 for ; Tue, 14 Nov 2017 13:42:05 -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=ktIR3tDRFZAfGuJsK1bZuZjh08icDGKXzVWW8cjBAKE=; b=D7uk7R4/DIwS4iytXd4GP2vb11+ct0PyyitNe6+2iWzQmcwEOZeziKIhE6K/bIgQXw vlD96r3Wo3h17FeU3YfCxknWvoBtKQSOmrhp1LaVK1NJOReDwySlsvaKUZmk4Fe8e6wz unaAx0Z8cNklJEHAq+o06XTyIipv38NCGaN/+Uhuqf+yp8XhJUSKitEIqDRkoL4XF5mC UuIrjJyGczZDGPfex9qPbbruDg2FDa05YWLbf8KjEeP18T+X2YfkLyMdzKO/FWEdI+jA USiuPnqdXWNiG9HjYNI4SEcwsghE9uLsOAyqvO+RzPob6IIaQdZxPhaw6unumRdsq7n7 24+g== 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=ktIR3tDRFZAfGuJsK1bZuZjh08icDGKXzVWW8cjBAKE=; b=j08IGk8/AdU61IxbLllnTLUR63I1CTFsz/EvcrlU7dVBn8okmLjQrjWysXJoaJ51Fn wK/amHL1A9m659ZXtw47NOFa8D9Iu/A28+ViTTM+eA1iv2lpDjoNjohe1pdaQVqFSY/z +oXLX4uGVJP4xPsd19XQkGVVF13Hl2jRv71iin2Uq9qMwxEMyxNopiCmz9Cv80hCTKeO /qL8MYJdlZtMnP8VOfZt7SCxteRk4IIg1Jc5vpuw/gxxLNXQADMDrjN5NADaaKOzp23K vkH3wyUiOOmJg7mvTEXK1+nb8JfxKxN33BBhSDbglbscM9BE5VU2kalX9c6katrHJnUQ DvyQ== X-Gm-Message-State: AJaThX4YddtDaULfvlt7X4Bhundd1Eta9lVC1S1gsWQDtaIgF73SBXMP GG6LPcgMg9TvkMorXl3YSVI= X-Google-Smtp-Source: AGs4zMYaXEBa/Bh+knne+I3TK6YuGgqu7/STUEuyjRouASKWC6jijFXpHPvd97KwzxAMIpa0IWHPhg== X-Received: by 10.28.206.8 with SMTP id e8mr3167840wmg.80.1510695724606; Tue, 14 Nov 2017 13:42:04 -0800 (PST) Received: from localhost.localdomain ([92.57.80.122]) by smtp.gmail.com with ESMTPSA id s12sm46706369wrc.89.2017.11.14.13.42.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 13:42:03 -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 6/8] drm/mediatek: Add mfd support for mt8173 Date: Tue, 14 Nov 2017 22:41:12 +0100 Message-Id: <20171114214114.15793-7-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 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 Acked-by: CK Hu Reviewed-by: Philipp Zabel --- 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 5a263aa3ab6e..1eb02acf229a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -409,20 +409,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_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; - } + 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; /* Iterate over sibling DISP function blocks */ for_each_child_of_node(parent_node, node) { @@ -565,14 +557,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); @@ -582,7 +569,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,