Merge "msm: dts: rename audio machine driver"

		memory-region = <&mailbox_mem>;

		voice_mhi_voting;

	};

* SA6155 ASoC Machine driver

Required properties:

- compatible : "qcom,sa6155-asoc-snd-auto" for auto adp codec and

               "qcom,sa6155-asoc-snd-auto-custom" for auto custom codec.

- qcom,model : The user-visible name of this sound card.

- asoc-platform: This is phandle list containing the references to platform device

		 nodes that are used as part of the sound card dai-links.

- asoc-platform-names: This property contains list of platform names. The order of

		       the platform names should match to that of the phandle order

		       given in "asoc-platform".

- asoc-cpu: This is phandle list containing the references to cpu dai device nodes

	    that are used as part of the sound card dai-links.

- asoc-cpu-names: This property contains list of cpu dai names. The order of the

		  cpu dai names should match to that of the phandle order given

		  in "asoc-cpu". The cpu names are in the form of "%s.%d" form,

		  where the id (%d) field represents the back-end AFE port id that

		  this CPU dai is associated with.

- asoc-codec: This is phandle list containing the references to codec dai device

	      nodes that are used as part of the sound card dai-links.

- asoc-codec-names: This property contains list of codec dai names. The order of the

		    codec dai names should match to that of the phandle order given

		    in "asoc-codec".

Optional properties:

- qcom,mi2s-audio-intf : Property to specify if MI2S interface is used for the target

- qcom,auxpcm-audio-intf : Property to specify if AUX PCM interface is used for the target

- qcom,msm-mi2s-master : List of master/slave configuration for MI2S interfaces

Example:

	sound-adp-star {

		compatible = "qcom,sa6155-asoc-snd-adp-star";

		qcom,model = "sa6155-adp-star-snd-card";

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&compr>,

				<&pcm_noirq>, <&loopback1>, <&pcm_dtmf>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_rx_1>,

				<&dai_pri_tdm_rx_2>, <&dai_pri_tdm_rx_3>,

				<&dai_pri_tdm_tx_0>, <&dai_pri_tdm_tx_1>,

				<&dai_pri_tdm_tx_2>, <&dai_pri_tdm_tx_3>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_rx_1>,

				<&dai_sec_tdm_rx_2>, <&dai_sec_tdm_rx_3>,

				<&dai_sec_tdm_tx_0>, <&dai_sec_tdm_tx_1>,

				<&dai_sec_tdm_tx_2>, <&dai_sec_tdm_tx_3>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_rx_1>,

				<&dai_tert_tdm_rx_2>, <&dai_tert_tdm_rx_3>,

				<&dai_tert_tdm_rx_4>, <&dai_tert_tdm_tx_0>,

				<&dai_tert_tdm_tx_1>, <&dai_tert_tdm_tx_2>,

				<&dai_tert_tdm_tx_3>, <&dai_quat_tdm_rx_0>,

				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,

				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_tx_0>,

				<&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_2>,

				<&dai_quat_tdm_tx_3>, <&dai_quin_tdm_rx_0>,

				<&dai_quin_tdm_rx_1>, <&dai_quin_tdm_rx_2>,

				<&dai_quin_tdm_rx_3>, <&dai_quin_tdm_tx_0>,

				<&dai_quin_tdm_tx_1>, <&dai_quin_tdm_tx_2>,

				<&dai_quin_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36866",

				"msm-dai-q6-tdm.36868", "msm-dai-q6-tdm.36870",

				"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36867",

				"msm-dai-q6-tdm.36869", "msm-dai-q6-tdm.36871",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36882",

				"msm-dai-q6-tdm.36884", "msm-dai-q6-tdm.36886",

				"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36883",

				"msm-dai-q6-tdm.36885", "msm-dai-q6-tdm.36887",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36898",

				"msm-dai-q6-tdm.36900", "msm-dai-q6-tdm.36902",

				"msm-dai-q6-tdm.36904", "msm-dai-q6-tdm.36897",

				"msm-dai-q6-tdm.36899", "msm-dai-q6-tdm.36901",

				"msm-dai-q6-tdm.36903", "msm-dai-q6-tdm.36912",

				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",

				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",

				"msm-dai-q6-tdm.36919", "msm-dai-q6-tdm.36928",

				"msm-dai-q6-tdm.36930", "msm-dai-q6-tdm.36932",

				"msm-dai-q6-tdm.36934", "msm-dai-q6-tdm.36929",

				"msm-dai-q6-tdm.36931", "msm-dai-q6-tdm.36933",

				"msm-dai-q6-tdm.36935";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

	};

	sound-adp-star {

		status = "ok";

		compatible = "qcom,sa8155-asoc-snd-adp-star";

		qcom,model = "sa8155-adp-star-snd-card";

		compatible = "qcom,sa6155-asoc-snd-adp-star";

		qcom,model = "sa6155-adp-star-snd-card";

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;