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

Linux 3.13-rc1

diff --cc drivers/mfd/wm5110-tables.c
index 3b079f6b021eac1318e687fd30ec800499da6cf3,bf8b3b5ad1fe65d03eb067881599c5cbc1418a32..d433e285f1f169367da039eb58685184d57c734e
--- 1/drivers/mfd/wm5110-tables.c
--- 2/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);
        }
  }
  

diff --cc include/linux/mfd/arizona/registers.h
Simple merge

diff --cc sound/soc/codecs/arizona.c
Simple merge

diff --cc sound/soc/codecs/wm5110.c
Simple merge