diff options
author | Peter De Schrijver <pdeschrijver@nvidia.com> | 2011-12-14 10:03:21 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-17 23:15:25 -0500 |
commit | 57be3bdb402afbf71b0490ccf229c3b9cf784ce1 (patch) | |
tree | d5e14d38d623f8fda5a11b87dffd2552da753a12 /arch/arm/mach-tegra/include | |
parent | 01548673fa15762137539d565767531eb4fef743 (diff) |
arm/tegra: rename tegra20 pinmux files
Rename pinmux-t2.h and pinmux-t2-tables.c to the new tegra naming. This file
will be reworked somewhat in the next patch to support multiple tegra SoC
types.
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/include')
-rw-r--r-- | arch/arm/mach-tegra/include/mach/pinmux-tegra20.h (renamed from arch/arm/mach-tegra/include/mach/pinmux-t2.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-tegra/include/mach/pinmux.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/include/mach/pinmux-t2.h b/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h index 4c2626347263..6a40c1dbab17 100644 --- a/arch/arm/mach-tegra/include/mach/pinmux-t2.h +++ b/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-tegra/include/mach/pinmux-t2.h | 2 | * linux/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h |
3 | * | 3 | * |
4 | * Copyright (C) 2010 Google, Inc. | 4 | * Copyright (C) 2010 Google, Inc. |
5 | * | 5 | * |
@@ -14,8 +14,8 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #ifndef __MACH_TEGRA_PINMUX_T2_H | 17 | #ifndef __MACH_TEGRA_PINMUX_TEGRA20_H |
18 | #define __MACH_TEGRA_PINMUX_T2_H | 18 | #define __MACH_TEGRA_PINMUX_TEGRA20_H |
19 | 19 | ||
20 | enum tegra_pingroup { | 20 | enum tegra_pingroup { |
21 | TEGRA_PINGROUP_ATA = 0, | 21 | TEGRA_PINGROUP_ATA = 0, |
diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h index bb7dfdb61205..b93df9e31349 100644 --- a/arch/arm/mach-tegra/include/mach/pinmux.h +++ b/arch/arm/mach-tegra/include/mach/pinmux.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #define __MACH_TEGRA_PINMUX_H | 18 | #define __MACH_TEGRA_PINMUX_H |
19 | 19 | ||
20 | #if defined(CONFIG_ARCH_TEGRA_2x_SOC) | 20 | #if defined(CONFIG_ARCH_TEGRA_2x_SOC) |
21 | #include "pinmux-t2.h" | 21 | #include "pinmux-tegra20.h" |
22 | #else | 22 | #else |
23 | #error "Undefined Tegra architecture" | 23 | #error "Undefined Tegra architecture" |
24 | #endif | 24 | #endif |