dt-bindings: memory: tegra: don't use upstream swgroup definitions
Joseph Lo [Fri, 1 Jun 2018 02:06:18 +0000 (10:06 +0800)]
After include "tegra210-mc.h" for MC hot reset definitions, it will
cause multiple re-definitions of SWGROUPs that we use in
"tegra-swgroup.h". So add a flag to isolate that.

Bug 200416069

Change-Id: I1b6dc54158e3272080c97c10b7dd67113db74187
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1747063
GVS: Gerrit_Virtual_Submit
Reviewed-by: Timo Alho <talho@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

kernel-include/dt-bindings/memory/tegra210-mc.h

index 92d6327..75b4292 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef DT_BINDINGS_MEMORY_TEGRA210_MC_H
 #define DT_BINDINGS_MEMORY_TEGRA210_MC_H
 
+#ifdef TEGRA_SWGROUP_USE_UPSTREAM
 #define TEGRA_SWGROUP_PTC      0
 #define TEGRA_SWGROUP_DC       1
 #define TEGRA_SWGROUP_DCB      2
@@ -32,6 +33,7 @@
 #define TEGRA_SWGROUP_AXIAP    28
 #define TEGRA_SWGROUP_ETR      29
 #define TEGRA_SWGROUP_TSECB    30
+#endif /* TEGRA_SWGROUP_USE_UPSTREAM */
 
 #define TEGRA210_MC_RESET_AFI          0
 #define TEGRA210_MC_RESET_AVPC         1