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

Merge remote-tracking branch 'regulator/topic/s5m8767' into regulator-next

Browse Source
This commit is contained in:
Mark Brown
2013-02-19 12:43:08 +00:00
parent 728088871c e81d7bc89c
commit 178a097d5e
4 changed files with 437 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/mfd/samsung/core.h
View File

@@ -26,6 +26,7 @@ enum sec_device_type {
/**
* struct sec_pmic_dev - s5m87xx master device for sub-drivers
* @dev: master device of the chip (can be used to access platform data)
* @pdata: pointer to private data used to pass platform data to child
* @i2c: i2c client private data for regulator
* @rtc: i2c client private data for rtc
* @iolock: mutex for serializing io access
@@ -39,6 +40,7 @@ enum sec_device_type {
*/
struct sec_pmic_dev {
struct device *dev;
struct sec_platform_data *pdata;
struct regmap *regmap;
struct i2c_client *i2c;
struct i2c_client *rtc;
@@ -82,11 +84,11 @@ struct sec_platform_data {
int buck_gpios[3];
int buck_ds[3];
int buck2_voltage[8];
unsigned int buck2_voltage[8];
bool buck2_gpiodvs;
int buck3_voltage[8];
unsigned int buck3_voltage[8];
bool buck3_gpiodvs;
int buck4_voltage[8];
unsigned int buck4_voltage[8];
bool buck4_gpiodvs;
int buck_set1;
@@ -127,6 +129,7 @@ struct sec_platform_data {
struct sec_regulator_data {
int id;
struct regulator_init_data *initdata;
struct device_node *reg_node;
};
/*
@@ -136,7 +139,7 @@ struct sec_regulator_data {
*/
struct sec_opmode_data {
int id;
int mode;
unsigned int mode;
};
/*