Commit 0bbf2119 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://android.git.kernel.org/kernel/tegra: (61 commits)
  ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice
  ARM: tegra: add PCI Express power gating
  ARM: tegra: PCIE minor code refactoring
  ARM: Tegra: DMA: Fail safe if initialization fails
  ARM: Tegra: Rename clk_dev1/2 to cdev1/2
  ARM: Tegra: Rename I2S clocks to match driver name
  ARM: Tegra: Make tegra_dma_init a postcore_initcall
  ARM: tegra: add seaboard, wario and kaen boards
  ARM: tegra: harmony: fix pinmux for MMC slot
  ARM: tegra: harmony: register sdhci devices
  ARM: tegra: remove stale nvidia atag handler
  ARM: tegra: common device resources
  ARM: tegra: harmony: move over to tegra_gpio_config
  ARM: tegra: add tegra_gpio_table and tegra_gpio_config
  ARM: tegra: Hide EMC scaling config behind ARCH_TEGRA
  ARM: tegra: Fix typo in TEGRA_IRQ_TO_GPIO
  ARM: tegra: common: Enable core clocks
  ARM: tegra: timer: Enable timer and rtc clocks
  ARM: tegra: Move tegra_common_init to tegra_init_early
  ARM: tegra: clock: prevent accidental disables of cpu clock
  ...
parents 51e8703b d5fdafd3

arch/arm/configs/tegra_defconfig

0 → 100644
+123 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y

CONFIG_MACH_HARMONY=y

CONFIG_TEGRA_DEBUG_UARTD=y

CONFIG_ARM_ERRATA_742230=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_VFP=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

CONFIG_IPV6=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_INET6_AH=y

CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_TUNNEL=y

CONFIG_IPV6_MULTIPLE_TABLES=y

# CONFIG_WIRELESS is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_MISC_DEVICES=y

CONFIG_AD525X_DPOT=y

CONFIG_AD525X_DPOT_I2C=y

CONFIG_ICS932S401=y

CONFIG_APDS9802ALS=y

CONFIG_ISL29003=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_SLAB=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_SG=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=y

CONFIG_CRC16=y

arch/arm/mach-tegra/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -27,6 +27,31 @@ config MACH_HARMONY 
       help

         Support for nVidia Harmony development platform



config MACH_KAEN

       bool "Kaen board"

       select MACH_SEABOARD

       help

         Support for the Kaen version of Seaboard



config MACH_SEABOARD

       bool "Seaboard board"

       help

         Support for nVidia Seaboard development platform. It will

	 also be included for some of the derivative boards that

	 have large similarities with the seaboard design.



config MACH_TRIMSLICE

       bool "TrimSlice board"

       select TEGRA_PCI

       help

         Support for CompuLab TrimSlice platform



config MACH_WARIO

       bool "Wario board"

       select MACH_SEABOARD

       help

         Support for the Wario version of Seaboard



choice

        prompt "Low-level debug console UART"

        default TEGRA_DEBUG_UART_NONE
@@ -58,4 +83,7 @@ config TEGRA_SYSTEM_DMA 
	  Adds system DMA functionality for NVIDIA Tegra SoCs, used by

	  several Tegra device drivers



config TEGRA_EMC_SCALING_ENABLE

	bool "Enable scaling the memory frequency"



endif

arch/arm/mach-tegra/Makefile

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

obj-y                                   += devices.o

obj-y                                   += io.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                                   += powergate.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)		+= tegra2_emc.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
@@ -19,3 +21,9 @@ 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



obj-${CONFIG_MACH_SEABOARD}             += board-seaboard.o

obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o



obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice.o

obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice-pinmux.o

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

+16 −3
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
 */



#include <linux/kernel.h>

#include <linux/gpio.h>

#include <mach/pinmux.h>



#include "gpio-names.h"

#include "board-harmony.h"



static struct tegra_pingroup_config harmony_pinmux[] = {
@@ -34,10 +36,10 @@ static struct tegra_pingroup_config harmony_pinmux[] = { 
	{TEGRA_PINGROUP_DAP3,  TEGRA_MUX_DAP3,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP4,  TEGRA_MUX_DAP4,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DDC,   TEGRA_MUX_I2C2,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DTA,   TEGRA_MUX_SDIO2,         TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DTB,   TEGRA_MUX_RSVD1,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DTA,   TEGRA_MUX_SDIO2,         TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DTB,   TEGRA_MUX_RSVD1,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DTC,   TEGRA_MUX_RSVD1,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DTD,   TEGRA_MUX_SDIO2,         TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DTD,   TEGRA_MUX_SDIO2,         TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DTE,   TEGRA_MUX_RSVD1,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DTF,   TEGRA_MUX_I2C3,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_GMA,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -138,7 +140,18 @@ static struct tegra_pingroup_config harmony_pinmux[] = { 
	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

};



static struct tegra_gpio_table gpio_table[] = {

	{ .gpio = TEGRA_GPIO_PI5,	.enable = true	}, /* mmc2 cd	*/

	{ .gpio = TEGRA_GPIO_PH1,	.enable = true	}, /* mmc2 wp	*/

	{ .gpio = TEGRA_GPIO_PT3,	.enable = true	}, /* mmc2 pwr	*/

	{ .gpio = TEGRA_GPIO_PH2,	.enable = true	}, /* mmc4 cd	*/

	{ .gpio = TEGRA_GPIO_PH3,	.enable = true	}, /* mmc4 wp	*/

	{ .gpio = TEGRA_GPIO_PI6,	.enable = true	}, /* mmc4 pwr	*/

};



void harmony_pinmux_init(void)

{

	tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));



	tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));

}

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

+33 −29
Original line number Diff line number Diff line
@@ -30,35 +30,13 @@ 


#include <mach/iomap.h>

#include <mach/irqs.h>

#include <mach/sdhci.h>



#include "board.h"

#include "board-harmony.h"

#include "clock.h"



/* NVidia bootloader tags */

#define ATAG_NVIDIA		0x41000801



#define ATAG_NVIDIA_RM			0x1

#define ATAG_NVIDIA_DISPLAY		0x2

#define ATAG_NVIDIA_FRAMEBUFFER		0x3

#define ATAG_NVIDIA_CHIPSHMOO		0x4

#define ATAG_NVIDIA_CHIPSHMOOPHYS	0x5

#define ATAG_NVIDIA_PRESERVED_MEM_0	0x10000

#define ATAG_NVIDIA_PRESERVED_MEM_N	2

#define ATAG_NVIDIA_FORCE_32		0x7fffffff



struct tag_tegra {

	__u32 bootarg_key;

	__u32 bootarg_len;

	char bootarg[1];

};



static int __init parse_tag_nvidia(const struct tag *tag)

{



	return 0;

}

__tagtable(ATAG_NVIDIA, parse_tag_nvidia);

#include "devices.h"

#include "gpio-names.h"



static struct plat_serial8250_port debug_uart_platform_data[] = {

	{
@@ -84,6 +62,9 @@ static struct platform_device debug_uart = { 


static struct platform_device *harmony_devices[] __initdata = {

	&debug_uart,

	&tegra_sdhci_device1,

	&tegra_sdhci_device2,

	&tegra_sdhci_device4,

};



static void __init tegra_harmony_fixup(struct machine_desc *desc,
@@ -102,22 +83,45 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = { 
	{ NULL,		NULL,		0,		0},

};





static struct tegra_sdhci_platform_data sdhci_pdata1 = {

	.cd_gpio	= -1,

	.wp_gpio	= -1,

	.power_gpio	= -1,

};



static struct tegra_sdhci_platform_data sdhci_pdata2 = {

	.cd_gpio	= TEGRA_GPIO_PI5,

	.wp_gpio	= TEGRA_GPIO_PH1,

	.power_gpio	= TEGRA_GPIO_PT3,

};



static struct tegra_sdhci_platform_data sdhci_pdata4 = {

	.cd_gpio	= TEGRA_GPIO_PH2,

	.wp_gpio	= TEGRA_GPIO_PH3,

	.power_gpio	= TEGRA_GPIO_PI6,

	.is_8bit	= 1,

};



static void __init tegra_harmony_init(void)

{

	tegra_common_init();



	tegra_clk_init_from_table(harmony_clk_init_table);



	harmony_pinmux_init();



	tegra_sdhci_device1.dev.platform_data = &sdhci_pdata1;

	tegra_sdhci_device2.dev.platform_data = &sdhci_pdata2;

	tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4;



	platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices));

}



MACHINE_START(HARMONY, "harmony")

	.boot_params  = 0x00000100,

	.fixup		= tegra_harmony_fixup,

	.init_irq       = tegra_init_irq,

	.init_machine   = tegra_harmony_init,

	.map_io         = tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_irq       = tegra_init_irq,

	.timer          = &tegra_timer,

	.init_machine   = tegra_harmony_init,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE