LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jean-Jacques Hiblot <jjhiblot@ti.com>
To: <broonie@kernel.org>, <robh+dt@kernel.org>,
	<mark.rutland@arm.com>, <perex@perex.cz>, <tiwai@suse.com>
Cc: <dannenberg@ti.com>, <afd@ti.com>, <alsa-devel@alsa-project.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Jean-Jacques Hiblot <jjhiblot@ti.com>
Subject: [PATCH v2 3/3] ASoC: tas6424: Allow disabling auto diagnostics for faster power-on
Date: Fri, 27 Apr 2018 15:55:49 +0200	[thread overview]
Message-ID: <1524837349-16350-4-git-send-email-jjhiblot@ti.com> (raw)
In-Reply-To: <1524837349-16350-1-git-send-email-jjhiblot@ti.com>

The TAS6424 incorporates both DC-load and AC-load diagnostics which are
used to determine the status of the load. The DC diagnostics runs when any
channel is directed to leave the Hi-Z state and enter the MUTE or PLAY
state.
The DC diagnostics are turned on by default but, if a fast startup without
diagnostics is required, the diagnostics can be disabled using a dedicated
ALSA control.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 sound/soc/codecs/tas6424.c | 19 +++++++++++++++++--
 sound/soc/codecs/tas6424.h |  4 ++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c
index 89fd0c1..8eb4842 100644
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
@@ -55,6 +55,13 @@ struct tas6424_data {
  */
 static DECLARE_TLV_DB_SCALE(dac_tlv, -10350, 50, 0);
 
+
+static const char * const diags_enum_texts[] = {"OFF", "ON"};
+static unsigned int diags_enum_values[] = {1, 0};
+SOC_VALUE_ENUM_SINGLE_DECL(diags_enum, TAS6424_DC_DIAG_CTRL1,
+			   TAS6424_LDGBYPASS_SHIFT, TAS6424_LDGBYPASS_MASK,
+			   diags_enum_texts, diags_enum_values);
+
 static const struct snd_kcontrol_new tas6424_snd_controls[] = {
 	SOC_SINGLE_TLV("Speaker Driver CH1 Playback Volume",
 		       TAS6424_CH1_VOL_CTRL, 0, 0xff, 0, dac_tlv),
@@ -64,6 +71,7 @@ static const struct snd_kcontrol_new tas6424_snd_controls[] = {
 		       TAS6424_CH3_VOL_CTRL, 0, 0xff, 0, dac_tlv),
 	SOC_SINGLE_TLV("Speaker Driver CH4 Playback Volume",
 		       TAS6424_CH4_VOL_CTRL, 0, 0xff, 0, dac_tlv),
+	SOC_ENUM("Auto Diagnostics", diags_enum),
 };
 
 static int tas6424_dac_event(struct snd_soc_dapm_widget *w,
@@ -297,6 +305,11 @@ static int tas6424_power_on(struct snd_soc_component *component)
 	struct tas6424_data *tas6424 = snd_soc_component_get_drvdata(component);
 	int ret;
 	u8 chan_states;
+	int no_auto_diags = 0;
+	unsigned int reg_val;
+
+	if (!regmap_read(tas6424->regmap, TAS6424_DC_DIAG_CTRL1, &reg_val))
+		no_auto_diags = reg_val & TAS6424_LDGBYPASS_MASK;
 
 	ret = regulator_bulk_enable(ARRAY_SIZE(tas6424->supplies),
 				    tas6424->supplies);
@@ -327,9 +340,11 @@ static int tas6424_power_on(struct snd_soc_component *component)
 	snd_soc_component_write(component, TAS6424_CH_STATE_CTRL, chan_states);
 
 	/* any time we come out of HIZ, the output channels automatically run DC
-	 * load diagnostics, wait here until this completes
+	 * load diagnostics if autodiagnotics are enabled. wait here until this
+	 * completes.
 	 */
-	msleep(230);
+	if (!no_auto_diags)
+		msleep(230);
 
 	return 0;
 }
diff --git a/sound/soc/codecs/tas6424.h b/sound/soc/codecs/tas6424.h
index 4305883..b5958c4 100644
--- a/sound/soc/codecs/tas6424.h
+++ b/sound/soc/codecs/tas6424.h
@@ -111,6 +111,10 @@
 					 TAS6424_CH3_STATE_DIAG | \
 					 TAS6424_CH4_STATE_DIAG)
 
+/* TAS6424_DC_DIAG_CTRL1 */
+#define TAS6424_LDGBYPASS_SHIFT		0
+#define TAS6424_LDGBYPASS_MASK		BIT(TAS6424_LDGBYPASS_SHIFT)
+
 /* TAS6424_GLOB_FAULT1_REG */
 #define TAS6424_FAULT_CLOCK		BIT(4)
 #define TAS6424_FAULT_PVDD_OV		BIT(3)
-- 
2.7.4

  parent reply	other threads:[~2018-04-27 13:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27 13:55 [PATCH v2 0/3] ASoc: TAS6424: Add support for mute, standby, and faster power on Jean-Jacques Hiblot
2018-04-27 13:55 ` [PATCH v2 1/3] ASoC: tas6424: Add support for the standby pin Jean-Jacques Hiblot
2018-04-27 18:24   ` Applied "ASoC: tas6424: Add support for the standby pin" to the asoc tree Mark Brown
2018-04-27 20:13   ` [PATCH v2 1/3] ASoC: tas6424: Add support for the standby pin Rob Herring
2018-04-27 13:55 ` [PATCH v2 2/3] ASoC: tas6424: Add support for the mute pin Jean-Jacques Hiblot
2018-04-27 18:24   ` Applied "ASoC: tas6424: Add support for the mute pin" to the asoc tree Mark Brown
2018-04-27 20:15   ` [PATCH v2 2/3] ASoC: tas6424: Add support for the mute pin Rob Herring
2018-04-27 13:55 ` Jean-Jacques Hiblot [this message]
2018-04-27 15:30   ` [PATCH v2 3/3] ASoC: tas6424: Allow disabling auto diagnostics for faster power-on Mark Brown
2018-04-28  9:21   ` kbuild test robot
2018-04-28  9:21   ` [RFC PATCH] ASoC: tas6424: diags_enum can be static kbuild test robot

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=1524837349-16350-4-git-send-email-jjhiblot@ti.com \
    --to=jjhiblot@ti.com \
    --cc=afd@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=dannenberg@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=tiwai@suse.com \
    --subject='Re: [PATCH v2 3/3] ASoC: tas6424: Allow disabling auto diagnostics for faster power-on' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).