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

Immutable branch for ASoC, as requested by Mark Brown

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

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