evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: add battery data information for SDM660/SDM630 MTP/CDP"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-16 23:06:11 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4af58b8ac7
5 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/qcom/msm-pm660l.dtsi
View file

@ -1,4 +1,4 @@
/* 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -37,7 +37,7 @@
qcom,temp-alarm@2400 { qcom,temp-alarm@2400 {
compatible = "qcom,qpnp-temp-alarm"; compatible = "qcom,qpnp-temp-alarm";
reg = <0x2400 0x100>; reg = <0x2400 0x100>;
interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>; interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
label = "pm660l_tz"; label = "pm660l_tz";
}; };

4
arch/arm/boot/dts/qcom/sdm630-cdp.dtsi
View file

@ -22,3 +22,7 @@
&soc { &soc {
}; };
&pm660_charger {
qcom,batteryless-platform;
};

9
arch/arm/boot/dts/qcom/sdm630-mtp.dtsi
View file

@ -12,6 +12,11 @@
#include "sdm660-pinctrl.dtsi" #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 { &uartblsp1dm1 {
@ -26,3 +31,7 @@
&soc { &soc {
}; };
&pm660_fg {
qcom,battery-data = <&mtp_batterydata>;
};

4
arch/arm/boot/dts/qcom/sdm660-cdp.dtsi
View file

@ -152,3 +152,7 @@
compatible = "qcom,msm-ssc-sensors"; compatible = "qcom,msm-ssc-sensors";
}; };
}; };
&pm660_charger {
qcom,batteryless-platform;
};

9
arch/arm/boot/dts/qcom/sdm660-mtp.dtsi
View file

@ -13,6 +13,11 @@
#include "sdm660-pinctrl.dtsi" #include "sdm660-pinctrl.dtsi"
#include "sdm660-camera-sensor-mtp.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 { &uartblsp1dm1 {
@ -156,3 +161,7 @@
&mem_client_3_size { &mem_client_3_size {
qcom,peripheral-size = <0x500000>; qcom,peripheral-size = <0x500000>;
}; };
&pm660_fg {
qcom,battery-data = <&mtp_batterydata>;
};