diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 09:03:08 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 09:03:08 -0400 |
| commit | b775e642bf958a02210ac4d4edd1a1b7067c49fa (patch) | |
| tree | a3425ead7b2738e6a05249a3c3667d1069782330 /arch/arm/boot | |
| parent | 32147e9a8ea54f2ec9914edeede8a9d9dc02e886 (diff) | |
| parent | ccdb8ed3b3c739fe99a6f2f474f7ffad3203485d (diff) | |
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/versatile-ab.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index e01e5a081def..88e94c5506a1 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts | |||
| @@ -15,6 +15,10 @@ | |||
| 15 | i2c0 = &i2c0; | 15 | i2c0 = &i2c0; |
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | chosen { | ||
| 19 | stdout-path = &uart0; | ||
| 20 | }; | ||
| 21 | |||
| 18 | memory { | 22 | memory { |
| 19 | reg = <0x0 0x08000000>; | 23 | reg = <0x0 0x08000000>; |
| 20 | }; | 24 | }; |