Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
  ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
  ALSA: hda - Keep EAPD turned on for old Conexant chips
  ALSA: hda/realtek - Fix missing volume controls with ALC260
  ASoC: wm8940: Properly set codec->dapm.bias_level
  ALSA: hda - Fix pin-config for ASUS W90V
  ALSA: hda - Fix surround/CLFE headphone and speaker pins order
  ALSA: hda - Fix typo
  ALSA: Update the sound git tree URL
  ALSA: HDA: Add new revision for ALC662
  ASoC: max98095: Convert codec->hw_write to snd_soc_write
  ASoC: keep pointer to resource so it can be freed
  ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
  ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
  ASoC: da7210: Add support for line out and DAC
  ASoC: da7210: Add support for DAPM
  ALSA: hda/realtek - Fix DAC assignments of multiple speakers
  ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
  ASoC: Set sgtl5000->ldo in ldo_regulator_register
  ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
  ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
  ...

1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 23855e12a30b..ad153a417eed 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -74,12 +74,12 @@ static irqreturn_t twl6040_vib_irq_handler(int irq, void *data)
         if (status & TWL6040_VIBLOCDET) {
                 dev_warn(info->dev, "Left Vibrator overcurrent detected\n");
                 twl6040_clear_bits(twl6040, TWL6040_REG_VIBCTLL,
-                                   TWL6040_VIBENAL);
+                                   TWL6040_VIBENA);
         }
         if (status & TWL6040_VIBROCDET) {
                 dev_warn(info->dev, "Right Vibrator overcurrent detected\n");
                 twl6040_clear_bits(twl6040, TWL6040_REG_VIBCTLR,
-                                   TWL6040_VIBENAR);
+                                   TWL6040_VIBENA);
         }
 
         return IRQ_HANDLED;
@@ -97,23 +97,23 @@ static void twl6040_vibra_enable(struct vibra_info *info)
         }
 
         twl6040_power(info->twl6040, 1);
-        if (twl6040->rev <= TWL6040_REV_ES1_1) {
+        if (twl6040_get_revid(twl6040) <= TWL6040_REV_ES1_1) {
                 /*
                  * ERRATA: Disable overcurrent protection for at least
                  * 3ms when enabling vibrator drivers to avoid false
                  * overcurrent detection
                  */
                 twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLL,
-                                  TWL6040_VIBENAL | TWL6040_VIBCTRLL);
+                                  TWL6040_VIBENA | TWL6040_VIBCTRL);
                 twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLR,
-                                  TWL6040_VIBENAR | TWL6040_VIBCTRLR);
+                                  TWL6040_VIBENA | TWL6040_VIBCTRL);
                 usleep_range(3000, 3500);
         }
 
         twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLL,
-                          TWL6040_VIBENAL);
+                          TWL6040_VIBENA);
         twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLR,
-                          TWL6040_VIBENAR);
+                          TWL6040_VIBENA);
 
         info->enabled = true;
 }
@@ -201,6 +201,13 @@ static int vibra_play(struct input_dev *input, void *data,
         struct vibra_info *info = input_get_drvdata(input);
         int ret;
 
+        /* Do not allow effect, while the routing is set to use audio */
+        ret = twl6040_get_vibralr_status(info->twl6040);
+        if (ret & TWL6040_VIBSEL) {
+                dev_info(&input->dev, "Vibra is configured for audio\n");
+                return -EBUSY;
+        }
+
         info->weak_speed = effect->u.rumble.weak_magnitude;
         info->strong_speed = effect->u.rumble.strong_magnitude;
         info->direction = effect->direction < EFFECT_DIR_180_DEG ? 1 : -1;