ASoC: wm8996: Remove write sequencer registers from the defaults table
Subsystems (3)
PATCH 1/8 ASoC: wm8996: Remove write sequencer registers from the defaults table
They aren't marked as readable and the feature is never used so they'll never get referenced.
--- sound/soc/codecs/wm8996.c | 178 --------------------------------------------- 1 file changed, 178 deletions(-)
sound/soc/codecs/wm8996.c +0 -178
@@ -296,184 +296,6 @@ static struct reg_default wm8996_reg[] = { { WM8996_RIGHT_PDM_SPEAKER, 0x1 }, { WM8996_PDM_SPEAKER_MUTE_SEQUENCE, 0x69 }, { WM8996_PDM_SPEAKER_VOLUME, 0x66 }, - { WM8996_WRITE_SEQUENCER_0, 0x1 }, - { WM8996_WRITE_SEQUENCER_1, 0x1 }, - { WM8996_WRITE_SEQUENCER_3, 0x6 }, - { WM8996_WRITE_SEQUENCER_4, 0x40 }, - { WM8996_WRITE_SEQUENCER_5, 0x1 }, - { WM8996_WRITE_SEQUENCER_6, 0xf }, - { WM8996_WRITE_SEQUENCER_7, 0x6 }, - { WM8996_WRITE_SEQUENCER_8, 0x1 }, - { WM8996_WRITE_SEQUENCER_9, 0x3 }, - { WM8996_WRITE_SEQUENCER_10, 0x104 }, - { WM8996_WRITE_SEQUENCER_12, 0x60 }, - { WM8996_WRITE_SEQUENCER_13, 0x11 }, - { WM8996_WRITE_SEQUENCER_14, 0x401 }, - { WM8996_WRITE_SEQUENCER_16, 0x50 }, - { WM8996_WRITE_SEQUENCER_17, 0x3 }, - { WM8996_WRITE_SEQUENCER_18, 0x100 }, - { WM8996_WRITE_SEQUENCER_20, 0x51 }, - { WM8996_WRITE_SEQUENCER_21, 0x3 }, - { WM8996_WRITE_SEQUENCER_22, 0x104 }, - { WM8996_WRITE_SEQUENCER_23, 0xa }, - { WM8996_WRITE_SEQUENCER_24, 0x60 }, - { WM8996_WRITE_SEQUENCER_25, 0x3b }, - { WM8996_WRITE_SEQUENCER_26, 0x502 }, - { WM8996_WRITE_SEQUENCER_27, 0x100 }, - { WM8996_WRITE_SEQUENCER_28, 0x2fff }, - { WM8996_WRITE_SEQUENCER_32, 0x2fff }, - { WM8996_WRITE_SEQUENCER_36, 0x2fff }, - { WM8996_WRITE_SEQUENCER_40, 0x2fff }, - { WM8996_WRITE_SEQUENCER_44, 0x2fff }, - { WM8996_WRITE_SEQUENCER_48, 0x2fff }, - { WM8996_WRITE_SEQUENCER_52, 0x2fff }, - { WM8996_WRITE_SEQUENCER_56, 0x2fff }, - { WM8996_WRITE_SEQUENCER_60, 0x2fff }, - { WM8996_WRITE_SEQUENCER_64, 0x1 }, - { WM8996_WRITE_SEQUENCER_65, 0x1 }, - { WM8996_WRITE_SEQUENCER_67, 0x6 }, - { WM8996_WRITE_SEQUENCER_68, 0x40 }, - { WM8996_WRITE_SEQUENCER_69, 0x1 }, - { WM8996_WRITE_SEQUENCER_70, 0xf }, - { WM8996_WRITE_SEQUENCER_71, 0x6 }, - { WM8996_WRITE_SEQUENCER_72, 0x1 }, - { WM8996_WRITE_SEQUENCER_73, 0x3 }, - { WM8996_WRITE_SEQUENCER_74, 0x104 }, - { WM8996_WRITE_SEQUENCER_76, 0x60 }, - { WM8996_WRITE_SEQUENCER_77, 0x11 }, - { WM8996_WRITE_SEQUENCER_78, 0x401 }, - { WM8996_WRITE_SEQUENCER_80, 0x50 }, - { WM8996_WRITE_SEQUENCER_81, 0x3 }, - { WM8996_WRITE_SEQUENCER_82, 0x100 }, - { WM8996_WRITE_SEQUENCER_84, 0x60 }, - { WM8996_WRITE_SEQUENCER_85, 0x3b }, - { WM8996_WRITE_SEQUENCER_86, 0x502 }, - { WM8996_WRITE_SEQUENCER_87, 0x100 }, - { WM8996_WRITE_SEQUENCER_88, 0x2fff }, - { WM8996_WRITE_SEQUENCER_92, 0x2fff }, - { WM8996_WRITE_SEQUENCER_96, 0x2fff }, - { WM8996_WRITE_SEQUENCER_100, 0x2fff }, - { WM8996_WRITE_SEQUENCER_104, 0x2fff }, - { WM8996_WRITE_SEQUENCER_108, 0x2fff }, - { WM8996_WRITE_SEQUENCER_112, 0x2fff }, - { WM8996_WRITE_SEQUENCER_116, 0x2fff }, - { WM8996_WRITE_SEQUENCER_120, 0x2fff }, - { WM8996_WRITE_SEQUENCER_124, 0x2fff }, - { WM8996_WRITE_SEQUENCER_128, 0x1 }, - { WM8996_WRITE_SEQUENCER_129, 0x1 }, - { WM8996_WRITE_SEQUENCER_131, 0x6 }, - { WM8996_WRITE_SEQUENCER_132, 0x40 }, - { WM8996_WRITE_SEQUENCER_133, 0x1 }, - { WM8996_WRITE_SEQUENCER_134, 0xf }, - { WM8996_WRITE_SEQUENCER_135, 0x6 }, - { WM8996_WRITE_SEQUENCER_136, 0x1 }, - { WM8996_WRITE_SEQUENCER_137, 0x3 }, - { WM8996_WRITE_SEQUENCER_138, 0x106 }, - { WM8996_WRITE_SEQUENCER_140, 0x61 }, - { WM8996_WRITE_SEQUENCER_141, 0x11 }, - { WM8996_WRITE_SEQUENCER_142, 0x401 }, - { WM8996_WRITE_SEQUENCER_144, 0x50 }, - { WM8996_WRITE_SEQUENCER_145, 0x3 }, - { WM8996_WRITE_SEQUENCER_146, 0x102 }, - { WM8996_WRITE_SEQUENCER_148, 0x51 }, - { WM8996_WRITE_SEQUENCER_149, 0x3 }, - { WM8996_WRITE_SEQUENCER_150, 0x106 }, - { WM8996_WRITE_SEQUENCER_151, 0xa }, - { WM8996_WRITE_SEQUENCER_152, 0x61 }, - { WM8996_WRITE_SEQUENCER_153, 0x3b }, - { WM8996_WRITE_SEQUENCER_154, 0x502 }, - { WM8996_WRITE_SEQUENCER_155, 0x100 }, - { WM8996_WRITE_SEQUENCER_156, 0x2fff }, - { WM8996_WRITE_SEQUENCER_160, 0x2fff }, - { WM8996_WRITE_SEQUENCER_164, 0x2fff }, - { WM8996_WRITE_SEQUENCER_168, 0x2fff }, - { WM8996_WRITE_SEQUENCER_172, 0x2fff }, - { WM8996_WRITE_SEQUENCER_176, 0x2fff }, - { WM8996_WRITE_SEQUENCER_180, 0x2fff }, - { WM8996_WRITE_SEQUENCER_184, 0x2fff }, - { WM8996_WRITE_SEQUENCER_188, 0x2fff }, - { WM8996_WRITE_SEQUENCER_192, 0x1 }, - { WM8996_WRITE_SEQUENCER_193, 0x1 }, - { WM8996_WRITE_SEQUENCER_195, 0x6 }, - { WM8996_WRITE_SEQUENCER_196, 0x40 }, - { WM8996_WRITE_SEQUENCER_197, 0x1 }, - { WM8996_WRITE_SEQUENCER_198, 0xf }, - { WM8996_WRITE_SEQUENCER_199, 0x6 }, - { WM8996_WRITE_SEQUENCER_200, 0x1 }, - { WM8996_WRITE_SEQUENCER_201, 0x3 }, - { WM8996_WRITE_SEQUENCER_202, 0x106 }, - { WM8996_WRITE_SEQUENCER_204, 0x61 }, - { WM8996_WRITE_SEQUENCER_205, 0x11 }, - { WM8996_WRITE_SEQUENCER_206, 0x401 }, - { WM8996_WRITE_SEQUENCER_208, 0x50 }, - { WM8996_WRITE_SEQUENCER_209, 0x3 }, - { WM8996_WRITE_SEQUENCER_210, 0x102 }, - { WM8996_WRITE_SEQUENCER_212, 0x61 }, - { WM8996_WRITE_SEQUENCER_213, 0x3b }, - { WM8996_WRITE_SEQUENCER_214, 0x502 }, - { WM8996_WRITE_SEQUENCER_215, 0x100 }, - { WM8996_WRITE_SEQUENCER_216, 0x2fff }, - { WM8996_WRITE_SEQUENCER_220, 0x2fff }, - { WM8996_WRITE_SEQUENCER_224, 0x2fff }, - { WM8996_WRITE_SEQUENCER_228, 0x2fff }, - { WM8996_WRITE_SEQUENCER_232, 0x2fff }, - { WM8996_WRITE_SEQUENCER_236, 0x2fff }, - { WM8996_WRITE_SEQUENCER_240, 0x2fff }, - { WM8996_WRITE_SEQUENCER_244, 0x2fff }, - { WM8996_WRITE_SEQUENCER_248, 0x2fff }, - { WM8996_WRITE_SEQUENCER_252, 0x2fff }, - { WM8996_WRITE_SEQUENCER_256, 0x60 }, - { WM8996_WRITE_SEQUENCER_258, 0x601 }, - { WM8996_WRITE_SEQUENCER_260, 0x50 }, - { WM8996_WRITE_SEQUENCER_262, 0x100 }, - { WM8996_WRITE_SEQUENCER_264, 0x1 }, - { WM8996_WRITE_SEQUENCER_266, 0x104 }, - { WM8996_WRITE_SEQUENCER_267, 0x100 }, - { WM8996_WRITE_SEQUENCER_268, 0x2fff }, - { WM8996_WRITE_SEQUENCER_272, 0x2fff }, - { WM8996_WRITE_SEQUENCER_276, 0x2fff }, - { WM8996_WRITE_SEQUENCER_280, 0x2fff }, - { WM8996_WRITE_SEQUENCER_284, 0x2fff }, - { WM8996_WRITE_SEQUENCER_288, 0x2fff }, - { WM8996_WRITE_SEQUENCER_292, 0x2fff }, - { WM8996_WRITE_SEQUENCER_296, 0x2fff }, - { WM8996_WRITE_SEQUENCER_300, 0x2fff }, - { WM8996_WRITE_SEQUENCER_304, 0x2fff }, - { WM8996_WRITE_SEQUENCER_308, 0x2fff }, - { WM8996_WRITE_SEQUENCER_312, 0x2fff }, - { WM8996_WRITE_SEQUENCER_316, 0x2fff }, - { WM8996_WRITE_SEQUENCER_320, 0x61 }, - { WM8996_WRITE_SEQUENCER_322, 0x601 }, - { WM8996_WRITE_SEQUENCER_324, 0x50 }, - { WM8996_WRITE_SEQUENCER_326, 0x102 }, - { WM8996_WRITE_SEQUENCER_328, 0x1 }, - { WM8996_WRITE_SEQUENCER_330, 0x106 }, - { WM8996_WRITE_SEQUENCER_331, 0x100 }, - { WM8996_WRITE_SEQUENCER_332, 0x2fff }, - { WM8996_WRITE_SEQUENCER_336, 0x2fff }, - { WM8996_WRITE_SEQUENCER_340, 0x2fff }, - { WM8996_WRITE_SEQUENCER_344, 0x2fff }, - { WM8996_WRITE_SEQUENCER_348, 0x2fff }, - { WM8996_WRITE_SEQUENCER_352, 0x2fff }, - { WM8996_WRITE_SEQUENCER_356, 0x2fff }, - { WM8996_WRITE_SEQUENCER_360, 0x2fff }, - { WM8996_WRITE_SEQUENCER_364, 0x2fff }, - { WM8996_WRITE_SEQUENCER_368, 0x2fff }, - { WM8996_WRITE_SEQUENCER_372, 0x2fff }, - { WM8996_WRITE_SEQUENCER_376, 0x2fff }, - { WM8996_WRITE_SEQUENCER_380, 0x2fff }, - { WM8996_WRITE_SEQUENCER_384, 0x60 }, - { WM8996_WRITE_SEQUENCER_386, 0x601 }, - { WM8996_WRITE_SEQUENCER_388, 0x61 }, - { WM8996_WRITE_SEQUENCER_390, 0x601 }, - { WM8996_WRITE_SEQUENCER_392, 0x50 }, - { WM8996_WRITE_SEQUENCER_394, 0x300 }, - { WM8996_WRITE_SEQUENCER_396, 0x1 }, - { WM8996_WRITE_SEQUENCER_398, 0x304 }, - { WM8996_WRITE_SEQUENCER_400, 0x40 }, - { WM8996_WRITE_SEQUENCER_402, 0xf }, - { WM8996_WRITE_SEQUENCER_404, 0x1 }, - { WM8996_WRITE_SEQUENCER_407, 0x100 }, }; static const DECLARE_TLV_DB_SCALE(inpga_tlv, 0, 100, 0);
Signature · 1 line
1.7.10
PATCH 2/8 ASoC: wm8996: Remove spurious regulator_bulk_free()
We're using demv_regulator_bulk_get() so don't need to manually free and this is in the CODEC driver not the I2C driver anyway.
--- sound/soc/codecs/wm8996.c | 1 - 1 file changed, 1 deletion(-)
sound/soc/codecs/wm8996.c +0 -1
@@ -2873,7 +2873,6 @@ static int wm8996_remove(struct snd_soc_codec *codec)for (i =0 ; i <ARRAY_SIZE (wm8996->supplies); i++)regulator_unregister_notifier (wm8996->supplies[i].consumer, &wm8996->disable_nb[i]); -regulator_bulk_free (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);return 0 ; }
Signature · 1 line
1.7.10
PATCH 3/8 ASoC: wm8996: Move reset before the initial regulator disable
In reply to Mark BrownIf we don't have control over the LDO but do have control over the other regulators then we may end up trying to write to a powered off device.
--- sound/soc/codecs/wm8996.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8996.c +2 -2
@@ -3027,14 +3027,14 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,dev_info (&i2c->dev,"revision %c\n" , (reg &WM8996_CHIP_REV_MASK ) +'A' ); -regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies); - ret =wm8996_reset (wm8996);if (ret <0 ) {dev_err (&i2c->dev,"Failed to issue reset\n" ); goto err_regmap; } +regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies); +wm8996_init_gpio (wm8996); ret = snd_soc_register_codec(&i2c->dev,
Signature · 1 line
1.7.10
PATCH 4/8 ASoC: wm8996: Mark the CODEC as cache only when powering off on boot
In reply to Mark BrownOtherwise we might try to write to a powered off device.
--- sound/soc/codecs/wm8996.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wm8996.c +1 -2
@@ -2659,8 +2659,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) } } -regcache_cache_only (codec->control_data, true); -/* Apply platform data settings */ snd_soc_update_bits(codec, WM8996_LINE_INPUT_CONTROL, WM8996_INL_MODE_MASK | WM8996_INR_MODE_MASK,
@@ -3033,6 +3031,7 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, goto err_regmap; } +regcache_cache_only (wm8996->regmap, true);regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);wm8996_init_gpio (wm8996);
Signature · 1 line
1.7.10
PATCH 5/8 ASoC: wm8996: Convert to devm_regmap_init_i2c()
In reply to Mark Brown--- sound/soc/codecs/wm8996.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/codecs/wm8996.c +1 -3
@@ -2997,7 +2997,7 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,msleep (5 ); } - wm8996->regmap =regmap_init_i2c (i2c, &wm8996_regmap); + wm8996->regmap =devm_regmap_init_i2c (i2c, &wm8996_regmap);if (IS_ERR (wm8996->regmap)) { ret =PTR_ERR (wm8996->regmap);dev_err (&i2c->dev,"regmap_init() failed: %d\n" , ret);
@@ -3047,7 +3047,6 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, err_gpiolib:wm8996_free_gpio (wm8996); err_regmap: -regmap_exit (wm8996->regmap); err_enable:if (wm8996->pdata.ldo_ena >0 )gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 );
@@ -3066,7 +3065,6 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client)snd_soc_unregister_codec (&client->dev);wm8996_free_gpio (wm8996); -regmap_exit (wm8996->regmap);if (wm8996->pdata.ldo_ena >0 ) {gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 );gpio_free (wm8996->pdata.ldo_ena);
Signature · 1 line
1.7.10
PATCH 6/8 ASoC: wm8996: Move regulator notifier callbacks into I2C level
In reply to Mark BrownNow that we're using regmap the cache is available here.
--- sound/soc/codecs/wm8996.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)
sound/soc/codecs/wm8996.c +20 -21
@@ -2644,21 +2644,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) goto err; } - wm8996->disable_nb[0 ].notifier_call = wm8996_regulator_event_0; - wm8996->disable_nb[1 ].notifier_call = wm8996_regulator_event_1; - wm8996->disable_nb[2 ].notifier_call = wm8996_regulator_event_2; - -/* This should really be moved into the regulator core */ -for (i =0 ; i <ARRAY_SIZE (wm8996->supplies); i++) { - ret =regulator_register_notifier (wm8996->supplies[i].consumer, - &wm8996->disable_nb[i]); -if (ret !=0 ) { -dev_err (codec->dev, -"Failed to register regulator notifier: %d\n" , - ret); - } - } -/* Apply platform data settings */ snd_soc_update_bits(codec, WM8996_LINE_INPUT_CONTROL, WM8996_INL_MODE_MASK | WM8996_INR_MODE_MASK,
@@ -2858,9 +2843,7 @@ err:static int wm8996_remove (struct snd_soc_codec *codec) { -struct wm8996_priv *wm8996 =snd_soc_codec_get_drvdata (codec);struct i2c_client *i2c =to_i2c_client (codec->dev); -int i;snd_soc_update_bits (codec,WM8996_INTERRUPT_CONTROL ,WM8996_IM_IRQ ,WM8996_IM_IRQ );
@@ -2868,10 +2851,6 @@ static int wm8996_remove(struct snd_soc_codec *codec)if (i2c->irq)free_irq (i2c->irq, codec); -for (i =0 ; i <ARRAY_SIZE (wm8996->supplies); i++) -regulator_unregister_notifier (wm8996->supplies[i].consumer, - &wm8996->disable_nb[i]); -return 0 ; }
@@ -2985,6 +2964,21 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, goto err_gpio; } + wm8996->disable_nb[0 ].notifier_call = wm8996_regulator_event_0; + wm8996->disable_nb[1 ].notifier_call = wm8996_regulator_event_1; + wm8996->disable_nb[2 ].notifier_call = wm8996_regulator_event_2; + +/* This should really be moved into the regulator core */ +for (i =0 ; i <ARRAY_SIZE (wm8996->supplies); i++) { + ret =regulator_register_notifier (wm8996->supplies[i].consumer, + &wm8996->disable_nb[i]); +if (ret !=0 ) { +dev_err (&i2c->dev, +"Failed to register regulator notifier: %d\n" , + ret); + } + } + ret =regulator_bulk_enable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);if (ret !=0 ) {
@@ -3062,6 +3056,7 @@ err: static __devexit int wm8996_i2c_remove(struct i2c_client *client) {struct wm8996_priv *wm8996 =i2c_get_clientdata (client); +int i;snd_soc_unregister_codec (&client->dev);wm8996_free_gpio (wm8996);
@@ -3069,6 +3064,10 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client)gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 );gpio_free (wm8996->pdata.ldo_ena); } +for (i =0 ; i <ARRAY_SIZE (wm8996->supplies); i++) +regulator_unregister_notifier (wm8996->supplies[i].consumer, + &wm8996->disable_nb[i]); +return 0 ; }
Signature · 1 line
1.7.10
PATCH 7/8 ASoC: wm8996: Inline wm8996_reset() and optimise cache-only usage
In reply to Mark BrownThere is only one caller and this allows us to cleanly leave the CODEC with the internal LDO powered down which is the default state we're looking for and means that we can robustly disable the register cache only when we either disable the LDO or power down the external regulators.
--- sound/soc/codecs/wm8996.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)
sound/soc/codecs/wm8996.c +13 -18
@@ -1528,18 +1528,6 @@ static bool wm8996_volatile_register(struct device *dev, unsigned int reg) } } -static int wm8996_reset (struct wm8996_priv *wm8996) -{ -if (wm8996->pdata.ldo_ena >0 ) { -gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 ); -gpio_set_value_cansleep (wm8996->pdata.ldo_ena,1 ); -return 0 ; - }else { -return regmap_write (wm8996->regmap,WM8996_SOFTWARE_RESET , -0x8915 ); - } -} -static const int bclk_divs[] = {1 ,2 ,3 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 ,64 ,96 };
@@ -1631,8 +1619,10 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_OFF :regcache_cache_only (codec->control_data, true); -if (wm8996->pdata.ldo_ena >=0 ) +if (wm8996->pdata.ldo_ena >=0 ) {gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 ); +regcache_cache_only (codec->control_data, true); + }regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);break ;
@@ -3019,13 +3009,18 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,dev_info (&i2c->dev,"revision %c\n" , (reg &WM8996_CHIP_REV_MASK ) +'A' ); - ret =wm8996_reset (wm8996); -if (ret <0 ) { -dev_err (&i2c->dev,"Failed to issue reset\n" ); - goto err_regmap; +if (wm8996->pdata.ldo_ena >0 ) { +gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 ); +regcache_cache_only (wm8996->regmap, true); + }else { + ret =regmap_write (wm8996->regmap,WM8996_SOFTWARE_RESET , +0x8915 ); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to issue reset: %d\n" , ret); + goto err_regmap; + } } -regcache_cache_only (wm8996->regmap, true);regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);wm8996_init_gpio (wm8996);
Signature · 1 line
1.7.10
PATCH 8/8 ASoC: wm8996: Move register default configuration to I2C probe
In reply to Mark BrownThis gets the registers set up as early as possible, mainly useful for the GPIOs to ensure that they're in the correct mode.
--- sound/soc/codecs/wm8996.c | 331 ++++++++++++++++++++++++--------------------- 1 file changed, 180 insertions(+), 151 deletions(-)
sound/soc/codecs/wm8996.c +180 -151
@@ -2619,7 +2619,7 @@ static int wm8996_probe(struct snd_soc_codec *codec)int ret;struct wm8996_priv *wm8996 =snd_soc_codec_get_drvdata (codec);struct i2c_client *i2c =to_i2c_client (codec->dev); -int i, irq_flags; +int irq_flags; wm8996->codec = codec;
@@ -2634,162 +2634,12 @@ static int wm8996_probe(struct snd_soc_codec *codec) goto err; } -/* Apply platform data settings */ -snd_soc_update_bits (codec,WM8996_LINE_INPUT_CONTROL , -WM8996_INL_MODE_MASK |WM8996_INR_MODE_MASK , - wm8996->pdata.inl_mode <<WM8996_INL_MODE_SHIFT | - wm8996->pdata.inr_mode); - -for (i =0 ; i <ARRAY_SIZE (wm8996->pdata.gpio_default); i++) { -if (!wm8996->pdata.gpio_default[i]) -continue ; - -snd_soc_write (codec,WM8996_GPIO_1 + i, - wm8996->pdata.gpio_default[i] &0xffff ); - } - -if (wm8996->pdata.spkmute_seq) -snd_soc_update_bits (codec,WM8996_PDM_SPEAKER_MUTE_SEQUENCE , -WM8996_SPK_MUTE_ENDIAN | -WM8996_SPK_MUTE_SEQ1_MASK , - wm8996->pdata.spkmute_seq); - -snd_soc_update_bits (codec,WM8996_ACCESSORY_DETECT_MODE_2 , -WM8996_MICD_BIAS_SRC |WM8996_HPOUT1FB_SRC | -WM8996_MICD_SRC , wm8996->pdata.micdet_def); - -/* Latch volume update bits */ -snd_soc_update_bits (codec,WM8996_LEFT_LINE_INPUT_VOLUME , -WM8996_IN1_VU ,WM8996_IN1_VU ); -snd_soc_update_bits (codec,WM8996_RIGHT_LINE_INPUT_VOLUME , -WM8996_IN1_VU ,WM8996_IN1_VU ); - -snd_soc_update_bits (codec,WM8996_DAC1_LEFT_VOLUME , -WM8996_DAC1_VU ,WM8996_DAC1_VU ); -snd_soc_update_bits (codec,WM8996_DAC1_RIGHT_VOLUME , -WM8996_DAC1_VU ,WM8996_DAC1_VU ); -snd_soc_update_bits (codec,WM8996_DAC2_LEFT_VOLUME , -WM8996_DAC2_VU ,WM8996_DAC2_VU ); -snd_soc_update_bits (codec,WM8996_DAC2_RIGHT_VOLUME , -WM8996_DAC2_VU ,WM8996_DAC2_VU ); - -snd_soc_update_bits (codec,WM8996_OUTPUT1_LEFT_VOLUME , -WM8996_DAC1_VU ,WM8996_DAC1_VU ); -snd_soc_update_bits (codec,WM8996_OUTPUT1_RIGHT_VOLUME , -WM8996_DAC1_VU ,WM8996_DAC1_VU ); -snd_soc_update_bits (codec,WM8996_OUTPUT2_LEFT_VOLUME , -WM8996_DAC2_VU ,WM8996_DAC2_VU ); -snd_soc_update_bits (codec,WM8996_OUTPUT2_RIGHT_VOLUME , -WM8996_DAC2_VU ,WM8996_DAC2_VU ); - -snd_soc_update_bits (codec,WM8996_DSP1_TX_LEFT_VOLUME , -WM8996_DSP1TX_VU ,WM8996_DSP1TX_VU ); -snd_soc_update_bits (codec,WM8996_DSP1_TX_RIGHT_VOLUME , -WM8996_DSP1TX_VU ,WM8996_DSP1TX_VU ); -snd_soc_update_bits (codec,WM8996_DSP2_TX_LEFT_VOLUME , -WM8996_DSP2TX_VU ,WM8996_DSP2TX_VU ); -snd_soc_update_bits (codec,WM8996_DSP2_TX_RIGHT_VOLUME , -WM8996_DSP2TX_VU ,WM8996_DSP2TX_VU ); - -snd_soc_update_bits (codec,WM8996_DSP1_RX_LEFT_VOLUME , -WM8996_DSP1RX_VU ,WM8996_DSP1RX_VU ); -snd_soc_update_bits (codec,WM8996_DSP1_RX_RIGHT_VOLUME , -WM8996_DSP1RX_VU ,WM8996_DSP1RX_VU ); -snd_soc_update_bits (codec,WM8996_DSP2_RX_LEFT_VOLUME , -WM8996_DSP2RX_VU ,WM8996_DSP2RX_VU ); -snd_soc_update_bits (codec,WM8996_DSP2_RX_RIGHT_VOLUME , -WM8996_DSP2RX_VU ,WM8996_DSP2RX_VU ); - -/* No support currently for the underclocked TDM modes and -* pick a default TDM layout with each channel pair working with -* slots 0 and 1. */ -snd_soc_update_bits (codec,WM8996_AIF1RX_CHANNEL_0_CONFIGURATION , -WM8996_AIF1RX_CHAN0_SLOTS_MASK | -WM8996_AIF1RX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1RX_CHAN0_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1RX_CHANNEL_1_CONFIGURATION , -WM8996_AIF1RX_CHAN1_SLOTS_MASK | -WM8996_AIF1RX_CHAN1_START_SLOT_MASK , -1 <<WM8996_AIF1RX_CHAN1_SLOTS_SHIFT |1 ); -snd_soc_update_bits (codec,WM8996_AIF1RX_CHANNEL_2_CONFIGURATION , -WM8996_AIF1RX_CHAN2_SLOTS_MASK | -WM8996_AIF1RX_CHAN2_START_SLOT_MASK , -1 <<WM8996_AIF1RX_CHAN2_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1RX_CHANNEL_3_CONFIGURATION , -WM8996_AIF1RX_CHAN3_SLOTS_MASK | -WM8996_AIF1RX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1RX_CHAN3_SLOTS_SHIFT |1 ); -snd_soc_update_bits (codec,WM8996_AIF1RX_CHANNEL_4_CONFIGURATION , -WM8996_AIF1RX_CHAN4_SLOTS_MASK | -WM8996_AIF1RX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1RX_CHAN4_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1RX_CHANNEL_5_CONFIGURATION , -WM8996_AIF1RX_CHAN5_SLOTS_MASK | -WM8996_AIF1RX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1RX_CHAN5_SLOTS_SHIFT |1 ); - -snd_soc_update_bits (codec,WM8996_AIF2RX_CHANNEL_0_CONFIGURATION , -WM8996_AIF2RX_CHAN0_SLOTS_MASK | -WM8996_AIF2RX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF2RX_CHAN0_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF2RX_CHANNEL_1_CONFIGURATION , -WM8996_AIF2RX_CHAN1_SLOTS_MASK | -WM8996_AIF2RX_CHAN1_START_SLOT_MASK , -1 <<WM8996_AIF2RX_CHAN1_SLOTS_SHIFT |1 ); - -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_0_CONFIGURATION , -WM8996_AIF1TX_CHAN0_SLOTS_MASK | -WM8996_AIF1TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN0_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_1_CONFIGURATION , -WM8996_AIF1TX_CHAN1_SLOTS_MASK | -WM8996_AIF1TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN1_SLOTS_SHIFT |1 ); -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_2_CONFIGURATION , -WM8996_AIF1TX_CHAN2_SLOTS_MASK | -WM8996_AIF1TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN2_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_3_CONFIGURATION , -WM8996_AIF1TX_CHAN3_SLOTS_MASK | -WM8996_AIF1TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN3_SLOTS_SHIFT |1 ); -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_4_CONFIGURATION , -WM8996_AIF1TX_CHAN4_SLOTS_MASK | -WM8996_AIF1TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN4_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_5_CONFIGURATION , -WM8996_AIF1TX_CHAN5_SLOTS_MASK | -WM8996_AIF1TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN5_SLOTS_SHIFT |1 ); - -snd_soc_update_bits (codec,WM8996_AIF2TX_CHANNEL_0_CONFIGURATION , -WM8996_AIF2TX_CHAN0_SLOTS_MASK | -WM8996_AIF2TX_CHAN0_START_SLOT_MASK , -1 <<WM8996_AIF2TX_CHAN0_SLOTS_SHIFT |0 ); -snd_soc_update_bits (codec,WM8996_AIF1TX_CHANNEL_1_CONFIGURATION , -WM8996_AIF2TX_CHAN1_SLOTS_MASK | -WM8996_AIF2TX_CHAN1_START_SLOT_MASK , -1 <<WM8996_AIF1TX_CHAN1_SLOTS_SHIFT |1 ); -if (wm8996->pdata.num_retune_mobile_cfgs)wm8996_retune_mobile_pdata (codec);else snd_soc_add_codec_controls (codec, wm8996_eq_controls,ARRAY_SIZE (wm8996_eq_controls)); -/* If the TX LRCLK pins are not in LRCLK mode configure the -* AIFs to source their clocks from the RX LRCLKs. -*/ -if ((snd_soc_read (codec,WM8996_GPIO_1 ))) -snd_soc_update_bits (codec,WM8996_AIF1_TX_LRCLK_2 , -WM8996_AIF1TX_LRCLK_MODE , -WM8996_AIF1TX_LRCLK_MODE ); - -if ((snd_soc_read (codec,WM8996_GPIO_2 ))) -snd_soc_update_bits (codec,WM8996_AIF2_TX_LRCLK_2 , -WM8996_AIF2TX_LRCLK_MODE , -WM8996_AIF2TX_LRCLK_MODE ); -if (i2c->irq) {if (wm8996->pdata.irq_flags) irq_flags = wm8996->pdata.irq_flags;
@@ -3023,6 +2873,185 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies); +/* Apply platform data settings */ +regmap_update_bits (wm8996->regmap,WM8996_LINE_INPUT_CONTROL , +WM8996_INL_MODE_MASK |WM8996_INR_MODE_MASK , + wm8996->pdata.inl_mode <<WM8996_INL_MODE_SHIFT | + wm8996->pdata.inr_mode); + +for (i =0 ; i <ARRAY_SIZE (wm8996->pdata.gpio_default); i++) { +if (!wm8996->pdata.gpio_default[i]) +continue ; + +regmap_write (wm8996->regmap,WM8996_GPIO_1 + i, + wm8996->pdata.gpio_default[i] &0xffff ); + } + +if (wm8996->pdata.spkmute_seq) +regmap_update_bits (wm8996->regmap, +WM8996_PDM_SPEAKER_MUTE_SEQUENCE , +WM8996_SPK_MUTE_ENDIAN | +WM8996_SPK_MUTE_SEQ1_MASK , + wm8996->pdata.spkmute_seq); + +regmap_update_bits (wm8996->regmap,WM8996_ACCESSORY_DETECT_MODE_2 , +WM8996_MICD_BIAS_SRC |WM8996_HPOUT1FB_SRC | +WM8996_MICD_SRC , wm8996->pdata.micdet_def); + +/* Latch volume update bits */ +regmap_update_bits (wm8996->regmap,WM8996_LEFT_LINE_INPUT_VOLUME , +WM8996_IN1_VU ,WM8996_IN1_VU ); +regmap_update_bits (wm8996->regmap,WM8996_RIGHT_LINE_INPUT_VOLUME , +WM8996_IN1_VU ,WM8996_IN1_VU ); + +regmap_update_bits (wm8996->regmap,WM8996_DAC1_LEFT_VOLUME , +WM8996_DAC1_VU ,WM8996_DAC1_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DAC1_RIGHT_VOLUME , +WM8996_DAC1_VU ,WM8996_DAC1_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DAC2_LEFT_VOLUME , +WM8996_DAC2_VU ,WM8996_DAC2_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DAC2_RIGHT_VOLUME , +WM8996_DAC2_VU ,WM8996_DAC2_VU ); + +regmap_update_bits (wm8996->regmap,WM8996_OUTPUT1_LEFT_VOLUME , +WM8996_DAC1_VU ,WM8996_DAC1_VU ); +regmap_update_bits (wm8996->regmap,WM8996_OUTPUT1_RIGHT_VOLUME , +WM8996_DAC1_VU ,WM8996_DAC1_VU ); +regmap_update_bits (wm8996->regmap,WM8996_OUTPUT2_LEFT_VOLUME , +WM8996_DAC2_VU ,WM8996_DAC2_VU ); +regmap_update_bits (wm8996->regmap,WM8996_OUTPUT2_RIGHT_VOLUME , +WM8996_DAC2_VU ,WM8996_DAC2_VU ); + +regmap_update_bits (wm8996->regmap,WM8996_DSP1_TX_LEFT_VOLUME , +WM8996_DSP1TX_VU ,WM8996_DSP1TX_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DSP1_TX_RIGHT_VOLUME , +WM8996_DSP1TX_VU ,WM8996_DSP1TX_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DSP2_TX_LEFT_VOLUME , +WM8996_DSP2TX_VU ,WM8996_DSP2TX_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DSP2_TX_RIGHT_VOLUME , +WM8996_DSP2TX_VU ,WM8996_DSP2TX_VU ); + +regmap_update_bits (wm8996->regmap,WM8996_DSP1_RX_LEFT_VOLUME , +WM8996_DSP1RX_VU ,WM8996_DSP1RX_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DSP1_RX_RIGHT_VOLUME , +WM8996_DSP1RX_VU ,WM8996_DSP1RX_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DSP2_RX_LEFT_VOLUME , +WM8996_DSP2RX_VU ,WM8996_DSP2RX_VU ); +regmap_update_bits (wm8996->regmap,WM8996_DSP2_RX_RIGHT_VOLUME , +WM8996_DSP2RX_VU ,WM8996_DSP2RX_VU ); + +/* No support currently for the underclocked TDM modes and +* pick a default TDM layout with each channel pair working with +* slots 0 and 1. */ +regmap_update_bits (wm8996->regmap, +WM8996_AIF1RX_CHANNEL_0_CONFIGURATION , +WM8996_AIF1RX_CHAN0_SLOTS_MASK | +WM8996_AIF1RX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1RX_CHAN0_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1RX_CHANNEL_1_CONFIGURATION , +WM8996_AIF1RX_CHAN1_SLOTS_MASK | +WM8996_AIF1RX_CHAN1_START_SLOT_MASK , +1 <<WM8996_AIF1RX_CHAN1_SLOTS_SHIFT |1 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1RX_CHANNEL_2_CONFIGURATION , +WM8996_AIF1RX_CHAN2_SLOTS_MASK | +WM8996_AIF1RX_CHAN2_START_SLOT_MASK , +1 <<WM8996_AIF1RX_CHAN2_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1RX_CHANNEL_3_CONFIGURATION , +WM8996_AIF1RX_CHAN3_SLOTS_MASK | +WM8996_AIF1RX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1RX_CHAN3_SLOTS_SHIFT |1 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1RX_CHANNEL_4_CONFIGURATION , +WM8996_AIF1RX_CHAN4_SLOTS_MASK | +WM8996_AIF1RX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1RX_CHAN4_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1RX_CHANNEL_5_CONFIGURATION , +WM8996_AIF1RX_CHAN5_SLOTS_MASK | +WM8996_AIF1RX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1RX_CHAN5_SLOTS_SHIFT |1 ); + +regmap_update_bits (wm8996->regmap, +WM8996_AIF2RX_CHANNEL_0_CONFIGURATION , +WM8996_AIF2RX_CHAN0_SLOTS_MASK | +WM8996_AIF2RX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF2RX_CHAN0_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF2RX_CHANNEL_1_CONFIGURATION , +WM8996_AIF2RX_CHAN1_SLOTS_MASK | +WM8996_AIF2RX_CHAN1_START_SLOT_MASK , +1 <<WM8996_AIF2RX_CHAN1_SLOTS_SHIFT |1 ); + +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_0_CONFIGURATION , +WM8996_AIF1TX_CHAN0_SLOTS_MASK | +WM8996_AIF1TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN0_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_1_CONFIGURATION , +WM8996_AIF1TX_CHAN1_SLOTS_MASK | +WM8996_AIF1TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN1_SLOTS_SHIFT |1 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_2_CONFIGURATION , +WM8996_AIF1TX_CHAN2_SLOTS_MASK | +WM8996_AIF1TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN2_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_3_CONFIGURATION , +WM8996_AIF1TX_CHAN3_SLOTS_MASK | +WM8996_AIF1TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN3_SLOTS_SHIFT |1 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_4_CONFIGURATION , +WM8996_AIF1TX_CHAN4_SLOTS_MASK | +WM8996_AIF1TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN4_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_5_CONFIGURATION , +WM8996_AIF1TX_CHAN5_SLOTS_MASK | +WM8996_AIF1TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN5_SLOTS_SHIFT |1 ); + +regmap_update_bits (wm8996->regmap, +WM8996_AIF2TX_CHANNEL_0_CONFIGURATION , +WM8996_AIF2TX_CHAN0_SLOTS_MASK | +WM8996_AIF2TX_CHAN0_START_SLOT_MASK , +1 <<WM8996_AIF2TX_CHAN0_SLOTS_SHIFT |0 ); +regmap_update_bits (wm8996->regmap, +WM8996_AIF1TX_CHANNEL_1_CONFIGURATION , +WM8996_AIF2TX_CHAN1_SLOTS_MASK | +WM8996_AIF2TX_CHAN1_START_SLOT_MASK , +1 <<WM8996_AIF1TX_CHAN1_SLOTS_SHIFT |1 ); + +/* If the TX LRCLK pins are not in LRCLK mode configure the +* AIFs to source their clocks from the RX LRCLKs. +*/ + ret =regmap_read (wm8996->regmap,WM8996_GPIO_1 , ®); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to read GPIO1: %d\n" , ret); + goto err_regmap; + } + +if (reg &WM8996_GP1_FN_MASK ) +regmap_update_bits (wm8996->regmap,WM8996_AIF1_TX_LRCLK_2 , +WM8996_AIF1TX_LRCLK_MODE , +WM8996_AIF1TX_LRCLK_MODE ); + + ret =regmap_read (wm8996->regmap,WM8996_GPIO_2 , ®); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to read GPIO2: %d\n" , ret); + goto err_regmap; + } + +if (reg &WM8996_GP2_FN_MASK ) +regmap_update_bits (wm8996->regmap,WM8996_AIF2_TX_LRCLK_2 , +WM8996_AIF2TX_LRCLK_MODE , +WM8996_AIF2TX_LRCLK_MODE ); +wm8996_init_gpio (wm8996); ret = snd_soc_register_codec(&i2c->dev,
Signature · 1 line
1.7.10