diff options
| author | Shengzhou Liu <Shengzhou.Liu@freescale.com> | 2014-11-05 07:37:15 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:40:27 (GMT) |
| commit | d21fb63a28b5cc0ba23cb41c0dae8ed308a61be1 (patch) | |
| tree | 9d869379dd1bd1fe6a7c26069e36ed5b9d4ade35 /arch | |
| parent | 92672c736cd9db7393a082139b998290509ff9d5 (diff) | |
| download | linux-fsl-qoriq-d21fb63a28b5cc0ba23cb41c0dae8ed308a61be1.tar.xz | |
powerpc/t1024: update defconfig and dts for fman_v3l platform
- add CONFIG_FMAN_V3L by default for FMan_V3L platform.
- t1024 officially supports 6 portals of QMan/BMan instead of 10
- remove CONFIG_ALTIVEC as e5500 core has no ALTIVEC.
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Change-Id: I71a5426ad441ef034c66e2d794a86b366092530d
Reviewed-on: http://git.am.freescale.net:8181/23188
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com>
Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 66 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet32_fmanv3_smp_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet64_fmanv3_smp_defconfig | 2 |
3 files changed, 3 insertions, 66 deletions
diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi index 00a1db9..ac86748 100644 --- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi @@ -222,30 +222,6 @@ 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>; - }; }; &qportals { @@ -300,38 +276,6 @@ 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>; - }; - qman-ceetm@0 { compatible = "fsl,qman-ceetm"; fsl,ceetm-lfqid-range = <0xf00000 0x1000>; @@ -513,7 +457,7 @@ sata@220000 { /include/ "qoriq-sec5.0-0.dtsi" /include/ "qoriq-qman1.dtsi" /include/ "qoriq-bman1.dtsi" -/include/ "qoriq-fman3-0.dtsi" +/include/ "qoriq-fman3l-0.dtsi" /include/ "qoriq-fman3-0-1g-0.dtsi" /include/ "qoriq-fman3-0-1g-1.dtsi" /include/ "qoriq-fman3-0-1g-2.dtsi" @@ -552,13 +496,5 @@ sata@220000 { 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>; - }; }; }; diff --git a/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig b/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig index 1b9f07c6..90ce7da 100644 --- a/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig +++ b/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig @@ -104,6 +104,7 @@ CONFIG_NETDEVICES=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FMAN_T4240=y +CONFIG_FMAN_V3L=y CONFIG_FSL_DPAA_ETH=y CONFIG_E1000=y CONFIG_E1000E=y diff --git a/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig b/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig index 4b2830b..270fed8 100644 --- a/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig +++ b/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig @@ -1,6 +1,5 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3E_64=y -CONFIG_ALTIVEC=y CONFIG_SMP=y CONFIG_NR_CPUS=24 CONFIG_SYSVIPC=y @@ -110,6 +109,7 @@ CONFIG_DUMMY=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FMAN_T4240=y +CONFIG_FMAN_V3L=y CONFIG_FSL_DPAA_ETH=y CONFIG_E1000E=y CONFIG_VITESSE_PHY=y |