From patchwork Tue Nov 14 21:41:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 10058995 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 443DD6023A for ; Wed, 15 Nov 2017 08:32:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31A2929E3A for ; Wed, 15 Nov 2017 08:32:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25FFB29E3D; Wed, 15 Nov 2017 08:32:42 +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 AE3FB29E3A for ; Wed, 15 Nov 2017 08:32:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AC9766E3BE; Wed, 15 Nov 2017 08:31:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF66E6E305 for ; Tue, 14 Nov 2017 21:42:00 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id p96so18728141wrb.7 for ; Tue, 14 Nov 2017 13:42:00 -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=DlmS3MjNpsiNUNY1cdozNrv00dizkR6gHr5autljYfA=; b=rOSS/IwjLj1CO2sX7sRS92VoivRNwTi8dbDpE2NvfQa0J3nRoG3+/nYMpicE+i7SN2 moC2cB2iJ8IODhA1wLc8GBOAM5y3rEUDqhlM2YrHnrv0vBSsn382Sq4piZwexVFm6rQD rvyb7b6zOJ/h1+TRNJ0EZqrN4czZQ+z87GMflIVkzcYBWzCqxttHUfCI9quvQecZOGFB 6h3uQfbxDBYYX8g8jYWTZcAe3mtrYSOE/k7Nn2vxJUPnOIf1sIRDxcM+TolOfxxFLfQj ybLcjXT79G0HAhzxkC8U4DNZIgfLPKnEvqEyn846ddnVw40JCpFEGajjvYlwNRVe3pBY y4iA== 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=DlmS3MjNpsiNUNY1cdozNrv00dizkR6gHr5autljYfA=; b=gizJllUUuNneQoGXp5YEeRkcsHTniQx2NMM+bR6+Wacw5W0H00RdWtzDHL8Rwyw6ky 1vrC/Jsm3B92vk16EZyrkKrA9VGTxTzFewjRnPAk/YIUGDXSAf/tbuSY1tnT2ENF1TOP Q6tFnc/Ux7i0Qxx8ziHlZvoHrvVVOFeEpVfktDAg/3YQEVtzDpUXR4FDeenpjqAj8l/8 6nGa3R6LfSWCN3LyNbhdrjIJC6LhdLHZH3zq0dHxMuD8rVoEW0bFe3a+FVFQAjsxxhWp zDNXkjWXPjKXoscjNoBbiLI3GDzpVfvIlhIOK65/ksIW5fauy9lkcxKF3TWcwwFECoL+ V52Q== X-Gm-Message-State: AJaThX7zgC8iWvIn5sbyfqTuVZq8+EP2yXURtdxPTL5R8mkS9IFGFcn8 9wdEEwY2TdoycwB7US9SXKc= X-Google-Smtp-Source: AGs4zMb13xxWjQlvu04YZv4HW3BRSbexJsHR5062MFcJ5y45F6vV7vB6yFSGyJBJe7IhDcvCs77gHw== X-Received: by 10.223.164.206 with SMTP id h14mr7862684wrb.221.1510695719616; Tue, 14 Nov 2017 13:41:59 -0800 (PST) Received: from localhost.localdomain ([92.57.80.122]) by smtp.gmail.com with ESMTPSA id s12sm46706369wrc.89.2017.11.14.13.41.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 13:41:58 -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 4/8] clk: mediatek: mt2701-mm: switch to mfd device Date: Tue, 14 Nov 2017 22:41:10 +0100 Message-Id: <20171114214114.15793-5-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 As the new mfd device is in place, switch probing for the MMSYS to support invocation from the mfd device. Signed-off-by: Matthias Brugger --- drivers/clk/mediatek/clk-mt2701-mm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt2701-mm.c b/drivers/clk/mediatek/clk-mt2701-mm.c index fe1f85072fc5..1725c2c17ca3 100644 --- a/drivers/clk/mediatek/clk-mt2701-mm.c +++ b/drivers/clk/mediatek/clk-mt2701-mm.c @@ -13,6 +13,7 @@ */ #include +#include #include #include "clk-mtk.h" @@ -87,16 +88,15 @@ static const struct mtk_gate mm_clks[] = { GATE_DISP1(CLK_MM_TVE_FMM, "mm_tve_fmm", "mm_sel", 14), }; -static const struct of_device_id of_match_clk_mt2701_mm[] = { - { .compatible = "mediatek,mt2701-mmsys", }, - {} -}; - static int clk_mt2701_mm_probe(struct platform_device *pdev) { struct clk_onecell_data *clk_data; int r; - struct device_node *node = pdev->dev.of_node; + struct device_node *node; + struct mmsys_dev *mmsys_private; + + mmsys_private = dev_get_drvdata(pdev->dev.parent); + node = mmsys_private->of_node; clk_data = mtk_alloc_clk_data(CLK_MM_NR); @@ -116,7 +116,6 @@ static struct platform_driver clk_mt2701_mm_drv = { .probe = clk_mt2701_mm_probe, .driver = { .name = "clk-mt2701-mm", - .of_match_table = of_match_clk_mt2701_mm, }, };