From: Stephen Warren swarren@nvidia.com
Equivalent code is already present in the core Tegra board file, so there's no point repeating it here. This removes the only use of <asm/arch/mc.h> from outside arch/arm/mach-tegra/.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/mach-tegra/gpu.c | 1 + board/nvidia/nyan-big/nyan-big.c | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c index 0da681bfe927..172514204b1d 100644 --- a/arch/arm/mach-tegra/gpu.c +++ b/arch/arm/mach-tegra/gpu.c @@ -20,6 +20,7 @@ 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_bom); writel(0, &mc->mc_video_protect_size_mb); writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED, &mc->mc_video_protect_reg_ctrl); diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c index efd3c18ba740..db2874ed93ac 100644 --- a/board/nvidia/nyan-big/nyan-big.c +++ b/board/nvidia/nyan-big/nyan-big.c @@ -14,7 +14,6 @@ #include <asm/io.h> #include <asm/arch/pinmux.h> #include <asm/arch/clock.h> -#include <asm/arch/mc.h> #include <asm/arch-tegra/clk_rst.h> #include <mach/tegra_gpio.h> #include "pinmux-config-nyan-big.h" @@ -65,17 +64,6 @@ int tegra_lcd_pmic_init(int board_id) return 0; }
-/* Setup required information for Linux kernel */ -static void setup_kernel_info(void) -{ - struct mc_ctlr *mc = (void *)NV_PA_MC_BASE; - - /* The kernel graphics driver needs this region locked down */ - writel(0, &mc->mc_video_protect_bom); - writel(0, &mc->mc_video_protect_size_mb); - writel(1, &mc->mc_video_protect_reg_ctrl); -} - /* * We need to take ALL audio devices conntected to AHUB (AUDIO, APBIF, * I2S, DAM, AMX, ADX, SPDIF, AFC) out of reset and enable the clocks. @@ -123,7 +111,6 @@ int nvidia_board_init(void)
/* For external MAX98090 audio codec */ clock_external_output(1); - setup_kernel_info(); enable_required_clocks();
return 0;