Commit 57be3bdb authored by Peter De Schrijver's avatar Peter De Schrijver Committed by Olof Johansson

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: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 01548673
...@@ -9,7 +9,7 @@ obj-y += fuse.o ...@@ -9,7 +9,7 @@ obj-y += fuse.o
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += powergate.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_clocks.o
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.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_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_TEGRA_SYSTEM_DMA) += dma.o
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <mach/pinmux.h> #include <mach/pinmux.h>
#include <mach/pinmux-t2.h> #include <mach/pinmux-tegra20.h>
#include "gpio-names.h" #include "gpio-names.h"
#include "board-seaboard.h" #include "board-seaboard.h"
......
/* /*
* 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. * Copyright (C) 2010 Google, Inc.
* *
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* *
*/ */
#ifndef __MACH_TEGRA_PINMUX_T2_H #ifndef __MACH_TEGRA_PINMUX_TEGRA20_H
#define __MACH_TEGRA_PINMUX_T2_H #define __MACH_TEGRA_PINMUX_TEGRA20_H
enum tegra_pingroup { enum tegra_pingroup {
TEGRA_PINGROUP_ATA = 0, TEGRA_PINGROUP_ATA = 0,
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define __MACH_TEGRA_PINMUX_H #define __MACH_TEGRA_PINMUX_H
#if defined(CONFIG_ARCH_TEGRA_2x_SOC) #if defined(CONFIG_ARCH_TEGRA_2x_SOC)
#include "pinmux-t2.h" #include "pinmux-tegra20.h"
#else #else
#error "Undefined Tegra architecture" #error "Undefined Tegra architecture"
#endif #endif
......
/* /*
* 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 * Copyright (C) 2010 NVIDIA Corporation
* *
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <mach/iomap.h> #include <mach/iomap.h>
#include <mach/pinmux.h> #include <mach/pinmux.h>
#include <mach/pinmux-tegra20.h>
#include <mach/suspend.h> #include <mach/suspend.h>
#define TRISTATE_REG_A 0x14 #define TRISTATE_REG_A 0x14
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment