diff options
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/samsung/core.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index b50c38f8bc48..f0f4de3b4ccc 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h | |||
@@ -26,6 +26,7 @@ enum sec_device_type { | |||
26 | /** | 26 | /** |
27 | * struct sec_pmic_dev - s5m87xx master device for sub-drivers | 27 | * struct sec_pmic_dev - s5m87xx master device for sub-drivers |
28 | * @dev: master device of the chip (can be used to access platform data) | 28 | * @dev: master device of the chip (can be used to access platform data) |
29 | * @pdata: pointer to private data used to pass platform data to child | ||
29 | * @i2c: i2c client private data for regulator | 30 | * @i2c: i2c client private data for regulator |
30 | * @rtc: i2c client private data for rtc | 31 | * @rtc: i2c client private data for rtc |
31 | * @iolock: mutex for serializing io access | 32 | * @iolock: mutex for serializing io access |
@@ -39,6 +40,7 @@ enum sec_device_type { | |||
39 | */ | 40 | */ |
40 | struct sec_pmic_dev { | 41 | struct sec_pmic_dev { |
41 | struct device *dev; | 42 | struct device *dev; |
43 | struct sec_platform_data *pdata; | ||
42 | struct regmap *regmap; | 44 | struct regmap *regmap; |
43 | struct i2c_client *i2c; | 45 | struct i2c_client *i2c; |
44 | struct i2c_client *rtc; | 46 | struct i2c_client *rtc; |
@@ -82,11 +84,11 @@ struct sec_platform_data { | |||
82 | 84 | ||
83 | int buck_gpios[3]; | 85 | int buck_gpios[3]; |
84 | int buck_ds[3]; | 86 | int buck_ds[3]; |
85 | int buck2_voltage[8]; | 87 | unsigned int buck2_voltage[8]; |
86 | bool buck2_gpiodvs; | 88 | bool buck2_gpiodvs; |
87 | int buck3_voltage[8]; | 89 | unsigned int buck3_voltage[8]; |
88 | bool buck3_gpiodvs; | 90 | bool buck3_gpiodvs; |
89 | int buck4_voltage[8]; | 91 | unsigned int buck4_voltage[8]; |
90 | bool buck4_gpiodvs; | 92 | bool buck4_gpiodvs; |
91 | 93 | ||
92 | int buck_set1; | 94 | int buck_set1; |
@@ -127,6 +129,7 @@ struct sec_platform_data { | |||
127 | struct sec_regulator_data { | 129 | struct sec_regulator_data { |
128 | int id; | 130 | int id; |
129 | struct regulator_init_data *initdata; | 131 | struct regulator_init_data *initdata; |
132 | struct device_node *reg_node; | ||
130 | }; | 133 | }; |
131 | 134 | ||
132 | /* | 135 | /* |
@@ -136,7 +139,7 @@ struct sec_regulator_data { | |||
136 | */ | 139 | */ |
137 | struct sec_opmode_data { | 140 | struct sec_opmode_data { |
138 | int id; | 141 | int id; |
139 | int mode; | 142 | unsigned int mode; |
140 | }; | 143 | }; |
141 | 144 | ||
142 | /* | 145 | /* |