xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/qcom' and 'regulator/topic/stw481x' into regulator-next

Browse Source
This commit is contained in:
Mark Brown
2015-04-10 19:16:03 +01:00
parent 3984c9da45 7e476c7dd8 046db763aa e999c7289c ce8ae17c5d 14aef2919d
commit bea3672833
14 changed files with 334 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/mfd/palmas.h
View File

@@ -117,6 +117,7 @@ struct palmas_pmic_driver_data {
int ldo_begin;
int ldo_end;
int max_reg;
bool has_regen3;
struct palmas_regs_info *palmas_regs_info;
struct of_regulator_match *palmas_matches;
struct palmas_sleep_requestor_info *sleep_req_info;

4
include/linux/mfd/stw481x.h
View File

@@ -41,15 +41,11 @@
/**
* struct stw481x - state holder for the Stw481x drivers
* @mutex: mutex to serialize I2C accesses
* @i2c_client: corresponding I2C client
* @regulator: regulator device for regulator children
* @map: regmap handle to access device registers
*/
struct stw481x {
struct mutex lock;
struct i2c_client *client;
struct regulator_dev *vmmc_regulator;
struct regmap *map;
};