forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/memory/tegra/tegra114.c
....@@ -1,9 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Copyright (C) 2014 NVIDIA CORPORATION.  All rights reserved.
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License version 2 as
6
- * published by the Free Software Foundation.
74  */
85 
96 #include <linux/of.h>
....@@ -572,7 +569,7 @@
572569 		},
573570 	}, {
574571 		.id = 0x34,
575
-		.name = "fdcwr2",
572
+		.name = "fdcdwr2",
576573 		.swgroup = TEGRA_SWGROUP_NV,
577574 		.smmu = {
578575 			.reg = 0x22c,
....@@ -912,16 +909,18 @@
912909 	{ .name = "tsec",      .swgroup = TEGRA_SWGROUP_TSEC,      .reg = 0x294 },
913910 };
914911 
915
-static const unsigned int tegra114_group_display[] = {
912
+static const unsigned int tegra114_group_drm[] = {
916913 	TEGRA_SWGROUP_DC,
917914 	TEGRA_SWGROUP_DCB,
915
+	TEGRA_SWGROUP_G2,
916
+	TEGRA_SWGROUP_NV,
918917 };
919918 
920919 static const struct tegra_smmu_group_soc tegra114_groups[] = {
921920 	{
922
-		.name = "display",
923
-		.swgroups = tegra114_group_display,
924
-		.num_swgroups = ARRAY_SIZE(tegra114_group_display),
921
+		.name = "drm",
922
+		.swgroups = tegra114_group_drm,
923
+		.num_swgroups = ARRAY_SIZE(tegra114_group_drm),
925924 	},
926925 };
927926 
....@@ -975,7 +974,7 @@
975974 	.smmu = &tegra114_smmu_soc,
976975 	.intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION |
977976 		   MC_INT_DECERR_EMEM,
978
-	.reset_ops = &terga_mc_reset_ops_common,
977
+	.reset_ops = &tegra_mc_reset_ops_common,
979978 	.resets = tegra114_mc_resets,
980979 	.num_resets = ARRAY_SIZE(tegra114_mc_resets),
981980 };