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

Commit 4fd6c6bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra 

* 'for-linus' of git://android.kernel.org/kernel/tegra:
  [ARM] tegra: add MAINTAINERS entry
  [ARM] tegra: harmony: Add harmony board file
  [ARM] tegra: add pinmux support
  [ARM] tegra: add GPIO support
  [ARM] tegra: Add timer support
  [ARM] tegra: SMP support
  [ARM] tegra: Add clock support
  [ARM] tegra: Add IRQ support
  [ARM] tegra: initial tegra support
parents c5f34757 84b9414b

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -5565,6 +5565,15 @@ W: http://tcp-lp-mod.sourceforge.net/ 
S:	Maintained

F:	net/ipv4/tcp_lp.c



TEGRA SUPPORT

M:	Colin Cross <ccross@android.com>

M:	Erik Gilling <konkers@android.com>

M:	Olof Johansson <olof@lixom.net>

L:	linux-tegra@vger.kernel.org

T:	git git://android.git.kernel.org/kernel/tegra.git

S:	Supported

F:	arch/arm/mach-tegra



TEHUTI ETHERNET DRIVER

M:	Alexander Indenbaum <baum@tehutinetworks.net>

M:	Andy Gospodarek <andy@greyhouse.net>

arch/arm/Kconfig

+20 −4
Original line number Diff line number Diff line
@@ -558,6 +558,18 @@ config ARCH_NUC93X 
	  Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a

	  low-power and high performance MPEG-4/JPEG multimedia controller chip.



config ARCH_TEGRA

	bool "NVIDIA Tegra"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_HAS_BARRIERS if CACHE_L2X0

	help

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

	  Tegra 6xx and Tegra 2 series).



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T
@@ -907,6 +919,8 @@ source "arch/arm/mach-shmobile/Kconfig" 


source "arch/arm/plat-stmp3xxx/Kconfig"



source "arch/arm/mach-tegra/Kconfig"



source "arch/arm/mach-u300/Kconfig"



source "arch/arm/mach-ux500/Kconfig"
@@ -1094,10 +1108,11 @@ config SMP 
	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \

		 ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -1167,9 +1182,10 @@ config LOCAL_TIMERS 
	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

		ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500)

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\

		ARCH_U8500 || ARCH_TEGRA

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ machine-$(CONFIG_ARCH_SHARK) := shark 
machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_TEGRA)		:= tegra

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U8500)		:= ux500

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

arch/arm/mach-tegra/Kconfig

0 → 100644
+50 −0
Original line number Diff line number Diff line 
if ARCH_TEGRA



comment "NVIDIA Tegra options"



choice

	prompt "Select Tegra processor family for target system"



config ARCH_TEGRA_2x_SOC

	bool "Tegra 2 family"

	select CPU_V7

	select ARM_GIC

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for NVIDIA Tegra AP20 and T20 processors, based on the

	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller



endchoice



comment "Tegra board type"



config MACH_HARMONY

       bool "Harmony board"

       help

         Support for nVidia Harmony development platform



choice

        prompt "Low-level debug console UART"

        default TEGRA_DEBUG_UART_NONE



config TEGRA_DEBUG_UART_NONE

        bool "None"



config TEGRA_DEBUG_UARTA

        bool "UART-A"



config TEGRA_DEBUG_UARTB

        bool "UART-B"



config TEGRA_DEBUG_UARTC

        bool "UART-C"



config TEGRA_DEBUG_UARTD

        bool "UART-D"



config TEGRA_DEBUG_UARTE

        bool "UART-E"



endchoice



endif

arch/arm/mach-tegra/Makefile

0 → 100644
+14 −0
Original line number Diff line number Diff line 
obj-y                                   += common.o

obj-y                                   += io.o

obj-y                                   += irq.o

obj-y                                   += clock.o

obj-y                                   += timer.o

obj-y                                   += gpio.o

obj-y                                   += pinmux.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

obj-$(CONFIG_SMP)                       += platsmp.o localtimer.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o



obj-${CONFIG_MACH_HARMONY}              += board-harmony.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o