mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/memory/tegra/tegra114.c
..
..
@@ -1,9 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * 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.
7
4
  */
8
5
 
9
6
 #include <linux/of.h>
..
..
@@ -572,7 +569,7 @@
572
569
 		},
573
570
 	}, {
574
571
 		.id = 0x34,
575
-		.name = "fdcwr2",
572
+		.name = "fdcdwr2",
576
573
 		.swgroup = TEGRA_SWGROUP_NV,
577
574
 		.smmu = {
578
575
 			.reg = 0x22c,
..
..
@@ -912,16 +909,18 @@
912
909
 	{ .name = "tsec",      .swgroup = TEGRA_SWGROUP_TSEC,      .reg = 0x294 },
913
910
 };
914
911
 
915
-static const unsigned int tegra114_group_display[] = {
912
+static const unsigned int tegra114_group_drm[] = {
916
913
 	TEGRA_SWGROUP_DC,
917
914
 	TEGRA_SWGROUP_DCB,
915
+	TEGRA_SWGROUP_G2,
916
+	TEGRA_SWGROUP_NV,
918
917
 };
919
918
 
920
919
 static const struct tegra_smmu_group_soc tegra114_groups[] = {
921
920
 	{
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),
925
924
 	},
926
925
 };
927
926
 
..
..
@@ -975,7 +974,7 @@
975
974
 	.smmu = &tegra114_smmu_soc,
976
975
 	.intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION |
977
976
 		   MC_INT_DECERR_EMEM,
978
-	.reset_ops = &terga_mc_reset_ops_common,
977
+	.reset_ops = &tegra_mc_reset_ops_common,
979
978
 	.resets = tegra114_mc_resets,
980
979
 	.num_resets = ARRAY_SIZE(tegra114_mc_resets),
981
980
 };