Commit 4a3c8895 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

MT8167:
- add support for mmsys subsystem

* tag 'v5.12-next-soc.2' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: mmsys: Add support for MT8167 SoC
  dt-bindings: mediatek: mmsys: add mt8167 binding

Link: https://lore.kernel.org/r/14104322-3a6c-e8eb-cd21-a5343a81aa0f@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0ffc253e 060f7875

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required Properties: 
	- "mediatek,mt6779-mmsys", "syscon"

	- "mediatek,mt6797-mmsys", "syscon"

	- "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon"

	- "mediatek,mt8167-mmsys", "syscon"

	- "mediatek,mt8173-mmsys", "syscon"

	- "mediatek,mt8183-mmsys", "syscon"

- #clock-cells: Must be 1

drivers/soc/mediatek/mt8167-mmsys.h

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



#ifndef __SOC_MEDIATEK_MT8167_MMSYS_H

#define __SOC_MEDIATEK_MT8167_MMSYS_H



#define MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN	0x030

#define MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN	0x038

#define MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN	0x058

#define MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN		0x064

#define MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN	0x06c



#define MT8167_DITHER_MOUT_EN_RDMA0			0x1

#define MT8167_RDMA0_SOUT_DSI0				0x2

#define MT8167_DSI0_SEL_IN_RDMA0			0x1



static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {

	{

		DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,

		MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN, OVL0_MOUT_EN_COLOR0,

	}, {

		DDP_COMPONENT_DITHER, DDP_COMPONENT_RDMA0,

		MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_RDMA0

	}, {

		DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,

		MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN, COLOR0_SEL_IN_OVL0

	}, {

		DDP_COMPONENT_RDMA0, DDP_COMPONENT_DSI0,

		MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN, MT8167_DSI0_SEL_IN_RDMA0

	}, {

		DDP_COMPONENT_RDMA0, DDP_COMPONENT_DSI0,

		MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN, MT8167_RDMA0_SOUT_DSI0

	},

};



#endif /* __SOC_MEDIATEK_MT8167_MMSYS_H */

drivers/soc/mediatek/mtk-mmsys.c

+11 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/soc/mediatek/mtk-mmsys.h>



#include "mtk-mmsys.h"

#include "mt8167-mmsys.h"

#include "mt8183-mmsys.h"



static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
@@ -33,6 +34,12 @@ static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = { 
	.clk_driver = "clk-mt6797-mm",

};



static const struct mtk_mmsys_driver_data mt8167_mmsys_driver_data = {

	.clk_driver = "clk-mt8167-mm",

	.routes = mt8167_mmsys_routing_table,

	.num_routes = ARRAY_SIZE(mt8167_mmsys_routing_table),

};



static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {

	.clk_driver = "clk-mt8173-mm",

	.routes = mmsys_default_routing_table,
@@ -138,6 +145,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = { 
		.compatible = "mediatek,mt6797-mmsys",

		.data = &mt6797_mmsys_driver_data,

	},

	{

		.compatible = "mediatek,mt8167-mmsys",

		.data = &mt8167_mmsys_driver_data,

	},

	{

		.compatible = "mediatek,mt8173-mmsys",

		.data = &mt8173_mmsys_driver_data,