From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <samuel.ortiz@intel.com>,
Dmitry Torokhov <dtor@mail.ru>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Misael Lopez Cruz <misael.lopez@ti.com>,
linux-input@vger.kernel.org
Subject: [PATCH 4/8] Input: twl6040-vibra: Check the selected path for vibra
Date: Thu, 15 Sep 2011 15:59:17 +0300 [thread overview]
Message-ID: <1316091561-30899-5-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1316091561-30899-1-git-send-email-peter.ujfalusi@ti.com>
The VIBSELL/R bit in the VIBCTLL/R register tells the source of the data,
which is going to be used to drive the attached motor(s).
Do not allow effect execution if any of the channels are set to receive
audio data.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/input/misc/twl6040-vibra.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index cb74185..fe624f2 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -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 -EPERM;
+ }
+
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;
--
1.7.6.1
next prev parent reply other threads:[~2011-09-15 13:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 12:59 [PATCH 0/8] ASoC/MFD/Input: twl6040: Support for audio driven vibra Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 1/8] Input: twl6040: Simplify vibra regsiter definitions Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 2/8] MFD: twl6040: Cache the vibra control registers Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 3/8] MFD: twl6040: function to query the vibra status for clients Peter Ujfalusi
2011-09-15 12:59 ` Peter Ujfalusi [this message]
2011-09-16 6:27 ` [PATCH 4/8] Input: twl6040-vibra: Check the selected path for vibra Dmitry Torokhov
2011-09-16 6:42 ` Péter Ujfalusi
2011-09-24 6:00 ` Dmitry Torokhov
2011-09-26 6:41 ` Péter Ujfalusi
2011-09-16 9:26 ` Liam Girdwood
2011-09-16 11:11 ` Péter Ujfalusi
2011-09-15 12:59 ` [PATCH 5/8] ASoC: twl6040: Fix the number of channels " Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:59 ` [PATCH 6/8] ASoC: twl6040: Correct supported number of playback channels Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:59 ` [PATCH 7/8] ASoC: omap-mcpdm: Correct the supported number of channels Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-20 10:57 ` Mark Brown
2011-09-20 11:10 ` Péter Ujfalusi
2011-09-20 11:19 ` Liam Girdwood
2011-09-20 11:24 ` Péter Ujfalusi
2011-09-20 11:35 ` Mark Brown
2011-09-15 12:59 ` [PATCH 8/8] ASoC: twl6040: Support for vibra output paths Peter Ujfalusi
2011-09-21 13:12 ` Péter Ujfalusi
2011-09-21 13:26 ` Mark Brown
2011-09-21 13:10 ` [PATCH 0/8] ASoC/MFD/Input: twl6040: Support for audio driven vibra Péter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316091561-30899-5-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dtor@mail.ru \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=misael.lopez@ti.com \
--cc=samuel.ortiz@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®