[PATCH 7/8] clk: mediatek: mt8173-mm: switch to mfd device

Matthias Brugger
2017-11-14T21:41:13Z

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 <mbrugger@suse.com>
---
drivers/clk/mediatek/clk-mt8173.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c
index 96c292c3e440..0fd39228eef4 100644
--- a/drivers/clk/mediatek/clk-mt8173.c
+++ b/drivers/clk/mediatek/clk-mt8173.c
@@ -13,8 +13,10 @@
*/

#include <linux/clk.h>
+#include <linux/mfd/mmsys.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/platform_device.h>

#include "clk-mtk.h"
#include "clk-gate.h"
@@ -1152,10 +1154,16 @@ 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;
+ 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_CLK);

@@ -1166,8 +1174,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.14.2