Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57be3bdb authored Dec 14, 2011 by Peter De Schrijver Committed by Olof Johansson Dec 17, 2011

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>

parent 01548673

arch/arm/mach-tegra/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

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

+3 −3

Original line number	Diff line number	Diff line
		/*
		* 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,

arch/arm/mach-tegra/include/mach/pinmux.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

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

+3 −2

Original line number	Diff line number	Diff line
		/*
		* 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