* [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay
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 10:32 ` Mark Brown
2017-08-22 7:57 ` [PATCH v5 4/9] arm64: dts: rockchip: Add rt5514 dsp for Gru Jeffy Chen
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Jeffy Chen @ 2017-08-22 7:57 UTC (permalink / raw)
To: linux-kernel, dgreid, heiko
Cc: briannorris, mengdong.lin, mka, lars, dianders, Jeffy Chen,
Jaroslav Kysela, devicetree, alsa-devel, linux-rockchip,
Liam Girdwood, Mark Brown, Takashi Iwai, Rob Herring,
Mark Rutland, linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay
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 11:01 ` jeffy
0 siblings, 1 reply; 7+ messages in thread
From: Mark Brown @ 2017-08-22 10:32 UTC (permalink / raw)
To: Jeffy Chen
Cc: linux-kernel, dgreid, heiko, briannorris, mengdong.lin, mka, lars,
dianders, Jaroslav Kysela, devicetree, alsa-devel, linux-rockchip,
Liam Girdwood, Takashi Iwai, Rob Herring, Mark Rutland,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
On Tue, Aug 22, 2017 at 03:57:20PM +0800, Jeffy Chen wrote:
> This property is no longer used.
I would still rather keep the existing property documented (the binding
does need to be fixed) than remove it. It's better practice and it's
not costing a huge amount.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay
2017-08-22 10:32 ` Mark Brown
@ 2017-08-22 11:01 ` jeffy
0 siblings, 0 replies; 7+ messages in thread
From: jeffy @ 2017-08-22 11:01 UTC (permalink / raw)
To: Mark Brown
Cc: Mark Rutland, devicetree, alsa-devel, mengdong.lin, heiko,
Liam Girdwood, Oder Chiou, briannorris, linux-kernel, Rob Herring,
dianders, linux-rockchip, mka, Takashi Iwai, dgreid, lars,
linux-arm-kernel
Hi Mark,
On 08/22/2017 06:32 PM, Mark Brown wrote:
> On Tue, Aug 22, 2017 at 03:57:20PM +0800, Jeffy Chen wrote:
>> This property is no longer used.
>
> I would still rather keep the existing property documented (the binding
> does need to be fixed) than remove it. It's better practice and it's
> not costing a huge amount.
>
sorry, i should explain more in the commit msg...
just to clarify, this property is replaced by
"realtek,dmic-init-delay-ms" in rt5514 driver:
a5461fd6c8f7 ASoC: rt5514: Add the DMIC initial delay to wait it ready.
which does exactly the same thing as the old one: perform a delay after
set clk...
i can do that if you still insist to keep it, since it's harmless :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v5 4/9] arm64: dts: rockchip: Add rt5514 dsp for Gru
2017-08-22 7:57 [PATCH v5 0/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen
2017-08-22 7:57 ` [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay 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
[not found] ` <20170822075729.8438-1-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
3 siblings, 0 replies; 7+ messages in thread
From: Jeffy Chen @ 2017-08-22 7:57 UTC (permalink / raw)
To: linux-kernel, dgreid, heiko
Cc: briannorris, mengdong.lin, mka, lars, dianders, Jeffy Chen,
devicetree, linux-rockchip, Rob Herring, linux-arm-kernel,
Will Deacon, Mark Rutland, Caesar Wang, Catalin Marinas
Add rt5514 dsp of_node to codec list for Gru boards.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 690a43f46641..72717e77a0fc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -514,7 +514,8 @@
sound {
compatible = "rockchip,rk3399-gru-sound";
rockchip,cpu = <&i2s0 &i2s2>;
- rockchip,codec = <&max98357a &headsetcodec &codec>;
+ rockchip,codec = <&max98357a &headsetcodec
+ &codec &wacky_spi_audio>;
};
};
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v5 5/9] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru
2017-08-22 7:57 [PATCH v5 0/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen
2017-08-22 7:57 ` [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay 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
[not found] ` <20170822075729.8438-1-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
3 siblings, 0 replies; 7+ messages in thread
From: Jeffy Chen @ 2017-08-22 7:57 UTC (permalink / raw)
To: linux-kernel, dgreid, heiko
Cc: briannorris, mengdong.lin, mka, lars, dianders, Jeffy Chen,
devicetree, Klaus Goger, linux-rockchip, Rob Herring,
linux-arm-kernel, Will Deacon, Mark Rutland, Caesar Wang,
Catalin Marinas
Currently the rt5514 i2c driver and rt5514 spi driver are using the same
compatible string.
Add additional unused compatible strings to identify them for Gru
boards.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 72717e77a0fc..c489c78b2b5b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -611,7 +611,7 @@ ap_i2c_mic: &i2c1 {
i2c-scl-rising-time-ns = <300>;
headsetcodec: rt5514@57 {
- compatible = "realtek,rt5514";
+ compatible = "realtek,rt5514", "realtek,rt5514-i2c";
reg = <0x57>;
interrupt-parent = <&gpio1>;
interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;
@@ -828,7 +828,7 @@ ap_i2c_audio: &i2c8 {
status = "okay";
wacky_spi_audio: spi2@0 {
- compatible = "realtek,rt5514";
+ compatible = "realtek,rt5514", "realtek,rt5514-spi";
reg = <0>;
/* May run faster once verified. */
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
[parent not found: <20170822075729.8438-1-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>]
* [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip,codec
[not found] ` <20170822075729.8438-1-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
@ 2017-08-22 7:57 ` Jeffy Chen
0 siblings, 0 replies; 7+ messages in thread
From: Jeffy Chen @ 2017-08-22 7:57 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
dgreid-F7+t8E8rja9g9hUCZPvPmw, heiko-4mtYJXux2i+zQB+pC5nmwQ
Cc: briannorris-F7+t8E8rja9g9hUCZPvPmw,
mengdong.lin-VuQAYsv1563Yd54FQh9/CA, mka-F7+t8E8rja9g9hUCZPvPmw,
lars-Qo5EllUWu/uELgA04lAiVw, dianders-F7+t8E8rja9g9hUCZPvPmw,
Jeffy Chen, devicetree-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, Liam Girdwood, Mark Brown,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Rob Herring,
Mark Rutland, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Update description for newly added optional audio codecs.
Signed-off-by: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
index f19b6c830a34..f54b4e91e97c 100644
--- a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
@@ -4,7 +4,7 @@ Required properties:
- compatible: "rockchip,rk3399-gru-sound"
- rockchip,cpu: The phandle of the Rockchip I2S controller that's
connected to the codecs
-- rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs
+- rockchip,codec: The phandle of the audio codecs
Example:
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 7+ messages in thread