diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 10:34:33 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 10:34:33 -0500 |
| commit | dfac74d38ec45bbdb80979ec966e1e703554c864 (patch) | |
| tree | 6f6c1ffd1d73ae2958209158d5a5d90c4ce52db0 /arch | |
| parent | e32643544d8d9e7776daf0a4e803c57b54ba77f0 (diff) | |
| parent | 322337b8fbd8c392246529d5db924820fc0c7381 (diff) | |
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.dtsi | 4 |
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 @@ | |||
| 73 | 73 | ||
| 74 | pinmux: pinmux { | 74 | pinmux: pinmux { |
| 75 | compatible = "nvidia,tegra30-pinmux"; | 75 | compatible = "nvidia,tegra30-pinmux"; |
| 76 | reg = <0x70000868 0xd0 /* Pad control registers */ | 76 | reg = <0x70000868 0xd4 /* Pad control registers */ |
| 77 | 0x70003000 0x3e0>; /* Mux registers */ | 77 | 0x70003000 0x3e4>; /* Mux registers */ |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | serial@70006000 { | 80 | serial@70006000 { |