x

omap3 linux 2.6 用nocc去除了冗余代码

--- /home/khasim/beagle/500/2.6_kernel/sound/arm/omap/omap2-audio-twl4030.h	2007-10-11 21:20:00.000000000 +0530
+++ omap2-audio-twl4030.h	2008-04-24 15:58:36.000000000 +0530
@@ -1,5 +1,5 @@
 /*
- * sound/arm/omap/omap2-audio-twl4030.h 
+ * sound/arm/omap/omap2-audio-twl4030.h
  *
  * The Audio Specific Definitions for TWL4030 ES1.0 chip
  *
@@ -16,13 +16,13 @@
  * History:
  *  -------
  *  2006-01-18 Nishanth Menon - Created
- *  2007-04-16 Leonides Martinez - Additional controls info 
+ *  2007-04-16 Leonides Martinez - Additional controls info
  */
 #ifndef __OMAP_AUDIO_TWL4030_H__
 #define __OMAP_AUDIO_TWL4030_H__
 
 /****************************************
- *  AUDIO_VOICE                           
+ *  AUDIO_VOICE
  ****************************************/
 
 /**** Register Definitions REG_BASE=0x0 DevAdd=0x49 */
@@ -481,7 +481,7 @@
 #define BIT_PRECKR_CTL_PRECKR_GAIN_M             (0x00000030)
 #define BIT_PRECKR_CTL_PRECKR_EN                 (0x006)
 #define BIT_PRECKR_CTL_PRECKR_EN_M               (0x00000040)
-#define HANDS_FREEL_VOICE                        (0x0)  
+#define HANDS_FREEL_VOICE                        (0x0)
 #define HANDS_FREEL_AL1                          (0x1)
 #define HANDS_FREEL_AL2                          (0x2)
 #define HANDS_FREEL_AR2                          (0x3)
@@ -711,7 +711,7 @@
  * OUTPUT_STEREO_HEADSET           SOUND_MASK_LINE1
  * OUTPUT_HANDS_FREE_CLASSD        SOUND_MASK_SPEAKER
  * OUTPUT_MONO_EARPIECE            SOUND_MASK_PHONEOUT (mono Sink)
- * 
+ *
  * INPUT:
  * ======
  * INPUT_HEADSET_MIC               SOUND_MASK_LINE
@@ -728,7 +728,7 @@
  * ===============
  * SOUND_MIXER_RECLEV - control the gain level of recording
  * SOUND_MIXER_VOLUME - control the gain level of playback
- * MIXER_WRITE and MIXER_READ with each of the device masks will 
+ * MIXER_WRITE and MIXER_READ with each of the device masks will
  *                            control the coarse volume control of the device
  */
 #define DIR_OUT                                  (0)
@@ -821,7 +821,7 @@
 
  /* From OSS spec:
   * The least significant
-  * byte gives volume for the left channel and the next 8 bits for 
+  * byte gives volume for the left channel and the next 8 bits for
   * the right channel.
   */
 #define READ_LEFT_VOLUME(ARG)                    ( (ARG) & 0xFF )
@@ -842,8 +842,8 @@
 #error "UnSupported platform"
 #endif
 
-/* Define to set the twl as the master w.r.t McBSP 
- * - remove to make mcbsp master 
+/* Define to set the twl as the master w.r.t McBSP
+ * - remove to make mcbsp master
  */
 #define TWL_MASTER
 
@@ -873,7 +873,7 @@ static struct snd_pcm_hw_constraint_list
 static struct snd_pcm_hardware twl4030_pcm_hardware_playback = {
 	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
 		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
-		 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),	
+		 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
  	.formats = (SNDRV_PCM_FMTBIT_S16_LE),
 	.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
 		  SNDRV_PCM_RATE_16000 |
@@ -960,7 +960,7 @@ static struct twl_local_info twl4030_loc
 	.mod_cnt = 0,
 };
 
-/* Configured count - 
+/* Configured count -
  * Codec is configured when this reaches 1
  * Codec is shutdown when this reaches 0
  */
@@ -1016,7 +1016,7 @@ static const struct sample_rate_info_t v
 #define NUMBER_OF_RATES_SUPPORTED (sizeof (valid_sample_rates)/\
 				   sizeof (struct sample_rate_info_t))
 
-/* Give time for these to settle down 
+/* Give time for these to settle down
  * one frame (worst case is at 8000hz) = 125 uSec
  * wait two frame duration each - giving dma a chance to push data thru also
  * =125*4= 500uSec
@@ -1071,8 +1071,8 @@ static void omap_twl4030_shutdown(void);
 static int omap_twl4030_sidle(u32 level);
 static int omap_twl4030_probe(void);
 
-static int omap_twl4030_mixer_init(struct snd_card *card); 
-static int omap_twl4030_mixer_shutdown(struct snd_card *card); 
+static int omap_twl4030_mixer_init(struct snd_card *card);
+static int omap_twl4030_mixer_shutdown(struct snd_card *card);
 
 #ifdef TONE_GEN
 void toneGen(void);
@@ -1115,7 +1115,7 @@ static struct mcbsp_config plat_mcbsp_co
 	.srg_clk_src = OMAP2_MCBSP_SRGCLKSRC_CLKX,
 	.tx_clk_src = OMAP2_MCBSP_TXFSYNC_EXTERNAL,
 	.rx_clk_src = OMAP2_MCBSP_RXFSYNC_EXTERNAL,
-	.rx_ip_clk = OMAP2_MCBSP_CLKRXSRC_EXTERNAL,	
+	.rx_ip_clk = OMAP2_MCBSP_CLKRXSRC_EXTERNAL,
 	.tx_ip_clk = OMAP2_MCBSP_CLKTXSRC_EXTERNAL,
 
 	.srg_clk_sync = OMAP2_MCBSP_SRG_FREERUNNING,
@@ -1124,7 +1124,7 @@ static struct mcbsp_config plat_mcbsp_co
 	.srg_clk_src = OMAP2_MCBSP_SRGCLKSRC_CLKX,
 	.tx_clk_src = OMAP2_MCBSP_TXFSYNC_INTERNAL,
 	.rx_clk_src = OMAP2_MCBSP_RXFSYNC_INTERNAL,
-	.rx_ip_clk = OMAP2_MCBSP_CLKRXSRC_INTERNAL,	
+	.rx_ip_clk = OMAP2_MCBSP_CLKRXSRC_INTERNAL,
 	.tx_ip_clk = OMAP2_MCBSP_CLKTXSRC_INTERNAL,
 
 	.srg_clk_sync = OMAP2_MCBSP_SRG_RUNNING,
@@ -1141,11 +1141,11 @@ static struct mcbsp_config plat_mcbsp_co
 			       .data_type = OMAP2_MCBSP_WORDLEN_NONE,
 			       .skip_alt = OMAP2_MCBSP_SKIP_NONE,
 			       .auto_reset = OMAP2_MCBSP_AUTO_XRST,
-			       .phase = OMAP2_MCBSP_FRAME_SINGLEPHASE,
+			       .phase = OMAP2_MCBSP_FRAME_DUALPHASE,
 			       .data_delay = OMAP2_MCBSP_DATADELAY1,	/* 1 bit delay expected */
 			       .reverse_compand = OMAP2_MCBSP_MSBFIRST,	/* Set msb first */
-			       .word_length1 = OMAP2_MCBSP_WORDLEN_32,	/* RWDLEN1 */
-			       .word_length2 = OMAP2_MCBSP_WORDLEN_8,	/* RWDLEN2 -dnt care*/
+			       .word_length1 = OMAP2_MCBSP_WORDLEN_16,	/* RWDLEN1 */
+			       .word_length2 = OMAP2_MCBSP_WORDLEN_16,	/* RWDLEN2 -dnt care*/
 			       .frame_length1 = OMAP2_MCBSP_FRAMELEN_1,	/* RFRLEN1 */
 			       .frame_length2 = OMAP2_MCBSP_FRAMELEN_1,	/* RFRLEN2 -dnt care*/
 			       .justification = OMAP2_MCBSP_RJUST_ZEROMSB,	/* RJUST and fill 0s */
@@ -1157,11 +1157,11 @@ static struct mcbsp_config plat_mcbsp_co
 			       .data_type = OMAP2_MCBSP_WORDLEN_NONE,
 			       .skip_alt = OMAP2_MCBSP_SKIP_NONE,
 			       .auto_reset = OMAP2_MCBSP_AUTO_RRST,
-			       .phase = OMAP2_MCBSP_FRAME_SINGLEPHASE,
+			       .phase = OMAP2_MCBSP_FRAME_DUALPHASE,
 			       .data_delay = OMAP2_MCBSP_DATADELAY1,	/* 1 bit delay expected */
 			       .reverse_compand = OMAP2_MCBSP_MSBFIRST,	/* Set msb first */
-			       .word_length1 = OMAP2_MCBSP_WORDLEN_32,	/* RWDLEN1 */
-			       .word_length2 = OMAP2_MCBSP_WORDLEN_8,	/* RWDLEN2 -dntcare*/
+			       .word_length1 = OMAP2_MCBSP_WORDLEN_16,	/* RWDLEN1 */
+			       .word_length2 = OMAP2_MCBSP_WORDLEN_16,	/* RWDLEN2 -dntcare*/
 			       .frame_length1 = OMAP2_MCBSP_FRAMELEN_1,	/* RFRLEN1 */
 			       .frame_length2 = OMAP2_MCBSP_FRAMELEN_1,	/* RFRLEN2 */
 			       .justification = OMAP2_MCBSP_RJUST_ZEROMSB,	/* RJUST and fill 0s */
@@ -1189,12 +1189,12 @@ static struct omap_alsa_codec omap_twl_c
 	.codec_probe = omap_twl4030_probe,
 	.codec_init = omap_twl4030_initialize,
 	.codec_shutdown = omap_twl4030_shutdown,
-	.codec_sidle = omap_twl4030_sidle,      
+	.codec_sidle = omap_twl4030_sidle,
 
-	.codec_set_samplerate = twl4030_set_samplerate, 
-#ifdef CONFIG_SND_OMAP_3430SDP
-	.codec_set_stereomode = twl4030_stereomode_set, 
-#endif	
+	.codec_set_samplerate = twl4030_set_samplerate,
+#if defined(CONFIG_SND_OMAP_3430SDP) || defined (CONFIG_SND_OMAP3EVM)
+	.codec_set_stereomode = twl4030_stereomode_set,
+#endif
 	.codec_default_samplerate = twl4030_default_samplerate,
 
 	.codec_transfer_init = omap_twl4030_transfer_init,