From: Matthias Brugger <matthias.bgg@gmail.com>
Date: Fri, 22 Apr 2022 12:39:59 +0000 (+0200)
Subject: Merge tag 'v5.18-next-vdso0-stable-tag' into v5.18-next/soc
X-Git-Tag: v5.19-rc1~145^2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=949cfe1a433b558ebf9e93407e3ea8bf9acae1ae;p=thirdparty%2Flinux.git

Merge tag 'v5.18-next-vdso0-stable-tag' into v5.18-next/soc
---

949cfe1a433b558ebf9e93407e3ea8bf9acae1ae
diff --cc drivers/soc/mediatek/mtk-mmsys.c
index 893cec3c96517,548efed8dc1c8..06d8e83a2cb56
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@@ -70,9 -127,35 +127,36 @@@ static const struct mtk_mmsys_driver_da
  	.clk_driver = "clk-mt8192-mm",
  	.routes = mmsys_mt8192_routing_table,
  	.num_routes = ARRAY_SIZE(mmsys_mt8192_routing_table),
 +	.sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
  };
  
+ static const struct mtk_mmsys_match_data mt8192_mmsys_match_data = {
+ 	.num_drv_data = 1,
+ 	.drv_data = {
+ 		&mt8192_mmsys_driver_data,
+ 	},
+ };
+ 
+ static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = {
+ 	.io_start = 0x1c01a000,
+ 	.clk_driver = "clk-mt8195-vdo0",
+ 	.routes = mmsys_mt8195_routing_table,
+ 	.num_routes = ARRAY_SIZE(mmsys_mt8195_routing_table),
+ };
+ 
+ static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = {
+ 	.io_start = 0x1c100000,
+ 	.clk_driver = "clk-mt8195-vdo1",
+ };
+ 
+ static const struct mtk_mmsys_match_data mt8195_mmsys_match_data = {
+ 	.num_drv_data = 2,
+ 	.drv_data = {
+ 		&mt8195_vdosys0_driver_data,
+ 		&mt8195_vdosys1_driver_data,
+ 	},
+ };
+ 
  static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = {
  	.clk_driver = "clk-mt8365-mm",
  	.routes = mt8365_mmsys_routing_table,