Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 494cc760 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-3.10-multiplatform' of... 

Merge tag 'tegra-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/multiplatform

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: multi-platform conversion

This branch converts Tegra to support multi-platform/single-zImage.

One header is made accessible to drivers. The earlyprintk implementation
is moved to the multi-platform location. Some Kconfig changes are made
to enable multi-platform. Some dead files are deleted.

The APIs exposed in the now-global tegra-powergate.h should be replaced
with standard reset and power domain APIs in the future.

This branch is based on (part of) the previous soc pull request.

* tag 'tegra-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: convert to multi-platform
  ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3afeb0a0 90027225

arch/arm/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -600,25 +600,6 @@ config ARCH_LPC32XX 
	help

	  Support for the NXP LPC32XX family of processors



config ARCH_TEGRA

	bool "NVIDIA Tegra"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select SOC_BUS

	select SPARSE_IRQ

	select USE_OF

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,

	  Tegra 6xx and Tegra 2 series).



config ARCH_PXA

	bool "PXA2xx/PXA3xx-based"

	depends on MMU

arch/arm/mach-tegra/Kconfig

+20 −7
Original line number Diff line number Diff line 
if ARCH_TEGRA

config ARCH_TEGRA

	bool "NVIDIA Tegra" if ARCH_MULTI_V7

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select SOC_BUS

	select SPARSE_IRQ

	select USE_OF

	help

	  This enables support for NVIDIA Tegra based systems.



comment "NVIDIA Tegra options"

menu "NVIDIA Tegra options"

	depends on ARCH_TEGRA



config ARCH_TEGRA_2x_SOC

	bool "Enable support for Tegra20 family"

	select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP

	select ARM_ERRATA_720789

	select ARM_ERRATA_742230 if SMP

	select ARM_ERRATA_751472

	select ARM_ERRATA_754327 if SMP

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC
@@ -26,8 +41,6 @@ config ARCH_TEGRA_2x_SOC 


config ARCH_TEGRA_3x_SOC

	bool "Enable support for Tegra30 family"

	select ARM_ERRATA_743622

	select ARM_ERRATA_751472

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC
@@ -71,4 +84,4 @@ config TEGRA_AHB 
config TEGRA_EMC_SCALING_ENABLE

	bool "Enable scaling the memory frequency"



endif
 
endmenu

arch/arm/mach-tegra/Makefile.boot

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)	+= 0x00008000

params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00000100

initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00800000

arch/arm/mach-tegra/board.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ int tegra_clk_debugfs_init(void); 
static inline int tegra_clk_debugfs_init(void) { return 0; }

#endif



int __init tegra_powergate_init(void);

#if defined(CONFIG_ARCH_TEGRA_2x_SOC) && defined(CONFIG_DEBUG_FS)

int __init tegra_powergate_debugfs_init(void);

#else

arch/arm/mach-tegra/common.c

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 


#include <asm/hardware/cache-l2x0.h>



#include <mach/powergate.h>



#include "board.h"

#include "common.h"

#include "fuse.h"