summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-06 16:34:33 +0100
committerOlof Johansson <olof@lixom.net>2012-11-06 16:34:33 +0100
commitdfac74d38ec45bbdb80979ec966e1e703554c864 (patch)
tree6f6c1ffd1d73ae2958209158d5a5d90c4ce52db0 /arch
parentARM: highbank: retry wfi on reset request (diff)
parentARM: dt: tegra: fix length of pad control and mux registers (diff)
downloadlinux-dfac74d38ec45bbdb80979ec966e1e703554c864.tar.xz
linux-dfac74d38ec45bbdb80979ec966e1e703554c864.zip
Merge branch 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
From Stephen Warren: * 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: dt: tegra: fix length of pad control and mux registers
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/tegra30.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index b1497c7d7d68..df7f2270fc91 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -73,8 +73,8 @@
pinmux: pinmux {
compatible = "nvidia,tegra30-pinmux";
- reg = <0x70000868 0xd0 /* Pad control registers */
- 0x70003000 0x3e0>; /* Mux registers */
+ reg = <0x70000868 0xd4 /* Pad control registers */
+ 0x70003000 0x3e4>; /* Mux registers */
};
serial@70006000 {