diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-25 11:20:59 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-07-25 11:20:59 -0600 |
| commit | 6385cefa179bb87fff0f9e041075280f119b2554 (patch) | |
| tree | 7268cffe35d29c255c4a777eb55d133c3a8b70fd /include/linux | |
| parent | a9c1a507d16f89cdc7ef01e6af7c9e732c124cdd (diff) | |
| parent | cc915a39313a9c5987f56d4e80fafedbb0ffa913 (diff) | |
Promotion of kernel.lnx.4.4-160725.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1045203 Icc884b53c85941f59f84bed108b536cc18b8be60 arm: dma-mapping: Export arch_setup_dma_ops symbol
1009124 Ic0dedbadc324b979583d7a3998195bf15ac537f6 msm: kgsl: Preemption cleanups
1044777 I9be1ee26419c082cda6351ef6d5aeedc6e17de55 msm: camera: isp: Vote bandwidth with clock enabled
1009194 Ic0dedbad998767a1ffdfe265e52fae7baa18d203 msm: kgsl: Program the secvid registers in the soft rese
1043961 I639e8bfb1275a1b8c8fa5bff3a46f9b34fe49ffe ARM: dts: msm: add ion heaps for msmfalcon
1040026 Ibb660397f8e7e3e0cd0a5e672924925e605b2eb7 msm: vidc: check for venus_hfi_device state in resume
1043478 Ib35104adf7b3618f94c6adf7fab531abffea3f76 msm: kgsl: Stop fault_timer before reading fault registe
1041122 I21e62361f40eb654c369048d01e158d4b96dd551 clk: msm: Fix MDSS compilation issue
1009149 Ic0dedbad641bfa3fd6cbc1c91a37fb0e37f72bae msm: kgsl: Relax timestamp comparisons for processing ev
1043798 I7a8c2b2fcc9b43e2e858114f7312fccf96dc3f78 of_batterydata: Pass battery id directly to find battery
1041459 I6122ceb014f70b8e0ac005bc3789fbd13a3e867a ARM: dts: msm: Remove SMD device for Modem edge for MSMC
1043377 Ic36a67c724d7f8a0e64affba92856160cce914bb ARM: dts: msm: Add SMEM entry for MSMFALCON
1041199 I32ad5c5c8c9dd30a79818c873cfe1d121fd62d49 ASoC: wcd: add wcd934x gpio controller device
1043961 I2b0d35bf90b92f7fbd4256f339c1567d539e17b2 ARM: dts: msm: Add initial memory map for msmfalcon
1035203 Ib5a2d7879f1b493bc445ab4a2d32a89f98d872b4 NFC: Fix crash due to invalid use of ese gpio
1009187 Ic0dedbadb8f6122e32a0a34a65c54a7bca2a523c msm: kgsl: Remove idle wait in kgsl_iommu_set_pf_policy(
1044736 I08fcb174fd0e0c49f8069e106b48597bcdfe847d clk: qcom: clk-dummy: Add a dummy clock provider
1041199 I889922a0c36ec80ee6ede95b2f19f80791323332 ASoC: wcd9335: add all child devices of codec
1009124 Ic0dedbadb277a6498d0840b45c90e1265e2f354a msm: kgsl: Force all command level context switches to t
1043369 I20253a0f0762982fe7d7cb0bde9f64f58a8068fb msm: vidc: add support for maximum bitrate rate control
1043465 Ic7652e43781f39d3137fb55f2fec2423e457fac4 qcom-charger: smb138x-charger: change power supply type
1009190 Ic0dedbad8476c308a13572d999540b243d97eabc msm: kgsl: Allow a draw context to skip snapshot
1009124 Ic0dedbadc48095eada9c5fce6004475a2cb0f0a9 msm: kgsl: Leave the MMU clocks on with the rest of the
1009124 Ic0dedbadff8df192096292b221130c8ef5b31e12 msm: kgsl: Keep the active draw context until it is swit
1037857 Id53a790cf67b201a4207f85604cb3472275d418a msm: mdss: mdp: fix handling of GDSC off notifier
1043373 Ic28f6f36781154ff0c28f4636ade8523d753ab6a msm: mdss: fix mdss errors on 32-bit compilation
1040761 I4ec609b45f5313d7c19ff6201742b0c5daf54174 ARM: dts: msm: update min voltage for pmcobalt s5 and s7
1042302 Ied8a0048d8af17fa593c1970cabb572aac338786 input: touchscreen: remove dead code in it7258 driver
1042813 I947b8d08f61624b914bd82caf4276364b9833cef soc: qcom: glink: Included sched.h to avoid build error
1025447 Ie302e79ff838837f214ac50ebfaa6e11f0055915 soc: qcom: code cleanup for service-locator
1009124 Ic0dedbad01a31a5da2954b097cb6fa937d45ef5c msm: kgsl: Implement fast preemption for 5XX
1041461 I299d31569291e90431802059f727a57ea0f76200 ARM: dts: msm: Remove SMD device for ADSP edge for MSMCO
1043377 I6df0575cf54003374a5ebdbfa54e169d3545ffe7 soc: qcom: smem: Add CDSP processor ID
1041199 I0489f9149cfd6ec7af056d074cb1869a705f9eff qcom: wcd934x: add pinctrl driver for wcd934x
1037272 I1cc965696c06bd3901d86668aaf597abb3ef2d6d msm: camera isp: Control camif interrupts on camif enabl
1043377 I097e5464ec6ab80c12bcdb5f38d0599fa40da9ee ARM: dts: msm: Add ipc-spinlock entry for MSMFALCON
986311 Ie7720001edbbaed8b202655445707b2b49a69cb1 msm: vidc: Increase output port buffer size for VP9 deco
1036037 I77ecff3a2ac395ff3799c1b0618fbc7f5eeb03da dwc3: gadget: Add debug event for pull up operation
1032174 Id70c3230f761385489e5e94c613f4519239dfb1f wcnss: Avoid user buffer overloading for write cal data
1041199 I0f04c08587f080eb2df7341d41344ce2079de21b ARM: dts: msm: add gpio controller node for msmcobalt
1041462 I9f62cc0e8229b86500fa72908be5c503847aed8f ARM: dts: msm: Remove SMD device for DSPS edge for MSMCO
553571 If56742a9c6b6c4ef774da6e83d57aee56bf28842 Bluetooth: HID: Add support for building hid drivers
507581 I4287e9103769535f43e0934bac08435a524ee6a4 WLAN subsystem: Sysctl support for key TCP/IP parameters
1043369 I3765506f1d703f47e481719296ab890b1f3dc106 msm: vidc: Add support for setting packed QP range
987082 Ic44759d1a5c6e48b2f0f566ea8c153f01cf68279 msm: kgsl: Use the GPU to write the RPTR
1009134 Ic0dedbad6d99130e31cd8a06dfe025610e9157a8 msm: kgsl: Record the ringbuffer start of pipeline times
1009183 Ic0dedbad1015883788e12815806e3249a1e09b21 msm: kgsl: Do INIT_WORK() just before queueing a deferre
1042660 I2b94e78f2470dbc2fd469b5cab287d643e8f3227 sched/core: Fix uninitialized variable used for tracepoi
1043729 If8e08112d065e1327fd54d7b0daf511632aa059f ARM: dts: msm: Add GDSC data for mnoc fab for msmcobalt
1043377 Iba226aa328906427593ecae35fab3396f34c19ae soc: qcom: smem_xprt: Add CDSP entry in smem xprt driver
1022201 I9472f3162a87b8a4255d9c684573093642d488a2 msm: camera: ispif: RDI Pack mode support
1042656 I6e6a57e24b41e4b3d049bfcf694b9ad7e2144dd5 sched/core: Fix null-pointer dereference
1042302 Ic1eab3ba79b8e8e5c259bb92f2692fd0db5fc8d3 input: touchscreen: Add Touch screen driver for IC it725
1041199 If6066a42b8aa5a820263a88627e2405df5e227b7 ARM: dts: msm: add sound node for msmcobalt
1043377 Ibd8ceb8149b3041ce1f58ac4c3642d7391b89385 ARM: dts: msm: Add G-Link SSR entries for MSMFALCON
1009158 Ic0dedbad7416abb23c769a4d3be9ebd0ca04810c msm: kgsl: Remove unneeded error message in kgsl_iommu.c
Change-Id: I1db3a206e714668dd1dcf714f3b236a07c92a862
CRs-Fixed: 1042660, 1036037, 1043478, 1041122, 1044736, 1041459, 507581, 1045203, 1009183, 1037857, 1009187, 1009124, 1043961, 553571, 1009149, 1037272, 1025447, 1040026, 1043798, 1043465, 1043373, 1042656, 1043377, 1009190, 1022201, 987082, 1009194, 1042302, 1041461, 1032174, 1035203, 1009134, 1040761, 1042813, 1043729, 1041199, 1041462, 986311, 1044777, 1009158, 1043369
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_batterydata.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/of_batterydata.h b/include/linux/of_batterydata.h index fe2c996de264..5505371488d0 100644 --- a/include/linux/of_batterydata.h +++ b/include/linux/of_batterydata.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2014, 2016 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 @@ -39,10 +39,7 @@ int of_batterydata_read_data(struct device_node *container_node, * of_batterydata_get_best_profile() - Find matching battery data device node * @batterydata_container_node: pointer to the battery-data container device * node containing the profile nodes. - * @psy_name: Name of the power supply which holds the - * POWER_SUPPLY_RESISTANCE_ID value to be used to match - * against the id resistances specified in the corresponding - * battery data profiles. + * @batt_id_kohm: Battery ID in KOhms for which we want to find the profile. * @batt_type: Battery type which we want to force load the profile. * * This routine returns a device_node pointer to the closest match battery data @@ -50,7 +47,7 @@ int of_batterydata_read_data(struct device_node *container_node, */ struct device_node *of_batterydata_get_best_profile( struct device_node *batterydata_container_node, - const char *psy_name, const char *batt_type); + int batt_id_kohm, const char *batt_type); #else static inline int of_batterydata_read_data(struct device_node *container_node, struct bms_battery_data *batt_data, @@ -60,7 +57,7 @@ static inline int of_batterydata_read_data(struct device_node *container_node, } static inline struct device_node *of_batterydata_get_best_profile( struct device_node *batterydata_container_node, - struct device_node *best_node, const char *psy_name) + int batt_id_kohm, const char *batt_type) { return -ENXIO; } |