From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 5 Apr 2010 18:19:32 +0000 (+0100)
Subject: Merge branch 'for-2.6.34' into for-2.6.35
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53a61d967a480307db4c8f7950ddb8bb1a0fda9b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h
---

53a61d967a480307db4c8f7950ddb8bb1a0fda9b
diff --cc include/sound/soc.h
index 80dfac162723,a57fbfcd4c8f..4ab3dad4a9c9
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -381,7 -374,7 +381,7 @@@ struct snd_soc_pcm_stream 
  	unsigned int rate_max;		/* max rate */
  	unsigned int channels_min;	/* min channels */
  	unsigned int channels_max;	/* max channels */
- 	unsigned int active;		/* num of active users of the stream */
 -	unsigned int active:1;		/* stream is in use */
++	unsigned int active;		/* stream is in use */
  	void *dma_data;			/* used by platform code */
  };
  
diff --cc sound/soc/codecs/wm8994.c
index fc3dce814924,f8355ac76a42..e00201e0820e
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -3866,36 -3735,13 +3871,37 @@@ static int wm8994_codec_probe(struct pl
  	case 3:
  		wm8994->hubs.dcs_codes = -5;
  		wm8994->hubs.hp_startup_mode = 1;
+ 		wm8994->hubs.dcs_readback_mode = 1;
  		break;
  	default:
+ 		wm8994->hubs.dcs_readback_mode = 1;
  		break;
  	}
- 			   
  
 +	ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_DET,
 +				 wm8994_mic_irq, "Mic 1 detect", wm8994);
 +	if (ret != 0)
 +		dev_warn(&pdev->dev,
 +			 "Failed to request Mic1 detect IRQ: %d\n", ret);
 +
 +	ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT,
 +				 wm8994_mic_irq, "Mic 1 short", wm8994);
 +	if (ret != 0)
 +		dev_warn(&pdev->dev,
 +			 "Failed to request Mic1 short IRQ: %d\n", ret);
 +
 +	ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC2_DET,
 +				 wm8994_mic_irq, "Mic 2 detect", wm8994);
 +	if (ret != 0)
 +		dev_warn(&pdev->dev,
 +			 "Failed to request Mic2 detect IRQ: %d\n", ret);
 +
 +	ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC2_SHRT,
 +				 wm8994_mic_irq, "Mic 2 short", wm8994);
 +	if (ret != 0)
 +		dev_warn(&pdev->dev,
 +			 "Failed to request Mic2 short IRQ: %d\n", ret);
 +
  	/* Remember if AIFnLRCLK is configured as a GPIO.  This should be
  	 * configured on init - if a system wants to do this dynamically
  	 * at runtime we can deal with that then.