diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-19 09:23:48 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-19 09:23:48 +0200 |
commit | 6096f884515466f400864ad23d16f20b731a7ce7 (patch) | |
tree | 8d0c6863daf21aa48f30e615e49263eded8db642 /arch/powerpc/boot/dts/t104xrdb.dtsi | |
parent | cxl: Fix typo in debug print (diff) | |
parent | powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760 (diff) | |
download | linux-6096f884515466f400864ad23d16f20b731a7ce7.tar.xz linux-6096f884515466f400864ad23d16f20b731a7ce7.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include more 8xx optimizations, an e6500 hugetlb optimization,
QMan device tree nodes, t1024/t1023 support, and various fixes and
cleanup."
Diffstat (limited to 'arch/powerpc/boot/dts/t104xrdb.dtsi')
-rw-r--r-- | arch/powerpc/boot/dts/t104xrdb.dtsi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/t104xrdb.dtsi b/arch/powerpc/boot/dts/t104xrdb.dtsi index 76e07a3f2ca8..830ea484295b 100644 --- a/arch/powerpc/boot/dts/t104xrdb.dtsi +++ b/arch/powerpc/boot/dts/t104xrdb.dtsi @@ -42,6 +42,14 @@ size = <0 0x1000000>; alignment = <0 0x1000000>; }; + qman_fqd: qman-fqd { + size = <0 0x400000>; + alignment = <0 0x400000>; + }; + qman_pfdr: qman-pfdr { + size = <0 0x2000000>; + alignment = <0 0x2000000>; + }; }; ifc: localbus@ffe124000 { @@ -83,6 +91,10 @@ ranges = <0x0 0xf 0xf4000000 0x2000000>; }; + qportals: qman-portals@ff6000000 { + ranges = <0x0 0xf 0xf6000000 0x2000000>; + }; + soc: soc@ffe000000 { ranges = <0x00000000 0xf 0xfe000000 0x1000000>; reg = <0xf 0xfe000000 0 0x00001000>; |