diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-16 13:30:25 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-10-16 13:30:25 -0600 |
| commit | d24625a7b1e866b3ffa339595de7f04aae280ac3 (patch) | |
| tree | 64f1f6a0e100cd7b976346ed2928250a5b27964d /include/linux | |
| parent | 9f7e29e2fe103c7eba34ce9210249ba5243e3170 (diff) | |
| parent | 4f983fd1aa1ae7640ddaff7e4838f9f04f3e263f (diff) | |
Promotion of kernel.lnx.4.4-161016.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1072671 I2a9b379715622b5f010a5780ca481da7f9619400 input: misc: pat9125: add gpio configuration and pinctrl
1063047 Iec92d2037fcc60446760182c9eda53918e6e094c leds: qpnp-flash-v2: Add support for preemptive charger
1071443 I0a3d98ac1e1202e5b655b2e3a8102691b61359c8 power_supply: Add additional USB PD properties
1047684 I144f8158dbf8be0babf5516b01d084fd053413c3 usb: pd: Simplify VDM tx handling
1047684 Id2590065a01e46f8da70733d55f3bfabff5b532d usb: pd: Correctly handle invalid Structured VDMs
1077123 If3a9aa316ae08a80468631f3d536a1b345e21b18 usb: pd: Support VCONN Swap
1071443 I4d8c9fcdf553d1cf1ae79c66932773834804d1a9 usb: pd: Use new power_supply PD_IN_HARD_RESET property
1066031 I71d8ea0c69a7b174c2280f92d1f5342e5e50d9b0 usb: pd: Prevent sleep when state machine in progress
1060705 Ice714c1fad1d202d05de6ecaf6d1d1ec17a04c15 leds: qpnp-flash-v2: Fix possible NULL pointer dereferen
1077874 Ibab7a5aa6aa89236974fcd0d65ffe0bd1a7acb12 clk: qcom: clk-voter: Add support for voter clocks
1004392 I88cdf5110cadb44a81c0c700d5188bf639bb2129 soc: qcom: core_hang: Separate sysfs entry for silver an
1046094 I44598eb0b49efd763f86f303c70e8b018fca994b usb: pd: Miscellaneous compliance fixes
1073129 Idf76a7d964ec6989a0474d49895e54103f17938b drivers: soc: add size checks and update log messages
Change-Id: Ifc7f4068e4bd638fea76dfcc8623b4d2e926cb64
CRs-Fixed: 1072671, 1077123, 1004392, 1077874, 1060705, 1046094, 1071443, 1066031, 1073129, 1047684, 1063047
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk-provider.h | 3 | ||||
| -rw-r--r-- | include/linux/leds-qpnp-flash.h | 3 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 23026ba6ff25..0de2d0c780d7 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -669,6 +669,9 @@ void clk_hw_reparent(struct clk_hw *hw, struct clk_hw *new_parent); void clk_hw_set_rate_range(struct clk_hw *hw, unsigned long min_rate, unsigned long max_rate); +unsigned long clk_aggregate_rate(struct clk_hw *hw, + const struct clk_core *parent); + static inline void __clk_hw_set_clk(struct clk_hw *dst, struct clk_hw *src) { dst->clk = src->clk; diff --git a/include/linux/leds-qpnp-flash.h b/include/linux/leds-qpnp-flash.h index 3df370a9e6d3..4b5a339970fa 100644 --- a/include/linux/leds-qpnp-flash.h +++ b/include/linux/leds-qpnp-flash.h @@ -18,6 +18,9 @@ #define ENABLE_REGULATOR BIT(0) #define DISABLE_REGULATOR BIT(1) #define QUERY_MAX_CURRENT BIT(2) +#define PRE_FLASH BIT(3) + +#define FLASH_LED_PREPARE_OPTIONS_MASK GENMASK(3, 0) int qpnp_flash_led_prepare(struct led_trigger *trig, int options, int *max_current); diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c477f60c3f01..218cd875ee5a 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -216,6 +216,9 @@ enum power_supply_property { POWER_SUPPLY_PROP_TYPEC_POWER_ROLE, POWER_SUPPLY_PROP_PD_ALLOWED, POWER_SUPPLY_PROP_PD_ACTIVE, + POWER_SUPPLY_PROP_PD_IN_HARD_RESET, + POWER_SUPPLY_PROP_PD_CURRENT_MAX, + POWER_SUPPLY_PROP_PD_USB_SUSPEND_SUPPORTED, POWER_SUPPLY_PROP_CHARGER_TEMP, POWER_SUPPLY_PROP_CHARGER_TEMP_MAX, POWER_SUPPLY_PROP_PARALLEL_DISABLE, |