qdsp5.u8110-u8120.diff

diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c
--- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c	2010-05-03 22:35:15.000000000 -0400
+++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c	2010-09-01 15:41:30.000000000 -0400
@@ -44,8 +44,6 @@
 #include <linux/msm_audio.h>
 #include "audmgr.h"

-#include "../socinfo.h"
-
 #include <mach/qdsp5/qdsp5audppcmdi.h>
 #include <mach/qdsp5/qdsp5audppmsg.h>
 #include <mach/qdsp5/qdsp5audplaycmdi.h>
@@ -203,12 +201,9 @@
 		cfg.tx_rate = RPC_AUD_DEF_SAMPLE_RATE_NONE;
 		cfg.rx_rate = RPC_AUD_DEF_SAMPLE_RATE_48000;
 		cfg.def_method = RPC_AUD_DEF_METHOD_PLAYBACK;
-		if (cpu_is_msm7x25())
-			cfg.codec = RPC_AUD_DEF_CODEC_VOC_AMR;
-		else
 			cfg.codec = RPC_AUD_DEF_CODEC_AMR_NB;
-
 		cfg.snd_method = RPC_SND_METHOD_MIDI;
+
 		rc = audmgr_enable(&audio->audmgr, &cfg);
 		if (rc < 0)
 			return rc;
diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c
--- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c	2010-05-03 22:35:24.000000000 -0400
+++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c	2010-09-01 15:41:30.000000000 -0400
@@ -43,8 +43,6 @@
 #include <mach/qdsp5/qdsp5audplaycmdi.h>
 #include <mach/qdsp5/qdsp5audplaymsg.h>

-#include "../socinfo.h"
-
 /* Hold 30 packets of 24 bytes each and 14 bytes of meta in */
 #define BUFSZ 			734
 #define DMASZ 			(BUFSZ * 2)
@@ -194,12 +192,9 @@
 		cfg.tx_rate = RPC_AUD_DEF_SAMPLE_RATE_NONE;
 		cfg.rx_rate = RPC_AUD_DEF_SAMPLE_RATE_48000;
 		cfg.def_method = RPC_AUD_DEF_METHOD_PLAYBACK;
-		if (cpu_is_msm7x25())
-			cfg.codec = RPC_AUD_DEF_CODEC_VOC_EVRC;
-		else
 			cfg.codec = RPC_AUD_DEF_CODEC_EVRC;
-
 		cfg.snd_method = RPC_SND_METHOD_MIDI;
+
 		rc = audmgr_enable(&audio->audmgr, &cfg);
 		if (rc < 0)
 			return rc;
diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c
--- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c	2010-05-03 22:35:37.000000000 -0400
+++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c	2010-09-01 15:41:30.000000000 -0400
@@ -42,8 +42,6 @@
 #include <mach/qdsp5/qdsp5audplaycmdi.h>
 #include <mach/qdsp5/qdsp5audplaymsg.h>

-#include "../socinfo.h"
-
 #include "audmgr.h"

 #define BUFSZ 1094 /* QCELP 13K Hold 600ms packet data = 36 * 30 and
@@ -191,11 +189,9 @@
 		cfg.tx_rate = RPC_AUD_DEF_SAMPLE_RATE_NONE;
 		cfg.rx_rate = RPC_AUD_DEF_SAMPLE_RATE_48000;
 		cfg.def_method = RPC_AUD_DEF_METHOD_PLAYBACK;
-		if (cpu_is_msm7x25())
-			cfg.codec = RPC_AUD_DEF_CODEC_VOC_13K;
-		else
 			cfg.codec = RPC_AUD_DEF_CODEC_13K;
 		cfg.snd_method = RPC_SND_METHOD_MIDI;
+
 		rc = audmgr_enable(&audio->audmgr, &cfg);
 		if (rc < 0)
 			return rc;
diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c
--- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c	2010-05-03 22:35:43.000000000 -0400
+++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c	2010-09-01 15:41:30.000000000 -0400
@@ -195,12 +195,7 @@

 		vmsg.args.device = cpu_to_be32(vol.device);
 		vmsg.args.method = cpu_to_be32(vol.method);
-#ifdef CONFIG_HUAWEI_KERNEL
-		if (vol.method != SND_METHOD_VOICE&&vol.method != SND_METHOD_MIDI) {
-#else
 		if (vol.method != SND_METHOD_VOICE) {
-#endif
-
 			MM_ERR("set volume: invalid method\n");
 			rc = -EINVAL;
 			break;