All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: Mark Brown <broonie@kernel.org>, Bard Liao <bardliao@realtek.com>,
	Oder Chiou <oder_chiou@realtek.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
	alsa-devel@alsa-project.org, Carlo Caione <carlo@endlessm.com>,
	Takashi Iwai <tiwai@suse.com>
Subject: [PATCH v2 05/32] ASoC: rt5651: Add rt5651_apply_properties() helper function
Date: Sun, 25 Feb 2018 11:46:46 +0100	[thread overview]
Message-ID: <20180225104713.4745-6-hdegoede@redhat.com> (raw)
In-Reply-To: <20180225104713.4745-1-hdegoede@redhat.com>

Move the applying of the differential input and dmic properties to a new
rt5651_apply_properties() helper function. This new function can be called
by platform code which attaches properties after probe() has run to apply
these new properties.

Note this also moves the time when we apply these properties for DT
platforms from i2c-probe to snd-component-probe time, this should not
result in any functional difference.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 sound/soc/codecs/rt5651.c | 22 ++++++++++++++--------
 sound/soc/codecs/rt5651.h |  2 ++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 3e507f53fc13..79a839c713ec 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1659,6 +1659,18 @@ static int rt5651_set_jack(struct snd_soc_component *component,
 	return 0;
 }
 
+void rt5651_apply_properties(struct snd_soc_component *component)
+{
+	if (device_property_read_bool(component->dev, "realtek,in2-differential"))
+		snd_soc_component_update_bits(component, RT5651_IN1_IN2,
+				RT5651_IN_DF2, RT5651_IN_DF2);
+
+	if (device_property_read_bool(component->dev, "realtek,dmic-en"))
+		snd_soc_component_update_bits(component, RT5651_GPIO_CTRL1,
+				RT5651_GP2_PIN_MASK, RT5651_GP2_PIN_DMIC1_SCL);
+}
+EXPORT_SYMBOL_GPL(rt5651_apply_properties);
+
 static int rt5651_probe(struct snd_soc_component *component)
 {
 	struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
@@ -1677,6 +1689,8 @@ static int rt5651_probe(struct snd_soc_component *component)
 
 	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
 
+	rt5651_apply_properties(component);
+
 	return 0;
 }
 
@@ -1933,14 +1947,6 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,
 	if (ret != 0)
 		dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
 
-	if (device_property_read_bool(&i2c->dev, "realtek,in2-differential"))
-		regmap_update_bits(rt5651->regmap, RT5651_IN1_IN2,
-					RT5651_IN_DF2, RT5651_IN_DF2);
-
-	if (device_property_read_bool(&i2c->dev, "realtek,dmic-en"))
-		regmap_update_bits(rt5651->regmap, RT5651_GPIO_CTRL1,
-				RT5651_GP2_PIN_MASK, RT5651_GP2_PIN_DMIC1_SCL);
-
 	rt5651->irq = i2c->irq;
 	rt5651->hp_mute = 1;
 
diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h
index f3158488fc89..7d9d5fa09d6f 100644
--- a/sound/soc/codecs/rt5651.h
+++ b/sound/soc/codecs/rt5651.h
@@ -2080,4 +2080,6 @@ struct rt5651_priv {
 	bool hp_mute;
 };
 
+void rt5651_apply_properties(struct snd_soc_component *component);
+
 #endif /* __RT5651_H__ */
-- 
2.14.3

  parent reply	other threads:[~2018-02-25 10:47 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-25 10:46 [PATCH v2 00/32] ASoC: rt5651: jack-detect fixes and improvements Hans de Goede
2018-02-25 10:46 ` [PATCH v2 01/32] ASoC: rt5651: Remove unused rt5651_platform_data Hans de Goede
2018-02-25 10:46 ` [PATCH v2 02/32] ASoC: rt5651: Move all jack-detect initialization to rt5651_set_jack_detect Hans de Goede
2018-03-01 18:06   ` Applied "ASoC: rt5651: Move all jack-detect initialization to rt5651_set_jack_detect" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 03/32] ASoC: rt5651: Move 2 functions higher up in rt5651.c Hans de Goede
2018-03-01 18:06   ` Applied "ASoC: rt5651: Move 2 functions higher up in rt5651.c" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 04/32] ASoC: rt5651: Use standard component set_jack callback Hans de Goede
2018-02-25 10:46 ` Hans de Goede [this message]
2018-03-01 18:06   ` Applied "ASoC: rt5651: Add rt5651_apply_properties() helper function" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 06/32] ASoC: rt5651: Configure jack-detect source through a device-property Hans de Goede
2018-03-01 19:30   ` Mark Brown
2018-03-01 22:35     ` Hans de Goede
2018-03-02  9:32       ` Hans de Goede
2018-03-02 12:18         ` Mark Brown
2018-03-02 12:58           ` Hans de Goede
2018-03-02 17:41             ` Mark Brown
2018-03-03 21:20               ` Hans de Goede
2018-03-02 22:17             ` Rob Herring
2018-02-25 10:46 ` [PATCH v2 07/32] ASoC: rt5651: Remove is_sys_clk_from_pll() Hans de Goede
2018-03-01 19:26   ` Applied "ASoC: rt5651: Remove is_sys_clk_from_pll()" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 08/32] ASoC: rt5651: Fix bias_level confusion Hans de Goede
2018-03-01 19:26   ` Applied "ASoC: rt5651: Fix bias_level confusion" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 09/32] ASoC: rt5651: Do not modify the LDO voltage control bits from set_bias_level() Hans de Goede
2018-03-01 19:26   ` Applied "ASoC: rt5651: Do not modify the LDO voltage control bits from set_bias_level()" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 10/32] ASoC: rt5651: Do not modify jd and PLL power bits from set_bias_level() Hans de Goede
2018-03-01 19:26   ` Applied "ASoC: rt5651: Do not modify jd and PLL power bits from set_bias_level()" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 11/32] ASoC: rt5651: Remove programming of PWR regs before force_bias_level() call Hans de Goede
2018-03-01 19:26   ` Applied "ASoC: rt5651: Remove programming of PWR regs before force_bias_level() call" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 12/32] ASoC: rt5651: Only configure LDO voltage once at boot Hans de Goede
2018-03-01 19:26   ` Applied "ASoC: rt5651: Only configure LDO voltage once at boot" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 13/32] ASoC: rt5651: Remove "JD Power" dapm supply Hans de Goede
2018-03-01 19:25   ` Applied "ASoC: rt5651: Remove "JD Power" dapm supply" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 14/32] ASoC: rt5651: Enable LDO and micbias1 supplies for jack-type detection Hans de Goede
2018-02-25 10:46 ` [PATCH v2 15/32] ASoC: rt5651: Only configure OVCD once at set_jack time Hans de Goede
2018-03-01 19:25   ` Applied "ASoC: rt5651: Only configure OVCD once at set_jack time" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 16/32] ASoC: rt5651: Always keep OVCD enabled Hans de Goede
2018-03-01 19:25   ` Applied "ASoC: rt5651: Always keep OVCD enabled" to the asoc tree Mark Brown
2018-02-25 10:46 ` [PATCH v2 17/32] ASoC: rt5651: Allow specifying over-current thresholds through device-properties Hans de Goede
2018-03-02 22:18   ` Rob Herring
2018-02-25 10:46 ` [PATCH v2 18/32] ASoC: rt5651: Enable sticky mode for OVCD Hans de Goede
2018-03-07 14:14   ` Applied "ASoC: rt5651: Enable sticky mode for OVCD" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 19/32] ASoC: rt5651: Enable Platform Clock during jack-type detect Hans de Goede
2018-03-07 14:13   ` Applied "ASoC: rt5651: Enable Platform Clock during jack-type detect" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 20/32] ASoC: rt5651: Add rt5651_jack_inserted() helper Hans de Goede
2018-03-07 14:13   ` Applied "ASoC: rt5651: Add rt5651_jack_inserted() helper" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 21/32] ASoC: rt5651: Rewrite jack-type detection Hans de Goede
2018-02-25 10:47 ` [PATCH v2 22/32] ASoC: Intel: bytcr_rt5651: Actually honor the DMIC_EN quirk if specified Hans de Goede
2018-02-25 10:47 ` [PATCH v2 23/32] ASoC: Intel: bytcr_rt5651: Only create jack if we have a jack-detect source Hans de Goede
2018-02-25 10:47 ` [PATCH v2 24/32] ASoC: Intel: bytcr_rt5651: Add quirk micbias OVCD configuration Hans de Goede
2018-02-25 10:47 ` [PATCH v2 25/32] ASoC: Intel: bytcr_rt5651: Configure PLL1 before using it Hans de Goede
2018-03-07 14:22   ` Applied "ASoC: Intel: bytcr_rt5651: Configure PLL1 before using it" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 26/32] ASoC: Intel: bytcr_rt5651: Drop snd_soc_dai_set_bclk_ratio() call Hans de Goede
2018-03-07 14:22   ` Applied "ASoC: Intel: bytcr_rt5651: Drop snd_soc_dai_set_bclk_ratio() call" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 27/32] ASoC: Intel: bytcr_rt5651: Rename IN3_MAP to IN1_HS_IN3_MAP Hans de Goede
2018-03-07 14:22   ` Applied "ASoC: Intel: bytcr_rt5651: Rename IN3_MAP to IN1_HS_IN3_MAP" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 28/32] ASoC: Intel: bytcr_rt5651: Add new IN2_HS_IN3 input map and a quirk using it Hans de Goede
2018-03-07 14:21   ` Applied "ASoC: Intel: bytcr_rt5651: Add new IN2_HS_IN3 input map and a quirk using it" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 29/32] ASoC: Intel: bytcr_rt5651: Add support for Bay Trail CR / SSP0 using boards Hans de Goede
2018-02-25 10:47 ` [PATCH v2 30/32] ASoC: Intel: bytcr_rt5651: Add quirk for the VIOS LTH17 laptop Hans de Goede
2018-03-07 14:21   ` Applied "ASoC: Intel: bytcr_rt5651: Add quirk for the VIOS LTH17 laptop" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 31/32] ASoC: Intel: bytcr_rt5651: Change defaults to enable jack-detect, analog mics Hans de Goede
2018-03-07 14:21   ` Applied "ASoC: Intel: bytcr_rt5651: Change defaults to enable jack-detect, analog mics" to the asoc tree Mark Brown
2018-02-25 10:47 ` [PATCH v2 32/32] ASoC: Intel: bytcr_rt5651: Select RCCLK on init() Hans de Goede
2018-03-07 14:21   ` Applied "ASoC: Intel: bytcr_rt5651: Select RCCLK on init()" to the asoc tree Mark Brown
2018-02-25 10:58 ` [PATCH v2 00/32] ASoC: rt5651: jack-detect fixes and improvements Hans de Goede

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=20180225104713.4745-6-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bardliao@realtek.com \
    --cc=broonie@kernel.org \
    --cc=carlo@endlessm.com \
    --cc=oder_chiou@realtek.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=tiwai@suse.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.