On Apr 2, 2013, at 2:16 AM, Shaveta Leekha wrote:

> B4860 and B4420 are similar that share some commonalities
> 
> * common features have been added in b4si-pre.dtsi and b4si-post.dtsi
> * differences are added in respective silicon files of B4860 and B4420

What are the differences between B4860 & B4420, beyond # of cores?

> 
> There are several things missing from the device trees of B4860 and B4420:
> 
> * DPAA related nodes (Qman, Bman, Fman, Rman)
> * DSP related nodes/information

What about:

serdes, sfp [security fuse processor], thermal, gpio, maple, cpri, quad timers, 

> 
> Signed-off-by: Shaveta Leekha <shav...@freescale.com>
> Signed-off-by: Zhao Chenhui <chenhui.z...@freescale.com>
> Signed-off-by: Li Yang <le...@freescale.com>
> Signed-off-by: Tang Yuantian <yuantian.t...@freescale.com>
> Signed-off-by: Varun Sethi <varun.se...@freescale.com>
> Signed-off-by: Minghuan Lian <minghuan.l...@freescale.com>
> Signed-off-by: Ramneek Mehresh <ramneek.mehr...@freescale.com>
> Signed-off-by: Kumar Gala <ga...@kernel.crashing.org>
> Signed-off-by: Andy Fleming <aflem...@freescale.com>
> Signed-off-by: Vakul Garg <va...@freescale.com>
> ---
> arch/powerpc/boot/dts/fsl/b4420si-post.dtsi |   94 ++++++++++
> arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi  |   49 +++++
> arch/powerpc/boot/dts/fsl/b4860si-post.dtsi |  138 ++++++++++++++
> arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi  |   59 ++++++
> arch/powerpc/boot/dts/fsl/b4si-post.dtsi    |  262 +++++++++++++++++++++++++++
> arch/powerpc/boot/dts/fsl/b4si-pre.dtsi     |   65 +++++++

Remove b4si-pre.dtsi, there isn't enough here to warrant not just merging it 
into b4420si-pre.dtsi & b4860si-pre.dtsi

> 6 files changed, 667 insertions(+), 0 deletions(-)
> create mode 100644 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
> create mode 100644 arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
> create mode 100644 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
> create mode 100644 arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
> create mode 100644 arch/powerpc/boot/dts/fsl/b4si-post.dtsi
> create mode 100644 arch/powerpc/boot/dts/fsl/b4si-pre.dtsi
> 
> diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi 
> b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
> new file mode 100644
> index 0000000..bba0c03
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
> @@ -0,0 +1,94 @@
> +/*
> + * B4420 Silicon/SoC Device Tree Source (post include)
> + *
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written 
> permission.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * This software is provided by Freescale Semiconductor "as is" and any
> + * express or implied warranties, including, but not limited to, the implied
> + * warranties of merchantability and fitness for a particular purpose are
> + * disclaimed. In no event shall Freescale Semiconductor be liable for any
> + * direct, indirect, incidental, special, exemplary, or consequential damages
> + * (including, but not limited to, procurement of substitute goods or 
> services;
> + * loss of use, data, or profits; or business interruption) however caused 
> and
> + * on any theory of liability, whether in contract, strict liability, or tort
> + * (including negligence or otherwise) arising in any way out of the use of
> + * this software, even if advised of the possibility of such damage.
> + */
> +
> +/include/ "b4si-post.dtsi"
> +
> +/* controller at 0x200000 */
> +&pci0 {
> +     compatible = "fsl,b4420-pcie", "fsl,qoriq-pcie-v2.4";
> +};
> +
> +&dcsr {
> +     dcsr-epu@0 {
> +             compatible = "fsl,b4420-dcsr-epu", "fsl,dcsr-epu";
> +     };
> +     dcsr-npc {
> +             compatible = "fsl,b4420-dcsr-cnpc", "fsl,dcsr-cnpc";
> +     };
> +     dcsr-dpaa@9000 {
> +             compatible = "fsl,b4420-dcsr-dpaa", "fsl,dcsr-dpaa";
> +     };
> +     dcsr-ocn@11000 {
> +             compatible = "fsl,b4420-dcsr-ocn", "fsl,dcsr-ocn";
> +     };
> +     dcsr-nal@18000 {
> +             compatible = "fsl,b4420-dcsr-nal", "fsl,dcsr-nal";
> +     };
> +     dcsr-rcpm@22000 {
> +             compatible = "fsl,b4420-dcsr-rcpm", "fsl,dcsr-rcpm";
> +     };
> +     dcsr-snpc@30000 {
> +             compatible = "fsl,b4420-dcsr-snpc", "fsl,dcsr-snpc";
> +     };
> +     dcsr-snpc@31000 {
> +             compatible = "fsl,b4420-dcsr-snpc", "fsl,dcsr-snpc";
> +     };
> +     dcsr-cpu-sb-proxy@108000 {
> +             compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
> +             cpu-handle = <&cpu1>;
> +             reg = <0x108000 0x1000 0x109000 0x1000>;
> +     };
> +};
> +
> +&soc {
> +     cpc: l3-cache-controller@10000 {
> +             compatible = "fsl,b4420-l3-cache-controller", "cache";
> +     };
> +
> +     corenet-cf@18000 {
> +             compatible = "fsl,b4420-corenet-cf";
> +     };
> +
> +     guts: global-utilities@e0000 {
> +             compatible = "fsl,b4420-device-config", 
> "fsl,qoriq-device-config-2.0";
> +     };
> +
> +     clockgen: global-utilities@e1000 {
> +             compatible = "fsl,b4420-clockgen", "fsl,qoriq-clockgen-2";
> +     };
> +
> +     L2: l2-cache-controller@c20000 {
> +             compatible = "fsl,b4420-l2-cache-controller";
> +     };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi 
> b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
> new file mode 100644
> index 0000000..555b0e4
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
> @@ -0,0 +1,49 @@
> +/*
> + * B4420 Silicon/SoC Device Tree Source (pre include)
> + *
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written 
> permission.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * This software is provided by Freescale Semiconductor "as is" and any
> + * express or implied warranties, including, but not limited to, the implied
> + * warranties of merchantability and fitness for a particular purpose are
> + * disclaimed. In no event shall Freescale Semiconductor be liable for any
> + * direct, indirect, incidental, special, exemplary, or consequential damages
> + * (including, but not limited to, procurement of substitute goods or 
> services;
> + * loss of use, data, or profits; or business interruption) however caused 
> and
> + * on any theory of liability, whether in contract, strict liability, or tort
> + * (including negligence or otherwise) arising in any way out of the use of
> + * this software, even if advised of the possibility of such damage.
> + */
> +
> +/dts-v1/;
> +
> +/include/ "b4si-pre.dtsi"
> +
> +/ {
> +     compatible = "fsl,B4420";
> +
> +     cpus {
> +             cpu1: PowerPC,e6500@1 {
> +                     device_type = "cpu";
> +                     reg = <2 3>;
> +                     next-level-cache = <&L2>;
> +             };
> +     };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi 
> b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
> new file mode 100644
> index 0000000..f43910f
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
> @@ -0,0 +1,138 @@
> +/*
> + * B4860 Silicon/SoC Device Tree Source (post include)
> + *
> + * Copyright 2012 Freescale Semiconductor Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written 
> permission.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
> + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
> + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
> SERVICES;
> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
> AND
> + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
> THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +/include/ "b4si-post.dtsi"
> +
> +/* controller at 0x200000 */
> +&pci0 {
> +     compatible = "fsl,b4860-pcie", "fsl,qoriq-pcie-v2.4";
> +};
> +
> +&rio {
> +     compatible = "fsl,srio";
> +     interrupts = <16 2 1 11>;
> +     #address-cells = <2>;
> +     #size-cells = <2>;
> +     fsl,iommu-parent = <&pamu0>;
> +     ranges;
> +
> +     port1 {
> +             #address-cells = <2>;
> +             #size-cells = <2>;
> +             cell-index = <1>;
> +             fsl,liodn-reg = <&guts 0x510>; /* RIO1LIODNR */
> +     };
> +
> +     port2 {
> +             #address-cells = <2>;
> +             #size-cells = <2>;
> +             cell-index = <2>;
> +             fsl,liodn-reg = <&guts 0x514>; /* RIO2LIODNR */
> +     };
> +};
> +
> +&dcsr {
> +     dcsr-epu@0 {
> +             compatible = "fsl,b4860-dcsr-epu", "fsl,dcsr-epu";
> +     };
> +     dcsr-npc {
> +             compatible = "fsl,b4860-dcsr-cnpc", "fsl,dcsr-cnpc";
> +     };
> +     dcsr-dpaa@9000 {
> +             compatible = "fsl,b4860-dcsr-dpaa", "fsl,dcsr-dpaa";
> +     };
> +     dcsr-ocn@11000 {
> +             compatible = "fsl,b4860-dcsr-ocn", "fsl,dcsr-ocn";
> +     };
> +     dcsr-ddr@13000 {
> +             compatible = "fsl,dcsr-ddr";
> +             dev-handle = <&ddr2>;
> +             reg = <0x13000 0x1000>;
> +     };
> +     dcsr-nal@18000 {
> +             compatible = "fsl,b4860-dcsr-nal", "fsl,dcsr-nal";
> +     };
> +     dcsr-rcpm@22000 {
> +             compatible = "fsl,b4860-dcsr-rcpm", "fsl,dcsr-rcpm";
> +     };
> +     dcsr-snpc@30000 {
> +             compatible = "fsl,b4860-dcsr-snpc", "fsl,dcsr-snpc";
> +     };
> +     dcsr-snpc@31000 {
> +             compatible = "fsl,b4860-dcsr-snpc", "fsl,dcsr-snpc";
> +     };
> +     dcsr-cpu-sb-proxy@108000 {
> +             compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
> +             cpu-handle = <&cpu1>;
> +             reg = <0x108000 0x1000 0x109000 0x1000>;
> +     };
> +     dcsr-cpu-sb-proxy@110000 {
> +             compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
> +             cpu-handle = <&cpu2>;
> +             reg = <0x110000 0x1000 0x111000 0x1000>;
> +     };
> +     dcsr-cpu-sb-proxy@118000 {
> +             compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
> +             cpu-handle = <&cpu3>;
> +             reg = <0x118000 0x1000 0x119000 0x1000>;
> +     };
> +};
> +
> +&soc {
> +     ddr2: memory-controller@9000 {
> +             compatible = "fsl,qoriq-memory-controller-v4.5", 
> "fsl,qoriq-memory-controller";
> +             reg = <0x9000 0x1000>;
> +             interrupts = <16 2 1 9>;
> +     };
> +
> +     cpc: l3-cache-controller@10000 {
> +             compatible = "fsl,b4860-l3-cache-controller", "cache";
> +     };
> +
> +     corenet-cf@18000 {
> +             compatible = "fsl,b4860-corenet-cf";
> +     };
> +
> +     guts: global-utilities@e0000 {
> +             compatible = "fsl,b4860-device-config", 
> "fsl,qoriq-device-config-2.0";
> +     };
> +
> +     clockgen: global-utilities@e1000 {
> +             compatible = "fsl,b4860-clockgen", "fsl,qoriq-clockgen-2";
> +     };
> +
> +     L2: l2-cache-controller@c20000 {
> +             compatible = "fsl,b4860-l2-cache-controller";
> +     };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi 
> b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
> new file mode 100644
> index 0000000..f5737a0
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
> @@ -0,0 +1,59 @@
> +/*
> + * B4860 Silicon/SoC Device Tree Source (pre include)
> + *
> + * Copyright 2012 Freescale Semiconductor Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written 
> permission.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
> + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
> + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
> SERVICES;
> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
> AND
> + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
> THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +/dts-v1/;
> +
> +/include/ "b4si-pre.dtsi"
> +
> +/ {
> +     compatible = "fsl,B4860";
> +
> +     cpus {
> +             cpu1: PowerPC,e6500@1 {
> +                     device_type = "cpu";
> +                     reg = <2 3>;
> +                     next-level-cache = <&L2>;
> +             };
> +             cpu2: PowerPC,e6500@2 {
> +                     device_type = "cpu";
> +                     reg = <4 5>;
> +                     next-level-cache = <&L2>;
> +             };
> +             cpu3: PowerPC,e6500@3 {
> +                     device_type = "cpu";
> +                     reg = <6 7>;
> +                     next-level-cache = <&L2>;
> +             };
> +     };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi 
> b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
> new file mode 100644
> index 0000000..06c97a2
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
> @@ -0,0 +1,262 @@
> +/*
> + * B4420 Silicon/SoC Device Tree Source (post include)
> + *
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written 
> permission.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * This software is provided by Freescale Semiconductor "as is" and any
> + * express or implied warranties, including, but not limited to, the implied
> + * warranties of merchantability and fitness for a particular purpose are
> + * disclaimed. In no event shall Freescale Semiconductor be liable for any
> + * direct, indirect, incidental, special, exemplary, or consequential damages
> + * (including, but not limited to, procurement of substitute goods or 
> services;
> + * loss of use, data, or profits; or business interruption) however caused 
> and
> + * on any theory of liability, whether in contract, strict liability, or tort
> + * (including negligence or otherwise) arising in any way out of the use of
> + * this software, even if advised of the possibility of such damage.
> + */
> +
> +&ifc {
> +     #address-cells = <2>;
> +     #size-cells = <1>;
> +     compatible = "fsl,ifc", "simple-bus";
> +     interrupts = <25 2 0 0>;
> +};
> +
> +/* controller at 0x200000 */
> +&pci0 {
> +     compatible = "fsl,b4-pcie", "fsl,qoriq-pcie-v2.4";
> +     device_type = "pci";
> +     #size-cells = <2>;
> +     #address-cells = <3>;
> +     bus-range = <0x0 0xff>;
> +     interrupts = <20 2 0 0>;
> +     fsl,iommu-parent = <&pamu0>;
> +     pcie@0 {
> +             #interrupt-cells = <1>;
> +             #size-cells = <2>;
> +             #address-cells = <3>;
> +             device_type = "pci";
> +             interrupts = <20 2 0 0>;
> +             interrupt-map-mask = <0xf800 0 0 7>;
> +             interrupt-map = <
> +                     /* IDSEL 0x0 */
> +                     0000 0 0 1 &mpic 40 1 0 0
> +                     0000 0 0 2 &mpic 1 1 0 0
> +                     0000 0 0 3 &mpic 2 1 0 0
> +                     0000 0 0 4 &mpic 3 1 0 0
> +                     >;
> +     };
> +};
> +
> +&dcsr {
> +     #address-cells = <1>;
> +     #size-cells = <1>;
> +     compatible = "fsl,dcsr", "simple-bus";
> +
> +     dcsr-epu@0 {
> +             compatible = "fsl,b4-dcsr-epu", "fsl,dcsr-epu";
> +             interrupts = <52 2 0 0
> +                           84 2 0 0
> +                           85 2 0 0
> +                           94 2 0 0
> +                           95 2 0 0>;
> +             reg = <0x0 0x1000>;
> +     };
> +     dcsr-npc {
> +             compatible = "fsl,b4-dcsr-cnpc", "fsl,dcsr-cnpc";
> +             reg = <0x1000 0x1000 0x1002000 0x10000>;
> +     };
> +     dcsr-nxc@2000 {
> +             compatible = "fsl,dcsr-nxc";
> +             reg = <0x2000 0x1000>;
> +     };
> +     dcsr-corenet {
> +             compatible = "fsl,dcsr-corenet";
> +             reg = <0x8000 0x1000 0x1A000 0x1000>;
> +     };
> +     dcsr-dpaa@9000 {
> +             compatible = "fsl,b4-dcsr-dpaa", "fsl,dcsr-dpaa";
> +             reg = <0x9000 0x1000>;
> +     };
> +     dcsr-ocn@11000 {
> +             compatible = "fsl,b4-dcsr-ocn", "fsl,dcsr-ocn";
> +             reg = <0x11000 0x1000>;
> +     };
> +     dcsr-ddr@12000 {
> +             compatible = "fsl,dcsr-ddr";
> +             dev-handle = <&ddr1>;
> +             reg = <0x12000 0x1000>;
> +     };
> +     dcsr-nal@18000 {
> +             compatible = "fsl,b4-dcsr-nal", "fsl,dcsr-nal";
> +             reg = <0x18000 0x1000>;
> +     };
> +     dcsr-rcpm@22000 {
> +             compatible = "fsl,b4-dcsr-rcpm", "fsl,dcsr-rcpm";
> +             reg = <0x22000 0x1000>;
> +     };
> +     dcsr-snpc@30000 {
> +             compatible = "fsl,b4-dcsr-snpc", "fsl,dcsr-snpc";
> +             reg = <0x30000 0x1000 0x1022000 0x10000>;
> +     };
> +     dcsr-snpc@31000 {
> +             compatible = "fsl,b4-dcsr-snpc", "fsl,dcsr-snpc";
> +             reg = <0x31000 0x1000 0x1042000 0x10000>;
> +     };
> +     dcsr-cpu-sb-proxy@100000 {
> +             compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
> +             cpu-handle = <&cpu0>;
> +             reg = <0x100000 0x1000 0x101000 0x1000>;
> +     };
> +};
> +
> +&soc {
> +     #address-cells = <1>;
> +     #size-cells = <1>;
> +     device_type = "soc";
> +     compatible = "simple-bus";
> +
> +     soc-sram-error {
> +             compatible = "fsl,soc-sram-error";
> +             interrupts = <16 2 1 2>;
> +     };
> +
> +     corenet-law@0 {
> +             compatible = "fsl,corenet-law";
> +             reg = <0x0 0x1000>;
> +             fsl,num-laws = <32>;
> +     };
> +
> +     ddr1: memory-controller@8000 {
> +             compatible = "fsl,qoriq-memory-controller-v4.5", 
> "fsl,qoriq-memory-controller";
> +             reg = <0x8000 0x1000>;
> +             interrupts = <16 2 1 8>;
> +     };
> +
> +     cpc: l3-cache-controller@10000 {
> +             compatible = "fsl,b4-l3-cache-controller", "cache";
> +             reg = <0x10000 0x1000>;
> +             interrupts = <16 2 1 4>;
> +     };
> +
> +     corenet-cf@18000 {
> +             compatible = "fsl,b4-corenet-cf";
> +             reg = <0x18000 0x1000>;
> +             interrupts = <16 2 1 0>;
> +             fsl,ccf-num-csdids = <32>;
> +             fsl,ccf-num-snoopids = <32>;
> +     };
> +
> +     iommu@20000 {
> +             compatible =  "fsl,pamu-v1.0", "fsl,pamu";
> +             reg = <0x20000 0x4000>;
> +             #address-cells = <1>;
> +             #size-cells = <1>;
> +             interrupts = <
> +                     24 2 0 0
> +                     16 2 1 1>;
> +
> +
> +             /* PCIe, DMA, SRIO */
> +             pamu0: pamu@0 {
> +                     reg = <0 0x1000>;
> +                     fsl,primary-cache-geometry = <8 1>;
> +                     fsl,secondary-cache-geometry = <32 2>;
> +             };
> +
> +             /* AXI2, Maple */
> +             pamu1: pamu@1000 {
> +                     reg = <0x1000 0x1000>;
> +                     fsl,primary-cache-geometry = <32 1>;
> +                     fsl,secondary-cache-geometry = <32 2>;
> +             };
> +
> +             /* Q/BMan */
> +             pamu2: pamu@2000 {
> +                     reg = <0x2000 0x1000>;
> +                     fsl,primary-cache-geometry = <32 1>;
> +                     fsl,secondary-cache-geometry = <32 2>;
> +             };
> +
> +             /* AXI1, FMAN */
> +             pamu3: pamu@3000 {
> +                     reg = <0x3000 0x1000>;
> +                     fsl,primary-cache-geometry = <32 1>;
> +                     fsl,secondary-cache-geometry = <32 2>;
> +             };
> +     };
> +
> +/include/ "qoriq-mpic.dtsi"
> +
> +     guts: global-utilities@e0000 {
> +             compatible = "fsl,b4-device-config";
> +             reg = <0xe0000 0xe00>;
> +             fsl,has-rstcr;
> +             fsl,liodn-bits = <12>;
> +     };
> +
> +     rcpm: global-utilities@e2000 {
> +             compatible = "fsl,b4-rcpm", "fsl,qoriq-rcpm-2";
> +             reg = <0xe2000 0x1000>;
> +     };
> +
> +/include/ "qoriq-dma-0.dtsi"
> +     dma@100300 {
> +             fsl,iommu-parent = <&pamu0>;
> +             fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
> +     };
> +
> +/include/ "qoriq-dma-1.dtsi"
> +     dma@101300 {
> +             fsl,iommu-parent = <&pamu0>;
> +             fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
> +     };
> +
> +/include/ "qonverge-usb2-dr-0.dtsi"
> +     usb0: usb@210000 {
> +             compatible = "fsl-usb2-dr-v2.4", "fsl-usb2-dr";
> +             fsl,iommu-parent = <&pamu1>;
> +             fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
> +     };
> +
> +/include/ "qoriq-espi-0.dtsi"
> +     spi@110000 {
> +             fsl,espi-num-chipselects = <4>;
> +     };
> +
> +/include/ "qoriq-esdhc-0.dtsi"
> +     sdhc@114000 {
> +             sdhci,auto-cmd12;
> +             fsl,iommu-parent = <&pamu1>;
> +             fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */
> +     };
> +
> +/include/ "qoriq-i2c-0.dtsi"
> +/include/ "qoriq-i2c-1.dtsi"
> +/include/ "qoriq-duart-0.dtsi"
> +/include/ "qoriq-duart-1.dtsi"
> +/include/ "qoriq-sec5.3-0.dtsi"
> +
> +     L2: l2-cache-controller@c20000 {
> +             compatible = "fsl,b4-l2-cache-controller";
> +                reg = <0xc20000 0x1000>;

white space issue

> +             next-level-cache = <&cpc>;
> +     };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/b4si-pre.dtsi 
> b/arch/powerpc/boot/dts/fsl/b4si-pre.dtsi
> new file mode 100644
> index 0000000..b6161c8
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/b4si-pre.dtsi
> @@ -0,0 +1,65 @@
> +/*
> + * B4420 Silicon/SoC Device Tree Source (pre include)
> + *
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written 
> permission.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * This software is provided by Freescale Semiconductor "as is" and any
> + * express or implied warranties, including, but not limited to, the implied
> + * warranties of merchantability and fitness for a particular purpose are
> + * disclaimed. In no event shall Freescale Semiconductor be liable for any
> + * direct, indirect, incidental, special, exemplary, or consequential damages
> + * (including, but not limited to, procurement of substitute goods or 
> services;
> + * loss of use, data, or profits; or business interruption) however caused 
> and
> + * on any theory of liability, whether in contract, strict liability, or tort
> + * (including negligence or otherwise) arising in any way out of the use of
> + * this software, even if advised of the possibility of such damage.
> + */
> +
> +/ {
> +     compatible = "fsl,B4";
> +     #address-cells = <2>;
> +     #size-cells = <2>;
> +     interrupt-parent = <&mpic>;
> +
> +     aliases {
> +             ccsr = &soc;
> +             dcsr = &dcsr;
> +
> +             serial0 = &serial0;
> +             serial1 = &serial1;
> +             serial2 = &serial2;
> +             serial3 = &serial3;
> +             pci0 = &pci0;
> +             dma0 = &dma0;
> +             dma1 = &dma1;
> +             sdhc = &sdhc;
> +     };
> +
> +     cpus {
> +             #address-cells = <1>;
> +             #size-cells = <0>;
> +
> +             cpu0: PowerPC,e6500@0 {
> +                     device_type = "cpu";
> +                     reg = <0 1>;
> +                     next-level-cache = <&L2>;
> +             };
> +     };
> +};
> -- 
> 1.7.6.GIT
> 

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to