Merge remote-tracking branches 'asoc/topic/eukrea-tlv320', 'asoc/topic/fsl', 'asoc...

diff --combined sound/soc/fsl/fsl_asrc.h
index 52c27a358933b100d85b2392abe2d2fc4501dd3a,0f163abe4ba37d93bec022afd0842b20423f2361,0f163abe4ba37d93bec022afd0842b20423f2361,0f163abe4ba37d93bec022afd0842b20423f2361,ec33dab4b9092c486e6d80c861adb02eb7ab5573..2c5856ac5bc31f7760c8bf4bed2db91454875375
--- 1/sound/soc/fsl/fsl_asrc.h
--- 2/sound/soc/fsl/fsl_asrc.h
--- 3/sound/soc/fsl/fsl_asrc.h
--- 4/sound/soc/fsl/fsl_asrc.h
--- 5/sound/soc/fsl/fsl_asrc.h
+++ b/sound/soc/fsl/fsl_asrc.h
@@@@@@ -57,7 -57,7 -57,7 -57,7 -57,7 +57,7 @@@@@@
     #define REG_ASRDOC                 0x74
     #define REG_ASRDI(i)                       (REG_ASRDIA + (i << 3))
     #define REG_ASRDO(i)                       (REG_ASRDOA + (i << 3))
---- #define REG_ASRDx(x, i)                    (x == IN ? REG_ASRDI(i) : REG_ASRDO(i))
++++ #define REG_ASRDx(x, i)                    ((x) == IN ? REG_ASRDI(i) : REG_ASRDO(i))
     
     #define REG_ASRIDRHA                       0x80
     #define REG_ASRIDRLA                       0x84
@@@@@@ -260,8 -260,8 -260,8 -260,8 -260,8 +260,8 @@@@@@
     #define ASRFSTi_OUTPUT_FIFO_SHIFT  12
     #define ASRFSTi_OUTPUT_FIFO_MASK   (((1 << ASRFSTi_OUTPUT_FIFO_WIDTH) - 1) << ASRFSTi_OUTPUT_FIFO_SHIFT)
     #define ASRFSTi_IAEi_SHIFT         11
 ----#define ASRFSTi_IAEi_MASK          (1 << ASRFSTi_OAFi_SHIFT)
 ----#define ASRFSTi_IAEi                       (1 << ASRFSTi_OAFi_SHIFT)
 ++++#define ASRFSTi_IAEi_MASK          (1 << ASRFSTi_IAEi_SHIFT)
 ++++#define ASRFSTi_IAEi                       (1 << ASRFSTi_IAEi_SHIFT)
     #define ASRFSTi_INPUT_FIFO_WIDTH   7
     #define ASRFSTi_INPUT_FIFO_SHIFT   0
     #define ASRFSTi_INPUT_FIFO_MASK            ((1 << ASRFSTi_INPUT_FIFO_WIDTH) - 1)