diff options
Diffstat (limited to 'include/linux/mfd/samsung')
-rw-r--r-- | include/linux/mfd/samsung/core.h | 6 | ||||
-rw-r--r-- | include/linux/mfd/samsung/s5m8767.h | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index cab2dd279076..41c9bde410c5 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h | |||
@@ -59,12 +59,6 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic); | |||
59 | void sec_irq_exit(struct sec_pmic_dev *sec_pmic); | 59 | void sec_irq_exit(struct sec_pmic_dev *sec_pmic); |
60 | int sec_irq_resume(struct sec_pmic_dev *sec_pmic); | 60 | int sec_irq_resume(struct sec_pmic_dev *sec_pmic); |
61 | 61 | ||
62 | extern int sec_reg_read(struct sec_pmic_dev *sec_pmic, u8 reg, void *dest); | ||
63 | extern int sec_bulk_read(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf); | ||
64 | extern int sec_reg_write(struct sec_pmic_dev *sec_pmic, u8 reg, u8 value); | ||
65 | extern int sec_bulk_write(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf); | ||
66 | extern int sec_reg_update(struct sec_pmic_dev *sec_pmic, u8 reg, u8 val, u8 mask); | ||
67 | |||
68 | struct sec_platform_data { | 62 | struct sec_platform_data { |
69 | struct sec_regulator_data *regulators; | 63 | struct sec_regulator_data *regulators; |
70 | struct sec_opmode_data *opmode; | 64 | struct sec_opmode_data *opmode; |
diff --git a/include/linux/mfd/samsung/s5m8767.h b/include/linux/mfd/samsung/s5m8767.h index 306a95fc558c..2ab0b0f03641 100644 --- a/include/linux/mfd/samsung/s5m8767.h +++ b/include/linux/mfd/samsung/s5m8767.h | |||
@@ -183,6 +183,22 @@ enum s5m8767_regulators { | |||
183 | S5M8767_REG_MAX, | 183 | S5M8767_REG_MAX, |
184 | }; | 184 | }; |
185 | 185 | ||
186 | #define S5M8767_ENCTRL_SHIFT 6 | 186 | #define S5M8767_ENCTRL_SHIFT 6 |
187 | #define S5M8767_ENCTRL_MASK (0x3 << S5M8767_ENCTRL_SHIFT) | ||
188 | |||
189 | /* | ||
190 | * Values for BUCK_RAMP field in DVS_RAMP register, matching raw values | ||
191 | * in mV/us. | ||
192 | */ | ||
193 | enum s5m8767_dvs_buck_ramp_values { | ||
194 | S5M8767_DVS_BUCK_RAMP_5 = 0x4, | ||
195 | S5M8767_DVS_BUCK_RAMP_10 = 0x9, | ||
196 | S5M8767_DVS_BUCK_RAMP_12_5 = 0xb, | ||
197 | S5M8767_DVS_BUCK_RAMP_25 = 0xd, | ||
198 | S5M8767_DVS_BUCK_RAMP_50 = 0xe, | ||
199 | S5M8767_DVS_BUCK_RAMP_100 = 0xf, | ||
200 | }; | ||
201 | #define S5M8767_DVS_BUCK_RAMP_SHIFT 4 | ||
202 | #define S5M8767_DVS_BUCK_RAMP_MASK (0xf << S5M8767_DVS_BUCK_RAMP_SHIFT) | ||
187 | 203 | ||
188 | #endif /* __LINUX_MFD_S5M8767_H */ | 204 | #endif /* __LINUX_MFD_S5M8767_H */ |