diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.c | 7 | ||||
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.h | 7 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_ab8500.c | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index 2bc711f67d8..ca7e9adfe05 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -3,7 +3,8 @@ * * Author: Mikko J. Lehto <mikko.lehto@symbio.com>, * Mikko Sarmanne <mikko.sarmanne@symbio.com>, - * Jarmo K. Kuronen <jarmo.kuronen@symbio.com> + * Jarmo K. Kuronen <jarmo.kuronen@symbio.com>, + * Ola Lilja <ola.o.lilja@stericsson.com> * for ST-Ericsson. * * License terms: @@ -1185,9 +1186,9 @@ static SOC_ENUM_SINGLE_DECL(soc_enum_bfifo19m2, static const char *enum_slavemaster[] = {"Slave", "Master"}; static SOC_ENUM_SINGLE_DECL(soc_enum_bfifomast, - REG_FIFOCONF3, REG_FIFOCONF3_BFIFOMAST, enum_slavemaster); + REG_FIFOCONF3, REG_FIFOCONF3_BFIFOMAST_SHIFT, enum_slavemaster); static SOC_ENUM_SINGLE_DECL(soc_enum_bfifoint, - REG_FIFOCONF3, REG_FIFOCONF3_BFIFORUN, enum_dis_ena); + REG_FIFOCONF3, REG_FIFOCONF3_BFIFORUN_SHIFT, enum_dis_ena); /* TODO: move to DAPM */ diff --git a/sound/soc/codecs/ab8500_audio.h b/sound/soc/codecs/ab8500_audio.h index f0658a807c4..40ec5e2baf2 100644 --- a/sound/soc/codecs/ab8500_audio.h +++ b/sound/soc/codecs/ab8500_audio.h @@ -2,7 +2,8 @@ * Copyright (C) ST-Ericsson SA 2010 * * Author: Mikko J. Lehto <mikko.lehto@symbio.com>, - * Mikko Sarmanne <mikko.sarmanne@symbio.com> + * Mikko Sarmanne <mikko.sarmanne@symbio.com>, + * Ola Lilja <ola.o.lilja@stericsson.com> * for ST-Ericsson. * * License terms: @@ -513,8 +514,8 @@ int ab8500_audio_setup_if1(struct snd_soc_codec *codec, #define REG_FIFOCONF3_BFIFOEXSL_MAX 0x5 #define REG_FIFOCONF3_PREBITCLK0_SHIFT 2 #define REG_FIFOCONF3_PREBITCLK0_MAX 0x7 -#define REG_FIFOCONF3_BFIFOMAST 0x02 -#define REG_FIFOCONF3_BFIFORUN 0x01 +#define REG_FIFOCONF3_BFIFOMAST_SHIFT 1 +#define REG_FIFOCONF3_BFIFORUN_SHIFT 0 /* REG_FIFOCONF4 */ #define REG_FIFOCONF4_BFIFOFRAMSW_SHIFT 0 diff --git a/sound/soc/ux500/ux500_ab8500.c b/sound/soc/ux500/ux500_ab8500.c index d2c0493aa5e..117f3aaad5d 100644 --- a/sound/soc/ux500/ux500_ab8500.c +++ b/sound/soc/ux500/ux500_ab8500.c @@ -3,7 +3,8 @@ * * Author: Mikko J. Lehto <mikko.lehto@symbio.com>, * Mikko Sarmanne <mikko.sarmanne@symbio.com>, - * Jarmo K. Kuronen <jarmo.kuronen@symbio.com> + * Jarmo K. Kuronen <jarmo.kuronen@symbio.com>. + * Ola Lilja <ola.o.lilja@stericsson.com> * for ST-Ericsson. * * License terms: |