Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/mfd/wm5102-tables.c between commit d078377faf5f ("mfd: wm5102:
Refresh register defaults") from the mfd tree and commit 689557d3c704
("mfd: wm5102: Add microphone clamp control registers") from the
char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mfd/wm5102-tables.c
index c68727d,a396a3a..0000000
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@@ -315,13 -316,9 +321,13 @@@ static const struct reg_default wm5102_
  	{ 0x00000218, 0x01A6 },   /* R536   - Mic Bias Ctrl 1 */ 
  	{ 0x00000219, 0x01A6 },   /* R537   - Mic Bias Ctrl 2 */ 
  	{ 0x0000021A, 0x01A6 },   /* R538   - Mic Bias Ctrl 3 */ 
 +	{ 0x00000225, 0x0400 },   /* R549   - HP Ctrl 1L */
 +	{ 0x00000226, 0x0400 },   /* R550   - HP Ctrl 1R */
  	{ 0x00000293, 0x0000 },   /* R659   - Accessory Detect Mode 1 */ 
  	{ 0x0000029B, 0x0020 },   /* R667   - Headphone Detect 1 */ 
 +	{ 0x0000029C, 0x0000 },   /* R668   - Headphone Detect 2 */
 +	{ 0x0000029F, 0x0000 },   /* R671   - Headphone Detect Test */
- 	{ 0x000002A2, 0x0000 },   /* R674   - Micd Clamp control */
+ 	{ 0x000002A2, 0x0000 },   /* R674   - Micd clamp control */
  	{ 0x000002A3, 0x1102 },   /* R675   - Mic Detect 1 */ 
  	{ 0x000002A4, 0x009F },   /* R676   - Mic Detect 2 */ 
  	{ 0x000002A5, 0x0000 },   /* R677   - Mic Detect 3 */ 
@@@ -1854,11 -1883,8 +1862,12 @@@ static bool wm5102_volatile_register(st
  	case ARIZONA_DSP1_STATUS_1:
  	case ARIZONA_DSP1_STATUS_2:
  	case ARIZONA_DSP1_STATUS_3:
 +	case ARIZONA_DSP1_SCRATCH_0:
 +	case ARIZONA_DSP1_SCRATCH_1:
 +	case ARIZONA_DSP1_SCRATCH_2:
 +	case ARIZONA_DSP1_SCRATCH_3:
  	case ARIZONA_HEADPHONE_DETECT_2:
+ 	case ARIZONA_HP_DACVAL:
  	case ARIZONA_MIC_DETECT_3:
  		return true;
  	default: