From ab4a0eb5195127fe3601ada49d156f1696bf753e Mon Sep 17 00:00:00 2001 From: Peter De Schrijver Date: Wed, 14 Dec 2011 17:03:21 +0200 Subject: [PATCH] --- yaml --- r: 281656 b: refs/heads/master c: 57be3bdb402afbf71b0490ccf229c3b9cf784ce1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/Makefile | 2 +- trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c | 2 +- .../include/mach/{pinmux-t2.h => pinmux-tegra20.h} | 6 +++--- trunk/arch/arm/mach-tegra/include/mach/pinmux.h | 2 +- .../{pinmux-t2-tables.c => pinmux-tegra20-tables.c} | 5 +++-- 6 files changed, 10 insertions(+), 9 deletions(-) rename trunk/arch/arm/mach-tegra/include/mach/{pinmux-t2.h => pinmux-tegra20.h} (96%) rename trunk/arch/arm/mach-tegra/{pinmux-t2-tables.c => pinmux-tegra20-tables.c} (99%) diff --git a/[refs] b/[refs] index 04a8d9be6d49..1391811296ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01548673fa15762137539d565767531eb4fef743 +refs/heads/master: 57be3bdb402afbf71b0490ccf229c3b9cf784ce1 diff --git a/trunk/arch/arm/mach-tegra/Makefile b/trunk/arch/arm/mach-tegra/Makefile index 813af0db07c3..48e0c2b87b2b 100644 --- a/trunk/arch/arm/mach-tegra/Makefile +++ b/trunk/arch/arm/mach-tegra/Makefile @@ -9,7 +9,7 @@ obj-y += fuse.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += powergate.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-t2-tables.o +obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-tegra20-tables.o obj-$(CONFIG_SMP) += platsmp.o localtimer.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o diff --git a/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c b/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c index b1c2972f62fe..f6b9c01ef0db 100644 --- a/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c +++ b/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "gpio-names.h" #include "board-seaboard.h" diff --git a/trunk/arch/arm/mach-tegra/include/mach/pinmux-t2.h b/trunk/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h similarity index 96% rename from trunk/arch/arm/mach-tegra/include/mach/pinmux-t2.h rename to trunk/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h index 4c2626347263..6a40c1dbab17 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/pinmux-t2.h +++ b/trunk/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-tegra/include/mach/pinmux-t2.h + * linux/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h * * Copyright (C) 2010 Google, Inc. * @@ -14,8 +14,8 @@ * */ -#ifndef __MACH_TEGRA_PINMUX_T2_H -#define __MACH_TEGRA_PINMUX_T2_H +#ifndef __MACH_TEGRA_PINMUX_TEGRA20_H +#define __MACH_TEGRA_PINMUX_TEGRA20_H enum tegra_pingroup { TEGRA_PINGROUP_ATA = 0, diff --git a/trunk/arch/arm/mach-tegra/include/mach/pinmux.h b/trunk/arch/arm/mach-tegra/include/mach/pinmux.h index bb7dfdb61205..b93df9e31349 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/pinmux.h +++ b/trunk/arch/arm/mach-tegra/include/mach/pinmux.h @@ -18,7 +18,7 @@ #define __MACH_TEGRA_PINMUX_H #if defined(CONFIG_ARCH_TEGRA_2x_SOC) -#include "pinmux-t2.h" +#include "pinmux-tegra20.h" #else #error "Undefined Tegra architecture" #endif diff --git a/trunk/arch/arm/mach-tegra/pinmux-t2-tables.c b/trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c similarity index 99% rename from trunk/arch/arm/mach-tegra/pinmux-t2-tables.c rename to trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c index a0dc2bc28ed3..88642a54e3aa 100644 --- a/trunk/arch/arm/mach-tegra/pinmux-t2-tables.c +++ b/trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c @@ -1,7 +1,7 @@ /* - * linux/arch/arm/mach-tegra/pinmux-t2-tables.c + * linux/arch/arm/mach-tegra/pinmux-tegra20-tables.c * - * Common pinmux configurations for Tegra 2 SoCs + * Common pinmux configurations for Tegra20 SoCs * * Copyright (C) 2010 NVIDIA Corporation * @@ -29,6 +29,7 @@ #include #include +#include #include #define TRISTATE_REG_A 0x14