diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
| commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
| tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /arch/arm/boot/dts/armada-xp-gp.dts | |
| parent | cd4373984a5903276f52777a6003425e023eaa7e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp-gp.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-gp.dts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 26ad06fc147e..3ee63d128e27 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts | |||
| @@ -39,6 +39,9 @@ | |||
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | soc { | 41 | soc { |
| 42 | ranges = <0 0 0xd0000000 0x100000 | ||
| 43 | 0xf0000000 0 0xf0000000 0x1000000>; | ||
| 44 | |||
| 42 | internal-regs { | 45 | internal-regs { |
| 43 | serial@12000 { | 46 | serial@12000 { |
| 44 | clock-frequency = <250000000>; | 47 | clock-frequency = <250000000>; |