Merge branch 'master' of git://git.denx.de/u-boot-tegra

diff --git a/arch/arm/dts/tegra20-u-boot.dtsi b/arch/arm/dts/tegra20-u-boot.dtsi
index 7c11972..f64667e 100644 (file)
--- a/arch/arm/dts/tegra20-u-boot.dtsi
+++ b/arch/arm/dts/tegra20-u-boot.dtsi
@@ -1,3 +1,13 @@
 #include <config.h>
 
 #include "tegra-u-boot.dtsi"
+
+
+/ {
+       host1x@50000000 {
+               u-boot,dm-pre-reloc;
+               dc@54200000 {
+                       u-boot,dm-pre-reloc;
+               };
+       };
+};

diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index bf8001d..84c20a4 100644 (file)
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -155,8 +155,13 @@ static void init_pmc_scratch(void)
        int i;
 
        /* SCRATCH0 is initialized by the boot ROM and shouldn't be cleared */
-       for (i = 0; i < 23; i++)
-               writel(0, &pmc->pmc_scratch1+i);
+#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
+       if (!tegra_cpu_is_non_secure())
+#endif
+       {
+               for (i = 0; i < 23; i++)
+                       writel(0, &pmc->pmc_scratch1 + i);
+       }
 
        /* ODMDATA is for kernel use to determine RAM size, LP config, etc. */
        odmdata = get_odmdata();

diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
index 2e203f7..e047f67 100644 (file)
--- a/arch/arm/mach-tegra/gpu.c
+++ b/arch/arm/mach-tegra/gpu.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch/mc.h>
+#include <asm/arch-tegra/ap.h>
 
 #include <fdt_support.h>
 
@@ -18,12 +19,17 @@ void tegra_gpu_config(void)
 {
        struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
 
-       /* Turn VPR off */
-       writel(0, &mc->mc_video_protect_size_mb);
-       writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
-              &mc->mc_video_protect_reg_ctrl);
-       /* read back to ensure the write went through */
-       readl(&mc->mc_video_protect_reg_ctrl);
+#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
+       if (!tegra_cpu_is_non_secure())
+#endif
+       {
+               /* Turn VPR off */
+               writel(0, &mc->mc_video_protect_size_mb);
+               writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
+                      &mc->mc_video_protect_reg_ctrl);
+               /* read back to ensure the write went through */
+               readl(&mc->mc_video_protect_reg_ctrl);
+       }
 
        debug("configured VPR\n");