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

Commit f2734508 authored by Ashish Jain's avatar Ashish Jain Committed by Gerrit - the friendly Code Review server
Browse files

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



Move bg_codec node to BG specific file used for MSM8909w.Also
add vdd-spkr to bg_codec driver.

Change-Id: If1f08969d9a749938c59d2ea596f473e7e0036d2
Signed-off-by: default avatarAshish Jain <ashishj@codeaurora.org>
parent 91fb13e3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
/*
 * Copyright (c) 2017, 2018 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
@@ -200,11 +200,11 @@

&audio_codec_bg {
	status = "ok";
	vdd-spkr-supply = <&pm660_l11>;
};

&bg_cdc {
	status = "ok";
	vdd-spkr-supply = <&pm660_l11>;
};

&blsp1_uart1 {
+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>;
		};
	};
};
+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 {
+2 −2
Original line number Diff line number Diff line
/*
 * Copyright (c) 2017, 2018 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
@@ -189,11 +189,11 @@

&audio_codec_bg {
	status = "ok";
	vdd-spkr-supply = <&pm660_l11>;
};

&bg_cdc {
	status = "ok";
	vdd-spkr-supply = <&pm660_l11>;
};

&i2c_1 {