aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/memory/tegra/tegra124.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
index 8f8487bda642..6985a4e33325 100644
--- a/drivers/memory/tegra/tegra124.c
+++ b/drivers/memory/tegra/tegra124.c
@@ -33,28 +33,6 @@
33#define MC_EMEM_ARB_MISC1 0xdc 33#define MC_EMEM_ARB_MISC1 0xdc
34#define MC_EMEM_ARB_RING1_THROTTLE 0xe0 34#define MC_EMEM_ARB_RING1_THROTTLE 0xe0
35 35
36static const unsigned long tegra124_mc_emem_regs[] = {
37 MC_EMEM_ARB_CFG,
38 MC_EMEM_ARB_OUTSTANDING_REQ,
39 MC_EMEM_ARB_TIMING_RCD,
40 MC_EMEM_ARB_TIMING_RP,
41 MC_EMEM_ARB_TIMING_RC,
42 MC_EMEM_ARB_TIMING_RAS,
43 MC_EMEM_ARB_TIMING_FAW,
44 MC_EMEM_ARB_TIMING_RRD,
45 MC_EMEM_ARB_TIMING_RAP2PRE,
46 MC_EMEM_ARB_TIMING_WAP2PRE,
47 MC_EMEM_ARB_TIMING_R2R,
48 MC_EMEM_ARB_TIMING_W2W,
49 MC_EMEM_ARB_TIMING_R2W,
50 MC_EMEM_ARB_TIMING_W2R,
51 MC_EMEM_ARB_DA_TURNS,
52 MC_EMEM_ARB_DA_COVERS,
53 MC_EMEM_ARB_MISC0,
54 MC_EMEM_ARB_MISC1,
55 MC_EMEM_ARB_RING1_THROTTLE
56};
57
58static const struct tegra_mc_client tegra124_mc_clients[] = { 36static const struct tegra_mc_client tegra124_mc_clients[] = {
59 { 37 {
60 .id = 0x00, 38 .id = 0x00,
@@ -1049,6 +1027,28 @@ static const struct tegra_mc_reset tegra124_mc_resets[] = {
1049}; 1027};
1050 1028
1051#ifdef CONFIG_ARCH_TEGRA_124_SOC 1029#ifdef CONFIG_ARCH_TEGRA_124_SOC
1030static const unsigned long tegra124_mc_emem_regs[] = {
1031 MC_EMEM_ARB_CFG,
1032 MC_EMEM_ARB_OUTSTANDING_REQ,
1033 MC_EMEM_ARB_TIMING_RCD,
1034 MC_EMEM_ARB_TIMING_RP,
1035 MC_EMEM_ARB_TIMING_RC,
1036 MC_EMEM_ARB_TIMING_RAS,
1037 MC_EMEM_ARB_TIMING_FAW,
1038 MC_EMEM_ARB_TIMING_RRD,
1039 MC_EMEM_ARB_TIMING_RAP2PRE,
1040 MC_EMEM_ARB_TIMING_WAP2PRE,
1041 MC_EMEM_ARB_TIMING_R2R,
1042 MC_EMEM_ARB_TIMING_W2W,
1043 MC_EMEM_ARB_TIMING_R2W,
1044 MC_EMEM_ARB_TIMING_W2R,
1045 MC_EMEM_ARB_DA_TURNS,
1046 MC_EMEM_ARB_DA_COVERS,
1047 MC_EMEM_ARB_MISC0,
1048 MC_EMEM_ARB_MISC1,
1049 MC_EMEM_ARB_RING1_THROTTLE
1050};
1051
1052static const struct tegra_smmu_soc tegra124_smmu_soc = { 1052static const struct tegra_smmu_soc tegra124_smmu_soc = {
1053 .clients = tegra124_mc_clients, 1053 .clients = tegra124_mc_clients,
1054 .num_clients = ARRAY_SIZE(tegra124_mc_clients), 1054 .num_clients = ARRAY_SIZE(tegra124_mc_clients),