[PATCH 17/17] ASoC: Move uda134x_codec.h to uda134x.h

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 17/17] ASoC: Move uda134x_codec.h to uda134x.h
Date: Tue, 18 Nov 2008 12:38:23 +0000	[thread overview]
Message-ID: <1227011903-2825-17-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1227011903-2825-16-git-send-email-broonie@opensource.wolfsonmicro.com>

For consistency with other ASoC codec drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/uda134x.c          |    2 +-
 sound/soc/codecs/uda134x.h          |   36 +++++++++++++++++++++++++++++++++++
 sound/soc/codecs/uda134x_codec.h    |   36 -----------------------------------
 sound/soc/s3c24xx/s3c24xx_uda134x.c |    2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 sound/soc/codecs/uda134x.h
 delete mode 100644 sound/soc/codecs/uda134x_codec.h

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index 04b30da..69ef521 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -24,7 +24,7 @@
 #include <sound/uda134x.h>
 #include <sound/l3.h>
 
-#include "uda134x_codec.h"
+#include "uda134x.h"
 
 
 #define POWER_OFF_ON_STANDBY 1
diff --git a/sound/soc/codecs/uda134x.h b/sound/soc/codecs/uda134x.h
new file mode 100644
index 0000000..94f4404
--- /dev/null
+++ b/sound/soc/codecs/uda134x.h
@@ -0,0 +1,36 @@
+#ifndef _UDA134X_CODEC_H
+#define _UDA134X_CODEC_H
+
+#define UDA134X_L3ADDR	5
+#define UDA134X_DATA0_ADDR	((UDA134X_L3ADDR << 2) | 0)
+#define UDA134X_DATA1_ADDR	((UDA134X_L3ADDR << 2) | 1)
+#define UDA134X_STATUS_ADDR	((UDA134X_L3ADDR << 2) | 2)
+
+#define UDA134X_EXTADDR_PREFIX	0xC0
+#define UDA134X_EXTDATA_PREFIX	0xE0
+
+/* UDA134X registers */
+#define UDA134X_EA000	0
+#define UDA134X_EA001	1
+#define UDA134X_EA010	2
+#define UDA134X_EA011	3
+#define UDA134X_EA100	4
+#define UDA134X_EA101	5
+#define UDA134X_EA110	6
+#define UDA134X_EA111	7
+#define UDA134X_STATUS0 8
+#define UDA134X_STATUS1 9
+#define UDA134X_DATA000 10
+#define UDA134X_DATA001 11
+#define UDA134X_DATA010 12
+#define UDA134X_DATA1	13
+
+#define UDA134X_REGS_NUM 14
+
+#define STATUS0_DAIFMT_MASK (~(7<<1))
+#define STATUS0_SYSCLK_MASK (~(3<<4))
+
+extern struct snd_soc_dai uda134x_dai;
+extern struct snd_soc_codec_device soc_codec_dev_uda134x;
+
+#endif
diff --git a/sound/soc/codecs/uda134x_codec.h b/sound/soc/codecs/uda134x_codec.h
deleted file mode 100644
index 94f4404..0000000
--- a/sound/soc/codecs/uda134x_codec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _UDA134X_CODEC_H
-#define _UDA134X_CODEC_H
-
-#define UDA134X_L3ADDR	5
-#define UDA134X_DATA0_ADDR	((UDA134X_L3ADDR << 2) | 0)
-#define UDA134X_DATA1_ADDR	((UDA134X_L3ADDR << 2) | 1)
-#define UDA134X_STATUS_ADDR	((UDA134X_L3ADDR << 2) | 2)
-
-#define UDA134X_EXTADDR_PREFIX	0xC0
-#define UDA134X_EXTDATA_PREFIX	0xE0
-
-/* UDA134X registers */
-#define UDA134X_EA000	0
-#define UDA134X_EA001	1
-#define UDA134X_EA010	2
-#define UDA134X_EA011	3
-#define UDA134X_EA100	4
-#define UDA134X_EA101	5
-#define UDA134X_EA110	6
-#define UDA134X_EA111	7
-#define UDA134X_STATUS0 8
-#define UDA134X_STATUS1 9
-#define UDA134X_DATA000 10
-#define UDA134X_DATA001 11
-#define UDA134X_DATA010 12
-#define UDA134X_DATA1	13
-
-#define UDA134X_REGS_NUM 14
-
-#define STATUS0_DAIFMT_MASK (~(7<<1))
-#define STATUS0_SYSCLK_MASK (~(3<<4))
-
-extern struct snd_soc_dai uda134x_dai;
-extern struct snd_soc_codec_device soc_codec_dev_uda134x;
-
-#endif
diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c
index 29a6813..487b010 100644
--- a/sound/soc/s3c24xx/s3c24xx_uda134x.c
+++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c
@@ -26,7 +26,7 @@
 
 #include "s3c24xx-pcm.h"
 #include "s3c24xx-i2s.h"
-#include "../codecs/uda134x_codec.h"
+#include "../codecs/uda134x.h"
 
 
 /* #define ENFORCE_RATES 1 */
-- 
1.5.6.5

     prev parent reply	other threads:[~2008-11-18 12:38 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-18 12:38 [PATCH 01/17] ASoC: Fix for master playback/capture volume range for TWL4030 codec Mark Brown
2008-11-18 12:38 ` [PATCH 02/17] ASoC: UDA134x codec driver Mark Brown
2008-11-18 12:38   ` [PATCH 03/17] ASoC: Machine driver for for s3c24xx with uda134x Mark Brown
2008-11-18 12:38     ` [PATCH 04/17] ASoC: Allow writes to uncached registers in WM8990 Mark Brown
2008-11-18 12:38       ` [PATCH 05/17] ASoC: Enable WM8990 ADC clocking workaround Mark Brown
2008-11-18 12:38         ` [PATCH 06/17] ASoC: Manage VMID mode for WM8990 Mark Brown
2008-11-18 12:38           ` [PATCH 07/17] ASoC: Build tlv320aic23 cleanly Mark Brown
2008-11-18 12:38             ` [PATCH 08/17] ASoC: DaVinci: Fix audio stall when doing full duplex Mark Brown
2008-11-18 12:38               ` [PATCH 09/17] ASoC: Blackfin: updates Kconfig for SPORT Mark Brown
2008-11-18 12:38                 ` [PATCH 10/17] ASoC: AD1980 codec: add multi-channel function support Mark Brown
2008-11-18 12:38                   ` [PATCH 11/17] ASoC: Blackfin: " Mark Brown
2008-11-18 12:38                     ` [PATCH 12/17] ASoC: Blackfin: Fix AD1980/1 build with MMAP support disabled Mark Brown
2008-11-18 12:38                       ` [PATCH 13/17] ASoC: Fix Blackfin AC97 DAI probe function return code Mark Brown
2008-11-18 12:38                         ` [PATCH 14/17] ASoC: Blackfin: do not force TWI bus for ssm2602 codec Mark Brown
2008-11-18 12:38                           ` [PATCH 15/17] ASoC: Blackfin: Simplify the MMAP_SUPPORT macros protected code Mark Brown
2008-11-18 12:38                             ` [PATCH 16/17] ASoC: Blackfin: always set a default value for that GPIO range Mark Brown
2008-11-18 12:38                               ` Mark Brown [this message]

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:04b30da dfblob:69ef521 dfblob:94f4404 dfblob:94f4404
dfblob:29a6813 dfblob:487b010 )
 OR (
bs:"[PATCH 17/17] ASoC: Move uda134x_codec.h to uda134x.h" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1227011903-2825-17-git-send-email-broonie@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.