Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1516125 > unrolled thread

[PATCH 0/3] ARM: gr8: evb: Enable the i2s codec

Started byMaxime Ripard <maxime.ripard@free-electrons.com>
First post2016-11-07 14:10 +0100
Last post2016-11-08 09:00 +0100
Articles 9 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] ARM: gr8: evb: Enable the i2s codec Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-07 14:10 +0100
    [PATCH 2/3] ASoC: wm8978: Adjust clock indices so that simple card works Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-07 14:10 +0100
      Applied "ASoC: wm8978: Adjust clock indices so that simple card works" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-11-09 16:10 +0100
    [PATCH 3/3] ARM: gr8: evb: Add i2s codec Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-07 14:20 +0100
      Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec Chen-Yu Tsai <wens@csie.org> - 2016-11-07 15:20 +0100
        Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec Chen-Yu Tsai <wens@csie.org> - 2016-11-08 09:00 +0100
          Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-08 21:40 +0100
          Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-10 12:00 +0100
        Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-08 09:00 +0100

#1516125 — [PATCH 0/3] ARM: gr8: evb: Enable the i2s codec

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-11-07 14:10 +0100
Subject[PATCH 0/3] ARM: gr8: evb: Enable the i2s codec
Message-ID<sARQu-3wK-55@gated-at.bofh.it>
The GR8-EVB comes with a wm8978 codec connected to the SoC through an I2S
bus.

A few patches were needed for it to work with simple-card, those are the
very first patches.

The last one will add that card to the relevant device tree so that we can
use it.

Let me know what you think,
Maxime

Maxime Ripard (3):
  ASoC: sunxi: i2s: Implement set_sysclk
  ASoC: wm8978: Adjust clock indices so that simple card works
  ARM: gr8: evb: Add i2s codec

 arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++-
 sound/soc/codecs/wm8978.h         |  2 +-
 sound/soc/sunxi/sun4i-i2s.c       | 53 ++++++++++++++++++++++----------
 3 files changed, 53 insertions(+), 16 deletions(-)

base-commit: ff9ed64af60bd87cc1c1225e595a33fe248b02bf
-- 
git-series 0.8.11

[toc] | [next] | [standalone]

#1516126 — [PATCH 2/3] ASoC: wm8978: Adjust clock indices so that simple card works

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-11-07 14:10 +0100
Subject[PATCH 2/3] ASoC: wm8978: Adjust clock indices so that simple card works
Message-ID<sARQv-3wK-81@gated-at.bofh.it>
In reply to#1516125
Using simple-card with the wm8978 doesn't work because simple card calls
set_sysclk on the clock index 0, which is not the MCLK in the WM8978.

Adjust the clock definition so that the clock 0 is the MCLK.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 sound/soc/codecs/wm8978.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm8978.h b/sound/soc/codecs/wm8978.h
index 6ae43495b7cf..0dcf6868dff6 100644
--- a/sound/soc/codecs/wm8978.h
+++ b/sound/soc/codecs/wm8978.h
@@ -78,8 +78,8 @@ enum wm8978_clk_id {
 };
 
 enum wm8978_sysclk_src {
+	WM8978_MCLK = 0,
 	WM8978_PLL,
-	WM8978_MCLK
 };
 
 #endif	/* __WM8978_H__ */
-- 
git-series 0.8.11

[toc] | [prev] | [next] | [standalone]

#1518247 — Applied "ASoC: wm8978: Adjust clock indices so that simple card works" to the asoc tree

FromMark Brown <broonie@kernel.org>
Date2016-11-09 16:10 +0100
SubjectApplied "ASoC: wm8978: Adjust clock indices so that simple card works" to the asoc tree
Message-ID<sBCFJ-xU-43@gated-at.bofh.it>
In reply to#1516126
The patch

   ASoC: wm8978: Adjust clock indices so that simple card works

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From fbd972d7f4a60677f6fbe558dc23e4029dc2d45d Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 7 Nov 2016 14:08:20 +0100
Subject: [PATCH] ASoC: wm8978: Adjust clock indices so that simple card works

Using simple-card with the wm8978 doesn't work because simple card calls
set_sysclk on the clock index 0, which is not the MCLK in the WM8978.

Adjust the clock definition so that the clock 0 is the MCLK.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/wm8978.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm8978.h b/sound/soc/codecs/wm8978.h
index 6ae43495b7cf..0dcf6868dff6 100644
--- a/sound/soc/codecs/wm8978.h
+++ b/sound/soc/codecs/wm8978.h
@@ -78,8 +78,8 @@ enum wm8978_clk_id {
 };
 
 enum wm8978_sysclk_src {
+	WM8978_MCLK = 0,
 	WM8978_PLL,
-	WM8978_MCLK
 };
 
 #endif	/* __WM8978_H__ */
-- 
2.10.2

[toc] | [prev] | [next] | [standalone]

#1516159 — [PATCH 3/3] ARM: gr8: evb: Add i2s codec

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-11-07 14:20 +0100
Subject[PATCH 3/3] ARM: gr8: evb: Add i2s codec
Message-ID<sAS0b-3Aq-73@gated-at.bofh.it>
In reply to#1516125
The GR8-EVB comes with a wm8978 codec connected to the i2s bus.

Add a card in order to have it working

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/ntc-gr8-evb.dts
index 12b4317a4383..5291e425caf9 100644
--- a/arch/arm/boot/dts/ntc-gr8-evb.dts
+++ b/arch/arm/boot/dts/ntc-gr8-evb.dts
@@ -76,6 +76,20 @@
 		default-brightness-level = <8>;
 	};
 
+	i2s {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "gr8-evb-wm8978";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <512>;
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s0>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&wm8978>;
+		};
+	};
 
 	panel {
 		compatible = "allwinner,sun4i-a10-sub-evb-5-lcd";
-- 
git-series 0.8.11

[toc] | [prev] | [next] | [standalone]

#1516222 — Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec

FromChen-Yu Tsai <wens@csie.org>
Date2016-11-07 15:20 +0100
SubjectRe: [PATCH 3/3] ARM: gr8: evb: Add i2s codec
Message-ID<sASWd-4ht-11@gated-at.bofh.it>
In reply to#1516159
On Mon, Nov 7, 2016 at 9:08 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> The GR8-EVB comes with a wm8978 codec connected to the i2s bus.
>
> Add a card in order to have it working
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++++++++
>  1 file changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/ntc-gr8-evb.dts
> index 12b4317a4383..5291e425caf9 100644
> --- a/arch/arm/boot/dts/ntc-gr8-evb.dts
> +++ b/arch/arm/boot/dts/ntc-gr8-evb.dts
> @@ -76,6 +76,20 @@
>                 default-brightness-level = <8>;
>         };
>
> +       i2s {

"sound" might be a better node name? The I2S controllers are also named "i2s".

Otherwise,

Acked-by: Chen-Yu Tsai <wens@csie.org>

> +               compatible = "simple-audio-card";
> +               simple-audio-card,name = "gr8-evb-wm8978";
> +               simple-audio-card,format = "i2s";
> +               simple-audio-card,mclk-fs = <512>;
> +
> +               simple-audio-card,cpu {
> +                       sound-dai = <&i2s0>;
> +               };
> +
> +               simple-audio-card,codec {
> +                       sound-dai = <&wm8978>;
> +               };
> +       };
>
>         panel {
>                 compatible = "allwinner,sun4i-a10-sub-evb-5-lcd";
> --
> git-series 0.8.11

[toc] | [prev] | [next] | [standalone]

#1516909 — Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec

FromChen-Yu Tsai <wens@csie.org>
Date2016-11-08 09:00 +0100
SubjectRe: [PATCH 3/3] ARM: gr8: evb: Add i2s codec
Message-ID<sB9u2-6ui-29@gated-at.bofh.it>
In reply to#1516222
On Tue, Nov 8, 2016 at 3:44 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Mon, Nov 07, 2016 at 10:11:45PM +0800, Chen-Yu Tsai wrote:
>> On Mon, Nov 7, 2016 at 9:08 PM, Maxime Ripard
>> <maxime.ripard@free-electrons.com> wrote:
>> > The GR8-EVB comes with a wm8978 codec connected to the i2s bus.
>> >
>> > Add a card in order to have it working
>> >
>> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>> > ---
>> >  arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++++++++
>> >  1 file changed, 14 insertions(+), 0 deletions(-)
>> >
>> > diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/ntc-gr8-evb.dts
>> > index 12b4317a4383..5291e425caf9 100644
>> > --- a/arch/arm/boot/dts/ntc-gr8-evb.dts
>> > +++ b/arch/arm/boot/dts/ntc-gr8-evb.dts
>> > @@ -76,6 +76,20 @@
>> >                 default-brightness-level = <8>;
>> >         };
>> >
>> > +       i2s {
>>
>> "sound" might be a better node name? The I2S controllers are also
>> named "i2s".
>
> I know, but we also had the codec and SPDIF on this board, so sound
> was too generic to be meaningful I guess. I don't really care about
> the name though, if you have any suggestion...

Well people seem to use "sound" for the sound card nodes...

What about "sound-analog" for this one, and "sound-spdif" for the
SPDIF simple card? Or "analog-sound" and "spdif-sound" if that looks
better.


ChenYu

>> Otherwise,
>>
>> Acked-by: Chen-Yu Tsai <wens@csie.org>
>
> Thanks!
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com

[toc] | [prev] | [next] | [standalone]

#1517567 — Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-11-08 21:40 +0100
SubjectRe: [PATCH 3/3] ARM: gr8: evb: Add i2s codec
Message-ID<sBllw-5TP-23@gated-at.bofh.it>
In reply to#1516909

[Multipart message — attachments visible in raw view] — view raw

On Tue, Nov 08, 2016 at 03:57:48PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 8, 2016 at 3:44 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > On Mon, Nov 07, 2016 at 10:11:45PM +0800, Chen-Yu Tsai wrote:
> >> On Mon, Nov 7, 2016 at 9:08 PM, Maxime Ripard
> >> <maxime.ripard@free-electrons.com> wrote:
> >> > The GR8-EVB comes with a wm8978 codec connected to the i2s bus.
> >> >
> >> > Add a card in order to have it working
> >> >
> >> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> >> > ---
> >> >  arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++++++++
> >> >  1 file changed, 14 insertions(+), 0 deletions(-)
> >> >
> >> > diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/ntc-gr8-evb.dts
> >> > index 12b4317a4383..5291e425caf9 100644
> >> > --- a/arch/arm/boot/dts/ntc-gr8-evb.dts
> >> > +++ b/arch/arm/boot/dts/ntc-gr8-evb.dts
> >> > @@ -76,6 +76,20 @@
> >> >                 default-brightness-level = <8>;
> >> >         };
> >> >
> >> > +       i2s {
> >>
> >> "sound" might be a better node name? The I2S controllers are also
> >> named "i2s".
> >
> > I know, but we also had the codec and SPDIF on this board, so sound
> > was too generic to be meaningful I guess. I don't really care about
> > the name though, if you have any suggestion...
> 
> Well people seem to use "sound" for the sound card nodes...
> 
> What about "sound-analog" for this one, and "sound-spdif" for the
> SPDIF simple card? Or "analog-sound" and "spdif-sound" if that looks
> better.

sound-analog works for me. I'll either fix it in the v2, or while
applying.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[toc] | [prev] | [next] | [standalone]

#1518856 — Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-11-10 12:00 +0100
SubjectRe: [PATCH 3/3] ARM: gr8: evb: Add i2s codec
Message-ID<sBVfk-4HF-27@gated-at.bofh.it>
In reply to#1516909

[Multipart message — attachments visible in raw view] — view raw

1;4600;0c
On Tue, Nov 08, 2016 at 03:57:48PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 8, 2016 at 3:44 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > On Mon, Nov 07, 2016 at 10:11:45PM +0800, Chen-Yu Tsai wrote:
> >> On Mon, Nov 7, 2016 at 9:08 PM, Maxime Ripard
> >> <maxime.ripard@free-electrons.com> wrote:
> >> > The GR8-EVB comes with a wm8978 codec connected to the i2s bus.
> >> >
> >> > Add a card in order to have it working
> >> >
> >> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> >> > ---
> >> >  arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++++++++
> >> >  1 file changed, 14 insertions(+), 0 deletions(-)
> >> >
> >> > diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/ntc-gr8-evb.dts
> >> > index 12b4317a4383..5291e425caf9 100644
> >> > --- a/arch/arm/boot/dts/ntc-gr8-evb.dts
> >> > +++ b/arch/arm/boot/dts/ntc-gr8-evb.dts
> >> > @@ -76,6 +76,20 @@
> >> >                 default-brightness-level = <8>;
> >> >         };
> >> >
> >> > +       i2s {
> >>
> >> "sound" might be a better node name? The I2S controllers are also
> >> named "i2s".
> >
> > I know, but we also had the codec and SPDIF on this board, so sound
> > was too generic to be meaningful I guess. I don't really care about
> > the name though, if you have any suggestion...
> 
> Well people seem to use "sound" for the sound card nodes...
> 
> What about "sound-analog" for this one, and "sound-spdif" for the
> SPDIF simple card? Or "analog-sound" and "spdif-sound" if that looks
> better.

I fixed it and applied.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[toc] | [prev] | [next] | [standalone]

#1516913 — Re: [PATCH 3/3] ARM: gr8: evb: Add i2s codec

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-11-08 09:00 +0100
SubjectRe: [PATCH 3/3] ARM: gr8: evb: Add i2s codec
Message-ID<sB9u2-6ui-31@gated-at.bofh.it>
In reply to#1516222

[Multipart message — attachments visible in raw view] — view raw

On Mon, Nov 07, 2016 at 10:11:45PM +0800, Chen-Yu Tsai wrote:
> On Mon, Nov 7, 2016 at 9:08 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > The GR8-EVB comes with a wm8978 codec connected to the i2s bus.
> >
> > Add a card in order to have it working
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> >  arch/arm/boot/dts/ntc-gr8-evb.dts | 14 ++++++++++++++
> >  1 file changed, 14 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/ntc-gr8-evb.dts
> > index 12b4317a4383..5291e425caf9 100644
> > --- a/arch/arm/boot/dts/ntc-gr8-evb.dts
> > +++ b/arch/arm/boot/dts/ntc-gr8-evb.dts
> > @@ -76,6 +76,20 @@
> >                 default-brightness-level = <8>;
> >         };
> >
> > +       i2s {
> 
> "sound" might be a better node name? The I2S controllers are also
> named "i2s".

I know, but we also had the codec and SPDIF on this board, so sound
was too generic to be meaningful I guess. I don't really care about
the name though, if you have any suggestion...

> Otherwise,
> 
> Acked-by: Chen-Yu Tsai <wens@csie.org>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web