diff options
| author | Carlo Caione <carlo@endlessm.com> | 2015-03-19 17:34:11 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-04-07 05:42:38 -0400 |
| commit | faa246debff1cfc0950f73c778f2db83451aa38b (patch) | |
| tree | 31aee3d0f873d5cfb22a43e3a6c421b08988b17e | |
| parent | 0cf6f3c2b5ef0b5b3bb82f02edbeda4751b27763 (diff) | |
documentation: Extend pinctrl docs for Meson8b
Add the compatible string for Meson8b in Meson pinctrl documentation
and add new information for Meson8b in source code comments.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
Acked-by: Beniamino Galvani <b.galvani@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt index 17e7240c6998..3f6a524cc5ff 100644 --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | == Amlogic Meson pinmux controller == | 1 | == Amlogic Meson pinmux controller == |
| 2 | 2 | ||
| 3 | Required properties for the root node: | 3 | Required properties for the root node: |
| 4 | - compatible: "amlogic,meson8-pinctrl" | 4 | - compatible: "amlogic,meson8-pinctrl" or "amlogic,meson8b-pinctrl" |
| 5 | - reg: address and size of registers controlling irq functionality | 5 | - reg: address and size of registers controlling irq functionality |
| 6 | 6 | ||
| 7 | === GPIO sub-nodes === | 7 | === GPIO sub-nodes === |
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index a2bf49ce16e7..e0195c1081c4 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c | |||
| @@ -13,8 +13,9 @@ | |||
| 13 | 13 | ||
| 14 | /* | 14 | /* |
| 15 | * The available pins are organized in banks (A,B,C,D,E,X,Y,Z,AO, | 15 | * The available pins are organized in banks (A,B,C,D,E,X,Y,Z,AO, |
| 16 | * BOOT,CARD for meson6 and X,Y,DV,H,Z,AO,BOOT,CARD for meson8) and | 16 | * BOOT,CARD for meson6, X,Y,DV,H,Z,AO,BOOT,CARD for meson8 and |
| 17 | * each bank has a variable number of pins. | 17 | * X,Y,DV,H,AO,BOOT,CARD,DIF for meson8b) and each bank has a |
| 18 | * variable number of pins. | ||
| 18 | * | 19 | * |
| 19 | * The AO bank is special because it belongs to the Always-On power | 20 | * The AO bank is special because it belongs to the Always-On power |
| 20 | * domain which can't be powered off; the bank also uses a set of | 21 | * domain which can't be powered off; the bank also uses a set of |
