rockchip: pinctrl: rk322x: Move the iomux definitions into pinctrl-driver

[u-boot] / drivers / input / i8042.c

diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 03d48403857a862c2e6224a15a71eb4472119607..18476e97d1886d8569e1343a1d9129c73835b4ce 100644 (file)
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -274,7 +274,7 @@ static int i8042_start(struct udevice *dev)
 
        /* Init keyboard device (default US layout) */
        keymap = KBD_US;
-       penv = getenv("keymap");
+       penv = env_get("keymap");
        if (penv != NULL) {
                if (strncmp(penv, "de", 3) == 0)
                        keymap = KBD_GER;
@@ -315,7 +315,7 @@ static int i8042_kbd_probe(struct udevice *dev)
        struct input_config *input = &uc_priv->input;
        int ret;
 
-       if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset,
+       if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev),
                            "intel,duplicate-por"))
                priv->quirks |= QUIRK_DUP_POR;