diff options
author | Rich Schmitt <B43082@freescale.com> | 2013-03-29 20:06:08 (GMT) |
---|---|---|
committer | Rich Schmitt <B43082@freescale.com> | 2013-04-04 21:25:29 (GMT) |
commit | 7a8b241fba87dac3d52f3af01cf8382b75b72ccd (patch) | |
tree | f9e32867f7013cc7847961d677c41b0a81227223 /arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | |
parent | 926d105b5d398cc50f1c05e2b82487160c83bfda (diff) | |
download | linux-fsl-qoriq-7a8b241fba87dac3d52f3af01cf8382b75b72ccd.tar.xz |
Merge sdk-v1.3.x config and device tree files
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/p5040si-post.dtsi')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 124 |
1 files changed, 67 insertions, 57 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi index 4a57371..35266f8 100644 --- a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi @@ -41,14 +41,13 @@ /* controller at 0x200000 */ &pci0 { - compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4"; + compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4", "fsl,qoriq-pcie-v2.2"; device_type = "pci"; #size-cells = <2>; #address-cells = <3>; bus-range = <0x0 0xff>; clock-frequency = <33333333>; interrupts = <16 2 1 15>; - fsl,iommu-parent = <&pamu0>; pcie@0 { reg = <0 0 0 0 0>; #interrupt-cells = <1>; @@ -69,14 +68,13 @@ /* controller at 0x201000 */ &pci1 { - compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4"; + compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4", "fsl,qoriq-pcie-v2.2"; device_type = "pci"; #size-cells = <2>; #address-cells = <3>; bus-range = <0 0xff>; clock-frequency = <33333333>; interrupts = <16 2 1 14>; - fsl,iommu-parent = <&pamu0>; pcie@0 { reg = <0 0 0 0 0>; #interrupt-cells = <1>; @@ -97,14 +95,13 @@ /* controller at 0x202000 */ &pci2 { - compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4"; + compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4", "fsl,qoriq-pcie-v2.2"; device_type = "pci"; #size-cells = <2>; #address-cells = <3>; bus-range = <0x0 0xff>; clock-frequency = <33333333>; interrupts = <16 2 1 13>; - fsl,iommu-parent = <&pamu0>; pcie@0 { reg = <0 0 0 0 0>; #interrupt-cells = <1>; @@ -250,42 +247,10 @@ iommu@20000 { compatible = "fsl,pamu-v1.0", "fsl,pamu"; - reg = <0x20000 0x5000>; /* for compatibility with older PAMU drivers */ - ranges = <0 0x20000 0x5000>; - #address-cells = <1>; - #size-cells = <1>; - interrupts = <24 2 0 0 - 16 2 1 30>; - - pamu0: pamu@0 { - reg = <0 0x1000>; - fsl,primary-cache-geometry = <32 1>; - fsl,secondary-cache-geometry = <128 2>; - }; - - pamu1: pamu@1000 { - reg = <0x1000 0x1000>; - fsl,primary-cache-geometry = <32 1>; - fsl,secondary-cache-geometry = <128 2>; - }; - - pamu2: pamu@2000 { - reg = <0x2000 0x1000>; - fsl,primary-cache-geometry = <32 1>; - fsl,secondary-cache-geometry = <128 2>; - }; - - pamu3: pamu@3000 { - reg = <0x3000 0x1000>; - fsl,primary-cache-geometry = <32 1>; - fsl,secondary-cache-geometry = <128 2>; - }; - - pamu4: pamu@4000 { - reg = <0x4000 0x1000>; - fsl,primary-cache-geometry = <32 1>; - fsl,secondary-cache-geometry = <128 2>; - }; + reg = <0x20000 0x5000>; + interrupts = < + 24 2 0 0 + 16 2 1 30>; }; /include/ "qoriq-mpic.dtsi" @@ -379,17 +344,7 @@ }; /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/ "qoriq-espi-0.dtsi" spi@110000 { fsl,espi-num-chipselects = <4>; @@ -397,8 +352,6 @@ /include/ "qoriq-esdhc-0.dtsi" sdhc@114000 { - fsl,iommu-parent = <&pamu2>; - fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */ sdhci,auto-cmd12; }; @@ -429,9 +382,66 @@ 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" +/include/ "qoriq-qman1.dtsi" +/include/ "qoriq-bman1.dtsi" + +/include/ "qoriq-fman-0.dtsi" +/include/ "qoriq-fman-0-1g-0.dtsi" +/include/ "qoriq-fman-0-1g-1.dtsi" +/include/ "qoriq-fman-0-1g-2.dtsi" +/include/ "qoriq-fman-0-1g-3.dtsi" +/include/ "qoriq-fman-0-1g-4.dtsi" +/include/ "qoriq-fman-0-10g-0.dtsi" + fman0: fman@400000 { + /* tx - 1g - 0 */ + port@a8000 { + fsl,qman-channel-id = <0x41>; + }; + /* tx - 1g - 1 */ + port@a9000 { + fsl,qman-channel-id = <0x42>; + }; + /* tx - 1g - 2 */ + port@aa000 { + fsl,qman-channel-id = <0x43>; + }; + /* tx - 1g - 3 */ + port@ab000 { + fsl,qman-channel-id = <0x44>; + }; + /* tx - 1g - 4 */ + port@ac000 { + fsl,qman-channel-id = <0x45>; + }; + /* tx - 10g - 0 */ + port@b0000 { + fsl,qman-channel-id = <0x40>; + }; + /* offline 0 */ + port@81000 { + fsl,qman-channel-id = <0x46>; + }; + /* offline 1 */ + port@82000 { + fsl,qman-channel-id = <0x47>; + }; + /* offline 2 */ + port@83000 { + fsl,qman-channel-id = <0x48>; + }; + /* offline 3 */ + port@84000 { + fsl,qman-channel-id = <0x49>; + }; + /* offline 4 */ + port@85000 { + fsl,qman-channel-id = <0x4a>; + }; + /* offline 5 */ + port@86000 { + fsl,qman-channel-id = <0x4b>; + }; }; /include/ "qoriq-sec5.2-0.dtsi" crypto@300000 { |