samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub', 'regulator/topic/tps65090', 'regulator/topic/tps65217' and 'regulator/topic/tps65218' into regulator-next

Browse Source
This commit is contained in:
Mark Brown
2014-06-02 17:08:12 +01:00
parent 4c04ef25b8 eba430c7ea d660e92a97 c122c5b682 5957ae1fdc 5ab9be4274
commit b58e917bf9
8 changed files with 237 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/mfd/tps65090.h
View File

@@ -92,11 +92,16 @@ struct tps65090 {
* DCDC1, DCDC2 and DCDC3.
* @gpio: Gpio number if external control is enabled and controlled through
* gpio.
* @overcurrent_wait_valid: True if the overcurrent_wait should be applied.
* @overcurrent_wait: Value to set as the overcurrent wait time. This is the
* actual bitfield value, not a time in ms (valid value are 0 - 3).
*/
struct tps65090_regulator_plat_data {
struct regulator_init_data *reg_init_data;
bool enable_ext_control;
int gpio;
bool overcurrent_wait_valid;
int overcurrent_wait;
};
struct tps65090_platform_data {

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

@@ -254,7 +254,6 @@ struct tps65217 {
struct tps65217_board *pdata;
unsigned long id;
struct regulator_desc desc[TPS65217_NUM_REGULATOR];
struct regulator_dev *rdev[TPS65217_NUM_REGULATOR];
struct regmap *regmap;
};