Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
This commit is contained in:
Коммит
f5164b8833
|
@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
|
|||
return NULL;
|
||||
|
||||
for (i = 0; i < num; i++) {
|
||||
int id;
|
||||
uintptr_t id;
|
||||
if (!tps6586x_matches[i].init_data)
|
||||
continue;
|
||||
|
||||
pdata->reg_init_data[i] = tps6586x_matches[i].init_data;
|
||||
id = (int)tps6586x_matches[i].driver_data;
|
||||
id = (uintptr_t)tps6586x_matches[i].driver_data;
|
||||
if (id == TPS6586X_ID_SYS)
|
||||
sys_rail = pdata->reg_init_data[i]->constraints.name;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче