Commit b4e3b881 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Refactor the mmsys to reflect that it's a clock driver and
the entry point for the DRM subsystem.

Replace clk-provider.h include with of_clk.h for mach-mediatek

* tag 'v5.7-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  ARM: mediatek: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  soc: mediatek: Missing platform_device_unregister() on error in mtk_mmsys_probe()
  soc: mediatek: mmsys: Drop <linux/clk-provider.h>
  soc / drm: mediatek: Fix mediatek-drm device probing
  soc / drm: mediatek: Move routing control to mmsys device
  clk / soc: mediatek: Move mt8173 MMSYS to platform driver
  dt-bindings: mediatek: Update mmsys binding to reflect it is a system controller
  drm/mediatek: Omit warning on probe defers

Link: https://lore.kernel.org/r/2cf27d33-59c6-023b-9993-57a2639824ea@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fff4a87f 154910f8

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt

+4 −3
Original line number Diff line number Diff line 
Mediatek mmsys controller

============================



The Mediatek mmsys controller provides various clocks to the system.

The Mediatek mmsys system controller provides clock control, routing control,

and miscellaneous control in mmsys partition.



Required Properties:
@@ -15,13 +16,13 @@ Required Properties: 
	- "mediatek,mt8183-mmsys", "syscon"

- #clock-cells: Must be 1



The mmsys controller uses the common clk binding from

For the clock control, the mmsys controller uses the common clk binding from

Documentation/devicetree/bindings/clock/clock-bindings.txt

The available clocks are defined in dt-bindings/clock/mt*-clk.h.



Example:



mmsys: clock-controller@14000000 {

mmsys: syscon@14000000 {

	compatible = "mediatek,mt8173-mmsys", "syscon";

	reg = <0 0x14000000 0 0x1000>;

	#clock-cells = <1>;

arch/arm/mach-mediatek/mediatek.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/io.h>

#include <asm/mach/arch.h>

#include <linux/of.h>

#include <linux/clk-provider.h>

#include <linux/of_clk.h>

#include <linux/clocksource.h>

drivers/clk/mediatek/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -274,6 +274,13 @@ config COMMON_CLK_MT8173 
	---help---

	  This driver supports MediaTek MT8173 clocks.



config COMMON_CLK_MT8173_MMSYS

	bool "Clock driver for MediaTek MT8173 mmsys"

	depends on COMMON_CLK_MT8173

	default COMMON_CLK_MT8173

	help

	  This driver supports MediaTek MT8173 mmsys clocks.



config COMMON_CLK_MT8183

	bool "Clock driver for MediaTek MT8183"

	depends on (ARCH_MEDIATEK && ARM64) || COMPILE_TEST

drivers/clk/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ obj-$(CONFIG_COMMON_CLK_MT7629_ETHSYS) += clk-mt7629-eth.o 
obj-$(CONFIG_COMMON_CLK_MT7629_HIFSYS) += clk-mt7629-hif.o

obj-$(CONFIG_COMMON_CLK_MT8135) += clk-mt8135.o

obj-$(CONFIG_COMMON_CLK_MT8173) += clk-mt8173.o

obj-$(CONFIG_COMMON_CLK_MT8173_MMSYS) += clk-mt8173-mm.o

obj-$(CONFIG_COMMON_CLK_MT8183) += clk-mt8183.o

obj-$(CONFIG_COMMON_CLK_MT8183_AUDIOSYS) += clk-mt8183-audio.o

obj-$(CONFIG_COMMON_CLK_MT8183_CAMSYS) += clk-mt8183-cam.o

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

0 → 100644
+146 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2014 MediaTek Inc.

 * Author: James Liao <jamesjj.liao@mediatek.com>

 */



#include <linux/clk-provider.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>



#include "clk-gate.h"

#include "clk-mtk.h"



#include <dt-bindings/clock/mt8173-clk.h>



static const struct mtk_gate_regs mm0_cg_regs = {

	.set_ofs = 0x0104,

	.clr_ofs = 0x0108,

	.sta_ofs = 0x0100,

};



static const struct mtk_gate_regs mm1_cg_regs = {

	.set_ofs = 0x0114,

	.clr_ofs = 0x0118,

	.sta_ofs = 0x0110,

};



#define GATE_MM0(_id, _name, _parent, _shift) {			\

		.id = _id,					\

		.name = _name,					\

		.parent_name = _parent,				\

		.regs = &mm0_cg_regs,				\

		.shift = _shift,				\

		.ops = &mtk_clk_gate_ops_setclr,		\

	}



#define GATE_MM1(_id, _name, _parent, _shift) {			\

		.id = _id,					\

		.name = _name,					\

		.parent_name = _parent,				\

		.regs = &mm1_cg_regs,				\

		.shift = _shift,				\

		.ops = &mtk_clk_gate_ops_setclr,		\

	}



static const struct mtk_gate mt8173_mm_clks[] = {

	/* MM0 */

	GATE_MM0(CLK_MM_SMI_COMMON, "mm_smi_common", "mm_sel", 0),

	GATE_MM0(CLK_MM_SMI_LARB0, "mm_smi_larb0", "mm_sel", 1),

	GATE_MM0(CLK_MM_CAM_MDP, "mm_cam_mdp", "mm_sel", 2),

	GATE_MM0(CLK_MM_MDP_RDMA0, "mm_mdp_rdma0", "mm_sel", 3),

	GATE_MM0(CLK_MM_MDP_RDMA1, "mm_mdp_rdma1", "mm_sel", 4),

	GATE_MM0(CLK_MM_MDP_RSZ0, "mm_mdp_rsz0", "mm_sel", 5),

	GATE_MM0(CLK_MM_MDP_RSZ1, "mm_mdp_rsz1", "mm_sel", 6),

	GATE_MM0(CLK_MM_MDP_RSZ2, "mm_mdp_rsz2", "mm_sel", 7),

	GATE_MM0(CLK_MM_MDP_TDSHP0, "mm_mdp_tdshp0", "mm_sel", 8),

	GATE_MM0(CLK_MM_MDP_TDSHP1, "mm_mdp_tdshp1", "mm_sel", 9),

	GATE_MM0(CLK_MM_MDP_WDMA, "mm_mdp_wdma", "mm_sel", 11),

	GATE_MM0(CLK_MM_MDP_WROT0, "mm_mdp_wrot0", "mm_sel", 12),

	GATE_MM0(CLK_MM_MDP_WROT1, "mm_mdp_wrot1", "mm_sel", 13),

	GATE_MM0(CLK_MM_FAKE_ENG, "mm_fake_eng", "mm_sel", 14),

	GATE_MM0(CLK_MM_MUTEX_32K, "mm_mutex_32k", "rtc_sel", 15),

	GATE_MM0(CLK_MM_DISP_OVL0, "mm_disp_ovl0", "mm_sel", 16),

	GATE_MM0(CLK_MM_DISP_OVL1, "mm_disp_ovl1", "mm_sel", 17),

	GATE_MM0(CLK_MM_DISP_RDMA0, "mm_disp_rdma0", "mm_sel", 18),

	GATE_MM0(CLK_MM_DISP_RDMA1, "mm_disp_rdma1", "mm_sel", 19),

	GATE_MM0(CLK_MM_DISP_RDMA2, "mm_disp_rdma2", "mm_sel", 20),

	GATE_MM0(CLK_MM_DISP_WDMA0, "mm_disp_wdma0", "mm_sel", 21),

	GATE_MM0(CLK_MM_DISP_WDMA1, "mm_disp_wdma1", "mm_sel", 22),

	GATE_MM0(CLK_MM_DISP_COLOR0, "mm_disp_color0", "mm_sel", 23),

	GATE_MM0(CLK_MM_DISP_COLOR1, "mm_disp_color1", "mm_sel", 24),

	GATE_MM0(CLK_MM_DISP_AAL, "mm_disp_aal", "mm_sel", 25),

	GATE_MM0(CLK_MM_DISP_GAMMA, "mm_disp_gamma", "mm_sel", 26),

	GATE_MM0(CLK_MM_DISP_UFOE, "mm_disp_ufoe", "mm_sel", 27),

	GATE_MM0(CLK_MM_DISP_SPLIT0, "mm_disp_split0", "mm_sel", 28),

	GATE_MM0(CLK_MM_DISP_SPLIT1, "mm_disp_split1", "mm_sel", 29),

	GATE_MM0(CLK_MM_DISP_MERGE, "mm_disp_merge", "mm_sel", 30),

	GATE_MM0(CLK_MM_DISP_OD, "mm_disp_od", "mm_sel", 31),

	/* MM1 */

	GATE_MM1(CLK_MM_DISP_PWM0MM, "mm_disp_pwm0mm", "mm_sel", 0),

	GATE_MM1(CLK_MM_DISP_PWM026M, "mm_disp_pwm026m", "pwm_sel", 1),

	GATE_MM1(CLK_MM_DISP_PWM1MM, "mm_disp_pwm1mm", "mm_sel", 2),

	GATE_MM1(CLK_MM_DISP_PWM126M, "mm_disp_pwm126m", "pwm_sel", 3),

	GATE_MM1(CLK_MM_DSI0_ENGINE, "mm_dsi0_engine", "mm_sel", 4),

	GATE_MM1(CLK_MM_DSI0_DIGITAL, "mm_dsi0_digital", "dsi0_dig", 5),

	GATE_MM1(CLK_MM_DSI1_ENGINE, "mm_dsi1_engine", "mm_sel", 6),

	GATE_MM1(CLK_MM_DSI1_DIGITAL, "mm_dsi1_digital", "dsi1_dig", 7),

	GATE_MM1(CLK_MM_DPI_PIXEL, "mm_dpi_pixel", "dpi0_sel", 8),

	GATE_MM1(CLK_MM_DPI_ENGINE, "mm_dpi_engine", "mm_sel", 9),

	GATE_MM1(CLK_MM_DPI1_PIXEL, "mm_dpi1_pixel", "lvds_pxl", 10),

	GATE_MM1(CLK_MM_DPI1_ENGINE, "mm_dpi1_engine", "mm_sel", 11),

	GATE_MM1(CLK_MM_HDMI_PIXEL, "mm_hdmi_pixel", "dpi0_sel", 12),

	GATE_MM1(CLK_MM_HDMI_PLLCK, "mm_hdmi_pllck", "hdmi_sel", 13),

	GATE_MM1(CLK_MM_HDMI_AUDIO, "mm_hdmi_audio", "apll1", 14),

	GATE_MM1(CLK_MM_HDMI_SPDIF, "mm_hdmi_spdif", "apll2", 15),

	GATE_MM1(CLK_MM_LVDS_PIXEL, "mm_lvds_pixel", "lvds_pxl", 16),

	GATE_MM1(CLK_MM_LVDS_CTS, "mm_lvds_cts", "lvds_cts", 17),

	GATE_MM1(CLK_MM_SMI_LARB4, "mm_smi_larb4", "mm_sel", 18),

	GATE_MM1(CLK_MM_HDMI_HDCP, "mm_hdmi_hdcp", "hdcp_sel", 19),

	GATE_MM1(CLK_MM_HDMI_HDCP24M, "mm_hdmi_hdcp24m", "hdcp_24m_sel", 20),

};



struct clk_mt8173_mm_driver_data {

	const struct mtk_gate *gates_clk;

	int gates_num;

};



static const struct clk_mt8173_mm_driver_data mt8173_mmsys_driver_data = {

	.gates_clk = mt8173_mm_clks,

	.gates_num = ARRAY_SIZE(mt8173_mm_clks),

};



static int clk_mt8173_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

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

	const struct clk_mt8173_mm_driver_data *data;

	struct clk_onecell_data *clk_data;

	int ret;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);

	if (!clk_data)

		return -ENOMEM;



	data = &mt8173_mmsys_driver_data;



	ret = mtk_clk_register_gates(node, data->gates_clk, data->gates_num,

				     clk_data);

	if (ret)

		return ret;



	ret = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (ret)

		return ret;



	return 0;

}



static struct platform_driver clk_mt8173_mm_drv = {

	.driver = {

		.name = "clk-mt8173-mm",

	},

	.probe = clk_mt8173_mm_probe,

};



builtin_platform_driver(clk_mt8173_mm_drv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE