diff options
| -rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 1fb4402bf72d..62cf231f34cb 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c | |||
| @@ -56,8 +56,7 @@ | |||
| 56 | #define GPIO31_DIR_OUTPUT 0x40 | 56 | #define GPIO31_DIR_OUTPUT 0x40 |
| 57 | 57 | ||
| 58 | /* Macrocell register definitions */ | 58 | /* Macrocell register definitions */ |
| 59 | #define AB8500_CTRL3_REG 0x0200 | 59 | #define AB8500_GPIO_DIR4_REG 0x13 /* Bank AB8500_MISC */ |
| 60 | #define AB8500_GPIO_DIR4_REG 0x1013 | ||
| 61 | 60 | ||
| 62 | /* Nr of FIR/IIR-coeff banks in ANC-block */ | 61 | /* Nr of FIR/IIR-coeff banks in ANC-block */ |
| 63 | #define AB8500_NR_OF_ANC_COEFF_BANKS 2 | 62 | #define AB8500_NR_OF_ANC_COEFF_BANKS 2 |
| @@ -1968,16 +1967,16 @@ static int ab8500_audio_setup_mics(struct snd_soc_codec *codec, | |||
| 1968 | dev_dbg(codec->dev, "%s: Enter.\n", __func__); | 1967 | dev_dbg(codec->dev, "%s: Enter.\n", __func__); |
| 1969 | 1968 | ||
| 1970 | /* Set DMic-clocks to outputs */ | 1969 | /* Set DMic-clocks to outputs */ |
| 1971 | status = abx500_get_register_interruptible(codec->dev, (u8)AB8500_MISC, | 1970 | status = abx500_get_register_interruptible(codec->dev, AB8500_MISC, |
| 1972 | (u8)AB8500_GPIO_DIR4_REG, | 1971 | AB8500_GPIO_DIR4_REG, |
| 1973 | &value8); | 1972 | &value8); |
| 1974 | if (status < 0) | 1973 | if (status < 0) |
| 1975 | return status; | 1974 | return status; |
| 1976 | value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT | | 1975 | value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT | |
| 1977 | GPIO31_DIR_OUTPUT; | 1976 | GPIO31_DIR_OUTPUT; |
| 1978 | status = abx500_set_register_interruptible(codec->dev, | 1977 | status = abx500_set_register_interruptible(codec->dev, |
| 1979 | (u8)AB8500_MISC, | 1978 | AB8500_MISC, |
| 1980 | (u8)AB8500_GPIO_DIR4_REG, | 1979 | AB8500_GPIO_DIR4_REG, |
| 1981 | value); | 1980 | value); |
| 1982 | if (status < 0) | 1981 | if (status < 0) |
| 1983 | return status; | 1982 | return status; |
