Merge "ARM: dts: msm: add support of SMB1357 for MSM8909"

#include "msm8909-camera-sensor-mtp.dtsi"

&soc {

	/*

	 * DT node to add support for SMB135x charger and integrate

	 * with VM-BMS.

	 */

	i2c@78b8000 {

		smb1357_otg_vreg: smb1357-charger@57 {

			compatible = "qcom,smb1357-charger";

			reg = <0x57>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <58 8>;

			pinctrl-names = "default";

			pinctrl-0 = <&smb_int_default>;

			qcom,bmd-algo-disabled;

			qcom,float-voltage-mv = <4200>;

			qcom,charging-timeout = <1536>;

			qcom,recharge-thresh-mv = <100>;

			regulator-name = "smb1357_otg_vreg";

			qcom,soft-vfloat-comp-disabled;

			qcom,thermal-mitigation = <1500 700 600 0>;

			qcom,bms-psy-name = "bms";

			/*

			 * Disable SMB1357 based charging termination as BMS

			 * controls charging.

			 */

			qcom,iterm-disabled;

			/*

			 * Disable charge inhibit feature to start chargin on

			 * charger insertion independent of battery voltage.

			 */

			qcom,inhibit-disabled;

			/* BMS is controlling charging/re-charge */

			qcom,bms-controlled-charging;

			/*

			 * To enable charger node:

			 * set status = "ok" and

			 * add 'qcom,use-external-charger' to pm8909_chg node

			 */

			status = "disabled";

		};

	};

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			compatible = "synaptics,dsx";