ARM: herring: sound: Use audio driver from 2.6.35

fix herring-wm8994.c to compile on 2.6.39
checkpoint: use mainline sound driver
checkout: audio driver loads but locks up
checkpoint: audio setup does not complain, but playback times-out
checkpoint: using soc sound i2s and dma code from 2.6.35 - dma still hangs
checkpoint: using old codec, dma and i2s code sound plays but is distorded
fix distorted sound
rename samsung wm8994 codec to not conflict with standard wm8994 mfd device
modify dma.c to work with dma wrapper
rename some audio config options and fix defconfig
remove some duplicate clocks

Change-Id: I1b72b5b7937fd4a40a1719674976ba16d7e8f3a6

1 files changed, 120 insertions, 145 deletions

diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index 0a1db04..13257dc 100644
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -1,145 +1,120 @@
-/*
- * wm8994.h  --  WM8994 Soc Audio driver
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _WM8994_H
-#define _WM8994_H
-
-#include <sound/soc.h>
-#include <linux/firmware.h>
-
-#include "wm_hubs.h"
-
-/* Sources for AIF1/2 SYSCLK - use with set_dai_sysclk() */
-#define WM8994_SYSCLK_MCLK1 1
-#define WM8994_SYSCLK_MCLK2 2
-#define WM8994_SYSCLK_FLL1  3
-#define WM8994_SYSCLK_FLL2  4
-
-/* OPCLK is also configured with set_dai_sysclk, specify division*10 as rate. */
-#define WM8994_SYSCLK_OPCLK 5
-
-#define WM8994_FLL1 1
-#define WM8994_FLL2 2
-
-#define WM8994_FLL_SRC_MCLK1  1
-#define WM8994_FLL_SRC_MCLK2  2
-#define WM8994_FLL_SRC_LRCLK  3
-#define WM8994_FLL_SRC_BCLK   4
-
-typedef void (*wm8958_micdet_cb)(u16 status, void *data);
-
-int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
-		      int micbias, int det, int shrt);
-int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
-		      wm8958_micdet_cb cb, void *cb_data);
-
-#define WM8994_CACHE_SIZE 1570
-
-struct wm8994_access_mask {
-	unsigned short readable;   /* Mask of readable bits */
-	unsigned short writable;   /* Mask of writable bits */
-};
-
-extern const struct wm8994_access_mask wm8994_access_masks[WM8994_CACHE_SIZE];
-extern const u16 wm8994_reg_defaults[WM8994_CACHE_SIZE];
-
-int wm8958_aif_ev(struct snd_soc_dapm_widget *w,
-		  struct snd_kcontrol *kcontrol, int event);
-
-void wm8958_dsp2_init(struct snd_soc_codec *codec);
-
-struct wm8994_micdet {
-	struct snd_soc_jack *jack;
-	int det;
-	int shrt;
-};
-
-/* codec private data */
-struct wm8994_fll_config {
-	int src;
-	int in;
-	int out;
-};
-
-#define WM8994_NUM_DRC 3
-#define WM8994_NUM_EQ  3
-
-struct wm8994_priv {
-	struct wm_hubs_data hubs;
-	enum snd_soc_control_type control_type;
-	void *control_data;
-	struct snd_soc_codec *codec;
-	int sysclk[2];
-	int sysclk_rate[2];
-	int mclk[2];
-	int aifclk[2];
-	struct wm8994_fll_config fll[2], fll_suspend[2];
-
-	int dac_rates[2];
-	int lrclk_shared[2];
-
-	int mbc_ena[3];
-	int hpf1_ena[3];
-	int hpf2_ena[3];
-	int vss_ena[3];
-	int enh_eq_ena[3];
-
-	/* Platform dependant DRC configuration */
-	const char **drc_texts;
-	int drc_cfg[WM8994_NUM_DRC];
-	struct soc_enum drc_enum;
-
-	/* Platform dependant ReTune mobile configuration */
-	int num_retune_mobile_texts;
-	const char **retune_mobile_texts;
-	int retune_mobile_cfg[WM8994_NUM_EQ];
-	struct soc_enum retune_mobile_enum;
-
-	/* Platform dependant MBC configuration */
-	int mbc_cfg;
-	const char **mbc_texts;
-	struct soc_enum mbc_enum;
-
-	/* Platform dependant VSS configuration */
-	int vss_cfg;
-	const char **vss_texts;
-	struct soc_enum vss_enum;
-
-	/* Platform dependant VSS HPF configuration */
-	int vss_hpf_cfg;
-	const char **vss_hpf_texts;
-	struct soc_enum vss_hpf_enum;
-
-	/* Platform dependant enhanced EQ configuration */
-	int enh_eq_cfg;
-	const char **enh_eq_texts;
-	struct soc_enum enh_eq_enum;
-
-	struct wm8994_micdet micdet[2];
-
-	wm8958_micdet_cb jack_cb;
-	void *jack_cb_data;
-	int micdet_irq;
-
-	int revision;
-	struct wm8994_pdata *pdata;
-
-	unsigned int aif1clk_enable:1;
-	unsigned int aif2clk_enable:1;
-
-	unsigned int aif1clk_disable:1;
-	unsigned int aif2clk_disable:1;
-
-	int dsp_active;
-	const struct firmware *cur_fw;
-	const struct firmware *mbc;
-	const struct firmware *mbc_vss;
-	const struct firmware *enh_eq;
-};
-
-#endif
+/*

+ * wm8994.h  --  WM8994 Soc Audio driver

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License version 2 as

+ * published by the Free Software Foundation.

+ */

+

+#ifndef _WM8994_H

+#define _WM8994_H

+

+#include <sound/soc.h>

+

+extern struct snd_soc_codec_device soc_codec_dev_wm8994;

+// We don't use array	- DW Shim.

+//extern struct snd_soc_dai wm8994_dai[];

+

+/* Sources for AIF1/2 SYSCLK - use with set_dai_sysclk() */

+#define WM8994_SYSCLK_MCLK1 1

+#define WM8994_SYSCLK_MCLK2 2

+#define WM8994_SYSCLK_FLL1  3

+#define WM8994_SYSCLK_FLL2  4

+

+#define WM8994_FLL1 1

+#define WM8994_FLL2 2

+

+//-----------------------------------------------------------

+// Added belows codes by Samsung Electronics.

+

+#include "wm8994_def.h"

+

+extern struct snd_soc_dai wm8994_dai;

+

+#define WM8994_SYSCLK_MCLK     1

+#define WM8994_SYSCLK_FLL      2

+

+#define AUDIO_COMMON_DEBUG  0 

+//#define WM8994_REGISTER_DUMP

+#if defined CONFIG_SND_SOC_WM8994_PCM

+#define ATTACH_ADDITINAL_PCM_DRIVER	// for VT call.

+#endif

+//------------------------------------------------

+// Definitions of enum type

+//------------------------------------------------

+enum audio_path	{ OFF, RCV, SPK, HP, BT, SPK_HP};

+enum mic_path		{ MAIN, SUB, MIC_OFF};

+enum fmradio_audio_path { FMR_OFF, FMR_SPK, FMR_HP, FMR_SPK_MIX, FMR_HP_MIX, FMR_SPK_HP_MIX};

+enum call_state		{ DISCONNECT, CONNECT};

+enum power_state	{ CODEC_OFF, CODEC_ON };

+enum mic_state		{ MIC_NO_USE, MIC_USE};

+

+typedef void (*select_route)(struct snd_soc_codec *);

+typedef void (*select_mic_route)(struct snd_soc_codec *);

+

+struct wm8994_setup_data {

+	int i2c_bus;

+	unsigned short i2c_address;

+};

+

+struct wm8994_priv {

+	//u16 reg_cache[WM8994_REGISTER_COUNT];

+	struct snd_soc_codec codec;

+	int master;

+	int sysclk_source;

+	unsigned int mclk_rate;

+	unsigned int sysclk_rate;

+	unsigned int fs;

+	unsigned int bclk;

+	unsigned int hw_version;		// For wolfson H/W version. 1 = Rev B, 3 = Rev D

+	enum audio_path cur_path;

+	enum mic_path rec_path;

+	enum fmradio_audio_path fmradio_path;

+	enum call_state call_state;

+	enum power_state power_state;

+	enum mic_state mic_state;

+	select_route *universal_playback_path;

+	select_route *universal_voicecall_path;

+	select_mic_route *universal_mic_path;

+	int testmode_config_flag;	// for testmode.

+};

+

+#if AUDIO_COMMON_DEBUG

+#define DEBUG_LOG(format,...)\

+	printk ("[ "SUBJECT " (%s,%d) ] " format "\n", __func__, __LINE__, ## __VA_ARGS__);

+#else

+#define DEBUG_LOG(format,...)

+#endif

+

+#define DEBUG_LOG_ERR(format,...)\

+	printk (KERN_ERR "[ "SUBJECT " (%s,%d) ] " format "\n", __func__, __LINE__, ## __VA_ARGS__);

+

+// Definitions of function prototype.

+inline unsigned int wm8994_read(struct snd_soc_codec *codec,unsigned int reg);

+int wm8994_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value);

+int audio_init(void);

+int audio_power(int en);

+void audio_ctrl_mic_bias_gpio(int enable);

+void wm8994_set_off(struct snd_soc_codec *codec);

+void wm8994_disable_playback_path(struct snd_soc_codec *codec, enum audio_path path);

+void wm8994_disable_fmradio_path(struct snd_soc_codec *codec, enum fmradio_audio_path path);

+void wm8994_disable_rec_path(struct snd_soc_codec *codec,enum mic_path rec_path);

+void  wm8994_record_main_mic( struct snd_soc_codec *codec);

+void wm8994_record_headset_mic( struct snd_soc_codec *codec);

+void wm8994_set_playback_receiver(struct snd_soc_codec *codec);

+void wm8994_set_playback_headset(struct snd_soc_codec *codec);

+void wm8994_set_playback_speaker(struct snd_soc_codec *codec);

+void wm8994_set_playback_speaker_headset(struct snd_soc_codec *codec);

+void wm8994_set_voicecall_receiver(struct snd_soc_codec *codec);

+void wm8994_set_voicecall_headset(struct snd_soc_codec *codec);

+void wm8994_set_voicecall_speaker(struct snd_soc_codec *codec);

+void wm8994_set_voicecall_bluetooth(struct snd_soc_codec *codec);

+void wm8994_set_fmradio_headset(struct snd_soc_codec *codec);

+void wm8994_set_fmradio_speaker(struct snd_soc_codec *codec);

+void wm8994_set_fmradio_headset_mix(struct snd_soc_codec *codec);

+void wm8994_set_fmradio_speaker_mix(struct snd_soc_codec *codec);

+void wm8994_set_fmradio_speaker_headset_mix(struct snd_soc_codec *codec);

+#if defined WM8994_REGISTER_DUMP

+void wm8994_register_dump(struct snd_soc_codec *codec);

+#endif

+#endif