diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-07 01:37:06 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-07 01:37:06 +0300 |
commit | d0300e5e8d2fb74852f8116f26546e12cfa66735 (patch) | |
tree | a6580aa74a0ebd7965dbc37767717b4f73dd9d79 /Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | |
parent | c32909741fe93032705e6da29b564b8fec84f415 (diff) | |
parent | 34c9ca37aaec2e307b837bb099d3b44f0ea04ddc (diff) | |
download | linux-d0300e5e8d2fb74852f8116f26546e12cfa66735.tar.xz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh to v4.15
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt')
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt index 6f2ec9af0de2..09789fdfa749 100644 --- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt @@ -89,7 +89,7 @@ Optional subnode-properties: Examples: -pio: pinctrl@01c20800 { +pio: pinctrl@1c20800 { compatible = "allwinner,sun5i-a13-pinctrl"; reg = <0x01c20800 0x400>; #address-cells = <1>; |