BMC/Intel-BMC/linux.git/sound/soc/codecs, branch devIntel OpenBMC Linux kernel source tree (mirror)https://git.radix-linux.su/BMC/Intel-BMC/linux.git/atom?h=dev2015-08-06T11:39:07+00:00Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/intel' and 'asoc/fix/topology' into asoc-linus2015-08-06T11:39:07+00:00Mark Brownbroonie@kernel.org2015-08-06T11:39:07+00:00urn:sha1:d00a9e02178401433fc386e69c936f2039f07b57Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus2015-08-06T11:39:07+00:00Mark Brownbroonie@kernel.org2015-08-06T11:39:07+00:00urn:sha1:78be55af0d6092dd7ec19c0c7b2f381383af1a95ASoC: rt5645: Fix lost pin setting for DMIC12015-08-03T16:02:45+00:00Bard Liaobardliao@realtek.com2015-08-03T04:17:39+00:00urn:sha1:a094935e4ebdf5c22c45b8aeeb2d88e9e8c53dbf
I2S2_DAC pin can be used for I2S or GPIO. We should set it as GPIO
if we use GPIO5 as DMIC1 data pin.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
ASoC: cs4265: Fix setting dai format for Left/Right Justified2015-07-24T17:30:46+00:00Axel Linaxel.lin@ingics.com2015-07-19T04:09:16+00:00urn:sha1:bffc4496886683fac86d31e5d0cf9a22f8044e3d
The settings in current code does not match the datasheet, fix it.
DAC Control - Address 03h
DAC Digital Interface Format (Bits 5:4)
DAC_DIF1 DAC_DIF0 Description
0 0 Left Justified, up to 24-bit data (default)
0 1 I²S, up to 24-bit data
1 0 Right-Justified, 16-bit Data
1 1 Right-Justified, 24-bit Data
Transmitter Control 2 - Address 12h
Transmitter Digital Interface Format (Bits 7:6)
Tx_DIF1 Tx_DIF0 Description Format Figure
0 0 Left Justified, up to 24-bit data (default)
0 1 I²S, up to 24-bit data
1 0 Right-Justified, 16-bit Data
1 1 Right-Justified, 24-bit Data
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Merge remote-tracking branches 'asoc/fix/sgtl5000', 'asoc/fix/topology' and 'asoc/fix/zx' into asoc-linus2015-07-24T15:18:22+00:00Mark Brownbroonie@kernel.org2015-07-24T15:18:22+00:00urn:sha1:996034b117b467709dec7811ef134063934fa626Merge remote-tracking branch 'asoc/fix/ssm4567' into asoc-linus2015-07-24T15:18:19+00:00Mark Brownbroonie@kernel.org2015-07-24T15:18:19+00:00urn:sha1:5c851ba4d5d23baff8766a2f176d7feaaae3b694Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus2015-07-24T15:18:19+00:00Mark Brownbroonie@kernel.org2015-07-24T15:18:19+00:00urn:sha1:51126f60491ab1a4952e2a2e93579c9b1deee9d2ASoC: pcm1681: Fix setting de-emphasis sampling rate selection2015-07-24T10:34:58+00:00Axel Linaxel.lin@ingics.com2015-07-23T15:22:26+00:00urn:sha1:fa8173a3ef0570affde7da352de202190b3786c2
The de-emphasis sampling rate selection is controlled by BIT[3:4] of
PCM1681_DEEMPH_CONTROL register. Do proper left shift to set it.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Marek Belisko <marek.belisko@streamunlimited.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt2015-07-22T09:54:22+00:00Ben Zhangbenzh@chromium.org2015-07-21T21:46:26+00:00urn:sha1:a6c2a32ac83567f15e9af3dcbc73148ce68b2ced
The regmap_write in ssm4567_set_dai_fmt accidentally clears the
TDM_BCLKS field which was set earlier by ssm4567_set_tdm_slot.
This patch fixes it by using regmap_update_bits with proper mask.
Signed-off-by: Ben Zhang <benzh@chromium.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
ASoC: sgtl5000: Fix up define for SGTL5000_SMALL_POP2015-07-22T09:49:02+00:00Axel Linaxel.lin@ingics.com2015-07-22T03:27:45+00:00urn:sha1:b101acfabc9377469af3abfb7cb63112da367284
Currently, below code actually does not update any bit because
SGTL5000_SMALL_POP is 0.
snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL, SGTL5000_SMALL_POP, 1);
The SGTL5000_SMALL_POP should be BIT(0) rather than 0, fix it.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-By: Alexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: Mark Brown <broonie@kernel.org>