diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-01-22 10:55:07 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-01-22 10:55:07 +0100 |
| commit | fe4a6485b819560381bcd83926edd86043950cbf (patch) | |
| tree | 08a0b14895814179b7d91be668097ebb70eec271 /Documentation | |
| parent | pinctrl: ti: iodelay: Lower the priority of prints (diff) | |
| parent | pinctrl: meson: add optional region for drive strength (diff) | |
| download | linux-fe4a6485b819560381bcd83926edd86043950cbf.tar.xz linux-fe4a6485b819560381bcd83926edd86043950cbf.zip | |
Merge branch 'ib-meson-fixes' into devel
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt index 82ead40311f6..a47dd990a8d3 100644 --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt @@ -23,11 +23,11 @@ The GPIO bank for the controller is represented as a sub-node and it acts as a GPIO controller. Required properties for sub-nodes are: - - reg: should contain address and size for mux, pull-enable, pull and - gpio register sets - - reg-names: an array of strings describing the "reg" entries. Must - contain "mux", "pull" and "gpio". "pull-enable" is optional and - when it is missing the "pull" registers are used instead + - reg: should contain a list of address and size, one tuple for each entry + in reg-names. + - reg-names: an array of strings describing the "reg" entries. + Must contain "mux" and "gpio". + May contain "pull", "pull-enable" and "ds" when appropriate. - gpio-controller: identifies the node as a gpio controller - #gpio-cells: must be 2 |