Merge "ARM: msm: dts: add support for 8939 CDP with JDI panel" (95e1889f) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \
		msm8939-rumi.dtb \
		msm8939-qrd-skuk.dtb \
		msm8939-cdp.dtb \
		msm8939-cdp-smb1360.dtb \
		msm8939-cdp-jdi.dtb \
		msm8939-mtp.dtb \
		msm8939-mtp-smb1360.dtb \
		msm8939-mtp-wcd9306.dtb \

+1 −29

Original line number	Diff line number	Diff line
		@@ -16,35 +16,7 @@
		#include "msm8939-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM 8939 SMB1360 CDP";
		model = "Qualcomm Technologies, Inc. MSM 8939 CDP JDI";
		compatible = "qcom,msm8939-cdp", "qcom,msm8939", "qcom,cdp";
		qcom,board-id = <1 1>;
		};

		&i2c_4 {
		smb1360_otg_supply: smb1360-chg-fg@14 {
		compatible = "qcom,smb1360-chg-fg";
		reg = <0x14>;
		interrupt-parent = <&msm_gpio>;
		interrupts = <62 8>;
		pinctrl-names = "default";
		pinctrl-0 = <&smb_int_default>;
		qcom,charging-disabled;
		qcom,chg-inhibit-disabled;
		qcom,float-voltage-mv = <4200>;
		qcom,iterm-ma = <100>;
		qcom,recharge-thresh-mv = <100>;
		qcom,thermal-mitigation = <1500 700 600 0>;
		regulator-name = "smb1360_otg_vreg";
		};
		};

		&pm8916_chg {
		status = "ok";
		qcom,use-external-charger;
		};

		&pm8916_bms {
		status = "ok";
		qcom,disable-bms;
		};