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

Commit eed7e23f 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: Add usbin-vadc dt property for 8953"

parents e3c2d20f 9d2c62bf

arch/arm64/boot/dts/qcom/msm8953-ext-codec-mtp-overlay.dts

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

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

 * Copyright (c) 2018-2019, 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
@@ -46,6 +46,7 @@ 
	qcom,battery-data = <&mtp_batterydata>;

	qcom,chg-led-sw-controls;

	qcom,chg-led-support;

	qcom,usbin-vadc = <&pmi8950_vadc>;

};



&int_codec {

arch/arm64/boot/dts/qcom/msm8953-mtp-overlay.dts

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

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

 * Copyright (c) 2018-2019, 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
@@ -44,4 +44,5 @@ 
	qcom,battery-data = <&mtp_batterydata>;

	qcom,chg-led-sw-controls;

	qcom,chg-led-support;

	qcom,usbin-vadc = <&pmi8950_vadc>;

};

arch/arm64/boot/dts/qcom/msm8953-mtp.dts

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
	qcom,battery-data = <&mtp_batterydata>;

	qcom,chg-led-sw-controls;

	qcom,chg-led-support;

	qcom,usbin-vadc = <&pmi8950_vadc>;

};

&cci {

	 qcom,camera@0 {