ASoC: Move uda134x_codec.h to uda134x.h

For consistency with other ASoC codec drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index 04b30da102280438184851f6e3d1a5482f0ebede..69ef521a2ed10449a684bfdb75639c67c5b34033 100644 (file)
--- 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 (file)
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 (file)
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 29a68132f1690fc40d07df9541db0c648727f347..487b010730b8df4942d734b14ff6f44c6d116669 100644 (file)
--- 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 */