Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1717118
| From | Jeffy Chen <jeffy.chen@rock-chips.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay |
| Date | 2017-08-22 10:00 +0200 |
| Message-ID | <uhcgp-7KH-11@gated-at.bofh.it> (permalink) |
| References | <uhcgp-7KH-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
This property is no longer used.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
---
Changes in v5: None
Changes in v4:
Use non-zero drv id to avoid legacy dai naming instead of switching to
snd_soc_register_codec.
Changes in v3: None
Changes in v2: None
.../bindings/sound/rockchip,rk3399-gru-sound.txt | 7 -------
sound/soc/rockchip/rk3399_gru_sound.c | 14 --------------
2 files changed, 21 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
index eac91db07178..f19b6c830a34 100644
--- a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
@@ -6,17 +6,10 @@ Required properties:
connected to the codecs
- rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs
-Optional properties:
-- dmic-wakeup-delay-ms : specify delay time (ms) for DMIC ready.
- If this option is specified, which means it's required dmic need
- delay for DMIC to ready so that rt5514 can avoid recording before
- DMIC send valid data
-
Example:
sound {
compatible = "rockchip,rk3399-gru-sound";
rockchip,cpu = <&i2s0>;
rockchip,codec = <&max98357a &rt5514 &da7219>;
- dmic-wakeup-delay-ms = <20>;
};
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 3475c61a5fa0..70876d3c34e6 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -38,8 +38,6 @@
#define SOUND_FS 256
-static unsigned int rt5514_dmic_delay;
-
static struct snd_soc_jack rockchip_sound_jack;
static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = {
@@ -125,9 +123,6 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream,
return ret;
}
- /* Wait for DMIC stable */
- msleep(rt5514_dmic_delay);
-
return 0;
}
@@ -348,15 +343,6 @@ static int rockchip_sound_probe(struct platform_device *pdev)
return -ENODEV;
}
- /* Set DMIC delay */
- ret = device_property_read_u32(&pdev->dev, "dmic-delay",
- &rt5514_dmic_delay);
- if (ret) {
- rt5514_dmic_delay = 0;
- dev_dbg(&pdev->dev,
- "no optional property 'dmic-delay' found, default: no delay\n");
- }
-
rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
--
2.11.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v5 0/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
[PATCH v5 4/9] arm64: dts: rockchip: Add rt5514 dsp for Gru Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
[PATCH v5 3/9] ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
[PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
Re: [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay Mark Brown <broonie@kernel.org> - 2017-08-22 12:40 +0200
Re: [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay jeffy <jeffy.chen@rock-chips.com> - 2017-08-22 13:10 +0200
[PATCH v5 8/9] ASoC: rockchip: Add support for DMIC codec Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
[PATCH v5 5/9] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
[PATCH v5 6/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
Re: [PATCH v5 6/9] ASoC: rockchip: Parse dai links from dts Donglin Peng <dolinux.peng@gmail.com> - 2017-08-22 11:10 +0200
Re: [PATCH v5 6/9] ASoC: rockchip: Parse dai links from dts jeffy <jeffy.chen@rock-chips.com> - 2017-08-22 11:30 +0200
[PATCH v5 7/9] ASoC: rockchip: Add support for DP codec Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:00 +0200
[PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip,codec Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:10 +0200
[PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-22 10:10 +0200
Applied "ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-08-22 14:50 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Donglin Peng <dolinux.peng@gmail.com> - 2017-08-22 15:30 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Mark Brown <broonie@kernel.org> - 2017-08-22 16:10 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Donglin Peng <dolinux.peng@gmail.com> - 2017-08-22 16:20 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Mark Brown <broonie@kernel.org> - 2017-08-22 16:30 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Takashi Iwai <tiwai@suse.de> - 2017-08-22 16:30 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Mark Brown <broonie@kernel.org> - 2017-08-22 16:40 +0200
Re: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai jeffy <jeffy.chen@rock-chips.com> - 2017-08-22 16:40 +0200
csiph-web