diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 18:11:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 18:11:13 +0100 |
| commit | 8f07b1d580fdbbc21969319d4208a15f5280d04e (patch) | |
| tree | 5fcbae26b297bfe4abc428c1a6814e0ac1753bcc /Documentation/devicetree/bindings/gpio/gpio.txt | |
| parent | Linux 3.9-rc2 (diff) | |
| parent | ARM: shmobile: kzm9g: correct smsc regulator registration (diff) | |
| download | linux-8f07b1d580fdbbc21969319d4208a15f5280d04e.tar.xz linux-8f07b1d580fdbbc21969319d4208a15f5280d04e.zip | |
Merge tag 'renesas-boards-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman <horms+renesas@verge.net.au>:
Renesas ARM-based SoC board updates for v3.10
This is based on a merge of the following:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-pinmux-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-for-v3.10
* tag 'renesas-boards-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (218 commits)
ARM: shmobile: kzm9g: correct smsc regulator registration
ARM: shmobile: marzen: Use gic_iid macro for ICCIAR / interrupt ID
ARM: shmobile: kzm9g: Trim reference DT_MACHINE_START
ARM: shmobile: kzm9g: Remove warning about SMP
ARM: shmobile: simplify kzm9g Kconfig dependencies
ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference
ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference
ARM: shmobile: kzm9g: Reference DT implementation
ARM: shmobile: marzen: Reference DT implementation
ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused
ARM: shmobile: streamline mackerel SD and MMC devices
ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva
ARM: shmobile: use GPIO SD-card detection on armadillo800eva
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/gpio/gpio.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt index a33628759d36..d933af370697 100644 --- a/Documentation/devicetree/bindings/gpio/gpio.txt +++ b/Documentation/devicetree/bindings/gpio/gpio.txt @@ -98,7 +98,7 @@ announce the pinrange to the pin ctrl subsystem. For example, compatible = "fsl,qe-pario-bank-e", "fsl,qe-pario-bank"; reg = <0x1460 0x18>; gpio-controller; - gpio-ranges = <&pinctrl1 20 10>, <&pinctrl2 50 20>; + gpio-ranges = <&pinctrl1 0 20 10>, <&pinctrl2 10 50 20>; } @@ -107,8 +107,8 @@ where, Next values specify the base pin and number of pins for the range handled by 'qe_pio_e' gpio. In the given example from base pin 20 to - pin 29 under pinctrl1 and pin 50 to pin 69 under pinctrl2 is handled - by this gpio controller. + pin 29 under pinctrl1 with gpio offset 0 and pin 50 to pin 69 under + pinctrl2 with gpio offset 10 is handled by this gpio controller. The pinctrl node must have "#gpio-range-cells" property to show number of arguments to pass with phandle from gpio controllers node. |