[PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Jeffy Chen <jeffy.chen@rock-chips.com>
Newsgroups	linux.kernel
Subject	[PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay
Date	Thu, 17 Aug 2017 06:50:01 +0200
Message-ID	<ufkUN-8bv-13@gated-at.bofh.it> (permalink)
References	<ufkUN-8bv-7@gated-at.bofh.it>
X-263anti-Spam	KSV:0;
X-Mail-Delivery	1
X-Abs-Checked	4
X-Rl-Sender	jeffy.chen@rock-chips.com
X-Fst-To	linux-kernel@vger.kernel.org
X-Sender-IP	103.29.142.67
X-Login-Name	jeffy.chen@rock-chips.com
X-Unique-Tag	<64a6d068c2304abb38dbe7e643e6dcc8>
X-Sender	cjf@rock-chips.com
X-Mailer	git-send-email 2.11.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	75
Organization	linux.* mail to news gateway
X-Original-Cc	briannorris@chromium.org, mka@chromium.org, 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
X-Original-Date	Thu, 17 Aug 2017 12:44:10 +0800
X-Original-Message-ID	<20170817044417.22069-3-jeffy.chen@rock-chips.com>
X-Original-References	<20170817044417.22069-1-jeffy.chen@rock-chips.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1713531

Show key headers only | View raw

This property is no longer used.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

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 — Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-08-17 06:50 +0200
  Re: [PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay Mark Brown <broonie@kernel.org> - 2017-08-17 19:20 +0200
    Re: [PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay jeffy <jeffy.chen@rock-chips.com> - 2017-08-18 03:50 +0200
      Re: [PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay Mark Brown <broonie@kernel.org> - 2017-08-18 14:00 +0200
        Re: [PATCH v3 2/9] ASoC: rockchip: Remove obsolete dmic-delay jeffy <jeffy.chen@rock-chips.com> - 2017-08-18 16:50 +0200

csiph-web