aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-04-05 17:54:53 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-06 09:17:45 -0400
commitef280d3907cea21b6093802398bbe4193e221a64 (patch)
tree77c78952531a4cdbc3732ccde794821976bc8cdb /sound/soc/tegra
parent5fa87d34846e347b62bebf40edf51167e7ffb081 (diff)
ASoC: tegra: rename Tegra20-specific driver files
Rename these files so they include a specific hardware version in their filenames. The contents is only touched minimally so that git's rename tracking operates correctly; renaming all symbols in the files results in a diff so large that the rename detection fails. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/Makefile12
-rw-r--r--sound/soc/tegra/tegra20_das.c (renamed from sound/soc/tegra/tegra_das.c)4
-rw-r--r--sound/soc/tegra/tegra20_das.h (renamed from sound/soc/tegra/tegra_das.h)2
-rw-r--r--sound/soc/tegra/tegra20_i2s.c (renamed from sound/soc/tegra/tegra_i2s.c)4
-rw-r--r--sound/soc/tegra/tegra20_i2s.h (renamed from sound/soc/tegra/tegra_i2s.h)2
-rw-r--r--sound/soc/tegra/tegra20_spdif.c (renamed from sound/soc/tegra/tegra_spdif.c)4
-rw-r--r--sound/soc/tegra/tegra20_spdif.h (renamed from sound/soc/tegra/tegra_spdif.h)2
7 files changed, 15 insertions, 15 deletions
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index 714d36070b86..4a33884115f8 100644
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -1,15 +1,15 @@
1# Tegra platform Support 1# Tegra platform Support
2snd-soc-tegra-pcm-objs := tegra_pcm.o 2snd-soc-tegra-pcm-objs := tegra_pcm.o
3snd-soc-tegra-utils-objs += tegra_asoc_utils.o 3snd-soc-tegra-utils-objs += tegra_asoc_utils.o
4snd-soc-tegra-das-objs := tegra_das.o 4snd-soc-tegra20-das-objs := tegra20_das.o
5snd-soc-tegra-i2s-objs := tegra_i2s.o 5snd-soc-tegra20-i2s-objs := tegra20_i2s.o
6snd-soc-tegra-spdif-objs := tegra_spdif.o 6snd-soc-tegra20-spdif-objs := tegra20_spdif.o
7 7
8obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o 8obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o
9obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o 9obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o
10obj-$(CONFIG_SND_SOC_TEGRA_DAS) += snd-soc-tegra-das.o 10obj-$(CONFIG_SND_SOC_TEGRA_DAS) += snd-soc-tegra20-das.o
11obj-$(CONFIG_SND_SOC_TEGRA_I2S) += snd-soc-tegra-i2s.o 11obj-$(CONFIG_SND_SOC_TEGRA_I2S) += snd-soc-tegra20-i2s.o
12obj-$(CONFIG_SND_SOC_TEGRA_SPDIF) += snd-soc-tegra-spdif.o 12obj-$(CONFIG_SND_SOC_TEGRA_SPDIF) += snd-soc-tegra20-spdif.o
13 13
14# Tegra machine Support 14# Tegra machine Support
15snd-soc-tegra-wm8903-objs := tegra_wm8903.o 15snd-soc-tegra-wm8903-objs := tegra_wm8903.o
diff --git a/sound/soc/tegra/tegra_das.c b/sound/soc/tegra/tegra20_das.c
index 3b3c1ba4d235..b5e369820cb3 100644
--- a/sound/soc/tegra/tegra_das.c
+++ b/sound/soc/tegra/tegra20_das.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * tegra_das.c - Tegra DAS driver 2 * tegra20_das.c - Tegra20 DAS driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2010 - NVIDIA, Inc. 5 * Copyright (C) 2010 - NVIDIA, Inc.
@@ -29,7 +29,7 @@
29#include <linux/io.h> 29#include <linux/io.h>
30#include <mach/iomap.h> 30#include <mach/iomap.h>
31#include <sound/soc.h> 31#include <sound/soc.h>
32#include "tegra_das.h" 32#include "tegra20_das.h"
33 33
34#define DRV_NAME "tegra-das" 34#define DRV_NAME "tegra-das"
35 35
diff --git a/sound/soc/tegra/tegra_das.h b/sound/soc/tegra/tegra20_das.h
index 1810cd1e7f0c..896bf031a801 100644
--- a/sound/soc/tegra/tegra_das.h
+++ b/sound/soc/tegra/tegra20_das.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * tegra_das.h - Definitions for Tegra DAS driver 2 * tegra20_das.h - Definitions for Tegra20 DAS driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2010 - NVIDIA, Inc. 5 * Copyright (C) 2010 - NVIDIA, Inc.
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 2d32b8ce5f2e..e24759ae291b 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * tegra_i2s.c - Tegra I2S driver 2 * tegra20_i2s.c - Tegra20 I2S driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2010,2012 - NVIDIA, Inc. 5 * Copyright (C) 2010,2012 - NVIDIA, Inc.
@@ -43,7 +43,7 @@
43#include <sound/pcm_params.h> 43#include <sound/pcm_params.h>
44#include <sound/soc.h> 44#include <sound/soc.h>
45 45
46#include "tegra_i2s.h" 46#include "tegra20_i2s.h"
47 47
48#define DRV_NAME "tegra-i2s" 48#define DRV_NAME "tegra-i2s"
49 49
diff --git a/sound/soc/tegra/tegra_i2s.h b/sound/soc/tegra/tegra20_i2s.h
index c08e019c0260..56f1e0f87c0b 100644
--- a/sound/soc/tegra/tegra_i2s.h
+++ b/sound/soc/tegra/tegra20_i2s.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * tegra_i2s.h - Definitions for Tegra I2S driver 2 * tegra20_i2s.h - Definitions for Tegra20 I2S driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2010 - NVIDIA, Inc. 5 * Copyright (C) 2010 - NVIDIA, Inc.
diff --git a/sound/soc/tegra/tegra_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 3426633e9147..ed1fd502ef8d 100644
--- a/sound/soc/tegra/tegra_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * tegra_spdif.c - Tegra SPDIF driver 2 * tegra20_spdif.c - Tegra20 SPDIF driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2011-2012 - NVIDIA, Inc. 5 * Copyright (C) 2011-2012 - NVIDIA, Inc.
@@ -34,7 +34,7 @@
34#include <sound/pcm_params.h> 34#include <sound/pcm_params.h>
35#include <sound/soc.h> 35#include <sound/soc.h>
36 36
37#include "tegra_spdif.h" 37#include "tegra20_spdif.h"
38 38
39#define DRV_NAME "tegra-spdif" 39#define DRV_NAME "tegra-spdif"
40 40
diff --git a/sound/soc/tegra/tegra_spdif.h b/sound/soc/tegra/tegra20_spdif.h
index f5fc7124aa7b..001f9dcd2033 100644
--- a/sound/soc/tegra/tegra_spdif.h
+++ b/sound/soc/tegra/tegra20_spdif.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * tegra_spdif.h - Definitions for Tegra SPDIF driver 2 * tegra20_spdif.h - Definitions for Tegra20 SPDIF driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2011 - NVIDIA, Inc. 5 * Copyright (C) 2011 - NVIDIA, Inc.