diff options
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 56da8ce1faf3..68356f2c78f8 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
@@ -686,6 +686,8 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, | |||
686 | if (mcasp->serial_dir[i] == TX_MODE && | 686 | if (mcasp->serial_dir[i] == TX_MODE && |
687 | tx_ser < max_active_serializers) { | 687 | tx_ser < max_active_serializers) { |
688 | mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AXR(i)); | 688 | mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AXR(i)); |
689 | mcasp_mod_bits(mcasp, DAVINCI_MCASP_XRSRCTL_REG(i), | ||
690 | DISMOD_LOW, DISMOD_MASK); | ||
689 | tx_ser++; | 691 | tx_ser++; |
690 | } else if (mcasp->serial_dir[i] == RX_MODE && | 692 | } else if (mcasp->serial_dir[i] == RX_MODE && |
691 | rx_ser < max_active_serializers) { | 693 | rx_ser < max_active_serializers) { |
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 79dc511180bf..a3be108a8c17 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h | |||
@@ -215,7 +215,10 @@ | |||
215 | * DAVINCI_MCASP_XRSRCTL_BASE_REG - Serializer Control Register Bits | 215 | * DAVINCI_MCASP_XRSRCTL_BASE_REG - Serializer Control Register Bits |
216 | */ | 216 | */ |
217 | #define MODE(val) (val) | 217 | #define MODE(val) (val) |
218 | #define DISMOD (val)(val<<2) | 218 | #define DISMOD_3STATE (0x0) |
219 | #define DISMOD_LOW (0x2 << 2) | ||
220 | #define DISMOD_HIGH (0x3 << 2) | ||
221 | #define DISMOD_MASK DISMOD_HIGH | ||
219 | #define TXSTATE BIT(4) | 222 | #define TXSTATE BIT(4) |
220 | #define RXSTATE BIT(5) | 223 | #define RXSTATE BIT(5) |
221 | #define SRMOD_MASK 3 | 224 | #define SRMOD_MASK 3 |