Skip to content

Commit 9645083

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
2 parents cd77607 + 78b78f5 commit 9645083

File tree

1 file changed

+108
-110
lines changed

1 file changed

+108
-110
lines changed

‎sound/soc/codecs/wm8962.c

Lines changed: 108 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -3242,7 +3242,7 @@ static void wm8962_free_beep(struct snd_soc_codec *codec)
32423242
}
32433243
#endif
32443244

3245-
static void wm8962_set_gpio_mode(struct snd_soc_codec *codec, int gpio)
3245+
static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio)
32463246
{
32473247
int mask = 0;
32483248
int val = 0;
@@ -3263,8 +3263,8 @@ static void wm8962_set_gpio_mode(struct snd_soc_codec *codec, int gpio)
32633263
}
32643264

32653265
if (mask)
3266-
snd_soc_update_bits(codec, WM8962_ANALOGUE_CLOCKING1,
3267-
mask, val);
3266+
regmap_update_bits(wm8962->regmap, WM8962_ANALOGUE_CLOCKING1,
3267+
mask, val);
32683268
}
32693269

32703270
#ifdef CONFIG_GPIOLIB
@@ -3276,7 +3276,6 @@ static inline struct wm8962_priv *gpio_to_wm8962(struct gpio_chip *chip)
32763276
static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset)
32773277
{
32783278
struct wm8962_priv *wm8962 = gpio_to_wm8962(chip);
3279-
struct snd_soc_codec *codec = wm8962->codec;
32803279

32813280
/* The WM8962 GPIOs aren't linearly numbered. For simplicity
32823281
* we export linear numbers and error out if the unsupported
@@ -3292,7 +3291,7 @@ static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset)
32923291
return -EINVAL;
32933292
}
32943293

3295-
wm8962_set_gpio_mode(codec, offset + 1);
3294+
wm8962_set_gpio_mode(wm8962, offset + 1);
32963295

32973296
return 0;
32983297
}
@@ -3376,8 +3375,7 @@ static int wm8962_probe(struct snd_soc_codec *codec)
33763375
{
33773376
int ret;
33783377
struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
3379-
struct wm8962_pdata *pdata = &wm8962->pdata;
3380-
int i, trigger, irq_pol;
3378+
int i;
33813379
bool dmicclk, dmicdat;
33823380

33833381
wm8962->codec = codec;
@@ -3409,75 +3407,6 @@ static int wm8962_probe(struct snd_soc_codec *codec)
34093407
}
34103408
}
34113409

3412-
/* SYSCLK defaults to on; make sure it is off so we can safely
3413-
* write to registers if the device is declocked.
3414-
*/
3415-
snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0);
3416-
3417-
/* Ensure we have soft control over all registers */
3418-
snd_soc_update_bits(codec, WM8962_CLOCKING2,
3419-
WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
3420-
3421-
/* Ensure that the oscillator and PLLs are disabled */
3422-
snd_soc_update_bits(codec, WM8962_PLL2,
3423-
WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
3424-
0);
3425-
3426-
/* Apply static configuration for GPIOs */
3427-
for (i = 0; i < ARRAY_SIZE(pdata->gpio_init); i++)
3428-
if (pdata->gpio_init[i]) {
3429-
wm8962_set_gpio_mode(codec, i + 1);
3430-
snd_soc_write(codec, 0x200 + i,
3431-
pdata->gpio_init[i] & 0xffff);
3432-
}
3433-
3434-
3435-
/* Put the speakers into mono mode? */
3436-
if (pdata->spk_mono)
3437-
snd_soc_update_bits(codec, WM8962_CLASS_D_CONTROL_2,
3438-
WM8962_SPK_MONO_MASK, WM8962_SPK_MONO);
3439-
3440-
/* Micbias setup, detection enable and detection
3441-
* threasholds. */
3442-
if (pdata->mic_cfg)
3443-
snd_soc_update_bits(codec, WM8962_ADDITIONAL_CONTROL_4,
3444-
WM8962_MICDET_ENA |
3445-
WM8962_MICDET_THR_MASK |
3446-
WM8962_MICSHORT_THR_MASK |
3447-
WM8962_MICBIAS_LVL,
3448-
pdata->mic_cfg);
3449-
3450-
/* Latch volume update bits */
3451-
snd_soc_update_bits(codec, WM8962_LEFT_INPUT_VOLUME,
3452-
WM8962_IN_VU, WM8962_IN_VU);
3453-
snd_soc_update_bits(codec, WM8962_RIGHT_INPUT_VOLUME,
3454-
WM8962_IN_VU, WM8962_IN_VU);
3455-
snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME,
3456-
WM8962_ADC_VU, WM8962_ADC_VU);
3457-
snd_soc_update_bits(codec, WM8962_RIGHT_ADC_VOLUME,
3458-
WM8962_ADC_VU, WM8962_ADC_VU);
3459-
snd_soc_update_bits(codec, WM8962_LEFT_DAC_VOLUME,
3460-
WM8962_DAC_VU, WM8962_DAC_VU);
3461-
snd_soc_update_bits(codec, WM8962_RIGHT_DAC_VOLUME,
3462-
WM8962_DAC_VU, WM8962_DAC_VU);
3463-
snd_soc_update_bits(codec, WM8962_SPKOUTL_VOLUME,
3464-
WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
3465-
snd_soc_update_bits(codec, WM8962_SPKOUTR_VOLUME,
3466-
WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
3467-
snd_soc_update_bits(codec, WM8962_HPOUTL_VOLUME,
3468-
WM8962_HPOUT_VU, WM8962_HPOUT_VU);
3469-
snd_soc_update_bits(codec, WM8962_HPOUTR_VOLUME,
3470-
WM8962_HPOUT_VU, WM8962_HPOUT_VU);
3471-
3472-
/* Stereo control for EQ */
3473-
snd_soc_update_bits(codec, WM8962_EQ1, WM8962_EQ_SHARED_COEFF, 0);
3474-
3475-
/* Don't debouce interrupts so we don't need SYSCLK */
3476-
snd_soc_update_bits(codec, WM8962_IRQ_DEBOUNCE,
3477-
WM8962_FLL_LOCK_DB | WM8962_PLL3_LOCK_DB |
3478-
WM8962_PLL2_LOCK_DB | WM8962_TEMP_SHUT_DB,
3479-
0);
3480-
34813410
wm8962_add_widgets(codec);
34823411

34833412
/* Save boards having to disable DMIC when not in use */
@@ -3506,36 +3435,6 @@ static int wm8962_probe(struct snd_soc_codec *codec)
35063435
wm8962_init_beep(codec);
35073436
wm8962_init_gpio(codec);
35083437

3509-
if (wm8962->irq) {
3510-
if (pdata->irq_active_low) {
3511-
trigger = IRQF_TRIGGER_LOW;
3512-
irq_pol = WM8962_IRQ_POL;
3513-
} else {
3514-
trigger = IRQF_TRIGGER_HIGH;
3515-
irq_pol = 0;
3516-
}
3517-
3518-
snd_soc_update_bits(codec, WM8962_INTERRUPT_CONTROL,
3519-
WM8962_IRQ_POL, irq_pol);
3520-
3521-
ret = request_threaded_irq(wm8962->irq, NULL, wm8962_irq,
3522-
trigger | IRQF_ONESHOT,
3523-
"wm8962", codec->dev);
3524-
if (ret != 0) {
3525-
dev_err(codec->dev, "Failed to request IRQ %d: %d\n",
3526-
wm8962->irq, ret);
3527-
wm8962->irq = 0;
3528-
/* Non-fatal */
3529-
} else {
3530-
/* Enable some IRQs by default */
3531-
snd_soc_update_bits(codec,
3532-
WM8962_INTERRUPT_STATUS_2_MASK,
3533-
WM8962_FLL_LOCK_EINT |
3534-
WM8962_TEMP_SHUT_EINT |
3535-
WM8962_FIFOS_ERR_EINT, 0);
3536-
}
3537-
}
3538-
35393438
return 0;
35403439
}
35413440

@@ -3544,9 +3443,6 @@ static int wm8962_remove(struct snd_soc_codec *codec)
35443443
struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
35453444
int i;
35463445

3547-
if (wm8962->irq)
3548-
free_irq(wm8962->irq, codec);
3549-
35503446
cancel_delayed_work_sync(&wm8962->mic_work);
35513447

35523448
wm8962_free_gpio(codec);
@@ -3619,7 +3515,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
36193515
struct wm8962_pdata *pdata = dev_get_platdata(&i2c->dev);
36203516
struct wm8962_priv *wm8962;
36213517
unsigned int reg;
3622-
int ret, i;
3518+
int ret, i, irq_pol, trigger;
36233519

36243520
wm8962 = devm_kzalloc(&i2c->dev, sizeof(struct wm8962_priv),
36253521
GFP_KERNEL);
@@ -3704,6 +3600,77 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
37043600
goto err_enable;
37053601
}
37063602

3603+
/* SYSCLK defaults to on; make sure it is off so we can safely
3604+
* write to registers if the device is declocked.
3605+
*/
3606+
regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
3607+
WM8962_SYSCLK_ENA, 0);
3608+
3609+
/* Ensure we have soft control over all registers */
3610+
regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
3611+
WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
3612+
3613+
/* Ensure that the oscillator and PLLs are disabled */
3614+
regmap_update_bits(wm8962->regmap, WM8962_PLL2,
3615+
WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
3616+
0);
3617+
3618+
/* Apply static configuration for GPIOs */
3619+
for (i = 0; i < ARRAY_SIZE(pdata->gpio_init); i++)
3620+
if (pdata->gpio_init[i]) {
3621+
wm8962_set_gpio_mode(wm8962, i + 1);
3622+
regmap_write(wm8962->regmap, 0x200 + i,
3623+
pdata->gpio_init[i] & 0xffff);
3624+
}
3625+
3626+
3627+
/* Put the speakers into mono mode? */
3628+
if (pdata->spk_mono)
3629+
regmap_update_bits(wm8962->regmap, WM8962_CLASS_D_CONTROL_2,
3630+
WM8962_SPK_MONO_MASK, WM8962_SPK_MONO);
3631+
3632+
/* Micbias setup, detection enable and detection
3633+
* threasholds. */
3634+
if (pdata->mic_cfg)
3635+
regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4,
3636+
WM8962_MICDET_ENA |
3637+
WM8962_MICDET_THR_MASK |
3638+
WM8962_MICSHORT_THR_MASK |
3639+
WM8962_MICBIAS_LVL,
3640+
pdata->mic_cfg);
3641+
3642+
/* Latch volume update bits */
3643+
regmap_update_bits(wm8962->regmap, WM8962_LEFT_INPUT_VOLUME,
3644+
WM8962_IN_VU, WM8962_IN_VU);
3645+
regmap_update_bits(wm8962->regmap, WM8962_RIGHT_INPUT_VOLUME,
3646+
WM8962_IN_VU, WM8962_IN_VU);
3647+
regmap_update_bits(wm8962->regmap, WM8962_LEFT_ADC_VOLUME,
3648+
WM8962_ADC_VU, WM8962_ADC_VU);
3649+
regmap_update_bits(wm8962->regmap, WM8962_RIGHT_ADC_VOLUME,
3650+
WM8962_ADC_VU, WM8962_ADC_VU);
3651+
regmap_update_bits(wm8962->regmap, WM8962_LEFT_DAC_VOLUME,
3652+
WM8962_DAC_VU, WM8962_DAC_VU);
3653+
regmap_update_bits(wm8962->regmap, WM8962_RIGHT_DAC_VOLUME,
3654+
WM8962_DAC_VU, WM8962_DAC_VU);
3655+
regmap_update_bits(wm8962->regmap, WM8962_SPKOUTL_VOLUME,
3656+
WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
3657+
regmap_update_bits(wm8962->regmap, WM8962_SPKOUTR_VOLUME,
3658+
WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
3659+
regmap_update_bits(wm8962->regmap, WM8962_HPOUTL_VOLUME,
3660+
WM8962_HPOUT_VU, WM8962_HPOUT_VU);
3661+
regmap_update_bits(wm8962->regmap, WM8962_HPOUTR_VOLUME,
3662+
WM8962_HPOUT_VU, WM8962_HPOUT_VU);
3663+
3664+
/* Stereo control for EQ */
3665+
regmap_update_bits(wm8962->regmap, WM8962_EQ1,
3666+
WM8962_EQ_SHARED_COEFF, 0);
3667+
3668+
/* Don't debouce interrupts so we don't need SYSCLK */
3669+
regmap_update_bits(wm8962->regmap, WM8962_IRQ_DEBOUNCE,
3670+
WM8962_FLL_LOCK_DB | WM8962_PLL3_LOCK_DB |
3671+
WM8962_PLL2_LOCK_DB | WM8962_TEMP_SHUT_DB,
3672+
0);
3673+
37073674
if (wm8962->pdata.in4_dc_measure) {
37083675
ret = regmap_register_patch(wm8962->regmap,
37093676
wm8962_dc_measure,
@@ -3714,6 +3681,37 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
37143681
ret);
37153682
}
37163683

3684+
if (wm8962->irq) {
3685+
if (pdata->irq_active_low) {
3686+
trigger = IRQF_TRIGGER_LOW;
3687+
irq_pol = WM8962_IRQ_POL;
3688+
} else {
3689+
trigger = IRQF_TRIGGER_HIGH;
3690+
irq_pol = 0;
3691+
}
3692+
3693+
regmap_update_bits(wm8962->regmap, WM8962_INTERRUPT_CONTROL,
3694+
WM8962_IRQ_POL, irq_pol);
3695+
3696+
ret = devm_request_threaded_irq(&i2c->dev, wm8962->irq, NULL,
3697+
wm8962_irq,
3698+
trigger | IRQF_ONESHOT,
3699+
"wm8962", &i2c->dev);
3700+
if (ret != 0) {
3701+
dev_err(&i2c->dev, "Failed to request IRQ %d: %d\n",
3702+
wm8962->irq, ret);
3703+
wm8962->irq = 0;
3704+
/* Non-fatal */
3705+
} else {
3706+
/* Enable some IRQs by default */
3707+
regmap_update_bits(wm8962->regmap,
3708+
WM8962_INTERRUPT_STATUS_2_MASK,
3709+
WM8962_FLL_LOCK_EINT |
3710+
WM8962_TEMP_SHUT_EINT |
3711+
WM8962_FIFOS_ERR_EINT, 0);
3712+
}
3713+
}
3714+
37173715
pm_runtime_enable(&i2c->dev);
37183716
pm_request_idle(&i2c->dev);
37193717

0 commit comments

Comments
 (0)