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

Commit 1bcbd831 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: Enable QCA6174 bluetooth device for apq8017 MTP"

parents f9984999 30bc94f2

arch/arm/boot/dts/qcom/apq8017-pmi8937-mtp.dts

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017, 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
@@ -22,3 +22,7 @@ 
	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};



&blsp1_uart1 {

	status = "ok";

};

arch/arm/boot/dts/qcom/apq8017-pmi8950-mtp.dts

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017, 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
@@ -22,3 +22,7 @@ 
	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};



&blsp1_uart1 {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8917-pmi8937-mtp.dtsi

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017, 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
@@ -24,6 +24,11 @@ 
		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,switch-source = <&pmi8937_switch>;

	};



	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&tlmm 129 0>; /* BT_EN */

	};

};



/{

arch/arm/boot/dts/qcom/msm8917-pmi8950-mtp.dtsi

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017, 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
@@ -24,6 +24,11 @@ 
		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,switch-source = <&pmi8950_switch>;

	};



	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&tlmm 129 0>; /* BT_EN */

	};

};



/{