Merge "ARM: dts: msm: add battery data information for SDM660/SDM630 MTP/CDP" (4af58b8a) · Commits · e / devices / android_kernel_sony_msm8998

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

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2017, 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
		@@ -37,7 +37,7 @@
		qcom,temp-alarm@2400 {
		compatible = "qcom,qpnp-temp-alarm";
		reg = <0x2400 0x100>;
		interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
		interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
		label = "pm660l_tz";
		};

+4 −0

+9 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,11 @@

		#include "sdm660-pinctrl.dtsi"
		/ {
		mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "fg-gen3-batterydata-itech-3000mah.dtsi"
		#include "fg-gen3-batterydata-ascent-3450mah.dtsi"
		};
		};

		&uartblsp1dm1 {
		@@ -26,3 +31,7 @@

		&soc {
		};

		&pm660_fg {
		qcom,battery-data = <&mtp_batterydata>;
		};

+4 −0

Original line number	Diff line number	Diff line
		@@ -152,3 +152,7 @@
		compatible = "qcom,msm-ssc-sensors";
		};
		};

		&pm660_charger {
		qcom,batteryless-platform;
		};

+9 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,11 @@
		#include "sdm660-pinctrl.dtsi"
		#include "sdm660-camera-sensor-mtp.dtsi"
		/ {
		mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "fg-gen3-batterydata-itech-3000mah.dtsi"
		#include "fg-gen3-batterydata-ascent-3450mah.dtsi"
		};
		};

		&uartblsp1dm1 {
		@@ -156,3 +161,7 @@
		&mem_client_3_size {
		qcom,peripheral-size = <0x500000>;
		};

		&pm660_fg {
		qcom,battery-data = <&mtp_batterydata>;
		};