summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2014-08-08 18:29:09 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-08-28 09:18:03 -0400
commitf3ababa8ba2ace6668a24803910577a49dc146dd (patch)
tree558ac7e30389df1714386acbc8027d58d29ea1bb
parent4f671cb25e0a1d2b903d9a19e66fa193572424cf (diff)
pinctrl: Add mux options 3 and 4 for rockchip pinctrl
Newer Rockchip SoCs have more muxing slots. Add slots 3 and 4 since the rk3288 table goes all the way up to 4. Signed-off-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt6
-rw-r--r--include/dt-bindings/pinctrl/rockchip.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
index 4658b69d4f4d..388b213249fd 100644
--- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
@@ -2,8 +2,8 @@
2 2
3The Rockchip Pinmux Controller, enables the IC 3The Rockchip Pinmux Controller, enables the IC
4to share one PAD to several functional blocks. The sharing is done by 4to share one PAD to several functional blocks. The sharing is done by
5multiplexing the PAD input/output signals. For each PAD there are up to 5multiplexing the PAD input/output signals. For each PAD there are several
64 muxing options with option 0 being the use as a GPIO. 6muxing options with option 0 being the use as a GPIO.
7 7
8Please refer to pinctrl-bindings.txt in this directory for details of the 8Please refer to pinctrl-bindings.txt in this directory for details of the
9common pinctrl bindings used by client devices, including the meaning of the 9common pinctrl bindings used by client devices, including the meaning of the
@@ -58,7 +58,7 @@ Deprecated properties for gpio sub nodes:
58Required properties for pin configuration node: 58Required properties for pin configuration node:
59 - rockchip,pins: 3 integers array, represents a group of pins mux and config 59 - rockchip,pins: 3 integers array, represents a group of pins mux and config
60 setting. The format is rockchip,pins = <PIN_BANK PIN_BANK_IDX MUX &phandle>. 60 setting. The format is rockchip,pins = <PIN_BANK PIN_BANK_IDX MUX &phandle>.
61 The MUX 0 means gpio and MUX 1 to 3 mean the specific device function. 61 The MUX 0 means gpio and MUX 1 to N mean the specific device function.
62 The phandle of a node containing the generic pinconfig options 62 The phandle of a node containing the generic pinconfig options
63 to use, as described in pinctrl-bindings.txt in this directory. 63 to use, as described in pinctrl-bindings.txt in this directory.
64 64
diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h
index cd5788be82ce..743e66a95e13 100644
--- a/include/dt-bindings/pinctrl/rockchip.h
+++ b/include/dt-bindings/pinctrl/rockchip.h
@@ -28,5 +28,7 @@
28#define RK_FUNC_GPIO 0 28#define RK_FUNC_GPIO 0
29#define RK_FUNC_1 1 29#define RK_FUNC_1 1
30#define RK_FUNC_2 2 30#define RK_FUNC_2 2
31#define RK_FUNC_3 3
32#define RK_FUNC_4 4
31 33
32#endif 34#endif