Merge git://git.denx.de/u-boot-x86

[u-boot] / arch / x86 / lib / pinctrl_ich6.c

diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 3f94cdf2dacad9dfee75081a22df4764c39b9e14..406852d324daf189ccc4133729feda9787bbeb4e 100644 (file)
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -104,7 +104,7 @@ static int ich6_pinctrl_cfg_pin(s32 gpiobase, s32 iobase, int pin_node)
 
        /* if iobase is present, let's configure the pad */
        if (iobase != -1) {
-               int iobase_addr;
+               ulong iobase_addr;
 
                /*
                 * The offset for the same pin for the IOBASE and GPIOBASE are
@@ -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 */