diff mbox

[3/3] ARM: dts: Add WM1811A audio CODEC to Arndale bindings

Message ID 1372714599-17588-3-git-send-email-broonie@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Mark Brown July 1, 2013, 9:36 p.m. UTC
From: Mark Brown <broonie@linaro.org>

The default audio module for the Arndale has a WM811A on it. Add this to
the device tree bindings.

Signed-off-by: Mark Brown <broonie@linaro.org>
---
 arch/arm/boot/dts/exynos5250-arndale.dts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Fabio Estevam July 1, 2013, 9:47 p.m. UTC | #1
On Mon, Jul 1, 2013 at 6:36 PM, Mark Brown <broonie@kernel.org> wrote:

>         i2c@12C90000 {
> -               status = "disabled";
> +               wm1811a@11 {
> +                       compatible = "wlf,wm1811";
> +                       reg = <0x1a>;

Shouldn't it be reg = <0x11> ? Or wm1811a@1a ?
Mark Brown July 1, 2013, 10:38 p.m. UTC | #2
On Mon, Jul 01, 2013 at 06:47:00PM -0300, Fabio Estevam wrote:
> On Mon, Jul 1, 2013 at 6:36 PM, Mark Brown <broonie@kernel.org> wrote:

> >         i2c@12C90000 {
> > -               status = "disabled";
> > +               wm1811a@11 {
> > +                       compatible = "wlf,wm1811";
> > +                       reg = <0x1a>;

> Shouldn't it be reg = <0x11> ? Or wm1811a@1a ?

The @ should change.  Though since it's one of the bits of ornamental
noise DT has rules for :/
Tushar Behera July 2, 2013, 5:21 a.m. UTC | #3
On 07/02/2013 03:06 AM, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
> 
> The default audio module for the Arndale has a WM811A on it. Add this to

typo: WM1811A

Arndale board also comes with two other audio codec boards - ALC5631Q
and AK4678. Different audio codec boards came with different shipments.

> the device tree bindings.
> 
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>  arch/arm/boot/dts/exynos5250-arndale.dts | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index 482f275..75c3065 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -325,7 +325,22 @@
>  	};
>  
>  	i2c@12C90000 {
> -		status = "disabled";
> +		wm1811a@11 {
> +			compatible = "wlf,wm1811";
> +			reg = <0x1a>;
> +
> +			AVDD2-supply = <&main_dc_reg>;
> +			CPVDD-supply = <&main_dc_reg>;
> +			DBVDD1-supply = <&main_dc_reg>;
> +			DBVDD2-supply = <&main_dc_reg>;
> +			DBVDD3-supply = <&main_dc_reg>;
> +			LDO1VDD-supply = <&main_dc_reg>;
> +			SPKVDD1-supply = <&main_dc_reg>;
> +			SPKVDD2-supply = <&main_dc_reg>;
> +
> +			wlf,ldo1ena = <&gpb0 0 0>;
> +			wlf,ldo2ena = <&gpb0 1 0>;
> +		};
>  	};
>  
>  	i2c@12CA0000 {
>
Mark Brown July 2, 2013, 9:25 a.m. UTC | #4
On Tue, Jul 02, 2013 at 10:51:36AM +0530, Tushar Behera wrote:

> Arndale board also comes with two other audio codec boards - ALC5631Q
> and AK4678. Different audio codec boards came with different shipments.

This is the default though and since they didn't bother providing any
way of identifying the modules we just have to put them all in the
device tree and hope that the individual CODEC drivers can do runtime
identification (the WM1811A can but I don't know about the other two,
nobody supported them upstream).
kgene@kernel.org July 24, 2013, 1:50 a.m. UTC | #5
Mark Brown wrote:
> 
> On Tue, Jul 02, 2013 at 10:51:36AM +0530, Tushar Behera wrote:
> 
> > Arndale board also comes with two other audio codec boards - ALC5631Q
> > and AK4678. Different audio codec boards came with different shipments.
> 
> This is the default though and since they didn't bother providing any
> way of identifying the modules we just have to put them all in the
> device tree and hope that the individual CODEC drivers can do runtime
> identification (the WM1811A can but I don't know about the other two,
> nobody supported them upstream).

Basically, I agree with Mark Brown's opinion, at this moment would be better
if upstreamed WM1811A could be supported on Arndale and if further
supporting of two codecs is required, we could discuss again next time. And
they should be identified in the kernel at runtime.

- Kukjin
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 482f275..75c3065 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -325,7 +325,22 @@ 
 	};
 
 	i2c@12C90000 {
-		status = "disabled";
+		wm1811a@11 {
+			compatible = "wlf,wm1811";
+			reg = <0x1a>;
+
+			AVDD2-supply = <&main_dc_reg>;
+			CPVDD-supply = <&main_dc_reg>;
+			DBVDD1-supply = <&main_dc_reg>;
+			DBVDD2-supply = <&main_dc_reg>;
+			DBVDD3-supply = <&main_dc_reg>;
+			LDO1VDD-supply = <&main_dc_reg>;
+			SPKVDD1-supply = <&main_dc_reg>;
+			SPKVDD2-supply = <&main_dc_reg>;
+
+			wlf,ldo1ena = <&gpb0 0 0>;
+			wlf,ldo2ena = <&gpb0 1 0>;
+		};
 	};
 
 	i2c@12CA0000 {