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

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

Merge "ARM: dts: msm: Moved bg_codec node to BG specific file for MSM8909"

parents 26355576 f2734508

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

+1 −0
Original line number Diff line number Diff line
@@ -2964,6 +2964,7 @@ Required properties: 
	- compatible :"qcom,bg-cdc-glink"

- qcom,msm-glink-channels: Number of glink channels available to communicate

			   with the glink client

- vdd-spkr-supply: BG codec supply's speaker regulator device tree node.





Example:

arch/arm/boot/dts/qcom/apq8009w-bg-wtp-v2.dts

+1 −1
Original line number Diff line number Diff line
@@ -205,11 +205,11 @@ 


&audio_codec_bg {

	status = "ok";

	vdd-spkr-supply = <&pm660_l11>;

};



&bg_cdc {

	status = "ok";

	vdd-spkr-supply = <&pm660_l11>;

};



&blsp1_uart1 {

arch/arm/boot/dts/qcom/msm8909-audio-bg_codec.dtsi

+10 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -182,4 +182,13 @@ 
		compatible = "qcom,wcd-dsp-glink";

		qcom,msm-codec-glink-edge = "bg";

	};



	bg_cdc: bg_codec {

		status = "disabled";

		compatible = "qcom,bg-codec";

		qcom,bg-glink {

			compatible = "qcom,bg-cdc-glink";

			qcom,msm-glink-channels = <4>;

		};

	};

};

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

+1 −10
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -285,15 +285,6 @@ 
		asoc-codec = <&stub_codec>, <&pm8909_conga_dig>;

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

	};



	bg_cdc: bg_codec {

		status = "disabled";

		compatible = "qcom,bg-codec";

		qcom,bg-glink {

			compatible = "qcom,bg-cdc-glink";

			qcom,msm-glink-channels = <4>;

		};

	};

};



&blsp1_uart1 {

arch/arm/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+1 −1
Original line number Diff line number Diff line
@@ -194,11 +194,11 @@ 


&audio_codec_bg {

	status = "ok";

	vdd-spkr-supply = <&pm660_l11>;

};



&bg_cdc {

	status = "ok";

	vdd-spkr-supply = <&pm660_l11>;

};



&i2c_1 {