ASoC: jz4740-codec: Add dB information
Subsystems (3)
PATCH 1/3 ASoC: jz4740-codec: Add dB information
Add dB TLV ranges for the various volume controls.
Signed-off-by Lars-Peter Clausen <[email protected]>
--- sound/soc/codecs/jz4740.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-)
sound/soc/codecs/jz4740.c +19 -6
@@ -24,6 +24,7 @@#include <sound/pcm_params.h> #include <sound/initval.h> #include <sound/soc.h> +#include <sound/tlv.h> #define JZ4740_REG_CODEC_1 0x0#define JZ4740_REG_CODEC_2 0x1
@@ -95,15 +96,27 @@ static int jz4740_codec_write(struct snd_soc_codec *codec, unsigned int reg,return 0 ; } +static const unsigned int jz4740_mic_tlv[] = { +TLV_DB_RANGE_HEAD (2 ), +0 ,2 ,TLV_DB_SCALE_ITEM (0 ,600 ,0 ), +3 ,3 ,TLV_DB_SCALE_ITEM (2000 ,0 ,0 ), +}; + +static const DECLARE_TLV_DB_SCALE(jz4740_out_tlv, 0, 200, 0); +static const DECLARE_TLV_DB_SCALE(jz4740_in_tlv, -3450, 150, 0); +static const struct snd_kcontrol_new jz4740_codec_controls[] = { -SOC_SINGLE ("Master Playback Volume" ,JZ4740_REG_CODEC_2 , -JZ4740_CODEC_2_HEADPHONE_VOLUME_OFFSET ,3 ,0 ), -SOC_SINGLE ("Master Capture Volume" ,JZ4740_REG_CODEC_2 , -JZ4740_CODEC_2_INPUT_VOLUME_OFFSET ,31 ,0 ), +SOC_SINGLE_TLV ("Master Playback Volume" ,JZ4740_REG_CODEC_2 , +JZ4740_CODEC_2_HEADPHONE_VOLUME_OFFSET ,3 ,0 , + jz4740_out_tlv), +SOC_SINGLE_TLV ("Master Capture Volume" ,JZ4740_REG_CODEC_2 , +JZ4740_CODEC_2_INPUT_VOLUME_OFFSET ,31 ,0 , + jz4740_in_tlv),SOC_SINGLE ("Master Playback Switch" ,JZ4740_REG_CODEC_1 ,JZ4740_CODEC_1_HEADPHONE_DISABLE_OFFSET ,1 ,1 ), -SOC_SINGLE ("Mic Capture Volume" ,JZ4740_REG_CODEC_2 , -JZ4740_CODEC_2_MIC_BOOST_GAIN_OFFSET ,3 ,0 ), +SOC_SINGLE_TLV ("Mic Capture Volume" ,JZ4740_REG_CODEC_2 , +JZ4740_CODEC_2_MIC_BOOST_GAIN_OFFSET ,3 ,0 , + jz4740_mic_tlv), };static const struct snd_kcontrol_new jz4740_codec_output_controls[] = {
Signature · 1 line
1.7.2.5
PATCH 2/3 ASoC: jz4740-codec: Use devm_request_and_ioremap
Use devm_request_and_ioremap for requesting and mapping the IO region. This makes the code a bit smaller and simpler.
Signed-off-by Lars-Peter Clausen <[email protected]>
--- sound/soc/codecs/jz4740.c | 41 ++++------------------------------------- 1 files changed, 4 insertions(+), 37 deletions(-)
sound/soc/codecs/jz4740.c +4 -37
@@ -74,7 +74,6 @@ static const uint32_t jz4740_codec_regs[] = {struct jz4740_codec {void __iomem *base; -struct resource *mem; }; static unsigned int jz4740_codec_read(struct snd_soc_codec *codec,
@@ -371,56 +370,24 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev)return -ENOMEM ; mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!mem) { -dev_err (&pdev->dev,"Failed to get mmio memory resource\n" ); - ret = -ENOENT ; - goto err_out; - } - - mem =request_mem_region (mem->start,resource_size (mem), pdev->name); -if (!mem) { -dev_err (&pdev->dev,"Failed to request mmio memory region\n" ); - ret = -EBUSY ; - goto err_out; - } - - jz4740_codec->base =ioremap (mem->start,resource_size (mem)); -if (!jz4740_codec->base) { -dev_err (&pdev->dev,"Failed to ioremap mmio memory\n" ); - ret = -EBUSY ; - goto err_release_mem_region; - } - jz4740_codec->mem = mem; + jz4740_codec->base =devm_request_and_ioremap (&pdev->dev, mem); +if (!jz4740_codec->base) +return -EBUSY ;platform_set_drvdata (pdev, jz4740_codec); ret =snd_soc_register_codec (&pdev->dev, &soc_codec_dev_jz4740_codec, &jz4740_codec_dai,1 ); -if (ret) { +if (ret)dev_err (&pdev->dev,"Failed to register codec\n" ); - goto err_iounmap; - } - -return 0 ; -err_iounmap: -iounmap (jz4740_codec->base); -err_release_mem_region: -release_mem_region (mem->start,resource_size (mem)); -err_out:return ret; } static int __devexit jz4740_codec_remove(struct platform_device *pdev) { -struct jz4740_codec *jz4740_codec =platform_get_drvdata (pdev); -struct resource *mem = jz4740_codec->mem; -snd_soc_unregister_codec (&pdev->dev); -iounmap (jz4740_codec->base); -release_mem_region (mem->start,resource_size (mem)); -platform_set_drvdata (pdev,NULL );return 0 ;
Signature · 1 line
1.7.2.5
PATCH 3/3 ASoC: jz4740-codec: Use regmap
In reply to Lars-Peter ClausenUse regmap-mmio instead of open-coding caching and register accessors.
Signed-off-by Lars-Peter Clausen <[email protected]>
--- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/jz4740.c | 86 +++++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 45 deletions(-)
sound/soc/codecs/Kconfig +1 -0
@@ -237,6 +237,7 @@ config SND_SOC_CX20442 tristate config SND_SOC_JZ4740_CODEC + select REGMAP_MMIO tristate config SND_SOC_L3
sound/soc/codecs/jz4740.c +41 -45
192 lines not on this page · raw message
Signature · 1 line
1.7.2.5
Mark Brown
AppliedQuoted 1 line · Lars-Peter Clausen
Add dB TLV ranges for the various volume controls.
Applied all, thanks.