Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
大约 1 年 前同步成功

通知 158
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 d3f9c570 编写于 作者: K Kukjin Kim
浏览文件
操作

ARM: S5PV210: Use REGULATOR_SUPPLY macro for regulator consumers 

To use REGULATOR_SUPPLY macro is cleaner for initializing regulator
consumer supply.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
上级 f5412be5
隐藏空白更改
内联 并排
Showing with 34 addition and 70 deletion
arch/arm/mach-s5pv210/mach-aquila.c
浏览文件 @ d3f9c570
...@@ -296,13 +296,11 @@ static struct regulator_init_data aquila_ldo17_data = { ...@@ -296,13 +296,11 @@ static struct regulator_init_data aquila_ldo17_data = {
}; };
/* BUCK */ /* BUCK */
static struct regulator_consumer_supply buck1_consumer[] = { static struct regulator_consumer_supply buck1_consumer =
{ .supply = "vddarm", }, REGULATOR_SUPPLY("vddarm", NULL);
};
static struct regulator_consumer_supply buck2_consumer[] = { static struct regulator_consumer_supply buck2_consumer =
{ .supply = "vddint", }, REGULATOR_SUPPLY("vddint", NULL);
};
static struct regulator_init_data aquila_buck1_data = { static struct regulator_init_data aquila_buck1_data = {
.constraints = { .constraints = {
...@@ -313,8 +311,8 @@ static struct regulator_init_data aquila_buck1_data = { ...@@ -313,8 +311,8 @@ static struct regulator_init_data aquila_buck1_data = {
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
REGULATOR_CHANGE_STATUS, REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(buck1_consumer), .num_consumer_supplies = 1,
.consumer_supplies = buck1_consumer, .consumer_supplies = &buck1_consumer,
}; };
static struct regulator_init_data aquila_buck2_data = { static struct regulator_init_data aquila_buck2_data = {
...@@ -326,8 +324,8 @@ static struct regulator_init_data aquila_buck2_data = { ...@@ -326,8 +324,8 @@ static struct regulator_init_data aquila_buck2_data = {
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
REGULATOR_CHANGE_STATUS, REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(buck2_consumer), .num_consumer_supplies = 1,
.consumer_supplies = buck2_consumer, .consumer_supplies = &buck2_consumer,
}; };
static struct regulator_init_data aquila_buck3_data = { static struct regulator_init_data aquila_buck3_data = {
...@@ -391,26 +389,14 @@ static struct max8998_platform_data aquila_max8998_pdata = { ...@@ -391,26 +389,14 @@ static struct max8998_platform_data aquila_max8998_pdata = {
#endif #endif
static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = { static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
{ REGULATOR_SUPPLY("DBVDD", "5-001a"),
.dev_name = "5-001a", REGULATOR_SUPPLY("AVDD2", "5-001a"),
.supply = "DBVDD", REGULATOR_SUPPLY("CPVDD", "5-001a"),
}, {
.dev_name = "5-001a",
.supply = "AVDD2",
}, {
.dev_name = "5-001a",
.supply = "CPVDD",
},
}; };
static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = { static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
{ REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
.dev_name = "5-001a", REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
.supply = "SPKVDD1",
}, {
.dev_name = "5-001a",
.supply = "SPKVDD2",
},
}; };
static struct regulator_init_data wm8994_fixed_voltage0_init_data = { static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
...@@ -459,15 +445,11 @@ static struct platform_device wm8994_fixed_voltage1 = { ...@@ -459,15 +445,11 @@ static struct platform_device wm8994_fixed_voltage1 = {
}, },
}; };
static struct regulator_consumer_supply wm8994_avdd1_supply = { static struct regulator_consumer_supply wm8994_avdd1_supply =
.dev_name = "5-001a", REGULATOR_SUPPLY("AVDD1", "5-001a");
.supply = "AVDD1",
};
static struct regulator_consumer_supply wm8994_dcvdd_supply = { static struct regulator_consumer_supply wm8994_dcvdd_supply =
.dev_name = "5-001a", REGULATOR_SUPPLY("DCVDD", "5-001a");
.supply = "DCVDD",
};
static struct regulator_init_data wm8994_ldo1_data = { static struct regulator_init_data wm8994_ldo1_data = {
.constraints = { .constraints = {
......
arch/arm/mach-s5pv210/mach-goni.c
浏览文件 @ d3f9c570
...@@ -436,13 +436,11 @@ static struct regulator_init_data goni_ldo17_data = { ...@@ -436,13 +436,11 @@ static struct regulator_init_data goni_ldo17_data = {
}; };
/* BUCK */ /* BUCK */
static struct regulator_consumer_supply buck1_consumer[] = { static struct regulator_consumer_supply buck1_consumer =
{ .supply = "vddarm", }, REGULATOR_SUPPLY("vddarm", NULL);
};
static struct regulator_consumer_supply buck2_consumer[] = { static struct regulator_consumer_supply buck2_consumer =
{ .supply = "vddint", }, REGULATOR_SUPPLY("vddint", NULL);
};
static struct regulator_init_data goni_buck1_data = { static struct regulator_init_data goni_buck1_data = {
.constraints = { .constraints = {
...@@ -453,8 +451,8 @@ static struct regulator_init_data goni_buck1_data = { ...@@ -453,8 +451,8 @@ static struct regulator_init_data goni_buck1_data = {
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
REGULATOR_CHANGE_STATUS, REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(buck1_consumer), .num_consumer_supplies = 1,
.consumer_supplies = buck1_consumer, .consumer_supplies = &buck1_consumer,
}; };
static struct regulator_init_data goni_buck2_data = { static struct regulator_init_data goni_buck2_data = {
...@@ -466,8 +464,8 @@ static struct regulator_init_data goni_buck2_data = { ...@@ -466,8 +464,8 @@ static struct regulator_init_data goni_buck2_data = {
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
REGULATOR_CHANGE_STATUS, REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(buck2_consumer), .num_consumer_supplies = 1,
.consumer_supplies = buck2_consumer, .consumer_supplies = &buck2_consumer,
}; };
static struct regulator_init_data goni_buck3_data = { static struct regulator_init_data goni_buck3_data = {
...@@ -531,26 +529,14 @@ static struct max8998_platform_data goni_max8998_pdata = { ...@@ -531,26 +529,14 @@ static struct max8998_platform_data goni_max8998_pdata = {
#endif #endif
static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = { static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
{ REGULATOR_SUPPLY("DBVDD", "5-001a"),
.dev_name = "5-001a", REGULATOR_SUPPLY("AVDD2", "5-001a"),
.supply = "DBVDD", REGULATOR_SUPPLY("CPVDD", "5-001a"),
}, {
.dev_name = "5-001a",
.supply = "AVDD2",
}, {
.dev_name = "5-001a",
.supply = "CPVDD",
},
}; };
static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = { static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
{ REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
.dev_name = "5-001a", REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
.supply = "SPKVDD1",
}, {
.dev_name = "5-001a",
.supply = "SPKVDD2",
},
}; };
static struct regulator_init_data wm8994_fixed_voltage0_init_data = { static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
...@@ -599,15 +585,11 @@ static struct platform_device wm8994_fixed_voltage1 = { ...@@ -599,15 +585,11 @@ static struct platform_device wm8994_fixed_voltage1 = {
}, },
}; };
static struct regulator_consumer_supply wm8994_avdd1_supply = { static struct regulator_consumer_supply wm8994_avdd1_supply =
.dev_name = "5-001a", REGULATOR_SUPPLY("AVDD1", "5-001a");
.supply = "AVDD1",
};
static struct regulator_consumer_supply wm8994_dcvdd_supply = { static struct regulator_consumer_supply wm8994_dcvdd_supply =
.dev_name = "5-001a", REGULATOR_SUPPLY("DCVDD", "5-001a");
.supply = "DCVDD",
};
static struct regulator_init_data wm8994_ldo1_data = { static struct regulator_init_data wm8994_ldo1_data = {
.constraints = { .constraints = {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或