diff options
Diffstat (limited to 'arch/powerpc/boot/dts/fsl')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 5 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 20 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 32 |
8 files changed, 49 insertions, 28 deletions
diff --git a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi index 4e8c887..751a29b 100644 --- a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi @@ -33,6 +33,7 @@ */ /include/ "b4si-post.dtsi" + &bportals { #address-cells = <0x1>; #size-cells = <0x1>; @@ -386,12 +387,14 @@ #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 */ }; }; @@ -454,7 +457,7 @@ }; corenet-cf@18000 { - compatible = "fsl,corenet2-cf"; + compatible = "fsl,b4860-corenet-cf"; }; /include/ "qoriq-fman3-0-1g-4.dtsi" diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi index 55ced62..b656757 100644 --- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi @@ -49,11 +49,11 @@ interrupts = <20 2 0 0>; fsl,iommu-parent = <&pamu0>; pcie@0 { - reg = <0 0 0 0 0>; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; device_type = "pci"; + reg = <0 0 0 0 0>; interrupts = <20 2 0 0>; interrupt-map-mask = <0xf800 0 0 7>; interrupt-map = < diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi index 1e1b810..1d87681 100644 --- a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi @@ -428,6 +428,7 @@ fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */ port0; }; + /include/ "qoriq-usb2-dr-0.dtsi" usb1: usb@211000 { compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr"; @@ -436,16 +437,19 @@ dr_mode = "host"; phy_type = "utmi"; }; + /include/ "qoriq-sata2-0.dtsi" sata@220000 { fsl,iommu-parent = <&pamu1>; fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */ }; + /include/ "qoriq-sata2-1.dtsi" sata@221000 { fsl,iommu-parent = <&pamu1>; fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */ }; + /include/ "qoriq-sec4.2-0.dtsi" crypto: crypto@300000 { fsl,iommu-parent = <&pamu1>; diff --git a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi index 1e84f0f..c9b49aa 100644 --- a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi @@ -455,6 +455,7 @@ fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */ port0; }; + /include/ "qoriq-usb2-dr-0.dtsi" usb1: usb@211000 { compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr"; @@ -463,16 +464,19 @@ dr_mode = "host"; phy_type = "utmi"; }; + /include/ "qoriq-sata2-0.dtsi" sata@220000 { fsl,iommu-parent = <&pamu1>; fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */ }; + /include/ "qoriq-sata2-1.dtsi" sata@221000 { fsl,iommu-parent = <&pamu1>; fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */ }; + /include/ "qoriq-sec4.2-0.dtsi" crypto: crypto@300000 { fsl,iommu-parent = <&pamu1>; diff --git a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi index ea5db06..7a48cd9 100644 --- a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi @@ -444,6 +444,7 @@ phy_type = "utmi"; port0; }; + /include/ "qoriq-usb2-dr-0.dtsi" usb1: usb@211000 { compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr"; @@ -452,11 +453,13 @@ dr_mode = "host"; phy_type = "utmi"; }; + /include/ "qoriq-sata2-0.dtsi" sata@220000 { fsl,iommu-parent = <&pamu1>; fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */ }; + /include/ "qoriq-sata2-1.dtsi" sata@221000 { fsl,iommu-parent = <&pamu1>; @@ -531,4 +534,7 @@ }; }; /include/ "qoriq-raid1.0-0.dtsi" + raideng@320000 { + fsl,iommu-parent = <&pamu1>; + }; }; diff --git a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi index 571eeab..54e35ce 100644 --- a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi @@ -416,6 +416,7 @@ phy_type = "utmi"; port0; }; + /include/ "qoriq-usb2-dr-0.dtsi" usb1: usb@211000 { compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr"; @@ -424,16 +425,19 @@ dr_mode = "host"; phy_type = "utmi"; }; + /include/ "qoriq-sata2-0.dtsi" sata@220000 { fsl,iommu-parent = <&pamu4>; fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */ }; + /include/ "qoriq-sata2-1.dtsi" sata@221000 { fsl,iommu-parent = <&pamu4>; fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */ }; + /include/ "qoriq-sec5.2-0.dtsi" crypto@300000 { fsl,iommu-parent = <&pamu4>; diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi index f51545c..d22e728 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi @@ -6,13 +6,13 @@ * 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. + * 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. + * 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. + * 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 @@ -48,11 +48,11 @@ bus-range = <0x0 0xff>; interrupts = <20 2 0 0>; pcie@0 { - reg = <0 0 0 0 0>; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; device_type = "pci"; + reg = <0 0 0 0 0>; interrupts = <20 2 0 0>; interrupt-map-mask = <0xf800 0 0 7>; interrupt-map = < @@ -74,11 +74,11 @@ bus-range = <0 0xff>; interrupts = <21 2 0 0>; pcie@0 { - reg = <0 0 0 0 0>; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; device_type = "pci"; + reg = <0 0 0 0 0>; interrupts = <21 2 0 0>; interrupt-map-mask = <0xf800 0 0 7>; interrupt-map = < @@ -100,11 +100,11 @@ bus-range = <0x0 0xff>; interrupts = <22 2 0 0>; pcie@0 { - reg = <0 0 0 0 0>; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; device_type = "pci"; + reg = <0 0 0 0 0>; interrupts = <22 2 0 0>; interrupt-map-mask = <0xf800 0 0 7>; interrupt-map = < @@ -126,11 +126,11 @@ bus-range = <0x0 0xff>; interrupts = <23 2 0 0>; pcie@0 { - reg = <0 0 0 0 0>; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; device_type = "pci"; + reg = <0 0 0 0 0>; interrupts = <23 2 0 0>; interrupt-map-mask = <0xf800 0 0 7>; interrupt-map = < @@ -1058,7 +1058,7 @@ }; corenet-cf@18000 { - compatible = "fsl,corenet2-cf"; + compatible = "fsl,corenet-cf"; reg = <0x18000 0x1000>; interrupts = <16 2 1 31>; fsl,ccf-num-csdids = <32>; diff --git a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi index 82cca29..40f2845 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi @@ -6,13 +6,13 @@ * 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. + * 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. + * 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. + * 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 @@ -103,69 +103,69 @@ clocks = <&mux0>; next-level-cache = <&L2_1>; }; - cpu1: PowerPC,e6500@1 { + cpu1: PowerPC,e6500@2 { device_type = "cpu"; reg = <2 3>; clocks = <&mux0>; next-level-cache = <&L2_1>; }; - cpu2: PowerPC,e6500@2 { + cpu2: PowerPC,e6500@4 { device_type = "cpu"; reg = <4 5>; clocks = <&mux0>; next-level-cache = <&L2_1>; }; - cpu3: PowerPC,e6500@3 { + cpu3: PowerPC,e6500@6 { device_type = "cpu"; reg = <6 7>; clocks = <&mux0>; next-level-cache = <&L2_1>; }; - cpu4: PowerPC,e6500@4 { + cpu4: PowerPC,e6500@8 { device_type = "cpu"; reg = <8 9>; clocks = <&mux1>; next-level-cache = <&L2_2>; }; - cpu5: PowerPC,e6500@5 { + cpu5: PowerPC,e6500@10 { device_type = "cpu"; reg = <10 11>; clocks = <&mux1>; next-level-cache = <&L2_2>; }; - cpu6: PowerPC,e6500@6 { + cpu6: PowerPC,e6500@12 { device_type = "cpu"; reg = <12 13>; clocks = <&mux1>; next-level-cache = <&L2_2>; }; - cpu7: PowerPC,e6500@7 { + cpu7: PowerPC,e6500@14 { device_type = "cpu"; reg = <14 15>; clocks = <&mux1>; next-level-cache = <&L2_2>; }; - cpu8: PowerPC,e6500@8 { + cpu8: PowerPC,e6500@16 { device_type = "cpu"; reg = <16 17>; clocks = <&mux2>; next-level-cache = <&L2_3>; }; - cpu9: PowerPC,e6500@9 { + cpu9: PowerPC,e6500@18 { device_type = "cpu"; reg = <18 19>; clocks = <&mux2>; next-level-cache = <&L2_3>; }; - cpu10: PowerPC,e6500@10 { + cpu10: PowerPC,e6500@20 { device_type = "cpu"; reg = <20 21>; clocks = <&mux2>; next-level-cache = <&L2_3>; }; - cpu11: PowerPC,e6500@11 { + cpu11: PowerPC,e6500@22 { device_type = "cpu"; reg = <22 23>; clocks = <&mux2>; |