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: 10058391 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 C7DBF602A7 for ; Tue, 14 Nov 2017 21:46:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B89D629AA0 for ; Tue, 14 Nov 2017 21:46:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB9BE29AA3; Tue, 14 Nov 2017 21:46:03 +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 34F3329AA0 for ; Tue, 14 Nov 2017 21:46:03 +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=/eagmMlj+RQCEIxiy9Dga0i/f9o4MzV5jDheuh26PkQ=; b=MOVCspM/H5FJ5kCgLY8A0nBrjU Hp2Gito9OE9JaTJVrF2K0lUy2eqtRWu0xPez1P/O7lVhPDa5gbVs+6Cuq22WraBdIZbTifXbVzIke JNRz3JvdN2bwJiU+tY9CvAFPrDgac09BbuDzg/nBRwy14UKUcj2PnHKTiEbHINTPImEEJMWAT2pHD 1IaNhOogLQgdPwy2M0Mq4uy73AiVr9rUwYjG/wu6F2Hey5MRsAts46knRATDmwujjEMXZuVMoNszA fUChwpOfRjvCWKICGEhUHFuNaVqRaGecu/2XiR1tzkcYmUzlFHhM/xUCNPJTvDXxNU4zsUtiFqVDf bTi6JxNg==; 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 1eEj1m-0003eV-Gl; Tue, 14 Nov 2017 21:45:54 +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 1eEiyO-0007vy-1Z; Tue, 14 Nov 2017 21:42:34 +0000 Received: by mail-wm0-x244.google.com with SMTP id z3so14525386wme.3; 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=pAXQOKR9tj30sPcCWdwSd4chmhEm1PdSHqioVwn4VcpgPAvidW2FG48wpsAvx7Bdbn Q+C6C3NI3Z70TAmh/C74mK3KWagsB6EG56H2fke9hiv9ghJvbc1fF8QPkcqDEbobQ+yS gM5Mwo3uLooeOQjL2iiNymiFj5SovK0b8ZhXMAuNGu3+8GB7LqNaMG7etodIWalNwWip qFxu5CsMbIa2C0nR6K8ELO8TYYfmwr/T8Fo4sPZl/SO6sp/jvepTDrnZZei6mrUgMBXz WJVIdBSiFr8A8ykebEnu7U7h1xJw0ZVc9CCdSXigo7n33TskjQVoSRP66NQdzv1pnw93 9+Iw== X-Gm-Message-State: AJaThX7XrepnURRd6t3dbNJMSg8TrngbqnKFYoaqXSO+8ybDxp3FbBGV lDvXu0v5mQfsXeYiYewslOc= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171114_134224_909133_8ABCC6D3 X-CRM114-Status: GOOD ( 12.99 ) 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 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,