Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a84b09b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Rename msmfalcon/apqfalcon to sdm660/sda660" into msm-4.9

parents 13f3cbb5 49934429

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+9 −9
Original line number Diff line number Diff line
@@ -1514,10 +1514,10 @@ Example: 
		asoc-wsa-codec-prefixes = "SpkrMono";

	};



* MSMFALCON ASoC Machine driver

* SDM660 ASoC Machine driver



Required properties:

- compatible : "qcom,msmfalcon-asoc-snd"

- compatible : "qcom,sdm660-asoc-snd"

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

- qcom,msm-hs-micbias-type : This property is used to recognize the headset

  micbias type, internal or external.
@@ -1570,8 +1570,8 @@ mclk frequency needs to be configured for internal and external PA. 


Example:

	 sound {

		compatible = "qcom,msmfalcon-asoc-snd";

		qcom,model = "msmfalcon-snd-card";

		compatible = "qcom,sdm660-asoc-snd";

		qcom,model = "sdm660-snd-card";

		qcom,msm-mclk-freq = <9600000>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;
@@ -2055,11 +2055,11 @@ Example: 
		asoc-codec-names = "msm-stub-codec.1";

	};



* MSMFALCON ASoC Slimbus Machine driver

* SDM660 ASoC Slimbus Machine driver



Required properties:

- compatible : "qcom,msmfalcon-asoc-snd-tasha" for tasha codec,

		"qcom,msmfalcon-asoc-snd-tavil" for tavil codec.

- compatible : "qcom,sdm660-asoc-snd-tasha" for tasha codec,

		"qcom,sdm660-asoc-snd-tavil" for tavil codec.

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

- qcom,msm-mclk-freq : MCLK frequency value for external codec

- qcom,msm-gpios : Lists down all the gpio sets that are supported.
@@ -2099,8 +2099,8 @@ Optional properties: 
Example:



	sound-9335 {

	compatible = "qcom,msmfalcon-asoc-snd-tasha";

	qcom,model = "msmfalcon-tasha-snd-card";

	compatible = "qcom,sdm660-asoc-snd-tasha";

	qcom,model = "sdm660-tasha-snd-card";



	qcom,audio-routing =

		"RX_BIAS", "MCLK",

sound/soc/codecs/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -927,11 +927,11 @@ config SND_SOC_WCD_CPE 


config AUDIO_EXT_CLK

	tristate

	default y if SND_SOC_WCD9335=y || SND_SOC_WCD9330=y || SND_SOC_MSMFALCON_CDC=y

	default y if SND_SOC_WCD9335=y || SND_SOC_WCD9330=y || SND_SOC_SDM660_CDC=y



config SND_SOC_WCD_MBHC

	tristate

	default y if (SND_SOC_MSM8909_WCD=y || SND_SOC_MSMFALCON_CDC=y || SND_SOC_WCD9335=y) && SND_SOC_MDMCALIFORNIUM!=y

	default y if (SND_SOC_MSM8909_WCD=y || SND_SOC_SDM660_CDC=y || SND_SOC_WCD9335=y) && SND_SOC_MDMCALIFORNIUM!=y



config SND_SOC_WCD_DSP_MGR

	tristate
@@ -1164,7 +1164,7 @@ config SND_SOC_MSM_HDMI_CODEC_RX 
	HDMI audio drivers should be built only if the platform

        supports hdmi panel.



source "sound/soc/codecs/msmfalcon_cdc/Kconfig"

source "sound/soc/codecs/sdm660_cdc/Kconfig"

source "sound/soc/codecs/msm_sdw/Kconfig"



endmenu

sound/soc/codecs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -482,5 +482,5 @@ obj-$(CONFIG_SND_SOC_MSM_STUB) += snd-soc-msm-stub.o 
obj-$(CONFIG_SND_SOC_MAX9877)	+= snd-soc-max9877.o

obj-$(CONFIG_SND_SOC_MAX98504)	+= snd-soc-max98504.o

obj-$(CONFIG_SND_SOC_TPA6130A2)	+= snd-soc-tpa6130a2.o

obj-y += msmfalcon_cdc/

obj-y += sdm660_cdc/

obj-y += msm_sdw/

sound/soc/codecs/msmfalcon_cdc/Makefile

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
snd-soc-msmfalcon-cdc-objs := msm-analog-cdc.o msm-digital-cdc.o msmfalcon-regmap.o

obj-$(CONFIG_SND_SOC_MSMFALCON_CDC) += snd-soc-msmfalcon-cdc.o msmfalcon-cdc-irq.o

sound/soc/codecs/msmfalcon_cdc/Kconfig→sound/soc/codecs/sdm660_cdc/Kconfig

+1 −1
Original line number Diff line number Diff line 


config SND_SOC_MSMFALCON_CDC

config SND_SOC_SDM660_CDC

	tristate "MSM Internal PMIC based codec"