[RESENT PATCH v7 0/7] ASoC: rockchip: Parse dai links from dts

[RESENT PATCH v7 0/7] ASoC: rockchip: Parse dai links from dts

[Jeffy Chen]

Currently we are using a fixed list of dai links in the driver.
This serial of patches would let the driver parse dai links from
dts, so that we can make some of them optional for future boards.

Tested on my chromebook bob(with cros 4.4 kernel), it still works
after disabled rt5514 codecs in the dts.


Changes in v7:
Rebase on the newest for-next

Changes in v6:
Add dmic wakeup delay(not used for now).

Changes in v3:
Use compatible to match audio codecs
        -- Suggested-by Matthias Kaehlcke <mka@chromium.org>

Changes in v2:
Let rockchip,codec-names be a required property, because we plan to
add more supported codecs to the fixed dai link list in the driver.

Jeffy Chen (7):
  ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp
  arm64: dts: rockchip: Add rt5514 dsp for Gru
  arm64: dts: rockchip: Update rt5514 devices' compatible for Gru
  ASoC: rockchip: Parse dai links from dts
  ASoC: rockchip: Add support for DP codec
  ASoC: rockchip: Add support for DMIC codec
  dt-bindings: ASoC: rockchip: Update description of rockchip,codec

 .../bindings/sound/rockchip,rk3399-gru-sound.txt   |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |   7 +-
 sound/soc/rockchip/Kconfig                         |   2 +
 sound/soc/rockchip/rk3399_gru_sound.c              | 255 +++++++++++++++------
 4 files changed, 186 insertions(+), 80 deletions(-)

-- 
2.11.0

[RESENT PATCH v7 2/7] arm64: dts: rockchip: Add rt5514 dsp for Gru

[Jeffy Chen]

Add rt5514 dsp of_node to codec list for Gru boards.

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

Changes in v7: None
Changes in v6: 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 199a5118b20d..5772c52fbfd3 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

Re: [RESENT PATCH v7 2/7] arm64: dts: rockchip: Add rt5514 dsp for Gru

[Heiko Stuebner]

Am Donnerstag, 24. August 2017, 12:52:22 CEST schrieb Jeffy Chen:
> Add rt5514 dsp of_node to codec list for Gru boards.
> 
> Signed-off-by: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>

applied for 4.15
Second patch needs to wait a bit more for the binding to get accepted.


Thanks
Heiko
--
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

Re: [RESENT PATCH v7 2/7] arm64: dts: rockchip: Add rt5514 dsp for Gru

[Heiko Stuebner]

Am Samstag, 9. September 2017, 13:13:01 CEST schrieb Heiko Stuebner:
> Am Donnerstag, 24. August 2017, 12:52:22 CEST schrieb Jeffy Chen:
> > Add rt5514 dsp of_node to codec list for Gru boards.
> > 
> > Signed-off-by: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
> 
> applied for 4.15
> Second patch needs to wait a bit more for the binding to get accepted.

just realized that
	[PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru

is also part of the 2-patch series adding the compatible, so I don't need
to track it here anymore, so nevermind the comment above.


Heiko
--
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

[RESENT PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru

[Jeffy Chen]

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 v7: None
Changes in v6: 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 5772c52fbfd3..50fb11ad9f17 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>;
 		realtek,dmic-init-delay-ms = <20>;
 	};
@@ -820,7 +820,7 @@ ap_i2c_audio: &i2c8 {
 	status = "okay";
 
 	wacky_spi_audio: spi2@0 {
-		compatible = "realtek,rt5514";
+		compatible = "realtek,rt5514", "realtek,rt5514-spi";
 		reg = <0>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.11.0

Re: [RESENT PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru

[Heiko Stübner]

Hi Jeffy,

Am Donnerstag, 24. August 2017, 12:52:23 CEST schrieb Jeffy Chen:
> 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-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
> ---
> 
> Changes in v7: None
> Changes in v6: 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
> 5772c52fbfd3..50fb11ad9f17 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";

the rt5514-i2c and -spi compatibles should be documented in the binding-txt
of the chip, but I haven't found any mention of this.


Heiko

--
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

Re: [RESENT PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru

[jeffy]

Hi Heiko,

thanks for your reply.

On 08/30/2017 09:30 PM, Heiko Stübner wrote:
>> >-		compatible = "realtek,rt5514";
>> >+		compatible = "realtek,rt5514", "realtek,rt5514-i2c";
> the rt5514-i2c and -spi compatibles should be documented in the binding-txt
> of the chip, but I haven't found any mention of this.
>
>
> Heiko

these compatibles are only used for our snd driver to detect rt5514 i2c 
driver and rt5514 spi driver, suggested by Matthias at 
https://patchwork.kernel.org/patch/9904731/

should i add it in the rockchip,rk3399-gru-sound.txt or rt5514 binding 
document?

Re: [RESENT PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru

[Heiko Stübner]

Am Donnerstag, 31. August 2017, 01:00:44 CEST schrieb jeffy:
> On 08/30/2017 09:30 PM, Heiko Stübner wrote:
> >> >-		compatible = "realtek,rt5514";
> >> >+		compatible = "realtek,rt5514", "realtek,rt5514-i2c";
> > 
> > the rt5514-i2c and -spi compatibles should be documented in the
> > binding-txt
> > of the chip, but I haven't found any mention of this.
> > 
> > 
> > Heiko
> 
> these compatibles are only used for our snd driver to detect rt5514 i2c
> driver and rt5514 spi driver, suggested by Matthias at
> https://patchwork.kernel.org/patch/9904731/
> 
> should i add it in the rockchip,rk3399-gru-sound.txt or rt5514 binding
> document?

You're introducing new bindings for the codec, so they should of course
part of the rt5514 binding.


Heiko

--
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

Re: [RESENT PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible for Gru

[jeffy]

Hi Heiko,

On 09/05/2017 06:33 AM, Heiko Stübner wrote:
> Am Donnerstag, 31. August 2017, 01:00:44 CEST schrieb jeffy:
>> On 08/30/2017 09:30 PM, Heiko Stübner wrote:
>>>>> -		compatible = "realtek,rt5514";
>>>>> +		compatible = "realtek,rt5514", "realtek,rt5514-i2c";
>>>
>>> the rt5514-i2c and -spi compatibles should be documented in the
>>> binding-txt
>>> of the chip, but I haven't found any mention of this.
>>>
>>>
>>> Heiko
>>
>> these compatibles are only used for our snd driver to detect rt5514 i2c
>> driver and rt5514 spi driver, suggested by Matthias at
>> https://patchwork.kernel.org/patch/9904731/
>>
>> should i add it in the rockchip,rk3399-gru-sound.txt or rt5514 binding
>> document?
>
> You're introducing new bindings for the codec, so they should of course
> part of the rt5514 binding.
ok, will do that.
and it looks like there's no binding for rt5514-spi, will add it too :)
>
>
> Heiko
>
>
>
>

[RESENT PATCH v7 7/7] dt-bindings: ASoC: rockchip: Update description of rockchip,codec

[Jeffy Chen]

Update description for newly added optional audio codecs.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
---

Changes in v7: None
Changes in v6: 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 eac91db07178..72d3cf4c2606 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
 
 Optional properties:
 - dmic-wakeup-delay-ms : specify delay time (ms) for DMIC ready.
-- 
2.11.0