Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Doug Anderson and committed by
Linus Walleij
f3ababa8 4f671cb2

+5 -3
+3 -3
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
··· 2 2 3 3 The Rockchip Pinmux Controller, enables the IC 4 4 to share one PAD to several functional blocks. The sharing is done by 5 - multiplexing the PAD input/output signals. For each PAD there are up to 6 - 4 muxing options with option 0 being the use as a GPIO. 5 + multiplexing the PAD input/output signals. For each PAD there are several 6 + muxing options with option 0 being the use as a GPIO. 7 7 8 8 Please refer to pinctrl-bindings.txt in this directory for details of the 9 9 common pinctrl bindings used by client devices, including the meaning of the ··· 58 58 Required properties for pin configuration node: 59 59 - rockchip,pins: 3 integers array, represents a group of pins mux and config 60 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 62 The phandle of a node containing the generic pinconfig options 63 63 to use, as described in pinctrl-bindings.txt in this directory. 64 64
+2
include/dt-bindings/pinctrl/rockchip.h
··· 28 28 #define RK_FUNC_GPIO 0 29 29 #define RK_FUNC_1 1 30 30 #define RK_FUNC_2 2 31 + #define RK_FUNC_3 3 32 + #define RK_FUNC_4 4 31 33 32 34 #endif