diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
| commit | 6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch) | |
| tree | c250644c5adce04947d664318996de16df3f02da /Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt | |
| parent | b96516220870d8571fc12da980668687c122976e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt index ab19e6bc7d3b..bcfdab5d442e 100644 --- a/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt @@ -24,9 +24,9 @@ Required properties for iomux controller: Required properties for pin configuration node: - fsl,pins: two integers array, represents a group of pins mux and config setting. The format is fsl,pins = <PIN_FUNC_ID CONFIG>, PIN_FUNC_ID is a - pin working on a specific function, CONFIG is the pad setting value like - pull-up on this pin. Please refer to fsl,<soc>-pinctrl.txt for the valid - pins and functions of each SoC. + pin working on a specific function, which consists of a tuple of + <mux_reg conf_reg input_reg mux_val input_val>. CONFIG is the pad setting + value like pull-up on this pin. Bits used for CONFIG: NO_PAD_CTL(1 << 31): indicate this pin does not need config. |