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

Commit b18cae42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-next' of git://android.git.kernel.org/kernel/tegra:
  spi: tegra: fix error setting on timeout
  spi: add spi_tegra driver
  tegra: harmony: enable PCI Express
  tegra: add PCI Express support
  tegra: add PCI Express clocks
  [ARM] tegra: Add APB DMA support
  [ARM] tegra: Add cpufreq support
  [ARM] tegra: common: Update common clock init table
  [ARM] tegra: clock: Add dvfs support, bug fixes, and cleanups
  [ARM] tegra: Add support for reading fuses
  [ARM] tegra: gpio: Add suspend and wake support
  [ARM] tegra: pinmux: add safe values, move tegra2, add suspend
  [ARM] tegra: add suspend and mirror irqs to legacy controller
  [ARM] tegra: Add legacy irq support
  [ARM] tegra: update iomap
parents 4833c16d f41649e0

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -573,6 +573,7 @@ config ARCH_TEGRA 
	select HAVE_CLK

	select HAVE_CLK

	select COMMON_CLKDEV

	select COMMON_CLKDEV

	select ARCH_HAS_BARRIERS if CACHE_L2X0

	select ARCH_HAS_BARRIERS if CACHE_L2X0

	select ARCH_HAS_CPUFREQ

	help

	help

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

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

	  Tegra 6xx and Tegra 2 series).

	  Tegra 6xx and Tegra 2 series).

arch/arm/mach-tegra/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,10 @@ config ARCH_TEGRA_2x_SOC 




endchoice

endchoice





config TEGRA_PCI

	bool "PCI Express support"

	select PCI



comment "Tegra board type"

comment "Tegra board type"





config MACH_HARMONY

config MACH_HARMONY
@@ -47,4 +51,11 @@ config TEGRA_DEBUG_UARTE 




endchoice

endchoice





config TEGRA_SYSTEM_DMA

	bool "Enable system DMA driver for NVIDIA Tegra SoCs"

	default y

	help

	  Adds system DMA functionality for NVIDIA Tegra SoCs, used by

	  several Tegra device drivers



endif
 
endif

arch/arm/mach-tegra/Makefile

+8 −1
Original line number Original line Diff line number Diff line 
obj-y                                   += common.o

obj-y                                   += common.o

obj-y                                   += io.o

obj-y                                   += io.o

obj-y                                   += irq.o

obj-y                                   += irq.o legacy_irq.o

obj-y                                   += clock.o

obj-y                                   += clock.o

obj-y                                   += timer.o

obj-y                                   += timer.o

obj-y                                   += gpio.o

obj-y                                   += gpio.o

obj-y                                   += pinmux.o

obj-y                                   += pinmux.o

obj-y					+= fuse.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_dvfs.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-t2-tables.o

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

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

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o

obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o

obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o

obj-$(CONFIG_TEGRA_PCI)			+= pcie.o





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

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

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

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

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

arch/arm/mach-tegra/board-harmony-pcie.c

0 → 100644
+57 −0
Original line number Original line Diff line number Diff line 
/*

 * arch/arm/mach-tegra/board-harmony-pcie.c

 *

 * Copyright (C) 2010 CompuLab, Ltd.

 * Mike Rapoport <mike@compulab.co.il>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/err.h>

#include <linux/regulator/consumer.h>



#include <asm/mach-types.h>



#include <mach/pinmux.h>

#include "board.h"



#ifdef CONFIG_TEGRA_PCI



static int __init harmony_pcie_init(void)

{

	int err;



	if (!machine_is_harmony())

		return 0;



	tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_NORMAL);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL);



	err = tegra_pcie_init(true, true);

	if (err)

		goto err_pcie;



	return 0;



err_pcie:

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_TRISTATE);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_TRISTATE);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_TRISTATE);



	return err;

}



subsys_initcall(harmony_pcie_init);



#endif

arch/arm/mach-tegra/board.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ void __init tegra_common_init(void); 
void __init tegra_map_common_io(void);

void __init tegra_map_common_io(void);

void __init tegra_init_irq(void);

void __init tegra_init_irq(void);

void __init tegra_init_clock(void);

void __init tegra_init_clock(void);

int __init tegra_pcie_init(bool init_port0, bool init_port1);





extern struct sys_timer tegra_timer;

extern struct sys_timer tegra_timer;

#endif
 
#endif