From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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, pi-cheng.chen@linaro.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 Subject: [v2 resend 08/10] clk: mediatek: mt8173-mm: switch to mfd device Date: Tue, 24 Apr 2018 11:47:05 +0200 Message-Id: <74bf4058534cf187e10ef041da1706878914aa45.1524563001.git.mbrugger@suse.com> In-Reply-To: References: In-Reply-To: References: List-ID: From: Matthias Brugger 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 Acked-by: Stephen Boyd --- drivers/clk/mediatek/clk-mt8173.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c index 96c292c3e440..abd2592078d4 100644 --- a/drivers/clk/mediatek/clk-mt8173.c +++ b/drivers/clk/mediatek/clk-mt8173.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "clk-mtk.h" #include "clk-gate.h" @@ -1152,10 +1153,13 @@ static void __init mtk_imgsys_init(struct device_node *node) } CLK_OF_DECLARE(mtk_imgsys, "mediatek,mt8173-imgsys", mtk_imgsys_init); -static void __init mtk_mmsys_init(struct device_node *node) +static int mtk_mmsys_probe(struct platform_device *pdev) { struct clk_onecell_data *clk_data; int r; + struct device_node *node; + + node = pdev->dev.parent->of_node; clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK); @@ -1166,8 +1170,17 @@ static void __init mtk_mmsys_init(struct device_node *node) if (r) pr_err("%s(): could not register clock provider: %d\n", __func__, r); + + return r; } -CLK_OF_DECLARE(mtk_mmsys, "mediatek,mt8173-mmsys", mtk_mmsys_init); + +static struct platform_driver clk_mt8173_mm_drv = { + .probe = mtk_mmsys_probe, + .driver = { + .name = "clk-mt8173-mm", + }, +}; +builtin_platform_driver(clk_mt8173_mm_drv); static void __init mtk_vdecsys_init(struct device_node *node) { -- 2.16.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: matthias.bgg@kernel.org Subject: [v2 resend 08/10] clk: mediatek: mt8173-mm: switch to mfd device Date: Tue, 24 Apr 2018 11:47:05 +0200 Message-ID: <74bf4058534cf187e10ef041da1706878914aa45.1524563001.git.mbrugger@suse.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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: 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 List-Id: linux-mediatek@lists.infradead.org RnJvbTogTWF0dGhpYXMgQnJ1Z2dlciA8bWJydWdnZXJAc3VzZS5jb20+CgpBcyB0aGUgbmV3IG1m ZCBkZXZpY2UgaXMgaW4gcGxhY2UsIHN3aXRjaCBwcm9iaW5nCmZvciB0aGUgTU1TWVMgdG8gc3Vw cG9ydCBpbnZvY2F0aW9uIGZyb20gdGhlIG1mZCBkZXZpY2UuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0 aGlhcyBCcnVnZ2VyIDxtYnJ1Z2dlckBzdXNlLmNvbT4KQWNrZWQtYnk6IFN0ZXBoZW4gQm95ZCA8 c2JveWRAY29kZWF1cm9yYS5vcmc+Ci0tLQogZHJpdmVycy9jbGsvbWVkaWF0ZWsvY2xrLW10ODE3 My5jIHwgMTcgKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvY2xrL21lZGlhdGVrL2Ns ay1tdDgxNzMuYyBiL2RyaXZlcnMvY2xrL21lZGlhdGVrL2Nsay1tdDgxNzMuYwppbmRleCA5NmMy OTJjM2U0NDAuLmFiZDI1OTIwNzhkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9jbGsvbWVkaWF0ZWsv Y2xrLW10ODE3My5jCisrKyBiL2RyaXZlcnMvY2xrL21lZGlhdGVrL2Nsay1tdDgxNzMuYwpAQCAt MTUsNiArMTUsNyBAQAogI2luY2x1ZGUgPGxpbnV4L2Nsay5oPgogI2luY2x1ZGUgPGxpbnV4L29m Lmg+CiAjaW5jbHVkZSA8bGludXgvb2ZfYWRkcmVzcy5oPgorI2luY2x1ZGUgPGxpbnV4L3BsYXRm b3JtX2RldmljZS5oPgogCiAjaW5jbHVkZSAiY2xrLW10ay5oIgogI2luY2x1ZGUgImNsay1nYXRl LmgiCkBAIC0xMTUyLDEwICsxMTUzLDEzIEBAIHN0YXRpYyB2b2lkIF9faW5pdCBtdGtfaW1nc3lz X2luaXQoc3RydWN0IGRldmljZV9ub2RlICpub2RlKQogfQogQ0xLX09GX0RFQ0xBUkUobXRrX2lt Z3N5cywgIm1lZGlhdGVrLG10ODE3My1pbWdzeXMiLCBtdGtfaW1nc3lzX2luaXQpOwogCi1zdGF0 aWMgdm9pZCBfX2luaXQgbXRrX21tc3lzX2luaXQoc3RydWN0IGRldmljZV9ub2RlICpub2RlKQor c3RhdGljIGludCBtdGtfbW1zeXNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikK IHsKIAlzdHJ1Y3QgY2xrX29uZWNlbGxfZGF0YSAqY2xrX2RhdGE7CiAJaW50IHI7CisJc3RydWN0 IGRldmljZV9ub2RlICpub2RlOworCisJbm9kZSA9IHBkZXYtPmRldi5wYXJlbnQtPm9mX25vZGU7 CiAKIAljbGtfZGF0YSA9IG10a19hbGxvY19jbGtfZGF0YShDTEtfTU1fTlJfQ0xLKTsKIApAQCAt MTE2Niw4ICsxMTcwLDE3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBtdGtfbW1zeXNfaW5pdChzdHJ1 Y3QgZGV2aWNlX25vZGUgKm5vZGUpCiAJaWYgKHIpCiAJCXByX2VycigiJXMoKTogY291bGQgbm90 IHJlZ2lzdGVyIGNsb2NrIHByb3ZpZGVyOiAlZFxuIiwKIAkJCV9fZnVuY19fLCByKTsKKworCXJl dHVybiByOwogfQotQ0xLX09GX0RFQ0xBUkUobXRrX21tc3lzLCAibWVkaWF0ZWssbXQ4MTczLW1t c3lzIiwgbXRrX21tc3lzX2luaXQpOworCitzdGF0aWMgc3RydWN0IHBsYXRmb3JtX2RyaXZlciBj bGtfbXQ4MTczX21tX2RydiA9IHsKKwkucHJvYmUgPSBtdGtfbW1zeXNfcHJvYmUsCisJLmRyaXZl ciA9IHsKKwkJLm5hbWUgPSAiY2xrLW10ODE3My1tbSIsCisJfSwKK307CitidWlsdGluX3BsYXRm b3JtX2RyaXZlcihjbGtfbXQ4MTczX21tX2Rydik7CiAKIHN0YXRpYyB2b2lkIF9faW5pdCBtdGtf dmRlY3N5c19pbml0KHN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZSkKIHsKLS0gCjIuMTYuMwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: matthias.bgg@kernel.org (matthias.bgg at kernel.org) Date: Tue, 24 Apr 2018 11:47:05 +0200 Subject: [v2 resend 08/10] clk: mediatek: mt8173-mm: switch to mfd device In-Reply-To: References: Message-ID: <74bf4058534cf187e10ef041da1706878914aa45.1524563001.git.mbrugger@suse.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Matthias Brugger 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 Acked-by: Stephen Boyd --- drivers/clk/mediatek/clk-mt8173.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c index 96c292c3e440..abd2592078d4 100644 --- a/drivers/clk/mediatek/clk-mt8173.c +++ b/drivers/clk/mediatek/clk-mt8173.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "clk-mtk.h" #include "clk-gate.h" @@ -1152,10 +1153,13 @@ static void __init mtk_imgsys_init(struct device_node *node) } CLK_OF_DECLARE(mtk_imgsys, "mediatek,mt8173-imgsys", mtk_imgsys_init); -static void __init mtk_mmsys_init(struct device_node *node) +static int mtk_mmsys_probe(struct platform_device *pdev) { struct clk_onecell_data *clk_data; int r; + struct device_node *node; + + node = pdev->dev.parent->of_node; clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK); @@ -1166,8 +1170,17 @@ static void __init mtk_mmsys_init(struct device_node *node) if (r) pr_err("%s(): could not register clock provider: %d\n", __func__, r); + + return r; } -CLK_OF_DECLARE(mtk_mmsys, "mediatek,mt8173-mmsys", mtk_mmsys_init); + +static struct platform_driver clk_mt8173_mm_drv = { + .probe = mtk_mmsys_probe, + .driver = { + .name = "clk-mt8173-mm", + }, +}; +builtin_platform_driver(clk_mt8173_mm_drv); static void __init mtk_vdecsys_init(struct device_node *node) { -- 2.16.3