[PATCH v2 2/2] ARM: Dove: Add the audio device to the Cubox DT

[PATCH v2 2/2] ARM: Dove: Add the audio device to the Cubox DT

[Jean-Francois Moine]

This patch activates the audio device of the Cubox.

The audio flow (pin mpp_audio1) is output on both I2S and S/PDIF.

The third si5351 clock (#2, pin mpp13) is used as the external clock.

Signed-off-by: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
---
 arch/arm/boot/dts/dove-cubox.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 022646e..bb38a24 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -132,3 +132,23 @@
 		reg = <0>;
 	};
 };
+
+&pinctrl {
+	pmx_gpio_13_audio1: pmx-gpio-13-audio1 {
+		marvell,pins = "mpp13";
+		marvell,function = "audio1";
+	};
+
+	pmx_audio1_i2s1_spdifo: pmx-audio1-i2s1-spdifo {
+		marvell,pins = "mpp_audio1";
+		marvell,function = "i2s1/spdifo";
+	};
+};
+
+&audio1 {
+	status = "okay";
+	clocks = <&gate_clk 13>, <&si5351 2>;
+	clock-names = "internal", "extclk";
+	pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_gpio_13_audio1>;
+	pinctrl-names = "default";
+};

-- 
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/
--
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: [PATCH v2 2/2] ARM: Dove: Add the audio device to the Cubox DT

[Sebastian Hesselbarth]

On 10/08/2013 07:42 PM, Jean-Francois Moine wrote:
> This patch activates the audio device of the Cubox.
>
> The audio flow (pin mpp_audio1) is output on both I2S and S/PDIF.
>
> The third si5351 clock (#2, pin mpp13) is used as the external clock.
>
> Signed-off-by: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
> ---
>   arch/arm/boot/dts/dove-cubox.dts | 20 ++++++++++++++++++++
>   1 file changed, 20 insertions(+)
>
> diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
> index 022646e..bb38a24 100644
> --- a/arch/arm/boot/dts/dove-cubox.dts
> +++ b/arch/arm/boot/dts/dove-cubox.dts
> @@ -132,3 +132,23 @@
>   		reg = <0>;
>   	};
>   };
> +
> +&pinctrl {
> +	pmx_gpio_13_audio1: pmx-gpio-13-audio1 {

Jean-Francois,

please name the node "pmx_audio1_extclk: pmx-audio1-extclk"
and move both to the corresponding section in dove.dtsi.
We can reuse them on other Dove boards for sure.

> +		marvell,pins = "mpp13";
> +		marvell,function = "audio1";
> +	};
> +
> +	pmx_audio1_i2s1_spdifo: pmx-audio1-i2s1-spdifo {
> +		marvell,pins = "mpp_audio1";
> +		marvell,function = "i2s1/spdifo";
> +	};
> +};
> +
> +&audio1 {
> +	status = "okay";
> +	clocks = <&gate_clk 13>, <&si5351 2>;
> +	clock-names = "internal", "extclk";
> +	pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_gpio_13_audio1>;

The above needs updated phandles then.

Otherwise,

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

> +	pinctrl-names = "default";
> +};
>

--
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: [PATCH v2 2/2] ARM: Dove: Add the audio device to the Cubox DT

[Jason Cooper]

On Tue, Oct 08, 2013 at 08:03:10PM +0200, Sebastian Hesselbarth wrote:
> On 10/08/2013 07:42 PM, Jean-Francois Moine wrote:
> >This patch activates the audio device of the Cubox.
> >
> >The audio flow (pin mpp_audio1) is output on both I2S and S/PDIF.
> >
> >The third si5351 clock (#2, pin mpp13) is used as the external clock.
> >
> >Signed-off-by: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
> >---
> >  arch/arm/boot/dts/dove-cubox.dts | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> >
> >diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
> >index 022646e..bb38a24 100644
> >--- a/arch/arm/boot/dts/dove-cubox.dts
> >+++ b/arch/arm/boot/dts/dove-cubox.dts
> >@@ -132,3 +132,23 @@
> >  		reg = <0>;
> >  	};
> >  };
> >+
> >+&pinctrl {
> >+	pmx_gpio_13_audio1: pmx-gpio-13-audio1 {
> 
> Jean-Francois,
> 
> please name the node "pmx_audio1_extclk: pmx-audio1-extclk"
> and move both to the corresponding section in dove.dtsi.
> We can reuse them on other Dove boards for sure.
> 
> >+		marvell,pins = "mpp13";
> >+		marvell,function = "audio1";
> >+	};
> >+
> >+	pmx_audio1_i2s1_spdifo: pmx-audio1-i2s1-spdifo {
> >+		marvell,pins = "mpp_audio1";
> >+		marvell,function = "i2s1/spdifo";
> >+	};
> >+};
> >+
> >+&audio1 {
> >+	status = "okay";
> >+	clocks = <&gate_clk 13>, <&si5351 2>;
> >+	clock-names = "internal", "extclk";
> >+	pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_gpio_13_audio1>;
> 
> The above needs updated phandles then.
> 
> Otherwise,
> 
> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Once you make the above changes, just send a v3 in-reply-to this patch
and I'll pick it up with the other two.

thx,

Jason.

> 
> >+	pinctrl-names = "default";
> >+};
> >
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
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

[PATCH v3 2/2] ARM: Dove: Add the audio device to the Cubox DT

[Jean-Francois Moine]

This patch activates the audio device of the Cubox.

The audio flow (pin mpp_audio1) is output on both I2S and S/PDIF.

The third si5351 clock (#2, pin mpp13) is used as the external clock.

Signed-off-by: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
---
Jason,

this patch replaces the previous patch v2 2/2

v3:
- move the pins declaration to dove.dtsi (Sebastian Hesselbarth)
---
 arch/arm/boot/dts/dove.dtsi      | 10 ++++++++++
 arch/arm/boot/dts/dove-cubox.dts |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index e177e66..772b15e 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -227,6 +227,11 @@
 				marvell,function = "gpio";
 			};
 
+			pmx_audio1_extclk: pmx-audio1-extclk {
+				marvell,pins = "mpp13";
+				marvell,function = "audio1";
+			};
+
 			pmx_gpio_14: pmx-gpio-14 {
 				marvell,pins = "mpp14";
 				marvell,function = "gpio";
@@ -302,6 +307,11 @@
 				marvell,function = "gpio";
 			};
 
+			pmx_audio1_i2s1_spdifo: pmx-audio1-i2s1-spdifo {
+				marvell,pins = "mpp_audio1";
+				marvell,function = "i2s1/spdifo";
+			};
+
 			pmx_spi0: pmx-spi0 {
 				marvell,pins = "mpp_spi0";
 				marvell,function = "spi0";
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 022646e..78b0057 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -132,3 +132,11 @@
 		reg = <0>;
 	};
 };
+
+&audio1 {
+	status = "okay";
+	clocks = <&gate_clk 13>, <&si5351 2>;
+	clock-names = "internal", "extclk";
+	pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_audio1_extclk>;
+	pinctrl-names = "default";
+};

-- 
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/
--
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: [PATCH v3 2/2] ARM: Dove: Add the audio device to the Cubox DT

[Jason Cooper]

On Tue, Oct 08, 2013 at 08:56:17PM +0200, Jean-Francois Moine wrote:
> This patch activates the audio device of the Cubox.
> 
> The audio flow (pin mpp_audio1) is output on both I2S and S/PDIF.
> 
> The third si5351 clock (#2, pin mpp13) is used as the external clock.
> 
> Signed-off-by: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
> ---
> Jason,
> 
> this patch replaces the previous patch v2 2/2
> 
> v3:
> - move the pins declaration to dove.dtsi (Sebastian Hesselbarth)
> ---
>  arch/arm/boot/dts/dove.dtsi      | 10 ++++++++++
>  arch/arm/boot/dts/dove-cubox.dts |  8 ++++++++
>  2 files changed, 18 insertions(+)

Applied to mvebu/dt with Sebastian's Ack

thx,

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