diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-30 11:10:09 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-30 11:10:09 +1000 |
commit | bc23100a0d646aedb6e17fbcecdc35a24cd3bf2a (patch) | |
tree | afbf44b177d17a8450d606b6d976e76e8e964273 /arch/powerpc/boot/dts/p1025rdb_36b.dts | |
parent | 28bf41a1fedad76e9b4de70c9573bb3f8afc3709 (diff) | |
parent | 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 (diff) | |
download | blackbird-op-linux-bc23100a0d646aedb6e17fbcecdc35a24cd3bf2a.tar.gz blackbird-op-linux-bc23100a0d646aedb6e17fbcecdc35a24cd3bf2a.zip |
Merge remote-tracking branch 'kumar/next' into next
From Kumar Gala:
<<
Add support for T4 and B4 SoC families from Freescale, e6500 altivec
support, some various board fixes and other minor cleanups.
>>
Diffstat (limited to 'arch/powerpc/boot/dts/p1025rdb_36b.dts')
-rw-r--r-- | arch/powerpc/boot/dts/p1025rdb_36b.dts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/p1025rdb_36b.dts b/arch/powerpc/boot/dts/p1025rdb_36b.dts index 4ce4bfa0eda4..06deb6f341ba 100644 --- a/arch/powerpc/boot/dts/p1025rdb_36b.dts +++ b/arch/powerpc/boot/dts/p1025rdb_36b.dts @@ -82,6 +82,11 @@ 0x0 0x100000>; }; }; + + qe: qe@fffe80000 { + status = "disabled"; /* no firmware loaded */ + }; + }; /include/ "p1025rdb.dtsi" |