diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2021-11-07 17:12:25 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2021-11-07 17:12:25 +0000 |
| commit | c5f6f3d75b2adba8a281be9838199ef691ad27ce (patch) | |
| tree | 4edee88db64669ba0bd8ba812cff60d19e09fd62 /sys/dev | |
| parent | c7f996c0a60dd592cd31cc0aa9c085632233dd4f (diff) | |
pinctrl-single: support #pinctrl-cells 2
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fdt/pinctrl_single.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/fdt/pinctrl_single.c b/sys/dev/fdt/pinctrl_single.c index 8d3a2864b10..dbc6a75a475 100644 --- a/sys/dev/fdt/pinctrl_single.c +++ b/sys/dev/fdt/pinctrl_single.c @@ -1,4 +1,4 @@ -/* $NetBSD: pinctrl_single.c,v 1.5 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: pinctrl_single.c,v 1.6 2021/11/07 17:12:25 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pinctrl_single.c,v 1.5 2021/01/27 03:10:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pinctrl_single.c,v 1.6 2021/11/07 17:12:25 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -110,7 +110,7 @@ pinctrl_single_pins_set_config(device_t dev, const void *data, size_t len) const u_int *pins; int pinslen; - if (len != 4) + if (len != 4 && len != 8) return -1; const int phandle = fdtbus_get_phandle_from_native(be32dec(data)); @@ -119,13 +119,14 @@ pinctrl_single_pins_set_config(device_t dev, const void *data, size_t len) if (pins == NULL) return -1; - while (pinslen >= 8) { + while (pinslen >= 4 + len) { const int off = be32toh(pins[0]); const int val = be32toh(pins[1]); + const int mux = len == 4 ? 0 : be32toh(pins[2]); - pinctrl_single_pins_write(sc, off, val); - pins += 2; - pinslen -= 8; + pinctrl_single_pins_write(sc, off, val | mux); + pins += 1 + (len / 4); + pinslen -= (4 + len); } return 0; |
