From 08e8996891cfef1dcde2291ed24d9616e82b9b78 Mon Sep 17 00:00:00 2001 From: Shengzhou Liu Date: Mon, 25 Nov 2013 13:12:40 +0800 Subject: powerpc/t2080qds: add dpaa ethernet and rman nodes - Add DPAA related nodes for ethernet on T2080QDS - Add RMan node Signed-off-by: Shengzhou Liu Change-Id: I1f92de8d646b8ea08ddbb582660e7a14eba9af13 Reviewed-on: http://git.am.freescale.net:8181/9458 Reviewed-by: Xiaobo Xie Reviewed-by: Jose Rivera Tested-by: Jose Rivera diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi index b230567..cc5b471 100644 --- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi @@ -169,6 +169,10 @@ compatible = "fsl,dcsr-corenet"; reg = <0x8000 0x1000 0x1A000 0x1000>; }; + dcsr-dpaa@9000 { + compatible = "fsl,t2080-dcsr-dpaa", "fsl,dcsr-dpaa"; + reg = <0x9000 0x1000>; + }; dcsr-ocn@11000 { compatible = "fsl,t2080-dcsr-ocn", "fsl,dcsr-ocn"; reg = <0x11000 0x1000>; @@ -220,6 +224,269 @@ }; }; +&bportals { + #address-cells = <0x1>; + #size-cells = <0x1>; + compatible = "simple-bus"; + bman-portal@0 { + cell-index = <0x0>; + compatible = "fsl,bman-portal"; + reg = <0x0 0x4000 0x1000000 0x1000>; + interrupts = <105 2 0 0>; + }; + bman-portal@4000 { + cell-index = <0x1>; + compatible = "fsl,bman-portal"; + reg = <0x4000 0x4000 0x1001000 0x1000>; + interrupts = <107 2 0 0>; + }; + bman-portal@8000 { + cell-index = <2>; + compatible = "fsl,bman-portal"; + reg = <0x8000 0x4000 0x1002000 0x1000>; + interrupts = <109 2 0 0>; + }; + bman-portal@c000 { + cell-index = <0x3>; + compatible = "fsl,bman-portal"; + reg = <0xc000 0x4000 0x1003000 0x1000>; + interrupts = <111 2 0 0>; + }; + bman-portal@10000 { + cell-index = <0x4>; + compatible = "fsl,bman-portal"; + reg = <0x10000 0x4000 0x1004000 0x1000>; + interrupts = <113 2 0 0>; + }; + bman-portal@14000 { + cell-index = <0x5>; + compatible = "fsl,bman-portal"; + reg = <0x14000 0x4000 0x1005000 0x1000>; + interrupts = <115 2 0 0>; + }; + bman-portal@18000 { + cell-index = <0x6>; + compatible = "fsl,bman-portal"; + reg = <0x18000 0x4000 0x1006000 0x1000>; + interrupts = <117 2 0 0>; + }; + bman-portal@1c000 { + cell-index = <0x7>; + compatible = "fsl,bman-portal"; + reg = <0x1c000 0x4000 0x1007000 0x1000>; + interrupts = <119 2 0 0>; + }; + bman-portal@20000 { + cell-index = <0x8>; + compatible = "fsl,bman-portal"; + reg = <0x20000 0x4000 0x1008000 0x1000>; + interrupts = <121 2 0 0>; + }; + bman-portal@24000 { + cell-index = <0x9>; + compatible = "fsl,bman-portal"; + reg = <0x24000 0x4000 0x1009000 0x1000>; + interrupts = <123 2 0 0>; + }; + bman-portal@28000 { + cell-index = <0xa>; + compatible = "fsl,bman-portal"; + reg = <0x28000 0x4000 0x100a000 0x1000>; + interrupts = <125 2 0 0>; + }; + bman-portal@2c000 { + cell-index = <0xb>; + compatible = "fsl,bman-portal"; + reg = <0x2c000 0x4000 0x100b000 0x1000>; + interrupts = <127 2 0 0>; + }; + bman-portal@30000 { + cell-index = <0xc>; + compatible = "fsl,bman-portal"; + reg = <0x30000 0x4000 0x100c000 0x1000>; + interrupts = <129 2 0 0>; + }; + bman-portal@34000 { + cell-index = <0xd>; + compatible = "fsl,bman-portal"; + reg = <0x34000 0x4000 0x100d000 0x1000>; + interrupts = <131 2 0 0>; + }; + bman-portal@38000 { + cell-index = <0xe>; + compatible = "fsl,bman-portal"; + reg = <0x38000 0x4000 0x100e000 0x1000>; + interrupts = <133 2 0 0>; + }; + bman-portal@3c000 { + cell-index = <0xf>; + compatible = "fsl,bman-portal"; + reg = <0x3c000 0x4000 0x100f000 0x1000>; + interrupts = <135 2 0 0>; + }; + bman-portal@40000 { + cell-index = <0x10>; + compatible = "fsl,bman-portal"; + reg = <0x40000 0x4000 0x1010000 0x1000>; + interrupts = <137 2 0 0>; + }; + bman-portal@44000 { + cell-index = <0x11>; + compatible = "fsl,bman-portal"; + reg = <0x44000 0x4000 0x1011000 0x1000>; + interrupts = <139 2 0 0>; + }; +}; + +&qportals { + #address-cells = <0x1>; + #size-cells = <0x1>; + compatible = "simple-bus"; + qportal0: qman-portal@0 { + cell-index = <0x0>; + compatible = "fsl,qman-portal"; + reg = <0x0 0x4000 0x1000000 0x1000>; + interrupts = <104 0x2 0 0>; + fsl,qman-channel-id = <0x0>; + }; + + qportal1: qman-portal@4000 { + cell-index = <0x1>; + compatible = "fsl,qman-portal"; + reg = <0x4000 0x4000 0x1001000 0x1000>; + interrupts = <106 0x2 0 0>; + fsl,qman-channel-id = <0x1>; + }; + + qportal2: qman-portal@8000 { + cell-index = <0x2>; + compatible = "fsl,qman-portal"; + reg = <0x8000 0x4000 0x1002000 0x1000>; + interrupts = <108 0x2 0 0>; + fsl,qman-channel-id = <0x2>; + }; + + qportal3: qman-portal@c000 { + cell-index = <0x3>; + compatible = "fsl,qman-portal"; + reg = <0xc000 0x4000 0x1003000 0x1000>; + interrupts = <110 0x2 0 0>; + fsl,qman-channel-id = <0x3>; + }; + + qportal4: qman-portal@10000 { + cell-index = <0x4>; + compatible = "fsl,qman-portal"; + reg = <0x10000 0x4000 0x1004000 0x1000>; + interrupts = <112 0x2 0 0>; + fsl,qman-channel-id = <0x4>; + }; + + qportal5: qman-portal@14000 { + cell-index = <0x5>; + compatible = "fsl,qman-portal"; + reg = <0x14000 0x4000 0x1005000 0x1000>; + interrupts = <114 0x2 0 0>; + fsl,qman-channel-id = <0x5>; + }; + + qportal6: qman-portal@18000 { + cell-index = <0x6>; + compatible = "fsl,qman-portal"; + reg = <0x18000 0x4000 0x1006000 0x1000>; + interrupts = <116 0x2 0 0>; + fsl,qman-channel-id = <0x6>; + }; + + qportal7: qman-portal@1c000 { + cell-index = <0x7>; + compatible = "fsl,qman-portal"; + reg = <0x1c000 0x4000 0x1007000 0x1000>; + interrupts = <118 0x2 0 0>; + fsl,qman-channel-id = <0x7>; + }; + + qportal8: qman-portal@20000 { + cell-index = <0x8>; + compatible = "fsl,qman-portal"; + reg = <0x20000 0x4000 0x1008000 0x1000>; + interrupts = <120 0x2 0 0>; + fsl,qman-channel-id = <0x8>; + }; + + qportal9: qman-portal@24000 { + cell-index = <0x9>; + compatible = "fsl,qman-portal"; + reg = <0x24000 0x4000 0x1009000 0x1000>; + interrupts = <122 0x2 0 0>; + fsl,qman-channel-id = <0x9>; + }; + + qportal10: qman-portal@28000 { + cell-index = <0xa>; + compatible = "fsl,qman-portal"; + reg = <0x28000 0x4000 0x100a000 0x1000>; + interrupts = <124 0x2 0 0>; + fsl,qman-channel-id = <0xa>; + }; + + qportal11: qman-portal@2c000 { + cell-index = <0xb>; + compatible = "fsl,qman-portal"; + reg = <0x2c000 0x4000 0x100b000 0x1000>; + interrupts = <126 0x2 0 0>; + fsl,qman-channel-id = <0xb>; + }; + + qportal12: qman-portal@30000 { + cell-index = <0xc>; + compatible = "fsl,qman-portal"; + reg = <0x30000 0x4000 0x100c000 0x1000>; + interrupts = <128 0x2 0 0>; + fsl,qman-channel-id = <0xc>; + }; + + qportal13: qman-portal@34000 { + cell-index = <0xd>; + compatible = "fsl,qman-portal"; + reg = <0x34000 0x4000 0x100d000 0x1000>; + interrupts = <130 0x2 0 0>; + fsl,qman-channel-id = <0xd>; + }; + + qportal14: qman-portal@38000 { + cell-index = <0xe>; + compatible = "fsl,qman-portal"; + reg = <0x38000 0x4000 0x100e000 0x1000>; + interrupts = <132 0x2 0 0>; + fsl,qman-channel-id = <0xe>; + }; + + qportal15: qman-portal@3c000 { + cell-index = <0xf>; + compatible = "fsl,qman-portal"; + reg = <0x3c000 0x4000 0x100f000 0x1000>; + interrupts = <134 0x2 0 0>; + fsl,qman-channel-id = <0xf>; + }; + + qportal16: qman-portal@40000 { + cell-index = <0x10>; + compatible = "fsl,qman-portal"; + reg = <0x40000 0x4000 0x1010000 0x1000>; + interrupts = <136 0x2 0 0>; + fsl,qman-channel-id = <0x10>; + }; + + qportal17: qman-portal@44000 { + cell-index = <0x11>; + compatible = "fsl,qman-portal"; + reg = <0x44000 0x4000 0x1011000 0x1000>; + interrupts = <138 0x2 0 0>; + fsl,qman-channel-id = <0x11>; + }; +}; + &soc { #address-cells = <1>; #size-cells = <1>; @@ -361,6 +628,10 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-rman-0.dtsi" + rman: rman@1e0000 { + fsl,qman-channels-id = <0x820 0x821>; + }; /include/ "qoriq-usb2-mph-0.dtsi" usb0: usb@210000 { compatible = "fsl-usb2-mph-v2.4", "fsl-usb2-mph"; @@ -374,6 +645,77 @@ phy_type = "utmi"; }; /include/ "qoriq-sec5.2-0.dtsi" +/include/ "qoriq-dce-0.dtsi" +/include/ "qoriq-pme-0.dtsi" +/include/ "qoriq-qman1.dtsi" +/include/ "qoriq-bman1.dtsi" +/include/ "qoriq-fman3-0.dtsi" +/include/ "qoriq-fman3-0-1g-0.dtsi" +/include/ "qoriq-fman3-0-1g-1.dtsi" +/include/ "qoriq-fman3-0-1g-2.dtsi" +/include/ "qoriq-fman3-0-1g-3.dtsi" +/include/ "qoriq-fman3-0-1g-4.dtsi" +/include/ "qoriq-fman3-0-1g-5.dtsi" +/include/ "qoriq-fman3-0-10g-0.dtsi" +/include/ "qoriq-fman3-0-10g-1.dtsi" + fman0: fman@400000 { + /* tx - 10g - 2 */ + port@a8000 { + fsl,qman-channel-id = <0x802>; + }; + /* tx - 10g - 3 */ + port@a9000 { + fsl,qman-channel-id = <0x803>; + }; + /* tx - 1g - 2 */ + port@aa000 { + fsl,qman-channel-id = <0x804>; + }; + /* tx - 1g - 3 */ + port@ab000 { + fsl,qman-channel-id = <0x805>; + }; + /* tx - 1g - 4 */ + port@ac000 { + fsl,qman-channel-id = <0x806>; + }; + /* tx - 1g - 5 */ + port@ad000 { + fsl,qman-channel-id = <0x807>; + }; + /* tx - 10g - 0 */ + port@b0000 { + fsl,qman-channel-id = <0x800>; + }; + /* tx - 10g - 1 */ + port@b1000 { + fsl,qman-channel-id = <0x801>; + }; + /* offline - 1 */ + port@82000 { + fsl,qman-channel-id = <0x809>; + }; + /* offline - 2 */ + port@83000 { + fsl,qman-channel-id = <0x80a>; + }; + /* offline - 3 */ + port@84000 { + fsl,qman-channel-id = <0x80b>; + }; + /* offline - 4 */ + port@85000 { + fsl,qman-channel-id = <0x80c>; + }; + /* offline - 5 */ + port@86000 { + fsl,qman-channel-id = <0x80d>; + }; + /* offline - 6 */ + port@87000 { + fsl,qman-channel-id = <0x80e>; + }; + }; L2_1: l2-cache-controller@c20000 { /* Cluster 0 L2 cache */ diff --git a/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi index 1e5d1a4..38411b7 100644 --- a/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi @@ -51,6 +51,21 @@ serial3 = &serial3; crypto = &crypto; + rman = &rman; + dce = &dce; + pme = &pme; + qman = &qman; + bman = &bman; + fman0 = &fman0; + ethernet0 = &fm1mac1; + ethernet1 = &fm1mac2; + ethernet2 = &fm1mac3; + ethernet3 = &fm1mac4; + ethernet4 = &fm1mac5; + ethernet5 = &fm1mac6; + ethernet8 = &fm1mac9; + ethernet9 = &fm1mac10; + pci0 = &pci0; pci1 = &pci1; pci2 = &pci2; diff --git a/arch/powerpc/boot/dts/t2080qds.dts b/arch/powerpc/boot/dts/t2080qds.dts index aa1d6d8..7241772 100644 --- a/arch/powerpc/boot/dts/t2080qds.dts +++ b/arch/powerpc/boot/dts/t2080qds.dts @@ -42,6 +42,12 @@ #size-cells = <2>; interrupt-parent = <&mpic>; + aliases { + emi1_slot1 = &t2080mdio2; + emi1_slot2 = &t2080mdio3; + emi1_slot3 = &t2080mdio4; + }; + rio: rapidio@ffe0c0000 { reg = <0xf 0xfe0c0000 0 0x11000>; @@ -54,4 +60,156 @@ }; }; +&soc { + fman0: fman@400000 { + fm1mac1: ethernet@e0000 { /* DTSEC1/10GEC3 */ + phy-handle = <&phy_sgmii_s3_1e>; + phy-connection-type = "xgmii"; + }; + + fm1mac2: ethernet@e2000 { /* DTSEC2/10GEC4 */ + phy-handle = <&phy_sgmii_s3_1d>; + phy-connection-type = "xgmii"; + }; + + fm1mac3: ethernet@e4000 { + phy-handle = <&rgmii_phy1>; + phy-connection-type = "rgmii"; + }; + + fm1mac4: ethernet@e6000 { + phy-handle = <&rgmii_phy2>; + phy-connection-type = "rgmii"; + }; + + fm1mac5: ethernet@e8000 { + phy-handle = <&phy_sgmii_s2_1e>; + phy-connection-type = "sgmii"; + }; + + fm1mac6: ethernet@ea000 { + phy-handle = <&phy_sgmii_s2_1d>; + phy-connection-type = "sgmii"; + }; + + fm1mac9: ethernet@f0000 { /* DTSEC9/10GEC1 */ + phy-handle = <&phy_xaui_slot3>; + phy-connection-type = "xgmii"; + }; + + fm1mac10: ethernet@f2000 { /* DTSEC10/10GEC2 */ + phy-handle = <&phy_sgmii_s3_1f>; + phy-connection-type = "xgmii"; + }; + + mdio0: mdio@fc000 { + }; + + xmdio0: mdio@fd000 { + phy_xaui_slot3: ethernet-phy@3 { + compatible = "ethernet-phy-ieee802.3-c45"; + reg = <0x3>; + }; + }; + }; +}; + +&boardctrl { + mdio-mux-emi1 { + compatible = "mdio-mux-mmioreg", "mdio-mux"; + mdio-parent-bus = <&mdio0>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x54 1>; /* BRDCFG4 */ + mux-mask = <0xe0>; /* EMI1 */ + + /* On-board RGMII1 PHY */ + t2080mdio0: mdio@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + rgmii_phy1: ethernet-phy@1 { /* MAC3 */ + reg = <0x1>; + }; + }; + + /* On-board RGMII2 PHY */ + t2080mdio1: mdio@20 { + reg = <0x20>; + #address-cells = <1>; + #size-cells = <0>; + + rgmii_phy2: ethernet-phy@2 { /* MAC4 */ + reg = <0x2>; + }; + }; + + /* Slot 1 */ + t2080mdio2: mdio@40 { + reg = <0x40>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + phy_sgmii_s1_1c: ethernet-phy@1c { + reg = <0x1c>; + }; + phy_sgmii_s1_1d: ethernet-phy@1d { + reg = <0x1d>; + }; + phy_sgmii_s1_1e: ethernet-phy@1e { + reg = <0x1e>; + }; + phy_sgmii_s1_1f: ethernet-phy@1f { + reg = <0x1f>; + }; + }; + + /* Slot 2 */ + t2080mdio3: mdio@c0 { + reg = <0xc0>; + #address-cells = <1>; + #size-cells = <0>; + /*status = "disabled";*/ + + phy_sgmii_s2_1c: ethernet-phy@1c { + reg = <0x1c>; + }; + phy_sgmii_s2_1d: ethernet-phy@1d { + reg = <0x1d>; + }; + phy_sgmii_s2_1e: ethernet-phy@1e { + reg = <0x1e>; + }; + phy_sgmii_s2_1f: ethernet-phy@1f { + reg = <0x1f>; + }; + }; + + /* Slot 3 */ + t2080mdio4: mdio@60 { + reg = <0x60>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + phy_sgmii_s3_1c: ethernet-phy@1c { + reg = <0x1c>; + }; + phy_sgmii_s3_1d: ethernet-phy@1d { + reg = <0x1d>; + }; + phy_sgmii_s3_1e: ethernet-phy@1e { + reg = <0x1e>; + }; + phy_sgmii_s3_1f: ethernet-phy@1f { + reg = <0x1f>; + }; + }; + }; +}; + /include/ "fsl/t2080si-post.dtsi" +/include/ "fsl/qoriq-dpaa-res3.dtsi" +/include/ "fsl/qoriq-qman-ceetm0.dtsi" diff --git a/arch/powerpc/boot/dts/t208xqds.dtsi b/arch/powerpc/boot/dts/t208xqds.dtsi index e5d5930..2b81351 100644 --- a/arch/powerpc/boot/dts/t208xqds.dtsi +++ b/arch/powerpc/boot/dts/t208xqds.dtsi @@ -105,6 +105,14 @@ ranges = <0x00000000 0xf 0x00000000 0x01072000>; }; + bportals: bman-portals@ff4000000 { + 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>; @@ -256,4 +264,40 @@ 0 0x00010000>; }; }; + + fsl,dpaa { + compatible = "fsl,t2080-dpaa", "fsl,dpaa"; + ethernet@0 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac1>; + }; + ethernet@1 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac2>; + }; + ethernet@2 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac3>; + }; + ethernet@3 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac4>; + }; + ethernet@4 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac5>; + }; + ethernet@5 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac6>; + }; + ethernet@8 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac9>; + }; + ethernet@9 { + compatible = "fsl,t2080-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&fm1mac10>; + }; + }; }; -- cgit v0.10.2