Merge branch '2020-02-07-master-imports'

[oweals/u-boot.git] / drivers / gpio / altera_pio.c

diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index 92849c5295e9ea481ba320130bdd2b04a68a05af..324f9c29a82e5ba914ecbbb84825bc43d49c3735 100644 (file)
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015  Thomas Chou <thomas@wytron.com.tw>
  * Copyright (C) 2011  Missing Link Electronics
  *                     Joachim Foerster <joachim@missinglinkelectronics.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <dm.h>
@@ -57,7 +56,7 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin)
        struct altera_pio_platdata *plat = dev_get_platdata(dev);
        struct altera_pio_regs *const regs = plat->regs;
 
-       return readl(&regs->data) & (1 << pin);
+       return !!(readl(&regs->data) & (1 << pin));
 }
 
 
@@ -89,7 +88,7 @@ static int altera_pio_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_pio_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = map_physmem(dev_get_addr(dev),
+       plat->regs = map_physmem(devfdt_get_addr(dev),
                                 sizeof(struct altera_pio_regs),
                                 MAP_NOCACHE);
        plat->gpio_count = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),