diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-08 16:24:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-08 16:24:44 -0500 |
| commit | 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a (patch) | |
| tree | 279c781bdcbe697257ff86714fa0355bcd92fd19 /arch/x86/lib | |
| parent | 7582ddce132390fba10822c5977cd1ab532bb1eb (diff) | |
| parent | f11a0af713a714ee2efcd810dd81c6dfd59381aa (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/mpspec.c | 3 | ||||
| -rw-r--r-- | arch/x86/lib/pinctrl_ich6.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index 17e977ce5e3..a6e493d69af 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -304,7 +304,8 @@ static int mptable_add_intsrc(struct mp_config_table *mc, } /* Get I/O interrupt information from device tree */ - cell = fdt_getprop(blob, dev->of_offset, "intel,pirq-routing", &len); + cell = fdt_getprop(blob, dev_of_offset(dev), "intel,pirq-routing", + &len); if (!cell) return -ENOENT; diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c index fb2d2940c95..406852d324d 100644 --- a/arch/x86/lib/pinctrl_ich6.c +++ b/arch/x86/lib/pinctrl_ich6.c @@ -187,7 +187,7 @@ static int ich6_pinctrl_probe(struct udevice *dev) return -EINVAL; } - for (pin_node = fdt_first_subnode(gd->fdt_blob, dev->of_offset); + for (pin_node = fdt_first_subnode(gd->fdt_blob, dev_of_offset(dev)); pin_node > 0; pin_node = fdt_next_subnode(gd->fdt_blob, pin_node)) { /* Configure the pin */ |