From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 17 Oct 2013 22:37:52 +0000 (-0700)
Subject: Merge tag 'tegra-for-3.13-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b25a51cb16520c561ad40b0f8e5e26351dc118fc;p=linux-beck.git

Merge tag 'tegra-for-3.13-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup

ARM: tegra: cleanup for 3.13

This branch mainly removes dead code and defines that were useful only
when booting using board files. A few other misc cleanups are also
included.

This branch is based on previous pull request
tegra-for-3.13-deps-for-arm-init-time-cleanup.

* tag 'tegra-for-3.13-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: fix ARCH_TEGRA_114_SOC select sort order
  ARM: tegra: make tegra_init_fuse() __init
  ARM: tegra: remove much of iomap.h
  ARM: tegra: move resume vector define to irammap.h
  ARM: tegra: delete gpio-names.h
  ARM: tegra: delete stale header content
  ARM: tegra: remove common.c

Signed-off-by: Kevin Hilman <khilman@linaro.org>
---

b25a51cb16520c561ad40b0f8e5e26351dc118fc
diff --cc arch/arm/mach-tegra/tegra.c
index 2e2192807830,40b031c42299..386115ae5c03
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@@ -32,8 -33,11 +32,10 @@@
  #include <linux/slab.h>
  #include <linux/sys_soc.h>
  #include <linux/usb/tegra_usb_phy.h>
 -#include <linux/clk-provider.h>
  #include <linux/clk/tegra.h>
+ #include <linux/irqchip.h>
  
+ #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
@@@ -121,8 -192,9 +184,8 @@@ DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegr
  	.smp		= smp_ops(tegra_smp_ops),
  	.init_early	= tegra_init_early,
  	.init_irq	= tegra_dt_init_irq,
 -	.init_time	= tegra_dt_init_time,
  	.init_machine	= tegra_dt_init,
  	.init_late	= tegra_dt_init_late,
- 	.restart	= tegra_assert_system_reset,
+ 	.restart	= tegra_pmc_restart,
  	.dt_compat	= tegra_dt_board_compat,
  MACHINE_END