From: b42378@freescale.com (Nicolin Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 5/8] ASoC: SGTL5000: Enhance the SGTL5000 codec driver about regulator.
Date: Fri, 1 Nov 2013 18:02:03 +0800 [thread overview]
Message-ID: <20131101100201.GF28401@MrMyself> (raw)
In-Reply-To: <1383289495-24523-6-git-send-email-Li.Xiubo@freescale.com>
On Fri, Nov 01, 2013 at 03:04:52PM +0800, Xiubo Li wrote:
> On VF610 series there are no regulators used, and now whether the
> CONFIG_REGULATOR mirco is enabled or not, for the VF610 audio
micro? or macro?
> patch series, the board cannot be probe successfully.
> And this patch will solve this issue.
>
I finally got your idea about what this patch does. But it seems to
be more likely a work around. Maybe I here can't think it through
comprehensively, but I think you can try to add a fixed regulator to
sgtl5000 in the devicetree, rather than disabling common functions
even if not breaking others.
> Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
> ---
> sound/soc/codecs/sgtl5000.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
> index 1f4093f..c2f6d86 100644
> --- a/sound/soc/codecs/sgtl5000.c
> +++ b/sound/soc/codecs/sgtl5000.c
> @@ -61,6 +61,7 @@ static const struct reg_default sgtl5000_reg_defaults[] = {
> { SGTL5000_DAP_AVC_DECAY, 0x0050 },
> };
>
> +#ifdef CONFIG_REGULATOR
> /* regulator supplies for sgtl5000, VDDD is an optional external supply */
> enum sgtl5000_regulator_supplies {
> VDDA,
> @@ -93,6 +94,9 @@ static struct regulator_init_data ldo_init_data = {
> .num_consumer_supplies = 1,
> .consumer_supplies = &ldo_consumer[0],
> };
> +#else
> +#define SGTL5000_SUPPLY_NUM 0
> +#endif
>
> /*
> * sgtl5000 internal ldo regulator,
> @@ -112,7 +116,9 @@ struct sgtl5000_priv {
> int master; /* i2s master or not */
> int fmt; /* i2s data format */
> struct regulator_bulk_data supplies[SGTL5000_SUPPLY_NUM];
> +#ifdef CONFIG_REGULATOR
> struct ldo_regulator *ldo;
> +#endif
> struct regmap *regmap;
> struct clk *mclk;
> };
> @@ -879,6 +885,7 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec)
> return 0;
> }
> #else
> +#ifndef CONFIG_SND_SOC_FSL_SGTL5000_VF610
Checking a platform or SoC specific define here is just a bit....
Could you pls find a better solution? Like I said at first, use fixed regulator
or figure out why your System would hang with current sgtl5000 driver. If it
really has a critical bug in its regulator-related code, I think you can then
make a greater contribution by fixing the bug rather than bypassing it.
Best regards,
Nicolin Chen
> static int ldo_regulator_register(struct snd_soc_codec *codec,
> struct regulator_init_data *init_data,
> int voltage)
> @@ -886,6 +893,7 @@ static int ldo_regulator_register(struct snd_soc_codec *codec,
> dev_err(codec->dev, "this setup needs regulator support in the kernel\n");
> return -EINVAL;
> }
> +#endif
>
> static int ldo_regulator_remove(struct snd_soc_codec *codec)
> {
> @@ -1137,6 +1145,7 @@ static int sgtl5000_resume(struct snd_soc_codec *codec)
> #define sgtl5000_resume NULL
> #endif /* CONFIG_SUSPEND */
>
> +#ifdef CONFIG_REGULATOR
> /*
> * sgtl5000 has 3 internal power supplies:
> * 1. VAG, normally set to vdda/2
> @@ -1373,6 +1382,7 @@ err_regulator_free:
> return ret;
>
> }
> +#endif
>
> static int sgtl5000_probe(struct snd_soc_codec *codec)
> {
> @@ -1387,6 +1397,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
> return ret;
> }
>
> +#ifdef CONFIG_REGULATOR
> ret = sgtl5000_enable_regulators(codec);
> if (ret)
> return ret;
> @@ -1395,6 +1406,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
> ret = sgtl5000_set_power_regs(codec);
> if (ret)
> goto err;
> +#endif
>
> /* enable small pop, introduce 400ms delay in turning off */
> snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL,
> --
> 1.8.4
>
next prev parent reply other threads:[~2013-11-01 10:02 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 7:04 No subject Xiubo Li
2013-11-01 7:04 ` [PATCHv2 1/8] ALSA: Add SAI SoC Digital Audio Interface driver Xiubo Li
2013-11-01 8:59 ` Nicolin Chen
2013-11-04 3:45 ` Li Xiubo
2013-11-04 4:33 ` Nicolin Chen
2013-11-20 3:37 ` Li Xiubo
2013-11-20 3:37 ` Nicolin Chen
2013-11-20 4:16 ` Li Xiubo
2013-11-05 13:26 ` Timur Tabi
2013-11-06 3:27 ` Li Xiubo
2013-11-06 3:31 ` Timur Tabi
2013-11-06 3:53 ` Li Xiubo
2013-11-06 8:12 ` Shawn Guo
2013-11-06 9:38 ` Li Xiubo
2013-11-01 18:25 ` Mark Brown
2013-11-04 7:35 ` Li Xiubo
2013-11-04 16:15 ` Mark Brown
2013-11-05 3:21 ` Li Xiubo
2013-11-06 9:53 ` Mark Brown
2013-11-01 7:04 ` [PATCHv2 2/8] ARM: dts: Add Freescale SAI ALSA SoC Digital Audio Interface node for VF610 Xiubo Li
2013-11-01 7:04 ` [PATCHv2 3/8] ARM: dts: Enables SAI ALSA SoC DAI device for Vybrid VF610 TOWER board Xiubo Li
2013-11-18 18:07 ` Bill Pringlemeir
2013-11-20 3:14 ` Li Xiubo
2013-11-20 16:04 ` Bill Pringlemeir
2013-11-21 2:58 ` Li Xiubo
2013-11-21 14:55 ` Bill Pringlemeir
2013-11-22 6:46 ` Li Xiubo
2013-11-22 15:09 ` Bill Pringlemeir
2013-11-28 7:45 ` Li Xiubo
2013-11-01 7:04 ` [PATCHv2 4/8] Documentation: Add device tree bindings for Freescale SAI Xiubo Li
2013-11-01 7:04 ` [PATCHv2 5/8] ASoC: SGTL5000: Enhance the SGTL5000 codec driver about regulator Xiubo Li
2013-11-01 10:02 ` Nicolin Chen [this message]
2013-11-01 18:50 ` Mark Brown
2013-11-06 8:59 ` Li Xiubo
2013-11-06 10:03 ` Mark Brown
2013-11-07 3:01 ` Li Xiubo
2013-11-07 20:38 ` Mark Brown
2013-11-01 7:04 ` [PATCHv2 6/8] ASoC: fsl: add SGTL5000 based audio machine driver Xiubo Li
2013-11-01 10:17 ` Oskar Schirmer
2013-11-05 3:26 ` Li Xiubo
2013-11-01 10:28 ` Nicolin Chen
2013-11-01 12:07 ` Shawn Guo
2013-11-05 6:17 ` Li Xiubo
2013-11-05 3:50 ` Li Xiubo
2013-11-01 18:40 ` Mark Brown
2013-11-04 9:52 ` Li Xiubo
2013-11-20 7:49 ` Li Xiubo
2013-11-01 7:04 ` [PATCHv2 7/8] ARM: dts: Enable SGTL5000 codec based audio driver node for VF610 Xiubo Li
2013-11-01 7:04 ` [PATCHv2 8/8] Documentation: Add device tree bindings for Freescale VF610 sound Xiubo Li
2013-11-01 7:52 ` [PATCHv1 0/8] ALSA: Add SAI driver and enable SGT15000 codec Li Xiubo
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=20131101100201.GF28401@MrMyself \
--to=b42378@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).