Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm/tegra: rename tegra20 pinmux files

Browse Source 
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>
This commit is contained in:
Peter De Schrijver 2011-12-14 17:03:21 +02:00 committed by Olof Johansson
parent 01548673fa
commit 57be3bdb40
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-tegra/Makefile
View File

@ -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

2
arch/arm/mach-tegra/board-seaboard-pinmux.c
View File

@ -19,7 +19,7 @@
#include <linux/of.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t2.h>
#include <mach/pinmux-tegra20.h>
#include "gpio-names.h"
#include "board-seaboard.h"

6
arch/arm/mach-tegra/include/mach/pinmux-t2.h → arch/arm/mach-tegra/include/mach/pinmux-tegra20.h
View File

@ -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,

2
arch/arm/mach-tegra/include/mach/pinmux.h
View File

@ -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

5
arch/arm/mach-tegra/pinmux-t2-tables.c → arch/arm/mach-tegra/pinmux-tegra20-tables.c
View File

@ -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 <mach/iomap.h>
#include <mach/pinmux.h>
#include <mach/pinmux-tegra20.h>
#include <mach/suspend.h>
#define TRISTATE_REG_A 0x14