From: Marcus Cooper <[email protected]>
Signed-off-by: Marcus Cooper <[email protected]>
---
sound/soc/sunxi/i2s/sndi2s.c | 2 --
sound/soc/sunxi/i2s/sndi2s.h | 58 --------------------------------------
sound/soc/sunxi/i2s/sunxi-i2s.c | 1 -
sound/soc/sunxi/i2s/sunxi-i2sdma.c | 1 -
sound/soc/sunxi/i2s/sunxi-i2sdma.h | 35 -----------------------
sound/soc/sunxi/i2s/sunxi-sndi2s.c | 3 --
sound/soc/sunxi/i2s/sunxi-sndi2s.h | 25 ----------------
7 files changed, 125 deletions(-)
delete mode 100644 sound/soc/sunxi/i2s/sndi2s.h
delete mode 100644 sound/soc/sunxi/i2s/sunxi-i2sdma.h
delete mode 100644 sound/soc/sunxi/i2s/sunxi-sndi2s.h
diff --git a/sound/soc/sunxi/i2s/sndi2s.c b/sound/soc/sunxi/i2s/sndi2s.c
index 194a869..f304422 100644
--- a/sound/soc/sunxi/i2s/sndi2s.c
+++ b/sound/soc/sunxi/i2s/sndi2s.c
@@ -24,8 +24,6 @@
#include <plat/sys_config.h>
#include <linux/io.h>
-#include "sndi2s.h"
-
struct sndi2s_priv {
int sysclk;
int dai_fmt;
diff --git a/sound/soc/sunxi/i2s/sndi2s.h b/sound/soc/sunxi/i2s/sndi2s.h
deleted file mode 100644
index e5b95c8..0000000
--- a/sound/soc/sunxi/i2s/sndi2s.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * sound\soc\sunxi\i2s\sndi2s.h
- * (C) Copyright 2007-2011
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- * chenpailin <[email protected]>
- *
- * some simple description for this code
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- */
-
-#ifndef SNDI2S_H_
-#define SNDI2S_H_
-
-typedef struct hdmi_audio
-{
- __u8 hw_intf; /* 0:iis 1:spdif 2:pcm */
- __u16 fs_between; /* fs */
- __u32 sample_rate; /*sample rate*/
- __u8 clk_edge; /* 0:*/
- __u8 ch0_en; /* 1 */
- __u8 ch1_en; /* 0 */
- __u8 ch2_en; /* 0 */
- __u8 ch3_en; /* 0 */
- __u8 word_length; /* 32 */
- __u8 shift_ctl; /* 0 */
- __u8 dir_ctl; /* 0 */
- __u8 ws_pol;
- __u8 just_pol;
-}hdmi_audio_t;
-
-
-typedef struct
-{
- __s32 (*hdmi_audio_enable)(__u8 mode, __u8 channel);
- __s32 (*hdmi_set_audio_para)(hdmi_audio_t * audio_para);
-}__audio_hdmi_func;
-
-
-/*define display driver command*/
-typedef enum tag_HDMI_CMD
-{
- /* command cache on/off */
- HDMI_CMD_SET_VIDEO_MOD,
- HDMI_CMD_GET_VIDEO_MOD,
- HDMI_CMD_SET_AUDIO_PARA,
- HDMI_CMD_AUDIO_RESET_NOTIFY, /*iis reset finish
notify */
- HDMI_CMD_CLOSE, /*iis reset finish
notify */
- HDMI_CMD_MOD_SUPPORT, /*判断某一种hdmi模式是否支持*/
- HDMI_CMD_AUDIO_ENABLE,
- HDMI_CMD_GET_HPD_STATUS,
-}__hdmi_cmd_t;
-
-#endif
diff --git a/sound/soc/sunxi/i2s/sunxi-i2s.c b/sound/soc/sunxi/i2s/sunxi-i2s.c
index b4dd3ad..3ea4bf6 100644
--- a/sound/soc/sunxi/i2s/sunxi-i2s.c
+++ b/sound/soc/sunxi/i2s/sunxi-i2s.c
@@ -35,7 +35,6 @@
#include <asm/dma.h>
#include <plat/dma_compat.h>
-#include "sunxi-i2sdma.h"
#include "sunxi-i2s.h"
static int regsave[8];
diff --git a/sound/soc/sunxi/i2s/sunxi-i2sdma.c
b/sound/soc/sunxi/i2s/sunxi-i2sdma.c
index 488ef4d..f239bda 100644
--- a/sound/soc/sunxi/i2s/sunxi-i2sdma.c
+++ b/sound/soc/sunxi/i2s/sunxi-i2sdma.c
@@ -30,7 +30,6 @@
#include <plat/dma_compat.h>
#include "sunxi-i2s.h"
-#include "sunxi-i2sdma.h"
static volatile unsigned int dmasrc = 0;
static volatile unsigned int dmadst = 0;
diff --git a/sound/soc/sunxi/i2s/sunxi-i2sdma.h
b/sound/soc/sunxi/i2s/sunxi-i2sdma.h
deleted file mode 100644
index 50418a58..0000000
--- a/sound/soc/sunxi/i2s/sunxi-i2sdma.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * sound\soc\sunxi\i2s\sunxi-i2sdma.h
- * (C) Copyright 2007-2011
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- * chenpailin <[email protected]>
- *
- * some simple description for this code
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- */
-
-
-#ifndef SUNXI_PCM_H_
-#define SUNXI_PCM_H_
-
-#define ST_RUNNING (1<<0)
-#define ST_OPENED (1<<1)
-
-#define SUNXI_DAI_I2S 1
-
-enum sunxi_dma_buffresult {
- SUNXI_RES_OK,
- SUNXI_RES_ERR,
- SUNXI_RES_ABORT
-};
-
-/* platform data */
-extern struct snd_soc_platform sunxi_soc_platform_i2s;
-extern struct sunxi_i2s_info sunxi_iis;
-
-#endif //SUNXI_PCM_H_
diff --git a/sound/soc/sunxi/i2s/sunxi-sndi2s.c
b/sound/soc/sunxi/i2s/sunxi-sndi2s.c
index 7c1a3d4..1d7a977 100644
--- a/sound/soc/sunxi/i2s/sunxi-sndi2s.c
+++ b/sound/soc/sunxi/i2s/sunxi-sndi2s.c
@@ -25,9 +25,6 @@
#include <linux/io.h>
#include "sunxi-i2s.h"
-#include "sunxi-i2sdma.h"
-
-#include "sndi2s.h"
static struct clk *xtal;
static int clk_users;
diff --git a/sound/soc/sunxi/i2s/sunxi-sndi2s.h
b/sound/soc/sunxi/i2s/sunxi-sndi2s.h
deleted file mode 100644
index 47f0961..0000000
--- a/sound/soc/sunxi/i2s/sunxi-sndi2s.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * sound\soc\sunxi\i2s\sunxi_sndi2s.h
- * (C) Copyright 2007-2011
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- * chenpailin <[email protected]>
- *
- * some simple description for this code
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- */
-#ifndef SUNXI_SNDI2S_H_
-#define SUNXI_SNDI2S_H_
-
-struct sunxi_sndi2s_platform_data {
- int iis_bclk;
- int iis_ws;
- int iis_data;
- void (*power)(int);
- int model;
-}
-#endif
--
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.
