summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ssm4567.c
Commit message (Collapse)AuthorAgeFilesLines
* ASoC: ssm4567: Add sense supportLars-Peter Clausen2015-08-141-0/+21
| | | | | | | | | | | | | | The ssm4567 has sensing circuitry that can be used to monitor the current and voltage on the speaker amplifier output has well as the VBAT input. This data can be output over the I2S interface so it can be processed by a DSP or similar. This patch adds the sense capture output stream to the CODEC DAI as well as DAPM widgets that ensure that the sensing circuitry is powered up when the capture stream is active. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* Merge branch 'fix/ssm4567' of ↵Mark Brown2015-07-241-1/+7
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567
| * ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmtBen Zhang2015-07-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'topic/owner' of ↵Mark Brown2015-07-241-1/+0
|\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567 Conflicts: sound/soc/codecs/ssm4567.c
| * | ASoC: drivers: Drop owner assignment from i2c_driverKrzysztof Kozlowski2015-07-151-1/+0
| |/ | | | | | | | | | | | | | | i2c_driver does not need to set an owner because i2c_register_driver() will set it. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* | ASoC: ssm4567: Added ACPI entry for SSM4567 codecHarsha Priya2015-07-241-0/+12
|/ | | | | | | | | | | Added INT343B ACPI ID for the SSM4567 codec Signed-off-by: Harsha Priya <harshapriya.n@intel.com> Signed-off-by: M Naveen <naveen.m@intel.com> Signed-off-by: M R Sathya Prakash <sathya.prakash.m.r@intel.com> Acked-by: Anatol Pomozov <anatol.pomozov@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
*-. Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/ssm2518', ↵Mark Brown2015-06-051-1/+1
|\ \ | | | | | | | | | 'asoc/topic/ssm2602', 'asoc/topic/ssm4567' and 'asoc/topic/sta32x' into asoc-next
| | * ASoC: ssm4567: Replace direct snd_soc_codec dapm field accessLars-Peter Clausen2015-05-041-1/+1
| |/ | | | | | | | | | | | | | | | | The dapm field of the snd_soc_codec struct is eventually going to be removed, in preparation for this replace all manual access to codec->dapm.bias_level with snd_soc_codec_get_bias_level(). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* | ASoC: Move bias level update to the coreLars-Peter Clausen2015-04-271-6/+1
|/ | | | | | | | | All drivers have the same line at the end of the set_bias_level callback to update the bias_level state. Move this update into snd_soc_dapm_force_bias_level() and remove them from the drivers. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* ASoC: ssm4567: Add support for disabling the boost stageLars-Peter Clausen2014-11-061-0/+7
| | | | | | | | | This patch adds a switch to enable/disable boost stage of the output amplifier. Applications that know that they do not need the output amplifier boost stage can disable it to conserve a bit of power. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* ASoC: ssm4567: Add support for setting the DAI format and TDM configurationLars-Peter Clausen2014-11-061-0/+119
| | | | | | | | | The SSM4567 has support for a couple of different DAI formats. In TDM mode it is also possible to select the TDM slot. This patch adds support for this by implementing the set_fmt and set_tdm_slot callbacks. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* ASoC: ssm4567: Add DAC high-pass-filter controlLars-Peter Clausen2014-11-061-0/+2
| | | | | | | Add a switch which can be used to enable/disable the DAC high-pass-filter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* ASoC: ssm4567: Remove duplicated else-if branchAnatol Pomozov2014-10-021-2/+0
| | | | | | Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
* ASoC: ssm4567: Add driver for Analog Devices SSM4567 amplifierAnatol Pomozov2014-09-271-0/+345
Analog Devices SSM4567 is a boost class-D audio amplifier. Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
OpenPOWER on IntegriCloud