Commit 372542d7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.7-next-soc.2' of... 

Merge tag 'v5.7-next-soc.2' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers

- make mmsys kconfig entry to depend on ARCH_MEDIATEK instead of a specific SoC
- move clock driver to bind against the new mmsys driver
  (mt2712, mt2701, mt8183, mt6797 and mt6779)

* tag 'v5.7-next-soc.2' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  clk/soc: mediatek: mt6779: Bind clock driver from platform device
  clk/soc: mediatek: mt6797: Bind clock driver from platform device
  clk/soc: mediatek: mt8183: Bind clock driver from platform device
  clk / soc: mediatek: Bind clock and gpu driver for mt2701
  clk / soc: mediatek: Bind clock and gpu driver for mt2712
  soc: mediatek: Enable mmsys driver by default if Mediatek arch is selected

Link: https://lore.kernel.org/r/d2eb19f4-589a-89c1-02ad-9f19a6cfb09a@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents be4ad166 32956dda

drivers/clk/mediatek/clk-mt2701-mm.c

+2 −7
Original line number Diff line number Diff line
@@ -79,16 +79,12 @@ 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 device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_onecell_data *clk_data;

	int r;

	struct device_node *node = pdev->dev.of_node;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR);
@@ -108,7 +104,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,

	},

};

drivers/clk/mediatek/clk-mt2712-mm.c

+2 −7
Original line number Diff line number Diff line
@@ -128,9 +128,10 @@ static const struct mtk_gate mm_clks[] = { 


static int clk_mt2712_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_onecell_data *clk_data;

	int r;

	struct device_node *node = pdev->dev.of_node;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
@@ -146,16 +147,10 @@ static int clk_mt2712_mm_probe(struct platform_device *pdev) 
	return r;

}



static const struct of_device_id of_match_clk_mt2712_mm[] = {

	{ .compatible = "mediatek,mt2712-mmsys", },

	{}

};



static struct platform_driver clk_mt2712_mm_drv = {

	.probe = clk_mt2712_mm_probe,

	.driver = {

		.name = "clk-mt2712-mm",

		.of_match_table = of_match_clk_mt2712_mm,

	},

};

drivers/clk/mediatek/clk-mt6779-mm.c

+2 −7
Original line number Diff line number Diff line
@@ -84,15 +84,11 @@ static const struct mtk_gate mm_clks[] = { 
	GATE_MM1(CLK_MM_DISP_OVL_FBDC, "mm_disp_ovl_fbdc", "mm_sel", 16),

};



static const struct of_device_id of_match_clk_mt6779_mm[] = {

	{ .compatible = "mediatek,mt6779-mmsys", },

	{}

};



static int clk_mt6779_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_onecell_data *clk_data;

	struct device_node *node = pdev->dev.of_node;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
@@ -106,7 +102,6 @@ static struct platform_driver clk_mt6779_mm_drv = { 
	.probe = clk_mt6779_mm_probe,

	.driver = {

		.name = "clk-mt6779-mm",

		.of_match_table = of_match_clk_mt6779_mm,

	},

};

drivers/clk/mediatek/clk-mt6797-mm.c

+2 −7
Original line number Diff line number Diff line
@@ -92,16 +92,12 @@ static const struct mtk_gate mm_clks[] = { 
		 "clk26m", 3),

};



static const struct of_device_id of_match_clk_mt6797_mm[] = {

	{ .compatible = "mediatek,mt6797-mmsys", },

	{}

};



static int clk_mt6797_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_onecell_data *clk_data;

	int r;

	struct device_node *node = pdev->dev.of_node;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR);
@@ -121,7 +117,6 @@ static struct platform_driver clk_mt6797_mm_drv = { 
	.probe = clk_mt6797_mm_probe,

	.driver = {

		.name = "clk-mt6797-mm",

		.of_match_table = of_match_clk_mt6797_mm,

	},

};

drivers/clk/mediatek/clk-mt8183-mm.c

+2 −7
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ static const struct mtk_gate mm_clks[] = { 


static int clk_mt8183_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_onecell_data *clk_data;

	struct device_node *node = pdev->dev.of_node;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
@@ -95,16 +96,10 @@ static int clk_mt8183_mm_probe(struct platform_device *pdev) 
	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

}



static const struct of_device_id of_match_clk_mt8183_mm[] = {

	{ .compatible = "mediatek,mt8183-mmsys", },

	{}

};



static struct platform_driver clk_mt8183_mm_drv = {

	.probe = clk_mt8183_mm_probe,

	.driver = {

		.name = "clk-mt8183-mm",

		.of_match_table = of_match_clk_mt8183_mm,

	},

};