From: Marcus Cooper <[email protected]>
Signed-off-by: Marcus Cooper <[email protected]>
---
sound/soc/sunxi/i2s/sndi2s.c | 2 +-
sound/soc/sunxi/i2s/sunxi-i2s.c | 14 +++++++++-----
sound/soc/sunxi/i2s/sunxi-i2s.h | 13 ++-----------
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/sound/soc/sunxi/i2s/sndi2s.c b/sound/soc/sunxi/i2s/sndi2s.c
index f4ed8a9..b10b8a2 100644
--- a/sound/soc/sunxi/i2s/sndi2s.c
+++ b/sound/soc/sunxi/i2s/sndi2s.c
@@ -21,8 +21,8 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/initval.h>
-#include <plat/sys_config.h>
#include <linux/io.h>
+#include <plat/sys_config.h>
struct sndi2s_priv {
int sysclk;
diff --git a/sound/soc/sunxi/i2s/sunxi-i2s.c b/sound/soc/sunxi/i2s/sunxi-i2s.c
index cdba4ca..c9ba71a 100644
--- a/sound/soc/sunxi/i2s/sunxi-i2s.c
+++ b/sound/soc/sunxi/i2s/sunxi-i2s.c
@@ -37,8 +37,17 @@
#include "sunxi-i2s.h"
+struct sunxi_i2s_info sunxi_iis;
+
static int regsave[8];
static int i2s_used;
+static u32 i2s_handle;
+
+static struct clk *i2s_apbclk;
+static struct clk *i2s_pll2clk;
+static struct clk *i2s_pllx8;
+static struct clk *i2s_moduleclk;
+
static struct sunxi_dma_params sunxi_i2s_pcm_stereo_out = {
.client.name = "I2S PCM Stereo out",
@@ -56,11 +65,6 @@ static struct sunxi_dma_params sunxi_i2s_pcm_stereo_in = {
.dma_addr = SUNXI_IISBASE + SUNXI_IISRXFIFO,
};
-
-struct sunxi_i2s_info sunxi_iis;
-static u32 i2s_handle;
-static struct clk *i2s_apbclk, *i2s_pll2clk, *i2s_pllx8, *i2s_moduleclk;
-
void sunxi_snd_txctrl_i2s(struct snd_pcm_substream *substream, int on)
{
u32 reg_val;
diff --git a/sound/soc/sunxi/i2s/sunxi-i2s.h b/sound/soc/sunxi/i2s/sunxi-i2s.h
index aed2dea..da62081 100644
--- a/sound/soc/sunxi/i2s/sunxi-i2s.h
+++ b/sound/soc/sunxi/i2s/sunxi-i2s.h
@@ -163,23 +163,14 @@
#define SUNXI_RXCHMAP_CH1(v) (((v)-1) << 4)
#define SUNXI_RXCHMAP_CH0(v) (((v)-1) << 0)
-/*------------------------------------------------------------*/
-/* Clock dividers */
-#define SUNXI_DIV_MCLK 0
-#define SUNXI_DIV_BCLK 1
-
#define SUNXI_IISCLKD_MCLK_MASK 0x0f
#define SUNXI_IISCLKD_MCLK_OFFS 0
#define SUNXI_IISCLKD_BCLK_MASK 0x070
#define SUNXI_IISCLKD_BCLK_OFFS 4
#define SUNXI_IISCLKD_MCLKEN_OFFS 7
-unsigned int sunxi_i2s_get_clockrate(void);
-extern struct sunxi_i2s_info sunxi_i2s;
-/* extern struct snd_soc_dai sunxi_iis_dai; */
-
-extern void sunxi_snd_txctrl_i2s(struct snd_pcm_substream *substream, int on);
-extern void sunxi_snd_rxctrl_i2s(int on);
+#define SUNXI_DIV_MCLK (0)
+#define SUNXI_DIV_BCLK (1)
/*
* struct sunxi_i2s_info {
--
1.9.1
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
