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

Commit def63a8e 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: change ibb/lab soft start and power up/down delay"

parents 15ccf85e d5088c74

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

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

/* Copyright (c) 2014-2015, 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
@@ -432,7 +432,7 @@ 
				qcom,qpnp-lab-init-amoled-voltage = <4600000>;

				qcom,qpnp-lab-init-lcd-voltage = <5500000>;



				qcom,qpnp-lab-soft-start = <400>;

				qcom,qpnp-lab-soft-start = <800>;



				qcom,qpnp-lab-full-pull-down;

				qcom,qpnp-lab-pull-down-enable;
@@ -462,11 +462,11 @@ 
				qcom,qpnp-ibb-init-amoled-voltage = <4000000>;

				qcom,qpnp-ibb-init-lcd-voltage = <5500000>;



				qcom,qpnp-ibb-soft-start = <10000>;

				qcom,qpnp-ibb-soft-start = <1000>;



				qcom,qpnp-ibb-discharge-resistor = <300>;

				qcom,qpnp-ibb-lab-pwrup-delay = <10000>;

				qcom,qpnp-ibb-lab-pwrdn-delay = <10000>;

				qcom,qpnp-ibb-lab-pwrup-delay = <4000>;

				qcom,qpnp-ibb-lab-pwrdn-delay = <4000>;

				qcom,qpnp-ibb-en-discharge;



				qcom,qpnp-ibb-full-pull-down;

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

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

/* Copyright (c) 2014-2015, 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
@@ -345,6 +345,7 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&dsi_dual_sharp_video_0 {

arch/arm/boot/dts/qcom/msm8994-fluid.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&pmx_hdmi_cec {

arch/arm/boot/dts/qcom/msm8994-liquid.dtsi

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


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

/* Copyright (c) 2014-2015, 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
@@ -89,6 +89,7 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&pmx_hdmi_cec {

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

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

/* Copyright (c) 2014-2015, 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
@@ -312,6 +312,7 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&dsi_dual_sharp_video_0 {