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

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

Merge "ASoC: msm8x16: split sound card based on target flavor"

parents 19483c16 ec44062d

arch/arm/boot/dts/qcom/msm8916-mtp.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ 




	sound {

	sound {

		compatible = "qcom,msm8x16-audio-codec";

		compatible = "qcom,msm8x16-audio-codec";

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

		qcom,model = "msm8x16-snd-card-mtp";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-codec-type = "internal";

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

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

sound/soc/msm/msm8x16.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1180,6 +1180,7 @@ static int msm8x16_asoc_machine_probe(struct platform_device *pdev) 
		dev_info(&pdev->dev, "external codec is configured\n");

		dev_info(&pdev->dev, "external codec is configured\n");

		pdata->codec_type = 1;

		pdata->codec_type = 1;

	} else {

	} else {

		bear_cards[pdev->id].name = dev_name(&pdev->dev);

		dev_info(&pdev->dev, "default codec configured\n");

		dev_info(&pdev->dev, "default codec configured\n");

		pdata->codec_type = 0;

		pdata->codec_type = 0;

	}

	}