From: Mark Brown <broonie@linaro.org>
Date: Sun, 24 Nov 2013 14:35:18 +0000 (+0000)
Subject: Merge tag 'v3.13-rc1' into asoc-arizona
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=30c27abd28fa168d7ebd2e5286f1fe473c74bfa9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'v3.13-rc1' into asoc-arizona

Linux 3.13-rc1
---

30c27abd28fa168d7ebd2e5286f1fe473c74bfa9
diff --cc drivers/mfd/wm5110-tables.c
index 3b079f6b021e,bf8b3b5ad1fe..d433e285f1f1
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@@ -2369,9 -2325,13 +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);
  	}
  }
  
@@@ -2429,9 -2401,13 +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);
  	}
  }