From: Jeffy Chen <jeffy.chen@rock-chips.com> To: linux-kernel@vger.kernel.org, dgreid@chromium.org, heiko@sntech.de Cc: briannorris@chromium.org, mengdong.lin@linux.intel.com, mka@chromium.org, lars@metafoo.de, dianders@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>, Jaroslav Kysela <perex@perex.cz>, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-rockchip@lists.infradead.org, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay Date: Tue, 22 Aug 2017 15:57:20 +0800 [thread overview] Message-ID: <20170822075729.8438-2-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <20170822075729.8438-1-jeffy.chen@rock-chips.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: jeffy.chen@rock-chips.com (Jeffy Chen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay Date: Tue, 22 Aug 2017 15:57:20 +0800 [thread overview] Message-ID: <20170822075729.8438-2-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <20170822075729.8438-1-jeffy.chen@rock-chips.com> 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
next prev parent reply other threads:[~2017-08-22 7:57 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-22 7:57 [PATCH v5 0/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen [this message] 2017-08-22 7:57 ` [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay Jeffy Chen 2017-08-22 10:32 ` Mark Brown 2017-08-22 10:32 ` Mark Brown 2017-08-22 11:01 ` jeffy 2017-08-22 11:01 ` jeffy 2017-08-22 11:01 ` jeffy 2017-08-22 7:57 ` [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 12:47 ` Applied "ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai" to the asoc tree Mark Brown 2017-08-22 12:47 ` Mark Brown 2017-08-22 13:24 ` [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Donglin Peng 2017-08-22 14:02 ` Mark Brown 2017-08-22 14:15 ` Donglin Peng 2017-08-22 14:21 ` Mark Brown 2017-08-22 14:26 ` Takashi Iwai 2017-08-22 14:26 ` Takashi Iwai 2017-08-22 14:31 ` Mark Brown 2017-08-22 14:39 ` jeffy 2017-08-22 14:39 ` jeffy 2017-08-22 7:57 ` [PATCH v5 3/9] ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 4/9] arm64: dts: rockchip: Add rt5514 dsp for Gru Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 5/9] arm64: dts: rockchip: Update rt5514 devices' compatible " Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 6/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 9:08 ` Donglin Peng 2017-08-22 9:08 ` Donglin Peng 2017-08-22 9:25 ` jeffy 2017-08-22 9:25 ` jeffy 2017-08-22 7:57 ` [PATCH v5 7/9] ASoC: rockchip: Add support for DP codec Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 8/9] ASoC: rockchip: Add support for DMIC codec Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip,codec Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip, codec Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip,codec Jeffy Chen
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=20170822075729.8438-2-jeffy.chen@rock-chips.com \ --to=jeffy.chen@rock-chips.com \ --cc=alsa-devel@alsa-project.org \ --cc=briannorris@chromium.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=dgreid@chromium.org \ --cc=dianders@chromium.org \ --cc=heiko@sntech.de \ --cc=lars@metafoo.de \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=mengdong.lin@linux.intel.com \ --cc=mka@chromium.org \ --cc=perex@perex.cz \ --cc=robh+dt@kernel.org \ --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: linkBe 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.