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 /arch/arm/boot/dts/spear1310.dtsi | |
| 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 'arch/arm/boot/dts/spear1310.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/spear1310.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi index 1513c1927cc8..122ae94076c8 100644 --- a/arch/arm/boot/dts/spear1310.dtsi +++ b/arch/arm/boot/dts/spear1310.dtsi @@ -89,7 +89,7 @@ pinmux: pinmux@e0700000 { compatible = "st,spear1310-pinmux"; reg = <0xe0700000 0x1000>; - #gpio-range-cells = <2>; + #gpio-range-cells = <3>; }; apb { @@ -212,7 +212,7 @@ interrupt-controller; gpio-controller; #gpio-cells = <2>; - gpio-ranges = <&pinmux 0 246>; + gpio-ranges = <&pinmux 0 0 246>; status = "disabled"; st-plgpio,ngpio = <246>; |