Merge branch 'for-next' of git://android.git.kernel.org/kernel/tegra (b18cae42) · Commits · 戴 / test

arch/arm/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -573,6 +573,7 @@ config ARCH_TEGRA
		select HAVE_CLK
		select COMMON_CLKDEV
		select ARCH_HAS_BARRIERS if CACHE_L2X0
		select ARCH_HAS_CPUFREQ
		help
		This enables support for NVIDIA Tegra based systems (Tegra APX,
		Tegra 6xx and Tegra 2 series).

+11 −0

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

		endchoice

		config TEGRA_PCI
		bool "PCI Express support"
		select PCI

		comment "Tegra board type"

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

		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

+8 −1

Original line number	Diff line number	Diff line
		obj-y += common.o
		obj-y += io.o
		obj-y += irq.o
		obj-y += irq.o legacy_irq.o
		obj-y += clock.o
		obj-y += timer.o
		obj-y += gpio.o
		obj-y += pinmux.o
		obj-y += fuse.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_dvfs.o
		obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-t2-tables.o
		obj-$(CONFIG_SMP) += platsmp.o localtimer.o headsmp.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-pinmux.o
		obj-${CONFIG_MACH_HARMONY} += board-harmony-pcie.o

0 → 100644

+57 −0

Original line number	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

+1 −0

Original line number	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_init_irq(void);
		void __init tegra_init_clock(void);
		int __init tegra_pcie_init(bool init_port0, bool init_port1);

		extern struct sys_timer tegra_timer;
		#endif