Merge tag 'tegra-for-5.3-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

memory: tegra: Changes for v5.3-rc1

A single fix for an unused constant variable, due to it being declared
outside the only #ifdef that it was being used from.

* tag 'tegra-for-5.3-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory: tegra: Fix -Wunused-const-variable

Signed-off-by: Olof Johansson <olof@lixom.net>

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 @@
 #define MC_EMEM_ARB_MISC1                       0xdc
 #define MC_EMEM_ARB_RING1_THROTTLE              0xe0
 
-static const unsigned long tegra124_mc_emem_regs[] = {
-        MC_EMEM_ARB_CFG,
-        MC_EMEM_ARB_OUTSTANDING_REQ,
-        MC_EMEM_ARB_TIMING_RCD,
-        MC_EMEM_ARB_TIMING_RP,
-        MC_EMEM_ARB_TIMING_RC,
-        MC_EMEM_ARB_TIMING_RAS,
-        MC_EMEM_ARB_TIMING_FAW,
-        MC_EMEM_ARB_TIMING_RRD,
-        MC_EMEM_ARB_TIMING_RAP2PRE,
-        MC_EMEM_ARB_TIMING_WAP2PRE,
-        MC_EMEM_ARB_TIMING_R2R,
-        MC_EMEM_ARB_TIMING_W2W,
-        MC_EMEM_ARB_TIMING_R2W,
-        MC_EMEM_ARB_TIMING_W2R,
-        MC_EMEM_ARB_DA_TURNS,
-        MC_EMEM_ARB_DA_COVERS,
-        MC_EMEM_ARB_MISC0,
-        MC_EMEM_ARB_MISC1,
-        MC_EMEM_ARB_RING1_THROTTLE
-};
-
 static const struct tegra_mc_client tegra124_mc_clients[] = {
         {
                 .id = 0x00,
@@ -1049,6 +1027,28 @@ static const struct tegra_mc_reset tegra124_mc_resets[] = {
 };
 
 #ifdef CONFIG_ARCH_TEGRA_124_SOC
+static const unsigned long tegra124_mc_emem_regs[] = {
+        MC_EMEM_ARB_CFG,
+        MC_EMEM_ARB_OUTSTANDING_REQ,
+        MC_EMEM_ARB_TIMING_RCD,
+        MC_EMEM_ARB_TIMING_RP,
+        MC_EMEM_ARB_TIMING_RC,
+        MC_EMEM_ARB_TIMING_RAS,
+        MC_EMEM_ARB_TIMING_FAW,
+        MC_EMEM_ARB_TIMING_RRD,
+        MC_EMEM_ARB_TIMING_RAP2PRE,
+        MC_EMEM_ARB_TIMING_WAP2PRE,
+        MC_EMEM_ARB_TIMING_R2R,
+        MC_EMEM_ARB_TIMING_W2W,
+        MC_EMEM_ARB_TIMING_R2W,
+        MC_EMEM_ARB_TIMING_W2R,
+        MC_EMEM_ARB_DA_TURNS,
+        MC_EMEM_ARB_DA_COVERS,
+        MC_EMEM_ARB_MISC0,
+        MC_EMEM_ARB_MISC1,
+        MC_EMEM_ARB_RING1_THROTTLE
+};
+
 static const struct tegra_smmu_soc tegra124_smmu_soc = {
         .clients = tegra124_mc_clients,
         .num_clients = ARRAY_SIZE(tegra124_mc_clients),