Commit f5164b88 authored by Mark Brown's avatar Mark Brown

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

parents aaa9b649 a70f0d02
...@@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt( ...@@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
return NULL; return NULL;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
int id; uintptr_t id;
if (!tps6586x_matches[i].init_data) if (!tps6586x_matches[i].init_data)
continue; continue;
pdata->reg_init_data[i] = tps6586x_matches[i].init_data; 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) if (id == TPS6586X_ID_SYS)
sys_rail = pdata->reg_init_data[i]->constraints.name; sys_rail = pdata->reg_init_data[i]->constraints.name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment