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

Commit 72c9cd54 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: update gpio setting for adv bridge chip"

parents 638ecaf8 e8dce8cf

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

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

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

 * Copyright (c) 2015-2016, 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
@@ -30,6 +30,15 @@ 
		qcom,dtest-sel = <1>;

		status = "okay";

	};



	gpio@c700 {

		status = "ok";

		qcom,mode = <1>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};

};



&soc {

arch/arm/boot/dts/qcom/msm8937-pmi8950-ext-codec-cdp.dts

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

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

 * Copyright (c) 2015-2016, 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
@@ -43,15 +43,6 @@ 
		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};



	gpio@c700 {

		status = "ok";

		qcom,mode = <1>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};

};



&slim_msm {