devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card
@ 2018-03-19 13:53 Matt Porter
  2018-03-19 14:13 ` Fabio Estevam
  2018-03-19 14:23 ` Russell King - ARM Linux
  0 siblings, 2 replies; 4+ messages in thread
From: Matt Porter @ 2018-03-19 13:53 UTC (permalink / raw)
  To: Shawn Guo, Sascha Hauer, Fabio Estevam, Rob Herring,
	Mark Rutland, Russell King,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list

The HB2 onboard audio currently makes use of the imx-audio-sgtl5000
binding. This binding does not support auxiliary audio devices such
as external amplifiers. The simple-audio-card binding does support
this property which allows systems incorporating the HB2 to easily
add an auxiliary device that's attached to the HB2 audio jack with
an overlay. Convert HB2 to use simple-audio-card for the onboard
audio to allow for this additional flexibility.

Signed-off-by: Matt Porter <mporter@konsulko.com>
---
 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 48 +++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index dffbc92e0023..587251ab76ec 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -38,6 +38,7 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
+#include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
 	chosen {
@@ -145,22 +146,52 @@
 		vin-supply = <&v_5v0>;
 	};
 
-	sound-sgtl5000 {
-		audio-codec = <&sgtl5000>;
-		audio-routing =
+	audio: sound-sgtl5000 {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "On-Board Codec";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,bitclock-master = <&sound_codec>;
+		simple-audio-card,frame-master = <&sound_codec>;
+		simple-audio-card,widgets =
+			"Microphone", "Mic Jack",
+			"Headphone", "Headphone Jack";
+		simple-audio-card,routing =
 			"MIC_IN", "Mic Jack",
 			"Mic Jack", "Mic Bias",
 			"Headphone Jack", "HP_OUT";
-		compatible = "fsl,imx-audio-sgtl5000";
-		model = "On-board Codec";
-		mux-ext-port = <5>;
-		mux-int-port = <1>;
-		ssi-controller = <&ssi1>;
+
+		sound_cpu: simple-audio-card,cpu {
+			sound-dai = <&ssi1>;
+		};
+
+		sound_codec: simple-audio-card,codec {
+			sound-dai = <&sgtl5000>;
+		};
 	};
 };
 
 &audmux {
 	status = "okay";
+
+	ssi1 {
+		fsl,audmux-port = <0>;
+		fsl,port-config = <
+			(IMX_AUDMUX_V2_PTCR_SYN |
+			 IMX_AUDMUX_V2_PTCR_TFSEL(4) |
+			 IMX_AUDMUX_V2_PTCR_TCSEL(4) |
+			 IMX_AUDMUX_V2_PTCR_TFSDIR |
+			 IMX_AUDMUX_V2_PTCR_TCLKDIR)
+			 IMX_AUDMUX_V2_PDCR_RXDSEL(4)
+		>;
+	};
+
+	pins5 {
+		fsl,audmux-port = <4>;
+		fsl,port-config = <
+			IMX_AUDMUX_V2_PTCR_SYN
+			IMX_AUDMUX_V2_PDCR_RXDSEL(0)
+		>;
+	};
 };
 
 &ecspi2 {
@@ -193,6 +224,7 @@
 		compatible = "fsl,sgtl5000";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>;
+		#sound-dai-cells = <0>;
 		reg = <0x0a>;
 		VDDA-supply = <&v_3v2>;
 		VDDD-supply = <&vcc_1p8>;
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card
  2018-03-19 13:53 [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card Matt Porter
@ 2018-03-19 14:13 ` Fabio Estevam
  2018-03-19 14:23 ` Russell King - ARM Linux
  1 sibling, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2018-03-19 14:13 UTC (permalink / raw)
  To: Matt Porter
  Cc: Shawn Guo, Sascha Hauer, Fabio Estevam, Rob Herring,
	Mark Rutland, Russell King,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list

On Mon, Mar 19, 2018 at 10:53 AM, Matt Porter <mporter@konsulko.com> wrote:
> The HB2 onboard audio currently makes use of the imx-audio-sgtl5000
> binding. This binding does not support auxiliary audio devices such
> as external amplifiers. The simple-audio-card binding does support
> this property which allows systems incorporating the HB2 to easily
> add an auxiliary device that's attached to the HB2 audio jack with
> an overlay. Convert HB2 to use simple-audio-card for the onboard
> audio to allow for this additional flexibility.
>
> Signed-off-by: Matt Porter <mporter@konsulko.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card
  2018-03-19 13:53 [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card Matt Porter
  2018-03-19 14:13 ` Fabio Estevam
@ 2018-03-19 14:23 ` Russell King - ARM Linux
  2018-03-19 15:02   ` Matt Porter
  1 sibling, 1 reply; 4+ messages in thread
From: Russell King - ARM Linux @ 2018-03-19 14:23 UTC (permalink / raw)
  To: Matt Porter
  Cc: Shawn Guo, Sascha Hauer, Fabio Estevam, Rob Herring,
	Mark Rutland,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list

On Mon, Mar 19, 2018 at 09:53:26AM -0400, Matt Porter wrote:
> The HB2 onboard audio currently makes use of the imx-audio-sgtl5000
> binding. This binding does not support auxiliary audio devices such
> as external amplifiers. The simple-audio-card binding does support
> this property which allows systems incorporating the HB2 to easily
> add an auxiliary device that's attached to the HB2 audio jack with
> an overlay. Convert HB2 to use simple-audio-card for the onboard
> audio to allow for this additional flexibility.

What is driving this change?  Why only make this change for HB2 and
not HB?

> 
> Signed-off-by: Matt Porter <mporter@konsulko.com>
> ---
>  arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 48 +++++++++++++++++++++++-----
>  1 file changed, 40 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
> index dffbc92e0023..587251ab76ec 100644
> --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
> @@ -38,6 +38,7 @@
>   *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>   *     OTHER DEALINGS IN THE SOFTWARE.
>   */
> +#include <dt-bindings/sound/fsl-imx-audmux.h>
>  
>  / {
>  	chosen {
> @@ -145,22 +146,52 @@
>  		vin-supply = <&v_5v0>;
>  	};
>  
> -	sound-sgtl5000 {
> -		audio-codec = <&sgtl5000>;
> -		audio-routing =
> +	audio: sound-sgtl5000 {
> +		compatible = "simple-audio-card";
> +		simple-audio-card,name = "On-Board Codec";
> +		simple-audio-card,format = "i2s";
> +		simple-audio-card,bitclock-master = <&sound_codec>;
> +		simple-audio-card,frame-master = <&sound_codec>;
> +		simple-audio-card,widgets =
> +			"Microphone", "Mic Jack",
> +			"Headphone", "Headphone Jack";
> +		simple-audio-card,routing =
>  			"MIC_IN", "Mic Jack",
>  			"Mic Jack", "Mic Bias",
>  			"Headphone Jack", "HP_OUT";
> -		compatible = "fsl,imx-audio-sgtl5000";
> -		model = "On-board Codec";
> -		mux-ext-port = <5>;
> -		mux-int-port = <1>;
> -		ssi-controller = <&ssi1>;
> +
> +		sound_cpu: simple-audio-card,cpu {
> +			sound-dai = <&ssi1>;
> +		};
> +
> +		sound_codec: simple-audio-card,codec {
> +			sound-dai = <&sgtl5000>;
> +		};
>  	};
>  };
>  
>  &audmux {
>  	status = "okay";
> +
> +	ssi1 {
> +		fsl,audmux-port = <0>;
> +		fsl,port-config = <
> +			(IMX_AUDMUX_V2_PTCR_SYN |
> +			 IMX_AUDMUX_V2_PTCR_TFSEL(4) |
> +			 IMX_AUDMUX_V2_PTCR_TCSEL(4) |
> +			 IMX_AUDMUX_V2_PTCR_TFSDIR |
> +			 IMX_AUDMUX_V2_PTCR_TCLKDIR)
> +			 IMX_AUDMUX_V2_PDCR_RXDSEL(4)
> +		>;
> +	};
> +
> +	pins5 {
> +		fsl,audmux-port = <4>;
> +		fsl,port-config = <
> +			IMX_AUDMUX_V2_PTCR_SYN
> +			IMX_AUDMUX_V2_PDCR_RXDSEL(0)
> +		>;
> +	};
>  };
>  
>  &ecspi2 {
> @@ -193,6 +224,7 @@
>  		compatible = "fsl,sgtl5000";
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>;
> +		#sound-dai-cells = <0>;
>  		reg = <0x0a>;
>  		VDDA-supply = <&v_3v2>;
>  		VDDD-supply = <&vcc_1p8>;
> -- 
> 2.11.0
> 

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card
  2018-03-19 14:23 ` Russell King - ARM Linux
@ 2018-03-19 15:02   ` Matt Porter
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Porter @ 2018-03-19 15:02 UTC (permalink / raw)
  To: Russell King - ARM Linux
  Cc: Shawn Guo, Sascha Hauer, Fabio Estevam, Rob Herring,
	Mark Rutland,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list

On Mon, Mar 19, 2018 at 02:23:50PM +0000, Russell King - ARM Linux wrote:
> On Mon, Mar 19, 2018 at 09:53:26AM -0400, Matt Porter wrote:
> > The HB2 onboard audio currently makes use of the imx-audio-sgtl5000
> > binding. This binding does not support auxiliary audio devices such
> > as external amplifiers. The simple-audio-card binding does support
> > this property which allows systems incorporating the HB2 to easily
> > add an auxiliary device that's attached to the HB2 audio jack with
> > an overlay. Convert HB2 to use simple-audio-card for the onboard
> > audio to allow for this additional flexibility.
> 
> What is driving this change?

I have an HB2 that's incorporated in a platform that includes an
audio processor (tda7419) and external amplifier (tda7850) attached to
the HB2 headphone out. The tda7419 also handles two additional non-Linux
audio source inputs, FWIW. The tda7419 and tda7850 are supported as
ASoC component drivers. However, they must be added to a card as
auxiliary devices to be instantiated and have their controls exposed
to userspace. In addition, once added as an aux device, the tda7419
muxes and switches can participate in DAPM properly. Using
simple-audio-card enables this option, without giving up any of the
current functionality when using imx-audio-sgtl5000.

>Why only make this change for HB2 and not HB?

I was a little fixated on the HB2 platform that I'm working on. It's
equally applicable to HB so I can add the same change there.

-Matt

> > Signed-off-by: Matt Porter <mporter@konsulko.com>
> > ---
> >  arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 48 +++++++++++++++++++++++-----
> >  1 file changed, 40 insertions(+), 8 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
> > index dffbc92e0023..587251ab76ec 100644
> > --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
> > +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
> > @@ -38,6 +38,7 @@
> >   *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> >   *     OTHER DEALINGS IN THE SOFTWARE.
> >   */
> > +#include <dt-bindings/sound/fsl-imx-audmux.h>
> >  
> >  / {
> >  	chosen {
> > @@ -145,22 +146,52 @@
> >  		vin-supply = <&v_5v0>;
> >  	};
> >  
> > -	sound-sgtl5000 {
> > -		audio-codec = <&sgtl5000>;
> > -		audio-routing =
> > +	audio: sound-sgtl5000 {
> > +		compatible = "simple-audio-card";
> > +		simple-audio-card,name = "On-Board Codec";
> > +		simple-audio-card,format = "i2s";
> > +		simple-audio-card,bitclock-master = <&sound_codec>;
> > +		simple-audio-card,frame-master = <&sound_codec>;
> > +		simple-audio-card,widgets =
> > +			"Microphone", "Mic Jack",
> > +			"Headphone", "Headphone Jack";
> > +		simple-audio-card,routing =
> >  			"MIC_IN", "Mic Jack",
> >  			"Mic Jack", "Mic Bias",
> >  			"Headphone Jack", "HP_OUT";
> > -		compatible = "fsl,imx-audio-sgtl5000";
> > -		model = "On-board Codec";
> > -		mux-ext-port = <5>;
> > -		mux-int-port = <1>;
> > -		ssi-controller = <&ssi1>;
> > +
> > +		sound_cpu: simple-audio-card,cpu {
> > +			sound-dai = <&ssi1>;
> > +		};
> > +
> > +		sound_codec: simple-audio-card,codec {
> > +			sound-dai = <&sgtl5000>;
> > +		};
> >  	};
> >  };
> >  
> >  &audmux {
> >  	status = "okay";
> > +
> > +	ssi1 {
> > +		fsl,audmux-port = <0>;
> > +		fsl,port-config = <
> > +			(IMX_AUDMUX_V2_PTCR_SYN |
> > +			 IMX_AUDMUX_V2_PTCR_TFSEL(4) |
> > +			 IMX_AUDMUX_V2_PTCR_TCSEL(4) |
> > +			 IMX_AUDMUX_V2_PTCR_TFSDIR |
> > +			 IMX_AUDMUX_V2_PTCR_TCLKDIR)
> > +			 IMX_AUDMUX_V2_PDCR_RXDSEL(4)
> > +		>;
> > +	};
> > +
> > +	pins5 {
> > +		fsl,audmux-port = <4>;
> > +		fsl,port-config = <
> > +			IMX_AUDMUX_V2_PTCR_SYN
> > +			IMX_AUDMUX_V2_PDCR_RXDSEL(0)
> > +		>;
> > +	};
> >  };
> >  
> >  &ecspi2 {
> > @@ -193,6 +224,7 @@
> >  		compatible = "fsl,sgtl5000";
> >  		pinctrl-names = "default";
> >  		pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>;
> > +		#sound-dai-cells = <0>;
> >  		reg = <0x0a>;
> >  		VDDA-supply = <&v_3v2>;
> >  		VDDD-supply = <&vcc_1p8>;
> > -- 
> > 2.11.0
> > 
> 
> -- 
> RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
> FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
> According to speedtest.net: 8.21Mbps down 510kbps up

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-19 15:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-19 13:53 [PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card Matt Porter
2018-03-19 14:13 ` Fabio Estevam
2018-03-19 14:23 ` Russell King - ARM Linux
2018-03-19 15:02   ` Matt Porter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).