From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 21 Jan 2014 08:23:16 +0000 (+0000)
Subject: Merge tag 'tags/ib-asoc-1' into for-mfd-next
X-Git-Tag: v3.14-rc1~142^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6eb37eb276f0b91adb43b853ce6fb0812fbf0883;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'tags/ib-asoc-1' into for-mfd-next

Immutable branch for ASoC, as requested by Mark Brown
---

6eb37eb276f0b91adb43b853ce6fb0812fbf0883
diff --cc drivers/mfd/wm5110-tables.c
index d3d7531,3b079f6..8dc49ec
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@@ -2325,13 -2369,9 +2388,13 @@@ static bool wm5110_readable_register(st
  	case ARIZONA_DSP4_STATUS_1:
  	case ARIZONA_DSP4_STATUS_2:
  	case ARIZONA_DSP4_STATUS_3:
 +	case ARIZONA_DSP4_SCRATCH_0:
 +	case ARIZONA_DSP4_SCRATCH_1:
 +	case ARIZONA_DSP4_SCRATCH_2:
 +	case ARIZONA_DSP4_SCRATCH_3:
  		return true;
  	default:
- 		return false;
+ 		return wm5110_is_adsp_memory(dev, reg);
  	}
  }
  
@@@ -2401,13 -2429,9 +2464,13 @@@ static bool wm5110_volatile_register(st
  	case ARIZONA_DSP4_STATUS_1:
  	case ARIZONA_DSP4_STATUS_2:
  	case ARIZONA_DSP4_STATUS_3:
 +	case ARIZONA_DSP4_SCRATCH_0:
 +	case ARIZONA_DSP4_SCRATCH_1:
 +	case ARIZONA_DSP4_SCRATCH_2:
 +	case ARIZONA_DSP4_SCRATCH_3:
  		return true;
  	default:
- 		return false;
+ 		return wm5110_is_adsp_memory(dev, reg);
  	}
  }