[PATCH] arm: dts: hummingboard2: convert onboard audio to simple-audio-card

[linux@armlinux.org.uk (Russell King - ARM Linux)]

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