diff options
| author | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-04 23:00:41 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-04 23:01:01 (GMT) |
| commit | 3e5c062af9d1785b3356f177b9e0050540dad4ef (patch) | |
| tree | 16f3a98e3f0ba39419e13da1fb81e3a870aec8d8 | |
| parent | 7a8b241fba87dac3d52f3af01cf8382b75b72ccd (diff) | |
| download | linux-fsl-qoriq-3e5c062af9d1785b3356f177b9e0050540dad4ef.tar.xz | |
Revert "Merge sdk-v1.3.x config and device tree files"
This reverts commit 7a8b241fba87dac3d52f3af01cf8382b75b72ccd
I'm guessing it was applied accidentally. To be frank, it doesn't look like most of my comments from the previous version were resolved by this version.
Change-Id: I9af40bff5021a432f7fad805771ec4d6c4fc39b7
Reviewed-on: http://git.am.freescale.net:8181/1012
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
39 files changed, 171 insertions, 4096 deletions
diff --git a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt index 825d289..2c6be03 100644 --- a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt +++ b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt @@ -56,9 +56,6 @@ Properties: hardware. - fsl,magic-packet : If present, indicates that the hardware supports waking up via magic packet. - - fsl,wake-on-filer : If present, indicates that the hardware supports - waking up via arp request to local ip address or unicast packet to - local mac address. - bd-stash : If present, indicates that the hardware supports stashing buffer descriptors in the L2. - rx-stash-len : Denotes the number of bytes of a received buffer to stash @@ -95,16 +92,6 @@ Clock Properties: - fsl,tmr-fiper1 Fixed interval period pulse generator. - fsl,tmr-fiper2 Fixed interval period pulse generator. - fsl,max-adj Maximum frequency adjustment in parts per billion. - - fsl,clock-source-select Value type: <u32>, - select 1588 Timer reference clock source. - 0. External high precision timer reference - clock (TSEC_1588_CLK_IN) - 1. eTSEC system clock - 2. eTSEC1 transmit clock - 3. RTC clock input. - - fsl,ts-to-buffer Value type <none>, if present, indicates that TSEC - has ability to write time stamp of the transmitted - frame to memory in the padding. These properties set the operational parameters for the PTP clock. You must choose these carefully for the clock to work right. @@ -140,6 +127,4 @@ Example: fsl,tmr-fiper1 = <0x3B9AC9F6>; fsl,tmr-fiper2 = <0x00018696>; fsl,max-adj = <659999998>; - fsl,clock-source-select = <1>; - fsl,ts-to-buffer; }; diff --git a/Documentation/devicetree/bindings/powerpc/fsl/interlaken-lac.txt b/Documentation/devicetree/bindings/powerpc/fsl/interlaken-lac.txt deleted file mode 100644 index 641bc13..0000000 --- a/Documentation/devicetree/bindings/powerpc/fsl/interlaken-lac.txt +++ /dev/null @@ -1,309 +0,0 @@ -=============================================================================== -Freescale Interlaken Look-Aside Controller Device Bindings -Copyright 2012 Freescale Semiconductor Inc. - -CONTENTS - - Interlaken Look-Aside Controller (LAC) Node - - Example LAC Node - - Interlaken Look-Aside Controller (LAC) Software Portal Node - - Interlaken Look-Aside Controller (LAC) Software Portal Child Nodes - - Example LAC SWP Node with Child Nodes - -============================================================================== -Interlaken Look-Aside Controller (LAC) Node - -DESCRIPTION - -The Interlaken is a narrow, high speed channelized chip-to-chip interface. To -facilitate interoperability between a data path device and a look-aside -co-processor, the Interlaken Look-Aside protocol is defined for short -transaction-related transfers. Although based on the Interlaken protocol, -Interlaken Look-Aside is not directly compatible with Interlaken and can be -considered a different operation mode. - -The Interlaken LA controller connects internal platform to Interlaken serial -interface. It accepts LA command through software portals, which are system -memory mapped 4KB spaces. The LA commands are then translated into the -Interlaken control words and data words, which are sent on TX side to TCAM -through SerDes lanes. - -There are two 4KiB spaces defined within the LAC global register memory map. -There is a full register set at 0x0000-0x0FFF (also known as the "hypervisor" -version), and a subset at 0x1000-0x1FFF. The former is a superset of the -latter, and includes certain registers that should not be accessible to -partitioned software. Separate nodes are used for each region, with a phandle -linking the hypervisor node to the normal operating node. - -PROPERTIES - - - compatible - Usage: required - Value type: <string> - Definition: Must include "fsl,interlaken-lac". This represents only - those LAC CCSR registers not protected in partitioned - software. The version of the device is determined by the LAC - IP Block Revision Register (IPBRR0) at offset 0x0BF8. - - Table of correspondences between IPBRR0 values and example - chips: - Value Device - ----------- ------- - 0x02000100 T4240 - - The Hypervisor node has a different compatible. It must include - "fsl,interlaken-lac-hv". This node represents the protected - LAC register space and is required except inside a partition - where access to the hypervisor node is to be denied. - - - fsl,non-hv-node - Usage: required in "fsl,interlaken-lac-hv" - Value type: <phandle> - Definition: Points to the non-protected LAC CCSR mapped register space - node. - - - reg - Usage: required - Value type: <prop-encoded-array> - Definition: A standard property. The first resource represents the - Interlaken LAC configuration registers. - - - interrupts: - Usage: required in non-hv node only - Value type: <prop-encoded-array> - Definition: Interrupt mapping for Interlaken LAC error IRQ. - -EXAMPLE - lac: lac@229000 { - compatible = "fsl,interlaken-lac" - reg = <0x229000 0x1000>; - interrupts = <16 2 1 18>; - }; - - lac-hv@228000 { - compatible = "fsl,interlaken-lac-hv" - reg = <0x228000 0x1000>; - fsl,non-hv-node = <&lac>; - }; - -=============================================================================== -Interlaken Look-Aside Controller (LAC) Software Portal Container Node - -DESCRIPTION -The Interlaken Look-Aside Controller (LAC) utilizes Software Portals to accept -Interlaken Look-Aside (ILA) commands. The Interlaken LAC software portal -memory map occupies 128KB of memory space. The software portal memory space is -intended to be cache-enabled. WIMG for each software space is required to be -0010 if stashing is enabled; otherwise, WIMG can be 0000 or 0010. - -PROPERTIES - - - #address-cells - Usage: required - Value type: <u32> - Definition: A standard property. Must have a value of 1. - - - #size-cells - Usage: required - Value type: <u32> - Definition: A standard property. Must have a value of 1. - - - compatible - Usage: required - Value type: <string> - Definition: Must include "fsl,interlaken-lac-portals" - - - ranges - Usage: required - Value type: <prop-encoded-array> - Definition: A standard property. Specifies the address and length - of the LAC portal memory space. - -=============================================================================== -Interlaken Look-Aside Controller (LAC) Software Portals Child Nodes - -DESCRIPTION -There are up to 24 available software portals with each software portal -requiring 4KB of consecutive memory within the software portal memory mapped -space. - -PROPERTIES - - - compatible - Usage: required - Value type: <string> - Definition: Must include "fsl,interlaken-lac-portal-vX.Y" where X is - the Major version (IP_MJ) found in the LAC IP Block Revision - Register (IPBRR0), at offset 0x0BF8, and Y is the Minor version - (IP_MN). - - Table of correspondences between version values and example chips: - Value Device - ------ ------- - 1.0 T4240 - - - reg - Usage: required - Value type: <prop-encoded-array> - Definition: A standard property. The first resource represents the - Interlaken LAC software portal registers. - - - fsl,liodn - Value type: <u32> - Definition: The logical I/O device number (LIODN) for this device. The - LIODN is a number expressed by this device and used to perform - look-ups in the IOMMU (PAMU) address table when performing - DMAs. This property is automatically added by u-boot. - -=============================================================================== -EXAMPLE - -lac-portals { - #address-cells = <0x1>; - #size-cells = <0x1>; - compatible = "fsl,interlaken-lac-portals"; - ranges = <0x0 0xf 0xf4400000 0x20000>; - - lportal0: lac-portal@0 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x204>; - reg = <0x0 0x1000>; - }; - - lportal1: lac-portal@1000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x205>; - reg = <0x1000 0x1000>; - }; - - lportal2: lac-portal@2000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x206>; - reg = <0x2000 0x1000>; - }; - - lportal3: lac-portal@3000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x207>; - reg = <0x3000 0x1000>; - }; - - lportal4: lac-portal@4000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x208>; - reg = <0x4000 0x1000>; - }; - - lportal5: lac-portal@5000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x209>; - reg = <0x5000 0x1000>; - }; - - lportal6: lac-portal@6000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x20A>; - reg = <0x6000 0x1000>; - }; - - lportal7: lac-portal@7000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x20B>; - reg = <0x7000 0x1000>; - }; - - lportal8: lac-portal@8000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x20C>; - reg = <0x8000 0x1000>; - }; - - lportal9: lac-portal@9000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x20D>; - reg = <0x9000 0x1000>; - }; - - lportal10: lac-portal@A000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x20E>; - reg = <0xA000 0x1000>; - }; - - lportal11: lac-portal@B000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x20F>; - reg = <0xB000 0x1000>; - }; - - lportal12: lac-portal@C000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x210>; - reg = <0xC000 0x1000>; - }; - - lportal13: lac-portal@D000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x211>; - reg = <0xD000 0x1000>; - }; - - lportal14: lac-portal@E000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x212>; - reg = <0xE000 0x1000>; - }; - - lportal15: lac-portal@F000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x213>; - reg = <0xF000 0x1000>; - }; - - lportal16: lac-portal@10000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x214>; - reg = <0x10000 0x1000>; - }; - - lportal17: lac-portal@11000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x215>; - reg = <0x11000 0x1000>; - }; - - lportal8: lac-portal@1200 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x216>; - reg = <0x12000 0x1000>; - }; - - lportal19: lac-portal@13000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x217>; - reg = <0x13000 0x1000>; - }; - - lportal20: lac-portal@14000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x218>; - reg = <0x14000 0x1000>; - }; - - lportal21: lac-portal@15000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x219>; - reg = <0x15000 0x1000>; - }; - - lportal22: lac-portal@16000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x21A>; - reg = <0x16000 0x1000>; - }; - - lportal23: lac-portal@17000 { - compatible = "fsl,interlaken-lac-portal-v1.0"; - fsl,liodn = <0x21B>; - reg = <0x17000 0x1000>; - }; -}; diff --git a/arch/powerpc/boot/dts/b4420qds.dts b/arch/powerpc/boot/dts/b4420qds.dts deleted file mode 100644 index f545ac6..0000000 --- a/arch/powerpc/boot/dts/b4420qds.dts +++ /dev/null @@ -1,245 +0,0 @@ -/* - * B4420DS Device Tree Source - * - * 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/ "fsl/b4420si-pre.dtsi" - -/ { - model = "fsl,B4420QDS"; - compatible = "fsl,B4420QDS"; - #address-cells = <2>; - #size-cells = <2>; - interrupt-parent = <&mpic>; - - aliases{ - ethernet0 = &fm1mac1; - ethernet1 = &fm1mac2; - ethernet2 = &fm1mac3; - ethernet3 = &fm1mac4; - - phy_sgmii_10 = &phy_sgmii_10; - phy_sgmii_11 = &phy_sgmii_11; - phy_sgmii_1c = &phy_sgmii_1c; - phy_sgmii_1d = &phy_sgmii_1d; - }; - - ifc: localbus@ffe124000 { - reg = <0xf 0xfe124000 0 0x2000>; - ranges = <0 0 0xf 0xe8000000 0x08000000 - 2 0 0xf 0xff800000 0x00010000 - 3 0 0xf 0xffdf0000 0x00008000>; - - nor@0,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0x0 0x0 0x8000000>; - bank-width = <2>; - device-width = <1>; - }; - - nand@2,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "fsl,ifc-nand"; - reg = <0x2 0x0 0x10000>; - - partition@0 { - /* This location must not be altered */ - /* 1MB for u-boot Bootloader Image */ - reg = <0x0 0x00100000>; - label = "NAND U-Boot Image"; - read-only; - }; - - partition@100000 { - /* 1MB for DTB Image */ - reg = <0x00100000 0x00100000>; - label = "NAND DTB Image"; - }; - - partition@200000 { - /* 10MB for Linux Kernel Image */ - reg = <0x00200000 0x00A00000>; - label = "NAND Linux Kernel Image"; - }; - - partition@c00000 { - /* 500MB for Root file System Image */ - reg = <0x00c00000 0x1F400000>; - label = "NAND RFS Image"; - }; - }; - - board-control@3,0 { - compatible = "fsl,b4420qds-fpga", "fsl,fpga-qixis"; - reg = <3 0 0x300>; - }; - }; - - memory { - device_type = "memory"; - }; - - dcsr: dcsr@f00000000 { - ranges = <0x00000000 0xf 0x00000000 0x01052000>; - }; - - 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>; - spi@110000 { - flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "sst,sst25wf040"; - reg = <0>; - spi-max-frequency = <40000000>; /* input clock */ - }; - }; - - sdhc@114000 { - /*Disabled as there is no sdhc connector on B4420QDS board*/ - status = "disabled"; - }; - - i2c@118000 { - eeprom@50 { - compatible = "at24,24c64"; - reg = <0x50>; - }; - eeprom@51 { - compatible = "at24,24c256"; - reg = <0x51>; - }; - eeprom@53 { - compatible = "at24,24c256"; - reg = <0x53>; - }; - eeprom@57 { - compatible = "at24,24c256"; - reg = <0x57>; - }; - rtc@68 { - compatible = "dallas,ds3232"; - reg = <0x68>; - interrupts = <0x1 0x1 0 0>; - }; - }; - - usb@210000 { - dr_mode = "host"; - phy_type = "ulpi"; - }; - - fman0: fman@400000 { - fm1mac1: ethernet@e0000 { - phy-handle = <&phy_sgmii_10>; - phy-connection-type = "sgmii"; - }; - fm1mac2: ethernet@e2000 { - phy-handle = <&phy_sgmii_11>; - phy-connection-type = "sgmii"; - }; - fm1mac3: ethernet@e4000 { - phy-handle = <&phy_sgmii_1c>; - phy-connection-type = "sgmii"; - }; - fm1mac4: ethernet@e6000 { - phy-handle = <&phy_sgmii_1d>; - phy-connection-type = "sgmii"; - }; - - mdio0: mdio@fc000 { - phy_sgmii_10: ethernet-phy@10 { - reg = <0x10>; - }; - phy_sgmii_11: ethernet-phy@11 { - reg = <0x11>; - }; - phy_sgmii_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - }; - }; - }; - - pci0: pcie@ffe200000 { - reg = <0xf 0xfe200000 0 0x10000>; - ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 - 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; - pcie@0 { - ranges = <0x02000000 0 0xe0000000 - 0x02000000 0 0xe0000000 - 0 0x20000000 - - 0x01000000 0 0x00000000 - 0x01000000 0 0x00000000 - 0 0x00010000>; - }; - }; - - fsl,dpaa { - compatible = "fsl,b4420-dpaa", "fsl,dpaa"; - ethernet@0 { - compatible = "fsl,b4420-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac1>; - }; - ethernet@1 { - compatible = "fsl,b4420-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac2>; - }; - ethernet@2 { - compatible = "fsl,b4420-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac3>; - }; - ethernet@3 { - compatible = "fsl,b4420-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac4>; - }; - }; -}; - -/include/ "fsl/b4420si-post.dtsi" -/include/ "fsl/qoriq-dpaa-res3.dtsi" diff --git a/arch/powerpc/boot/dts/b4860qds-usdpaa.dts b/arch/powerpc/boot/dts/b4860qds-usdpaa.dts deleted file mode 100644 index f41ee5d..0000000 --- a/arch/powerpc/boot/dts/b4860qds-usdpaa.dts +++ /dev/null @@ -1,159 +0,0 @@ -/* - * B4860QDS Device Tree Source - * - * 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/ "b4860qds.dts" - -/ { - /* NB: "bpool-ethernet-seeds" is not set to avoid buffer seeding, - * because apps seed these pools with buffers allocated at - * run-time. - * HOWEVER, the kernel driver requires the buffer-size so - * "fsl,bpool-ethernet-cfg" is set. It also mis-interprets - * things if the base-address is zero (hence the 0xdeadbeef - * values). - */ - bp7: buffer-pool@7 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <7>; - fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>; - fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>; - }; - bp8: buffer-pool@8 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <8>; - fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp9: buffer-pool@9 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <9>; - fsl,bpool-ethernet-cfg = <0 0 0 1728 0 0xfeedabba>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - - bp10: buffer-pool@10 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <10>; - fsl,bpool-thresholds = <0x10 0x30 0x0 0x0>; - }; - bp11: buffer-pool@11 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <11>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp12: buffer-pool@12 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <12>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - - bp16: buffer-pool@16 { - compatible = "fsl,b4860-bpool", "fsl,bpool"; - fsl,bpid = <16>; - fsl,bpool-ethernet-cfg = <0 2048 0 1728 0 0>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - - - fsl,dpaa { - ethernet@0 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x50 1 0x51 1>; - fsl,qman-frame-queues-tx = <0x70 1 0x71 1>; - }; - ethernet@1 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x52 1 0x53 1>; - fsl,qman-frame-queues-tx = <0x72 1 0x73 1>; - }; - ethernet@2 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x54 1 0x55 1>; - fsl,qman-frame-queues-tx = <0x74 1 0x75 1>; - }; - ethernet@3 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x56 1 0x57 1>; - fsl,qman-frame-queues-tx = <0x76 1 0x77 1>; - }; - - /* ethernet@4 will be used as a normal Linux ethernet that - * interfaces to the kernel network stack. All others will be - * dedicated for use by usdpaa */ - - ethernet@5 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x5a 1 0x5b 1>; - fsl,qman-frame-queues-tx = <0x7a 1 0x7b 1>; - }; - ethernet@8 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x5c 1 0x5d 1>; - fsl,qman-frame-queues-tx = <0x7c 1 0x7d 1>; - }; - ethernet@9 { - compatible = "fsl,b4860-dpa-ethernet-init", "fsl,dpa-ethernet-init"; - fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-frame-queues-rx = <0x5e 1 0x5f 1>; - fsl,qman-frame-queues-tx = <0x7e 1 0x7f 1>; - }; - - /* ethernet@16 declared as MAC-less interface with no "fsl,fman-mac" property. - * USDPAA will seed buffers to this buffer pool and initialize 8 TX Frame - * queues. The ethernet driver will initialize 8 RX default Frame queues. - * On receiving frame at this interface, the ethernet driver will do - * kmap_atomic/kunmap_atomic for that frame. */ - ethernet@16 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,bman-buffer-pools = <&bp16>; - fsl,qman-frame-queues-rx = <4000 8>; - fsl,qman-frame-queues-tx = <4008 8>; - local-mac-address = [00 11 22 33 44 55]; - }; - - dpa-fman0-oh@2 { - compatible = "fsl,dpa-oh"; - /* Define frame queues for the OH port*/ - /* <OH Rx error, OH Rx default> */ - fsl,qman-frame-queues-oh = <0x6e 1 0x6f 1>; - fsl,fman-oh-port = <&fman0_oh2>; - }; - }; -}; diff --git a/arch/powerpc/boot/dts/b4860qds.dts b/arch/powerpc/boot/dts/b4860qds.dts index 0e7e68d..8da3f9c 100644 --- a/arch/powerpc/boot/dts/b4860qds.dts +++ b/arch/powerpc/boot/dts/b4860qds.dts @@ -41,89 +41,10 @@ #size-cells = <2>; interrupt-parent = <&mpic>; - aliases{ - ethernet0 = &fm1mac1; - ethernet1 = &fm1mac2; - ethernet2 = &fm1mac3; - ethernet3 = &fm1mac4; - ethernet4 = &fm1mac5; - ethernet5 = &fm1mac6; - ethernet8 = &fm1mac9; - ethernet9 = &fm1mac10; - - phy_sgmii_10 = &phy_sgmii_10; - phy_sgmii_11 = &phy_sgmii_11; - phy_sgmii_1c = &phy_sgmii_1c; - phy_sgmii_1d = &phy_sgmii_1d; - phy_sgmii_1e = &phy_sgmii_1e; - phy_sgmii_1f = &phy_sgmii_1f; - - phy_xaui_slot1 = &phy_xaui_slot1; - phy_xaui_slot2 = &phy_xaui_slot2; - }; - - ifc: localbus@ffe124000 { - reg = <0xf 0xfe124000 0 0x2000>; - ranges = <0 0 0xf 0xe8000000 0x08000000 - 2 0 0xf 0xff800000 0x00010000 - 3 0 0xf 0xffdf0000 0x00008000>; - - nor@0,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0x0 0x0 0x8000000>; - bank-width = <2>; - device-width = <1>; - }; - - nand@2,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "fsl,ifc-nand"; - reg = <0x2 0x0 0x10000>; - - partition@0 { - /* This location must not be altered */ - /* 1MB for u-boot Bootloader Image */ - reg = <0x0 0x00100000>; - label = "NAND U-Boot Image"; - read-only; - }; - - partition@100000 { - /* 1MB for DTB Image */ - reg = <0x00100000 0x00100000>; - label = "NAND DTB Image"; - }; - - partition@200000 { - /* 10MB for Linux Kernel Image */ - reg = <0x00200000 0x00A00000>; - label = "NAND Linux Kernel Image"; - }; - - partition@c00000 { - /* 500MB for Root file System Image */ - reg = <0x00c00000 0x1F400000>; - label = "NAND RFS Image"; - }; - }; - - board-control@3,0 { - compatible = "fsl,b4860qds-fpga", "fsl,fpga-qixis"; - reg = <3 0 0x300>; - }; - }; - memory { device_type = "memory"; }; - dcsr: dcsr@f00000000 { - ranges = <0x00000000 0xf 0x00000000 0x01052000>; - }; - bportals: bman-portals@ff4000000 { ranges = <0x0 0xf 0xf4000000 0x2000000>; }; @@ -135,177 +56,6 @@ soc: soc@ffe000000 { ranges = <0x00000000 0xf 0xfe000000 0x1000000>; reg = <0xf 0xfe000000 0 0x00001000>; - spi@110000 { - flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "sst,sst25wf040"; - reg = <0>; - spi-max-frequency = <40000000>; /* input clock */ - }; - }; - - sdhc@114000 { - status = "disabled"; - }; - - i2c@118000 { - eeprom@50 { - compatible = "at24,24c64"; - reg = <0x50>; - }; - eeprom@51 { - compatible = "at24,24c256"; - reg = <0x51>; - }; - eeprom@53 { - compatible = "at24,24c256"; - reg = <0x53>; - }; - eeprom@57 { - compatible = "at24,24c256"; - reg = <0x57>; - }; - rtc@68 { - compatible = "dallas,ds3232"; - reg = <0x68>; - }; - }; - - usb@210000 { - dr_mode = "host"; - phy_type = "ulpi"; - }; - - fman0: fman@400000 { - fm1mac1: ethernet@e0000 { - phy-handle = <&phy_sgmii_10>; - phy-connection-type = "sgmii"; - }; - fm1mac2: ethernet@e2000 { - phy-handle = <&phy_sgmii_11>; - phy-connection-type = "sgmii"; - }; - fm1mac3: ethernet@e4000 { - phy-handle = <&phy_sgmii_1c>; - phy-connection-type = "sgmii"; - }; - fm1mac4: ethernet@e6000 { - phy-handle = <&phy_sgmii_1d>; - phy-connection-type = "sgmii"; - }; - fm1mac5: ethernet@e8000 { - phy-handle = <&phy_sgmii_1e>; - phy-connection-type = "sgmii"; - }; - fm1mac6: ethernet@ea000 { - phy-handle = <&phy_sgmii_1f>; - phy-connection-type = "sgmii"; - }; - fm1mac9: ethernet@f0000 { /* FM1@TGEC2 */ - phy-handle = <&phy_xaui_slot1>; - phy-connection-type = "xgmii"; - }; - fm1mac10: ethernet@f2000 { /* FM1@TGEC1 */ - phy-handle = <&phy_xaui_slot2>; - phy-connection-type = "xgmii"; - }; - - mdio0: mdio@fc000 { - phy_sgmii_10: ethernet-phy@10 { - reg = <0x10>; - }; - phy_sgmii_11: ethernet-phy@11 { - reg = <0x11>; - }; - phy_sgmii_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - xmdio0: mdio@fd000 { - /* For 10g interfaces */ - phy_xaui_slot1: xaui-phy@slot1 { - compatible = "ethernet-phy-ieee802.3-c45"; - reg = <0x7>; /* default switch setting on slot1 of AMC2PEX */ - }; - phy_xaui_slot2: xaui-phy@slot2 { - compatible = "ethernet-phy-ieee802.3-c45"; - reg = <0x6>; /* default switch setting on slot1 of AMC2PEX */ - }; - }; - }; - }; - - pci0: pcie@ffe200000 { - reg = <0xf 0xfe200000 0 0x10000>; - ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 - 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; - pcie@0 { - ranges = <0x02000000 0 0xe0000000 - 0x02000000 0 0xe0000000 - 0 0x20000000 - - 0x01000000 0 0x00000000 - 0x01000000 0 0x00000000 - 0 0x00010000>; - }; - }; - - rio: rapidio@ffe0c0000 { - reg = <0xf 0xfe0c0000 0 0x11000>; - - port1 { - ranges = <0 0 0xc 0x20000000 0 0x10000000>; - }; - port2 { - ranges = <0 0 0xc 0x30000000 0 0x10000000>; - }; - }; - - fsl,dpaa { - compatible = "fsl,b4860-dpaa", "fsl,dpaa"; - ethernet@0 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac1>; - }; - ethernet@1 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac2>; - }; - ethernet@2 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac3>; - }; - ethernet@3 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac4>; - }; - ethernet@4 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac5>; - }; - ethernet@5 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac6>; - }; - ethernet@8 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac9>; - }; - ethernet@9 { - compatible = "fsl,b4860-dpa-ethernet", "fsl,dpa-ethernet"; - fsl,fman-mac = <&fm1mac10>; - }; }; rio: rapidio@ffe0c0000 { diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi deleted file mode 100644 index 0d13641..0000000 --- a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi +++ /dev/null @@ -1,292 +0,0 @@ -/* - * 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,b4420-pcie", "fsl,qoriq-pcie-v2.4"; - device_type = "pci"; - #size-cells = <2>; - #address-cells = <3>; - bus-range = <0x0 0xff>; - interrupts = <20 2 0 0>; - 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 - >; - }; -}; - -&bportals { -/include/ "qoriq-bman2-portals.dtsi" -}; -&qportals { -/include/ "qoriq-qman2-portals.dtsi" -}; - -&dcsr { - #address-cells = <1>; - #size-cells = <1>; - compatible = "fsl,dcsr", "simple-bus"; - - dcsr-epu@0 { - compatible = "fsl,b4420-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,b4420-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,b4420-dcsr-dpaa", "fsl,dcsr-dpaa"; - reg = <0x9000 0x1000>; - }; - dcsr-ocn@11000 { - compatible = "fsl,b4420-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,b4420-dcsr-nal", "fsl,dcsr-nal"; - reg = <0x18000 0x1000>; - }; - dcsr-rcpm@22000 { - compatible = "fsl,b4420-dcsr-rcpm", "fsl,dcsr-rcpm"; - reg = <0x22000 0x1000>; - }; - dcsr-snpc@30000 { - compatible = "fsl,b4420-dcsr-snpc", "fsl,dcsr-snpc"; - reg = <0x30000 0x1000 0x1022000 0x10000>; - }; - dcsr-snpc@31000 { - compatible = "fsl,b4420-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>; - }; - 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 { - #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,p5020-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache"; - reg = <0x10000 0x1000>; - interrupts = <16 2 1 4>; - }; - - corenet-cf@18000 { - compatible = "fsl,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"; - reg = <0x20000 0x4000>; - interrupts = < - 24 2 0 0 - 16 2 1 1>; - }; - -/include/ "qoriq-qman1.dtsi" - - qman: qman@318000 { - interrupts = <16 2 1 28>; - }; - -/include/ "qoriq-bman1.dtsi" - - bman: bman@31a000 { - interrupts = <16 2 1 29>; - }; - -/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" - fman0: fman@400000 { - interrupts = < - 96 2 0 0 - 16 2 1 30>; - - /* tx - 1g - 0 */ - port@a8000 { - fsl,qman-channel-id = <0x802>; - }; - /* tx - 1g - 1 */ - 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>; - }; - - /* offline - 0 is not usable on B4420 */ - /* 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>; - }; - }; - -/include/ "qoriq-mpic.dtsi" - - guts: global-utilities@e0000 { - compatible = "fsl,b4420-device-config"; - reg = <0xe0000 0xe00>; - fsl,has-rstcr; - fsl,liodn-bits = <12>; - }; - - rcpm: global-utilities@e2000 { - compatible = "fsl,b4420-rcpm", "fsl,qoriq-rcpm-2"; - reg = <0xe2000 0x1000>; - }; - -/include/ "qoriq-dma-0.dtsi" -/include/ "qoriq-dma-1.dtsi" - -/include/ "qonverge-usb2-dr-0.dtsi" - usb0: usb@210000 { - compatible = "fsl-usb2-dr-v2.4", "fsl-usb2-dr"; - }; - -/include/ "qoriq-espi-0.dtsi" - spi@110000 { - fsl,espi-num-chipselects = <4>; - }; - -/include/ "qoriq-esdhc-0.dtsi" - sdhc@114000 { - sdhci,auto-cmd12; - }; -/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 { - next-level-cache = <&cpc>; - }; -}; diff --git a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi deleted file mode 100644 index 9493fb0..0000000 --- a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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/; -/ { - compatible = "fsl,B4420"; - #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; - - fman0 = &fman0; - crypto = &crypto; - sec_jr0 = &sec_jr0; - sec_jr1 = &sec_jr1; - sec_jr2 = &sec_jr2; - sec_jr3 = &sec_jr3; - rtic_a = &rtic_a; - rtic_b = &rtic_b; - rtic_c = &rtic_c; - rtic_d = &rtic_d; - sec_mon = &sec_mon; - }; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu0: PowerPC,e6500@0 { - device_type = "cpu"; - reg = <0 1>; - next-level-cache = <&L2>; - }; - 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 index 64e3266..19358ea 100644 --- a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi @@ -119,11 +119,6 @@ /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 { - next-level-cache = <&cpc>; - }; /include/ "qoriq-rman-0.dtsi" rman: rman@1e0000 { diff --git a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi index a648443..0750ded 100644 --- a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi @@ -41,7 +41,6 @@ aliases { ccsr = &soc; - dcsr = &dcsr; serial0 = &serial0; serial1 = &serial1; @@ -50,47 +49,27 @@ qman = &qman; bman = &bman; - pci0 = &pci0; - dma0 = &dma0; - dma1 = &dma1; - sdhc = &sdhc; - - fman0 = &fman0; - crypto = &crypto; - sec_jr0 = &sec_jr0; - sec_jr1 = &sec_jr1; - sec_jr2 = &sec_jr2; - sec_jr3 = &sec_jr3; - rtic_a = &rtic_a; - rtic_b = &rtic_b; - rtic_c = &rtic_c; - rtic_d = &rtic_d; - sec_mon = &sec_mon; }; cpus { #address-cells = <1>; #size-cells = <0>; - cpu0: PowerPC,e6500@0 { + PowerPC,e6500@0 { device_type = "cpu"; - reg = <0 1>; - next-level-cache = <&L2>; + reg = <0>; }; - cpu1: PowerPC,e6500@1 { + PowerPC,e6500@1 { device_type = "cpu"; - reg = <2 3>; - next-level-cache = <&L2>; + reg = <2>; }; - cpu2: PowerPC,e6500@2 { + PowerPC,e6500@2 { device_type = "cpu"; - reg = <4 5>; - next-level-cache = <&L2>; + reg = <4>; }; - cpu3: PowerPC,e6500@3 { + PowerPC,e6500@3 { device_type = "cpu"; - reg = <6 7>; - next-level-cache = <&L2>; + reg = <6>; }; }; }; diff --git a/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi index 5af0aae..684f664 100644 --- a/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi @@ -161,30 +161,16 @@ /include/ "pq3-mpic.dtsi" /include/ "pq3-mpic-timer-B.dtsi" - ptp_timer: ptimer@b0e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0xb0e00 0xb0>; - fsl,ts-to-buffer; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - /include/ "pq3-etsec2-0.dtsi" enet0: enet0_grp2: ethernet@b0000 { - fsl,pmc-handle = <&etsec1_clk>; - ptimer-handle = <&ptp_timer>; }; /include/ "pq3-etsec2-1.dtsi" enet1: enet1_grp2: ethernet@b1000 { - fsl,pmc-handle = <&etsec2_clk>; - ptimer-handle = <&ptp_timer>; }; /include/ "pq3-etsec2-2.dtsi" enet2: enet2_grp2: ethernet@b2000 { - fsl,pmc-handle = <&etsec3_clk>; - ptimer-handle = <&ptp_timer>; }; global-utilities@e0000 { @@ -192,8 +178,6 @@ reg = <0xe0000 0x1000>; fsl,has-rstcr; }; - -/include/ "pq3-power.dtsi" }; /include/ "pq3-etsec2-grp2-0.dtsi" diff --git a/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi index cbdf47f..adb82fd 100644 --- a/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi @@ -156,30 +156,16 @@ /include/ "pq3-mpic.dtsi" /include/ "pq3-mpic-timer-B.dtsi" - ptp_timer: ptimer@b0e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0xb0e00 0xb0>; - fsl,ts-to-buffer; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - /include/ "pq3-etsec2-0.dtsi" enet0: enet0_grp2: ethernet@b0000 { - fsl,pmc-handle = <&etsec1_clk>; - ptimer-handle = <&ptp_timer>; }; /include/ "pq3-etsec2-1.dtsi" enet1: enet1_grp2: ethernet@b1000 { - fsl,pmc-handle = <&etsec2_clk>; - ptimer-handle = <&ptp_timer>; }; /include/ "pq3-etsec2-2.dtsi" enet2: enet2_grp2: ethernet@b2000 { - fsl,pmc-handle = <&etsec3_clk>; - ptimer-handle = <&ptp_timer>; }; global-utilities@e0000 { @@ -187,8 +173,6 @@ reg = <0xe0000 0x1000>; fsl,has-rstcr; }; - -/include/ "pq3-power.dtsi" }; &qe { diff --git a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi index 35266f8..4a57371 100644 --- a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi @@ -41,13 +41,14 @@ /* controller at 0x200000 */ &pci0 { - compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4", "fsl,qoriq-pcie-v2.2"; + compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4"; 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>; @@ -68,13 +69,14 @@ /* controller at 0x201000 */ &pci1 { - compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4", "fsl,qoriq-pcie-v2.2"; + compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4"; 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>; @@ -95,13 +97,14 @@ /* controller at 0x202000 */ &pci2 { - compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4", "fsl,qoriq-pcie-v2.2"; + compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4"; 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>; @@ -247,10 +250,42 @@ iommu@20000 { compatible = "fsl,pamu-v1.0", "fsl,pamu"; - reg = <0x20000 0x5000>; - interrupts = < - 24 2 0 0 - 16 2 1 30>; + 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>; + }; }; /include/ "qoriq-mpic.dtsi" @@ -344,7 +379,17 @@ }; /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>; @@ -352,6 +397,8 @@ /include/ "qoriq-esdhc-0.dtsi" sdhc@114000 { + fsl,iommu-parent = <&pamu2>; + fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */ sdhci,auto-cmd12; }; @@ -382,66 +429,9 @@ fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */ }; /include/ "qoriq-sata2-1.dtsi" -/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>; - }; + sata@221000 { + fsl,iommu-parent = <&pamu4>; + fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */ }; /include/ "qoriq-sec5.2-0.dtsi" crypto@300000 { diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi deleted file mode 100644 index 0339825..0000000 --- a/arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi +++ /dev/null @@ -1,118 +0,0 @@ -/* - * QorIQ Sec/Crypto 5.3 device tree stub [ controller @ offset 0x300000 ] - * - * 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. - */ - -crypto: crypto@300000 { - compatible = "fsl,sec-v5.3", "fsl,sec-v5.0", "fsl,sec-v4.0"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x300000 0x10000>; - ranges = <0 0x300000 0x10000>; - interrupts = <92 2 0 0>; - - sec_jr0: jr@1000 { - compatible = "fsl,sec-v5.3-job-ring", - "fsl,sec-v5.0-job-ring", - "fsl,sec-v4.0-job-ring"; - reg = <0x1000 0x1000>; - interrupts = <88 2 0 0>; - }; - - sec_jr1: jr@2000 { - compatible = "fsl,sec-v5.3-job-ring", - "fsl,sec-v5.0-job-ring", - "fsl,sec-v4.0-job-ring"; - reg = <0x2000 0x1000>; - interrupts = <89 2 0 0>; - }; - - sec_jr2: jr@3000 { - compatible = "fsl,sec-v5.3-job-ring", - "fsl,sec-v5.0-job-ring", - "fsl,sec-v4.0-job-ring"; - reg = <0x3000 0x1000>; - interrupts = <90 2 0 0>; - }; - - sec_jr3: jr@4000 { - compatible = "fsl,sec-v5.3-job-ring", - "fsl,sec-v5.0-job-ring", - "fsl,sec-v4.0-job-ring"; - reg = <0x4000 0x1000>; - interrupts = <91 2 0 0>; - }; - - rtic@6000 { - compatible = "fsl,sec-v5.3-rtic", - "fsl,sec-v5.0-rtic", - "fsl,sec-v4.0-rtic"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x6000 0x100>; - ranges = <0x0 0x6100 0xe00>; - - rtic_a: rtic-a@0 { - compatible = "fsl,sec-v5.3-rtic-memory", - "fsl,sec-v5.0-rtic-memory", - "fsl,sec-v4.0-rtic-memory"; - reg = <0x00 0x20 0x100 0x80>; - }; - - rtic_b: rtic-b@20 { - compatible = "fsl,sec-v5.3-rtic-memory", - "fsl,sec-v5.0-rtic-memory", - "fsl,sec-v4.0-rtic-memory"; - reg = <0x20 0x20 0x200 0x80>; - }; - - rtic_c: rtic-c@40 { - compatible = "fsl,sec-v5.3-rtic-memory", - "fsl,sec-v5.0-rtic-memory", - "fsl,sec-v4.0-rtic-memory"; - reg = <0x40 0x20 0x300 0x80>; - }; - - rtic_d: rtic-d@60 { - compatible = "fsl,sec-v5.3-rtic-memory", - "fsl,sec-v5.0-rtic-memory", - "fsl,sec-v4.0-rtic-memory"; - reg = <0x60 0x20 0x500 0x80>; - }; - }; -}; - -sec_mon: sec_mon@314000 { - compatible = "fsl,sec-v5.3-mon", "fsl,sec-v5.0-mon", "fsl,sec-v4.0-mon"; - reg = <0x314000 0x1000>; - interrupts = <93 2 0 0>; -}; diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi index 4731008..d65e7e2 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi @@ -39,18 +39,6 @@ interrupts = <25 2 0 0>; }; -&lportals { -/include/ "interlaken-lac-portals.dtsi" -}; - -&bportals { -/include/ "qoriq-bman2-portals.dtsi" -}; - -&qportals { -/include/ "qoriq-qman2-portals.dtsi" -}; - /* controller at 0x240000 */ &pci0 { compatible = "fsl,t4240-pcie", "fsl,qoriq-pcie-v3.0"; @@ -58,7 +46,6 @@ #size-cells = <2>; #address-cells = <3>; bus-range = <0x0 0xff>; - clock-frequency = <33333333>; interrupts = <20 2 0 0>; pcie@0 { #interrupt-cells = <1>; @@ -84,7 +71,6 @@ #size-cells = <2>; #address-cells = <3>; bus-range = <0 0xff>; - clock-frequency = <33333333>; interrupts = <21 2 0 0>; pcie@0 { #interrupt-cells = <1>; @@ -110,7 +96,6 @@ #size-cells = <2>; #address-cells = <3>; bus-range = <0x0 0xff>; - clock-frequency = <33333333>; interrupts = <22 2 0 0>; pcie@0 { #interrupt-cells = <1>; @@ -136,7 +121,6 @@ #size-cells = <2>; #address-cells = <3>; bus-range = <0x0 0xff>; - clock-frequency = <33333333>; interrupts = <23 2 0 0>; pcie@0 { #interrupt-cells = <1>; @@ -357,11 +341,13 @@ }; cpc: l3-cache-controller@10000 { - compatible = "fsl,p5020-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache"; + compatible = "fsl,t4240-l3-cache-controller", "cache"; reg = <0x10000 0x1000 - 0x11000 0x1000>; + 0x11000 0x1000 + 0x12000 0x1000>; interrupts = <16 2 1 27 - 16 2 1 26>; + 16 2 1 26 + 16 2 1 25>; }; corenet-cf@18000 { @@ -469,13 +455,21 @@ }; }; -/include/ "interlaken-lac.dtsi" - rcpm: global-utilities@e2000 { compatible = "fsl,t4240-rcpm", "fsl,qoriq-rcpm-2"; reg = <0xe2000 0x1000>; }; + sfp: sfp@e8000 { + compatible = "fsl,t4240-sfp"; + reg = <0xe8000 0x1000>; + }; + + serdes: serdes@ea000 { + compatible = "fsl,t4240-serdes"; + reg = <0xea000 0x4000>; + }; + /include/ "qoriq-dma-0.dtsi" /include/ "qoriq-dma-1.dtsi" @@ -656,12 +650,6 @@ }; }; - - /* - * Temporarily define cluster 1/2/3's L2 cache nodes in order to pass - * next-level-cache info to uboot to do L3 cache fixup. This can be - * removed once u-boot can create cpu node with cache info. - */ L2_1: l2-cache-controller@c20000 { compatible = "fsl,t4240-l2-cache-controller"; reg = <0xc20000 0x40000>; @@ -677,171 +665,4 @@ reg = <0xca0000 0x40000>; next-level-cache = <&cpc>; }; - -/include/ "qoriq-qman1.dtsi" -/include/ "qoriq-bman1.dtsi" - -/include/ "qoriq-rman-0.dtsi" - rman: rman@1e0000 { - fsl,qman-channels-id = <0x880 0x881>; - }; - -/include/ "qoriq-usb2-mph-0.dtsi" - usb0: usb@210000 { - compatible = "fsl-usb2-mph-v2.4", "fsl-usb2-mph"; - phy_type = "utmi"; - port0; - }; -/include/ "qoriq-usb2-dr-0.dtsi" - usb1: usb@211000 { - compatible = "fsl-usb2-dr-v2.4", "fsl-usb2-dr"; - dr_mode = "host"; - phy_type = "utmi"; - }; -/include/ "qoriq-sata2-0.dtsi" - sata0: sata@220000 { - compatible = "fsl,t4240-rev1.0-sata", "fsl,pq-sata-v2"; - }; -/include/ "qoriq-sata2-1.dtsi" - sata1: sata@221000 { - compatible = "fsl,t4240-rev1.0-sata", "fsl,pq-sata-v2"; - }; -/include/ "qoriq-dce-0.dtsi" -/include/ "qoriq-pme-0.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 - 1g - 0 */ - port@a8000 { - fsl,qman-channel-id = <0x802>; - }; - /* tx - 1g - 1 */ - 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>; - }; - }; - -/include/ "qoriq-fman3-1.dtsi" -/include/ "qoriq-fman3-1-1g-0.dtsi" -/include/ "qoriq-fman3-1-1g-1.dtsi" -/include/ "qoriq-fman3-1-1g-2.dtsi" -/include/ "qoriq-fman3-1-1g-3.dtsi" -/include/ "qoriq-fman3-1-1g-4.dtsi" -/include/ "qoriq-fman3-1-1g-5.dtsi" -/include/ "qoriq-fman3-1-10g-0.dtsi" -/include/ "qoriq-fman3-1-10g-1.dtsi" - fman1: fman@500000 { - /* tx - 1g - 0 */ - port@a8000 { - fsl,qman-channel-id = <0x822>; - }; - /* tx - 1g - 1 */ - port@a9000 { - fsl,qman-channel-id = <0x823>; - }; - /* tx - 1g - 2 */ - port@aa000 { - fsl,qman-channel-id = <0x824>; - }; - /* tx - 1g - 3 */ - port@ab000 { - fsl,qman-channel-id = <0x825>; - }; - /* tx - 1g - 4 */ - port@ac000 { - fsl,qman-channel-id = <0x826>; - }; - /* tx - 1g - 5 */ - port@ad000 { - fsl,qman-channel-id = <0x827>; - }; - /* tx - 10g - 0 */ - port@b0000 { - fsl,qman-channel-id = <0x820>; - }; - /* tx - 10g - 1 */ - port@b1000 { - fsl,qman-channel-id = <0x821>; - }; - /* offline - 1 */ - port@82000 { - fsl,qman-channel-id = <0x829>; - }; - /* offline - 2 */ - port@83000 { - fsl,qman-channel-id = <0x82a>; - }; - /* offline - 3 */ - port@84000 { - fsl,qman-channel-id = <0x82b>; - }; - /* offline - 4 */ - port@85000 { - fsl,qman-channel-id = <0x82c>; - }; - /* offline - 5 */ - port@86000 { - fsl,qman-channel-id = <0x82d>; - }; - /* offline - 6 */ - port@87000 { - fsl,qman-channel-id = <0x82e>; - }; - }; }; diff --git a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi index 3b97308..07dba1d 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi @@ -33,6 +33,9 @@ */ /dts-v1/; + +/include/ "e6500_power_isa.dtsi" + / { compatible = "fsl,T4240"; #address-cells = <2>; @@ -78,7 +81,6 @@ pci1 = &pci1; pci2 = &pci2; pci3 = &pci3; - rman = &rman; dma0 = &dma0; dma1 = &dma1; sdhc = &sdhc; diff --git a/arch/powerpc/boot/dts/mpc8536ds.dtsi b/arch/powerpc/boot/dts/mpc8536ds.dtsi index edb205f..7c3dde8 100644 --- a/arch/powerpc/boot/dts/mpc8536ds.dtsi +++ b/arch/powerpc/boot/dts/mpc8536ds.dtsi @@ -190,19 +190,10 @@ phy_type = "ulpi"; }; - ptp_timer: ptimer@24e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0x24e00 0xb0>; - fsl,ts-to-buffer; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - enet0: ethernet@24000 { tbi-handle = <&tbi0>; phy-handle = <&phy1>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; mdio@24520 { @@ -234,7 +225,6 @@ tbi-handle = <&tbi1>; phy-handle = <&phy0>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; mdio@26520 { diff --git a/arch/powerpc/boot/dts/mpc8536ds_36b.dts b/arch/powerpc/boot/dts/mpc8536ds_36b.dts index 2134abe..f8a3b34 100644 --- a/arch/powerpc/boot/dts/mpc8536ds_36b.dts +++ b/arch/powerpc/boot/dts/mpc8536ds_36b.dts @@ -32,7 +32,7 @@ reg = <0 0 0 0>; // Filled by U-Boot }; - lbc: localbus@fffe05000 { + lbc: localbus@ffe05000 { reg = <0xf 0xffe05000 0 0x1000>; ranges = <0x0 0x0 0xf 0xe8000000 0x08000000 @@ -44,7 +44,7 @@ ranges = <0x0 0xf 0xffe00000 0x100000>; }; - pci0: pci@fffe08000 { + pci0: pci@ffe08000 { reg = <0xf 0xffe08000 0 0x1000>; ranges = <0x02000000 0 0xf0000000 0xc 0x00000000 0 0x10000000 0x01000000 0 0x00000000 0xf 0xffc00000 0 0x00010000>; diff --git a/arch/powerpc/boot/dts/mpc8572ds.dtsi b/arch/powerpc/boot/dts/mpc8572ds.dtsi index d877f42d..357490b 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dtsi +++ b/arch/powerpc/boot/dts/mpc8572ds.dtsi @@ -149,7 +149,6 @@ tbi-handle = <&tbi0>; phy-handle = <&phy0>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; mdio@24520 { @@ -202,18 +201,10 @@ fsl,max-adj = <499999999>; }; - ptp_timer: ptimer@24e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0x24e00 0xb0>; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - enet1: ethernet@25000 { tbi-handle = <&tbi1>; phy-handle = <&phy1>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; @@ -228,7 +219,6 @@ tbi-handle = <&tbi2>; phy-handle = <&phy2>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; mdio@26520 { diff --git a/arch/powerpc/boot/dts/p1010rdb.dtsi b/arch/powerpc/boot/dts/p1010rdb.dtsi index 2f9b1cd..ec7c27a 100644 --- a/arch/powerpc/boot/dts/p1010rdb.dtsi +++ b/arch/powerpc/boot/dts/p1010rdb.dtsi @@ -1,7 +1,7 @@ /* * P1010 RDB Device Tree Source stub (no addresses or top-level ranges) * - * Copyright 2011-2012 Freescale Semiconductor Inc. + * Copyright 2011 Freescale Semiconductor Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -126,19 +126,31 @@ &board_soc { i2c@3000 { + eeprom@50 { + compatible = "st,24c256"; + reg = <0x50>; + }; + rtc@68 { compatible = "pericom,pt7c4338"; reg = <0x68>; }; }; + i2c@3100 { + eeprom@52 { + compatible = "atmel,24c01"; + reg = <0x52>; + }; + }; + spi@7000 { flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "spansion,s25sl12801"; reg = <0>; - spi-max-frequency = <50000000>; + spi-max-frequency = <40000000>; partition@0 { /* 1MB for u-boot Bootloader Image */ @@ -172,12 +184,6 @@ label = "SPI Flash JFFS2 RFS"; }; }; - - slic@0 { - compatible = "zarlink,le88266"; - reg = <0>; - spi-max-frequency = <8000000>; - }; }; usb@22000 { @@ -221,31 +227,20 @@ }; }; - ptp_timer: ptimer@b0e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0xb0e00 0xb0>; - fsl,ts-to-buffer; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - enet0: ethernet@b0000 { phy-handle = <&phy0>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; enet1: ethernet@b1000 { phy-handle = <&phy1>; tbi-handle = <&tbi0>; phy-connection-type = "sgmii"; - ptimer-handle = <&ptp_timer>; }; enet2: ethernet@b2000 { phy-handle = <&phy2>; tbi-handle = <&tbi1>; phy-connection-type = "sgmii"; - ptimer-handle = <&ptp_timer>; }; }; diff --git a/arch/powerpc/boot/dts/p1021rdb_camp_core0.dts b/arch/powerpc/boot/dts/p1021rdb_camp_core0.dts deleted file mode 100644 index 43f44c2..0000000 --- a/arch/powerpc/boot/dts/p1021rdb_camp_core0.dts +++ /dev/null @@ -1,91 +0,0 @@ -/* - * P1021 RDB Core0 Device Tree Source in CAMP mode. - * - * Copyright 2011 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. - * - * In CAMP mode, each core needs to have its own dts. Only mpic and L2 cache - * can be shared, all the other devices must be assigned to one core only. - * This dts file allows core0 to have memory, l2, serail0, i2c, spi, gpio, - * tdm, dma, usb, eth0, eth1, sdhc, crypto, global-util, message, pci0, pci1, - * msi. - * - * Please note to add "-b 0" for core0's dts compiling. - */ - -/include/ "p1021rdb.dts" - -/ { - model = "fsl,P1021RDB"; - compatible = "fsl,P1021RDB-PC"; - - aliases { - ethernet1 = &enet0; - ethernet2 = &enet1; - serial0 = &serial0; - pci0 = &pci0; - pci1 = &pci1; - }; - - cpus { - PowerPC,P1021@1 { - status = "disabled"; - }; - }; - - memory { - device_type = "memory"; - }; - - soc@ffe00000 { - serial1: serial@4600 { - status = "disabled"; - }; - - mdio@24000 { - phy1: ethernet-phy@1 { - status = "disabled"; - }; - }; - - enet2: ethernet@b2000 { - status = "disabled"; - }; - - mpic: pic@40000 { - protected-sources = < - 42 /* serial1 */ - 31 32 33 /* enet2-queue-group0 */ - 25 26 27 /* enet2-queue-group1 */ - >; - pic-no-reset; - }; - }; -}; diff --git a/arch/powerpc/boot/dts/p1021rdb_camp_core1.dts b/arch/powerpc/boot/dts/p1021rdb_camp_core1.dts deleted file mode 100644 index 591cf5f..0000000 --- a/arch/powerpc/boot/dts/p1021rdb_camp_core1.dts +++ /dev/null @@ -1,179 +0,0 @@ -/* - * P1021 RDB Core1 Device Tree Source in CAMP mode. - * - * Copyright 2011 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. - * - * In CAMP mode, each core needs to have its own dts. Only mpic and L2 cache - * can be shared, all the other devices must be assigned to one core only. - * This dts allows core1 to have l2, eth2, serial1, crypto. - * - * Please note to add "-b 1" for core1's dts compiling. - */ - -/include/ "p1021rdb.dts" - -/ { - model = "fsl,P1021RDB"; - compatible = "fsl,P1021RDB-PC"; - - aliases { - ethernet0 = &enet2; - serial0 = &serial1; - }; - - cpus { - PowerPC,P1021@0 { - status = "disabled"; - }; - }; - - memory { - device_type = "memory"; - }; - - localbus@ffe05000 { - status = "disabled"; - }; - - soc@ffe00000 { - ecm-law@0 { - status = "disabled"; - }; - - ecm@1000 { - status = "disabled"; - }; - - memory-controller@2000 { - status = "disabled"; - }; - - i2c@3000 { - status = "disabled"; - }; - - i2c@3100 { - status = "disabled"; - }; - - serial0: serial@4500 { - status = "disabled"; - }; - - spi@7000 { - status = "disabled"; - }; - - gpio: gpio-controller@f000 { - status = "disabled"; - }; - - dma@21300 { - status = "disabled"; - }; - - mdio@24000 { - phy0: ethernet-phy@0 { - status = "disabled"; - }; - - tbi0: tbi-phy@11 { - status = "disabled"; - }; - }; - - mdio@25000 { - status = "disabled"; - }; - - mdio@26000 { - status = "disabled"; - }; - - enet0: ethernet@b0000 { - status = "disabled"; - }; - - enet1: ethernet@b1000 { - status = "disabled"; - }; - - usb@22000 { - status = "disabled"; - }; - - sdhci@2e000 { - status = "disabled"; - }; - - crypto@30000 { - status = "disabled"; - }; - - mpic: pic@40000 { - protected-sources = < - 16 /* ecm, mem, L2, pci0, pci1 */ - 43 42 59 /* i2c, serial0, spi */ - 47 63 62 /* gpio, tdm */ - 20 21 22 23 /* dma */ - 03 02 /* mdio */ - 29 30 34 /* enet0-queue-group0 */ - 17 18 24 /* enet0-queue-group1 */ - 35 36 40 /* enet1-queue-group0 */ - 51 52 67 /* enet1-queue-group1 */ - 28 72 45 58 /* usb, sdhci, crypto */ - 0xb0 0xb1 0xb2 /* message */ - 0xb3 0xb4 0xb5 - 0xb6 0xb7 - 0xe0 0xe1 0xe2 /* msi */ - 0xe3 0xe4 0xe5 - 0xe6 0xe7 /* sdhci, crypto , pci */ - >; - pic-no-reset; - }; - - msi@41600 { - status = "disabled"; - }; - - global-utilities@e0000 { //global utilities block - status = "disabled"; - }; - }; - - pci0: pcie@ffe09000 { - status = "disabled"; - }; - - pci1: pcie@ffe0a000 { - status = "disabled"; - }; -}; diff --git a/arch/powerpc/boot/dts/p1022ds.dtsi b/arch/powerpc/boot/dts/p1022ds.dtsi index d1d9cd1..873da35 100644 --- a/arch/powerpc/boot/dts/p1022ds.dtsi +++ b/arch/powerpc/boot/dts/p1022ds.dtsi @@ -183,18 +183,6 @@ reg = <0x00700000 0x00900000>; }; }; - - slic@0 { - compatible = "zarlink,le88266"; - reg = <1>; - spi-max-frequency = <8000000>; - }; - - slic@1 { - compatible = "zarlink,le88266"; - reg = <2>; - spi-max-frequency = <8000000>; - }; }; ssi@15000 { @@ -226,23 +214,13 @@ }; }; - ptp_timer: ptimer@b0e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0xb0e00 0xb0>; - fsl,ts-to-buffer; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - ethernet@b0000 { phy-handle = <&phy0>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; ethernet@b1000 { phy-handle = <&phy1>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; }; diff --git a/arch/powerpc/boot/dts/p2020rdb-pc.dtsi b/arch/powerpc/boot/dts/p2020rdb-pc.dtsi index 154fba4..c21d1c7 100644 --- a/arch/powerpc/boot/dts/p2020rdb-pc.dtsi +++ b/arch/powerpc/boot/dts/p2020rdb-pc.dtsi @@ -223,30 +223,19 @@ fsl,max-adj = <249999999>; }; - ptp_timer: ptimer@24e00 { - compatible = "fsl,gianfar-ptp-timer"; - reg = <0x24e00 0xb0>; - fsl,ts-to-buffer; - fsl,tmr-prsc = <0x2>; - fsl,clock-source-select = <1>; - }; - enet0: ethernet@24000 { fixed-link = <1 1 1000 0 0>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; enet1: ethernet@25000 { tbi-handle = <&tbi0>; phy-handle = <&phy0>; phy-connection-type = "sgmii"; - ptimer-handle = <&ptp_timer>; }; enet2: ethernet@26000 { phy-handle = <&phy1>; phy-connection-type = "rgmii-id"; - ptimer-handle = <&ptp_timer>; }; }; diff --git a/arch/powerpc/boot/dts/p3041ds.dts b/arch/powerpc/boot/dts/p3041ds.dts index 15ca9de..276bb49 100644 --- a/arch/powerpc/boot/dts/p3041ds.dts +++ b/arch/powerpc/boot/dts/p3041ds.dts @@ -144,60 +144,6 @@ reg = <0x8>; device_type = "tbi-phy"; }; - - /* - * Virtual MDIO for the two on-board RGMII - * ports. The fsl,hydra-mdio-muxval property - * is already correct. - */ - hydra_mdio_rgmii: hydra-mdio-rgmii { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-mask = <0x70>; - fsl,hydra-mdio-muxval = <0x00>; - status = "disabled"; - - phy_rgmii_0: ethernet-phy@0 { - reg = <0x0>; - }; - phy_rgmii_1: ethernet-phy@1 { - reg = <0x1>; - }; - }; - - /* - * Virtual MDIO for the four-port SGMII card. - * The fsl,hydra-mdio-muxval property will be - * fixed-up by U-Boot based on the slot that - * the SGMII card is in. - * - * Note: we do not support DTSEC5 connected to - * SGMII, so this is the only SGMII node. - */ - hydra_mdio_sgmii: hydra-mdio-sgmii { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-mask = <0x70>; - fsl,hydra-mdio-muxval = <0x00>; - status = "disabled"; - - phy_sgmii_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; }; enet1: ethernet@e2000 { diff --git a/arch/powerpc/boot/dts/p5020ds.dts b/arch/powerpc/boot/dts/p5020ds.dts index 6a4ef62..384461d 100644 --- a/arch/powerpc/boot/dts/p5020ds.dts +++ b/arch/powerpc/boot/dts/p5020ds.dts @@ -144,60 +144,6 @@ reg = <0x8>; device_type = "tbi-phy"; }; - - /* - * Virtual MDIO for the two on-board RGMII - * ports. The fsl,hydra-mdio-muxval property - * is already correct. - */ - hydra_mdio_rgmii: hydra-mdio-rgmii { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-mask = <0x70>; - fsl,hydra-mdio-muxval = <0x00>; - status = "disabled"; - - phy_rgmii_0: ethernet-phy@0 { - reg = <0x0>; - }; - phy_rgmii_1: ethernet-phy@1 { - reg = <0x1>; - }; - }; - - /* - * Virtual MDIO for the four-port SGMII card. - * The fsl,hydra-mdio-muxval property will be - * fixed-up by U-Boot based on the slot that - * the SGMII card is in. - * - * Note: we do not support DTSEC5 connected to - * SGMII, so this is the only SGMII node. - */ - hydra_mdio_sgmii: hydra-mdio-sgmii { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-mask = <0x70>; - fsl,hydra-mdio-muxval = <0x00>; - status = "disabled"; - - phy_sgmii_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; }; enet1: ethernet@e2000 { diff --git a/arch/powerpc/boot/dts/p5040ds.dts b/arch/powerpc/boot/dts/p5040ds.dts index 102ad65..55b33b6 100644 --- a/arch/powerpc/boot/dts/p5040ds.dts +++ b/arch/powerpc/boot/dts/p5040ds.dts @@ -166,128 +166,6 @@ reg = <0x8>; device_type = "tbi-phy"; }; - - /* - * Virtual MDIO for the two on-board RGMII - * ports. The fsl,hydra-mdio-muxval property - * is already correct. - */ - hydra_rg: hydra-rg { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-val = <0x08>; - fsl,hydra-mdio-mux-mask = <0x70>; - status = "disabled"; - - phy_rgmii_0: ethernet-phy@0 { - reg = <0x0>; - }; - phy_rgmii_1: ethernet-phy@1 { - reg = <0x1>; - }; - }; - - /* - * Virtual MDIO for the four-port SGMII cards. - */ - - /* This for Slot 2 */ - hydra_sg_slot2: hydra-sg-slot2 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-val = <0x28>; - fsl,hydra-mdio-mux-mask = <0x70>; - status = "disabled"; - - phy_sgmii_slot2_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_slot2_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_slot2_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_slot2_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - /* This for Slot 3 */ - hydra_sg_slot3: hydra-sg-slot3 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-val = <0x68>; - fsl,hydra-mdio-mux-mask = <0x70>; - status = "disabled"; - - phy_sgmii_slot3_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_slot3_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_slot3_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_slot3_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - /* This for Slot 5 */ - hydra_sg_slot5: hydra-sg-slot5 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-val = <0x38>; - fsl,hydra-mdio-mux-mask = <0x70>; - status = "disabled"; - - phy_sgmii_slot5_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_slot5_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_slot5_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_slot5_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - /* This for Slot 6 */ - hydra_sg_slot6: hydra-sg-slot6 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,hydra-mdio-mux-val = <0x48>; - fsl,hydra-mdio-mux-mask = <0x70>; - status = "disabled"; - - phy_sgmii_slot6_1c: ethernet-phy@1c { - reg = <0x1c>; - }; - phy_sgmii_slot6_1d: ethernet-phy@1d { - reg = <0x1d>; - }; - phy_sgmii_slot6_1e: ethernet-phy@1e { - reg = <0x1e>; - }; - phy_sgmii_slot6_1f: ethernet-phy@1f { - reg = <0x1f>; - }; - }; }; fm1dtsec2: ethernet@e2000 { @@ -346,44 +224,7 @@ phy-connection-type = "xgmii"; }; - /* - * We only support one XAUI card, so the MDIO muxing - * is set by U-Boot, and Linux never touches it. - * Therefore, we don't need a virtual MDIO node. - * However, the phy address depends on the slot, so - * only one of the ethernet-phy nodes below will be - * used. - */ xmdio0: mdio@f1000 { - /* FM2 10GEC1 is always on slot 1 */ - hydra_xg_slot1: hydra-xg-slot1 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-xmdio"; - fsl,mdio-handle = <&xmdio0>; - fsl,hydra-mdio-mux-val = <0x00>; - fsl,hydra-mdio-mux-mask = <0x06>; - status = "disabled"; - - phy_xgmii_slot_1: ethernet-phy@0 { - reg = <4>; - }; - }; - - /* FM1 10GEC1 is always on slot 2 */ - hydra_xg_slot2: hydra-xg-slot2 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,hydra-xmdio"; - fsl,mdio-handle = <&xmdio0>; - fsl,hydra-mdio-mux-val = <0x02>; - fsl,hydra-mdio-mux-mask = <0x06>; - status = "disabled"; - - phy_xgmii_slot_2: ethernet-phy@4 { - reg = <0>; - }; - }; }; }; diff --git a/arch/powerpc/boot/dts/t4240qds.dts b/arch/powerpc/boot/dts/t4240qds.dts index 7e90089..1e6abdf 100644 --- a/arch/powerpc/boot/dts/t4240qds.dts +++ b/arch/powerpc/boot/dts/t4240qds.dts @@ -69,11 +69,6 @@ emi1_slot2 = &t4240mdio2; emi1_slot3 = &t4240mdio3; emi1_slot4 = &t4240mdio4; - emi2_xauislot1 = &t4240xmdio1; - emi2_xauislot2 = &t4240xmdio2; - emi2_xauislot3 = &t4240xmdio3; - emi2_xauislot4 = &t4240xmdio4; - emi2_xfislot3 = &t4240xmdio3_xfi; }; ifc: localbus@ffe124000 { @@ -461,157 +456,6 @@ }; mdio0: mdio@fc000 { - /* For 10g interfaces */ - t4240mdio0: mdio_onboard { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,tetra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,mdio-muxval = <0>; - - phyrgmii1: ethernet-phy@1 { /* FM2.5 */ - reg = <0x1>; - }; - phyrgmii2: ethernet-phy@2 { /* FM1.5 */ - reg = <0x2>; - }; - }; - - t4240mdio1: mdio-slot1 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,tetra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,mdio-muxval = <1>; - status = "disabled"; - - phy1: ethernet-phy@0 { - reg = <0x0>; - }; - phy2: ethernet-phy@1 { - reg = <0x1>; - }; - phy3: ethernet-phy@2 { - reg = <0x2>; - }; - phy4: ethernet-phy@3 { - reg = <0x3>; - }; - sgmiiphy11: ethernet-phy@1c { - reg = <0x1c>; - }; - sgmiiphy12: ethernet-phy@1d { - reg = <0x1d>; - }; - sgmiiphy13: ethernet-phy@1e { - reg = <0x1e>; - }; - sgmiiphy14: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - t4240mdio2: mdio-slot2 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,tetra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,mdio-muxval = <2>; - status = "disabled"; - - phy5: ethernet-phy@4 { - reg = <0x4>; - }; - phy6: ethernet-phy@5 { - reg = <0x5>; - }; - phy7: ethernet-phy@6 { - reg = <0x6>; - }; - phy8: ethernet-phy@7 { - reg = <0x7>; - }; - sgmiiphy21: ethernet-phy@1c { - reg = <0x1c>; - }; - sgmiiphy22: ethernet-phy@1d { - reg = <0x1d>; - }; - sgmiiphy23: ethernet-phy@1e { - reg = <0x1e>; - }; - sgmiiphy24: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - t4240mdio3: mdio-slot3 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,tetra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,mdio-muxval = <3>; - status = "disabled"; - - phy9: ethernet-phy@8 { - reg = <0x8>; - }; - phy10: ethernet-phy@9 { - reg = <0x9>; - }; - phy11: ethernet-phy@a { - reg = <0xa>; - }; - phy12: ethernet-phy@b { - reg = <0xb>; - }; - sgmiiphy31: ethernet-phy@1c { - reg = <0x1c>; - }; - sgmiiphy32: ethernet-phy@1d { - reg = <0x1d>; - }; - sgmiiphy33: ethernet-phy@1e { - reg = <0x1e>; - }; - sgmiiphy34: ethernet-phy@1f { - reg = <0x1f>; - }; - }; - - t4240mdio4: mdio-slot4 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,tetra-mdio"; - fsl,mdio-handle = <&mdio0>; - fsl,mdio-muxval = <4>; - status = "disabled"; - - phy13: ethernet-phy@c { - reg = <0xc>; - }; - phy14: ethernet-phy@d { - reg = <0xd>; - }; - phy15: ethernet-phy@e { - reg = <0xe>; - }; - phy16: ethernet-phy@f { - reg = <0xf>; - }; - sgmiiphy41: ethernet-phy@1c { - reg = <0x1c>; - }; - sgmiiphy42: ethernet-phy@1d { - reg = <0x1d>; - }; - sgmiiphy43: ethernet-phy@1e { - reg = <0x1e>; - }; - sgmiiphy44: ethernet-phy@1f { - reg = <0x1f>; - }; - }; }; xmdio0: mdio@fd000 { diff --git a/arch/powerpc/configs/85xx/p1023rds_chk_defconfig b/arch/powerpc/configs/85xx/p1023rds_chk_defconfig deleted file mode 100644 index 9521e16..0000000 --- a/arch/powerpc/configs/85xx/p1023rds_chk_defconfig +++ /dev/null @@ -1,211 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_PHYS_64BIT=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -CONFIG_PERF_EVENTS=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_MPC8540_ADS=y -CONFIG_MPC8560_ADS=y -CONFIG_MPC85xx_CDS=y -CONFIG_MPC85xx_MDS=y -CONFIG_MPC8536_DS=y -CONFIG_MPC85xx_DS=y -CONFIG_MPC85xx_RDB=y -CONFIG_P1023_RDS=y -CONFIG_SOCRATES=y -CONFIG_KSI8560=y -CONFIG_XES_MPC85xx=y -CONFIG_STX_GP3=y -CONFIG_TQM8540=y -CONFIG_TQM8541=y -CONFIG_TQM8548=y -CONFIG_TQM8555=y -CONFIG_TQM8560=y -CONFIG_SBC8548=y -CONFIG_QUICC_ENGINE=y -CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y -CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_LL=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_BINFMT_MISC=m -CONFIG_MATH_EMULATION=y -CONFIG_HAS_FSL_QBMAN=y -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCIEAER is not set -# CONFIG_PCIEASPM is not set -CONFIG_PCI_MSI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IP_SCTP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_MISC_DEVICES=y -CONFIG_EEPROM_LEGACY=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_FS_ENET=y -CONFIG_E1000E=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_DPA=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_QE=m -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_CPM=m -CONFIG_I2C_MPC=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_SUPPORT_OLD_API is not set -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -# CONFIG_NET_DMA is not set -CONFIG_STAGING=y -CONFIG_FMAN_P1023=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_ADFS_FS=m -CONFIG_AFFS_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_CRAMFS=y -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_CRC_T10DIF=y -CONFIG_PRINTK_TIME=y -CONFIG_FRAME_WARN=8092 -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SPARSE_RCU_POINTER=y -CONFIG_DEBUG_LOCKDEP=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -CONFIG_DEBUG_PER_CPU_MAPS=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_FUNCTION_TRACER=y -CONFIG_DMA_API_DEBUG=y -CONFIG_DEBUG_STACKOVERFLOW=y -CONFIG_VIRQ_DEBUG=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_FSL_CAAM=y diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig index 2ed1636..b80bcc6 100644 --- a/arch/powerpc/configs/85xx/p1023rds_defconfig +++ b/arch/powerpc/configs/85xx/p1023rds_defconfig @@ -1,5 +1,4 @@ CONFIG_PPC_85xx=y -CONFIG_PHYS_64BIT=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_EXPERIMENTAL=y @@ -7,48 +6,31 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y -CONFIG_PERF_EVENTS=y -CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_MPC8540_ADS=y -CONFIG_MPC8560_ADS=y -CONFIG_MPC85xx_CDS=y -CONFIG_MPC85xx_MDS=y -CONFIG_MPC8536_DS=y -CONFIG_MPC85xx_DS=y -CONFIG_MPC85xx_RDB=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y CONFIG_P1023_RDS=y -CONFIG_SOCRATES=y -CONFIG_KSI8560=y -CONFIG_XES_MPC85xx=y -CONFIG_STX_GP3=y -CONFIG_TQM8540=y -CONFIG_TQM8541=y -CONFIG_TQM8548=y -CONFIG_TQM8555=y -CONFIG_TQM8560=y -CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_CPM2=y CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y -CONFIG_HAS_FSL_QBMAN=y +CONFIG_SWIOTLB=y CONFIG_PCI=y CONFIG_PCIEPORTBUS=y # CONFIG_PCIEAER is not set @@ -85,7 +67,6 @@ CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_MISC_DEVICES=y CONFIG_EEPROM_LEGACY=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y @@ -98,16 +79,14 @@ CONFIG_SATA_FSL=y CONFIG_SATA_SIL24=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y +CONFIG_FS_ENET=y +CONFIG_FSL_PQ_MDIO=y +CONFIG_E1000E=y CONFIG_MARVELL_PHY=y CONFIG_DAVICOM_PHY=y CONFIG_CICADA_PHY=y CONFIG_VITESSE_PHY=y CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_FS_ENET=y -CONFIG_E1000E=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_DPA=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set @@ -117,7 +96,6 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y @@ -126,6 +104,7 @@ CONFIG_NVRAM=y CONFIG_I2C=y CONFIG_I2C_CPM=m CONFIG_I2C_MPC=y +CONFIG_GPIO_MPC8XXX=y # CONFIG_HWMON is not set CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_SOUND=y @@ -147,7 +126,6 @@ CONFIG_DMADEVICES=y CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set CONFIG_STAGING=y -CONFIG_FMAN_P1023=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set @@ -160,7 +138,6 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y CONFIG_ADFS_FS=m CONFIG_AFFS_FS=m CONFIG_HFS_FS=m @@ -175,25 +152,18 @@ CONFIG_QNX4FS_FS=m CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y CONFIG_CRC_T10DIF=y CONFIG_FRAME_WARN=8092 CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_VIRQ_DEBUG=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_FMAN_RESOURCE_ALLOCATION_ALGORITHM=y diff --git a/arch/powerpc/configs/corenet32_smp_chk_defconfig b/arch/powerpc/configs/corenet32_smp_chk_defconfig deleted file mode 100644 index 9f3a512..0000000 --- a/arch/powerpc/configs/corenet32_smp_chk_defconfig +++ /dev/null @@ -1,224 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_RCU_TRACE=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -CONFIG_PERF_EVENTS=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_P2041_RDB=y -CONFIG_P3041_DS=y -CONFIG_P3060_QDS=y -CONFIG_P4080_DS=y -CONFIG_P5020_DS=y -CONFIG_P5040_DS=y -CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_LL=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_BINFMT_MISC=m -CONFIG_KEXEC=y -CONFIG_IRQ_ALL_CPUS=y -CONFIG_FORCE_MAX_ZONEORDER=13 -CONFIG_FSL_LBC=y -CONFIG_FSL_PAMU=y -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCIEASPM is not set -CONFIG_PCI_MSI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_STATISTICS=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IP_SCTP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=262144 -CONFIG_MISC_DEVICES=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_SATA_SIL=y -CONFIG_PATA_SIL680=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -# CONFIG_MD_AUTODETECT is not set -CONFIG_MD_RAID456=y -CONFIG_MULTICORE_RAID456=y -CONFIG_NETDEVICES=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_E1000=y -CONFIG_E1000E=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_DPA=y -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_PPC_EPAPR_HV_BYTECHAN=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_FSL_ESPI=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_USB_HID=m -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PPC_OF_BE=y -CONFIG_USB_OHCI_HCD_PPC_OF_LE=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_EDAC_MPC85XX=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_DS3232=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_RAID=y -CONFIG_ASYNC_TX_DMA=y -CONFIG_UIO=y -CONFIG_UIO_FSL_SRIO=y -CONFIG_UIO_FSL_DMA=y -CONFIG_STAGING=y -CONFIG_VIRT_DRIVERS=y -CONFIG_FSL_HV_MANAGER=y -CONFIG_FMAN_RESOURCE_ALLOCATION_ALGORITHM=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=m -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_SLAB=y -CONFIG_DEBUG_SLAB_LEAK=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SPARSE_RCU_POINTER=y -CONFIG_DEBUG_LOCKDEP=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -CONFIG_DEBUG_PER_CPU_MAPS=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_FUNCTION_TRACER=y -CONFIG_DMA_API_DEBUG=y -CONFIG_DEBUG_STACKOVERFLOW=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_FSL_PME2=y diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index b43d4b6..60027c2 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig @@ -6,8 +6,8 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 @@ -21,25 +21,24 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y CONFIG_P2041_RDB=y CONFIG_P3041_DS=y CONFIG_P4080_DS=y CONFIG_P5020_DS=y CONFIG_P5040_DS=y CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m CONFIG_KEXEC=y -CONFIG_IRQ_ALL_CPUS=y CONFIG_FORCE_MAX_ZONEORDER=13 -CONFIG_FSL_LBC=y -CONFIG_FSL_PAMU=y CONFIG_PCI=y CONFIG_PCIEPORTBUS=y # CONFIG_PCIEASPM is not set CONFIG_PCI_MSI=y +CONFIG_RAPIDIO=y +CONFIG_FSL_RIO=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -79,11 +78,13 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_FSL_ELBC=y +CONFIG_MTD_NAND_FSL_IFC=y CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=262144 -CONFIG_MISC_DEVICES=y +CONFIG_BLK_DEV_RAM_SIZE=131072 CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y CONFIG_BLK_DEV_SR=y @@ -97,18 +98,12 @@ CONFIG_SATA_FSL=y CONFIG_SATA_SIL24=y CONFIG_SATA_SIL=y CONFIG_PATA_SIL680=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -# CONFIG_MD_AUTODETECT is not set -CONFIG_MD_RAID456=y -CONFIG_MULTICORE_RAID456=y CONFIG_NETDEVICES=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y +CONFIG_FSL_PQ_MDIO=y CONFIG_E1000=y CONFIG_E1000E=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_DPA=y +CONFIG_VITESSE_PHY=y +CONFIG_FIXED_PHY=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set @@ -117,12 +112,12 @@ CONFIG_SERIO_LIBPS2=y CONFIG_PPC_EPAPR_HV_BYTECHAN=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_NVRAM=y CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y CONFIG_I2C_MPC=y CONFIG_SPI=y CONFIG_SPI_GPIO=y @@ -132,7 +127,6 @@ CONFIG_SPI_FSL_ESPI=y CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_USB_HID=m CONFIG_USB=y -CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y @@ -142,25 +136,16 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_MPC85XX=y CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_DS3232=y CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_RAID=y -CONFIG_ASYNC_TX_DMA=y CONFIG_UIO=y -CONFIG_UIO_FSL_SRIO=y -CONFIG_UIO_FSL_DMA=y CONFIG_STAGING=y CONFIG_VIRT_DRIVERS=y CONFIG_FSL_HV_MANAGER=y -CONFIG_FMAN_RESOURCE_ALLOCATION_ALGORITHM=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set @@ -177,20 +162,16 @@ CONFIG_HUGETLBFS=y CONFIG_JFFS2_FS=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_SHIRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_RCU_TRACE=y CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_MD4=y @@ -199,4 +180,3 @@ CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_FSL_PME2=y diff --git a/arch/powerpc/configs/corenet64_smp_chk_defconfig b/arch/powerpc/configs/corenet64_smp_chk_defconfig deleted file mode 100644 index 34582cf..0000000 --- a/arch/powerpc/configs/corenet64_smp_chk_defconfig +++ /dev/null @@ -1,207 +0,0 @@ -CONFIG_PPC64=y -CONFIG_PPC_BOOK3E_64=y -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_RCU_TRACE=y -CONFIG_RCU_FANOUT=32 -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -CONFIG_PERF_EVENTS=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_P5020_DS=y -CONFIG_P5040_DS=y -# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_BINFMT_MISC=m -CONFIG_IRQ_ALL_CPUS=y -CONFIG_FSL_LBC=y -CONFIG_FSL_PAMU=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_MSI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_STATISTICS=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IP_SCTP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=262144 -CONFIG_MISC_DEVICES=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SPI_ATTRS=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -# CONFIG_MD_AUTODETECT is not set -CONFIG_MD_RAID456=y -CONFIG_MULTICORE_RAID456=y -CONFIG_NETDEVICES=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_E1000E=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_DPA=y -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_PPC_EPAPR_HV_BYTECHAN=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_I2C=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_FSL_ESPI=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_USB_HID=m -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS3232=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_RAID=y -CONFIG_ASYNC_TX_DMA=y -CONFIG_UIO=y -CONFIG_UIO_FSL_SRIO=y -CONFIG_UIO_FSL_DMA=y -CONFIG_STAGING=y -CONFIG_VIRT_DRIVERS=y -CONFIG_FSL_HV_MANAGER=y -CONFIG_FMAN_RESOURCE_ALLOCATION_ALGORITHM=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=m -CONFIG_PRINTK_TIME=y -CONFIG_FRAME_WARN=1024 -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_SLAB=y -CONFIG_DEBUG_SLAB_LEAK=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SPARSE_RCU_POINTER=y -CONFIG_DEBUG_LOCKDEP=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -CONFIG_DEBUG_PER_CPU_MAPS=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_FUNCTION_TRACER=y -CONFIG_DMA_API_DEBUG=y -CONFIG_DEBUG_STACKOVERFLOW=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_FSL_PME2=y diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index 6c56d1e..1c6eb66 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig @@ -1,49 +1,41 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3E_64=y +CONFIG_ALTIVEC=y CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_EXPERIMENTAL=y +CONFIG_NR_CPUS=24 CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_RCU_TRACE=y -CONFIG_RCU_FANOUT=32 CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y +CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y -CONFIG_EMBEDDED=y -CONFIG_PERF_EVENTS=y -CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y CONFIG_P5020_DS=y CONFIG_P5040_DS=y +CONFIG_T4240_QDS=y # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m CONFIG_FSL_IFC=y -CONFIG_IRQ_ALL_CPUS=y -CONFIG_FSL_LBC=y -CONFIG_FSL_PAMU=y CONFIG_PCIEPORTBUS=y CONFIG_PCI_MSI=y +CONFIG_RAPIDIO=y +CONFIG_FSL_RIO=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_XFRM_USER=y -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_STATISTICS=y CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -59,9 +51,8 @@ CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_ARPD=y -CONFIG_INET_AH=y CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set CONFIG_IPV6=y CONFIG_IP_SCTP=m @@ -98,42 +89,26 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=262144 -CONFIG_MISC_DEVICES=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SPI_ATTRS=y +CONFIG_BLK_DEV_RAM_SIZE=131072 +CONFIG_EEPROM_LEGACY=y CONFIG_ATA=y CONFIG_SATA_FSL=y CONFIG_SATA_SIL24=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -# CONFIG_MD_AUTODETECT is not set -CONFIG_MD_RAID456=y -CONFIG_MULTICORE_RAID456=y CONFIG_NETDEVICES=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y +CONFIG_DUMMY=y CONFIG_E1000E=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_DPA=y +CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_SERIO_LIBPS2=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_PPC_EPAPR_HV_BYTECHAN=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y CONFIG_I2C_MPC=y CONFIG_SPI=y CONFIG_SPI_GPIO=y @@ -143,33 +118,18 @@ CONFIG_SPI_FSL_ESPI=y CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_USB_HID=m CONFIG_USB=y -CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS3232=y -CONFIG_RTC_DRV_CMOS=y CONFIG_DMADEVICES=y -CONFIG_FSL_RAID=y -CONFIG_ASYNC_TX_DMA=y -CONFIG_UIO=y -CONFIG_UIO_FSL_SRIO=y -CONFIG_UIO_FSL_DMA=y -CONFIG_STAGING=y -CONFIG_VIRT_DRIVERS=y -CONFIG_FSL_HV_MANAGER=y -CONFIG_FMAN_RESOURCE_ALLOCATION_ALGORITHM=y +CONFIG_FSL_DMA=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y @@ -190,14 +150,10 @@ CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_XATTR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y -CONFIG_CRAMFS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_CRC_T10DIF=y @@ -209,17 +165,14 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_FS=y CONFIG_DEBUG_SHIRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_FSL_PME2=y diff --git a/arch/powerpc/configs/mpc83xx_chk_defconfig b/arch/powerpc/configs/mpc83xx_chk_defconfig deleted file mode 100644 index c0f02fe..0000000 --- a/arch/powerpc/configs/mpc83xx_chk_defconfig +++ /dev/null @@ -1,155 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_SPARSE_IRQ=y -CONFIG_TINY_RCU=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_PPC_CHRP is not set -# CONFIG_PPC_PMAC is not set -CONFIG_PPC_83xx=y -CONFIG_MPC831x_RDB=y -CONFIG_MPC832x_MDS=y -CONFIG_MPC832x_RDB=y -CONFIG_MPC834x_MDS=y -CONFIG_MPC834x_ITX=y -CONFIG_MPC836x_MDS=y -CONFIG_MPC836x_RDK=y -CONFIG_MPC837x_MDS=y -CONFIG_MPC837x_RDB=y -CONFIG_SBC834x=y -CONFIG_ASP834x=y -CONFIG_QUICC_ENGINE=y -CONFIG_QE_GPIO=y -CONFIG_PREEMPT_LL=y -CONFIG_MATH_EMULATION=y -CONFIG_PCI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -CONFIG_INET_ESP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=32768 -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_ICPLUS_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_GIANFAR=y -CONFIG_UCC_GETH=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MPC=y -CONFIG_WATCHDOG=y -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GYRATION=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_DS1374=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_CRC_T10DIF=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_SLAB=y -CONFIG_DEBUG_SLAB_LEAK=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SPARSE_RCU_POINTER=y -CONFIG_DEBUG_LOCKDEP=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_PAGEALLOC=y -# CONFIG_FTRACE is not set -CONFIG_DMA_API_DEBUG=y -CONFIG_DEBUG_STACKOVERFLOW=y -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 1357282..09116c6 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig @@ -1,6 +1,5 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y -CONFIG_SPARSE_IRQ=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y @@ -8,6 +7,7 @@ CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y # CONFIG_PPC_CHRP is not set # CONFIG_PPC_PMAC is not set CONFIG_PPC_83xx=y @@ -50,7 +50,6 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y @@ -63,14 +62,13 @@ CONFIG_SATA_FSL=y CONFIG_SATA_SIL=y CONFIG_NETDEVICES=y CONFIG_MII=y +CONFIG_UCC_GETH=y +CONFIG_GIANFAR=y CONFIG_MARVELL_PHY=y CONFIG_DAVICOM_PHY=y CONFIG_VITESSE_PHY=y CONFIG_ICPLUS_PHY=y CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_GIANFAR=y -CONFIG_UCC_GETH=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set @@ -113,12 +111,9 @@ CONFIG_EXT3_FS=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y CONFIG_CRC_T10DIF=y -CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y diff --git a/arch/powerpc/configs/mpc85xx_chk_defconfig b/arch/powerpc/configs/mpc85xx_chk_defconfig deleted file mode 100644 index 37c0c7f..0000000 --- a/arch/powerpc/configs/mpc85xx_chk_defconfig +++ /dev/null @@ -1,265 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_TINY_RCU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_MPC8540_ADS=y -CONFIG_MPC8560_ADS=y -CONFIG_MPC85xx_CDS=y -CONFIG_MPC85xx_MDS=y -CONFIG_MPC8536_DS=y -CONFIG_MPC85xx_DS=y -CONFIG_MPC85xx_RDB=y -CONFIG_P1010_RDB=y -CONFIG_P1022_DS=y -CONFIG_P1023_RDS=y -CONFIG_SOCRATES=y -CONFIG_KSI8560=y -CONFIG_XES_MPC85xx=y -CONFIG_STX_GP3=y -CONFIG_TQM8540=y -CONFIG_TQM8541=y -CONFIG_TQM8548=y -CONFIG_TQM8555=y -CONFIG_TQM8560=y -CONFIG_SBC8548=y -CONFIG_QUICC_ENGINE=y -CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y -CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_LL=y -CONFIG_BINFMT_MISC=m -CONFIG_MATH_EMULATION=y -CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_RAPIDIO=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IP_SCTP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_MTD_UBI=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_MISC_DEVICES=y -CONFIG_EEPROM_LEGACY=y -CONFIG_IDE=y -CONFIG_BLK_DEV_VIA82CXXX=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_PATA_ALI=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_FS_ENET=y -CONFIG_GIANFAR=y -CONFIG_GIANFAR_L2SRAM=y -CONFIG_UCC_GETH=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_QE=m -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_CPM=m -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_FSL_ESPI=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_FSL_DIU=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_INTEL8X0=y -# CONFIG_SND_PPC is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GYRATION=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PPC_OF_BE=y -CONFIG_USB_OHCI_HCD_PPC_OF_LE=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -# CONFIG_NET_DMA is not set -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_ADFS_FS=m -CONFIG_AFFS_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y -CONFIG_CRAMFS=y -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_CRC_T10DIF=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SPARSE_RCU_POINTER=y -CONFIG_DEBUG_LOCKDEP=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_FUNCTION_TRACER=y -CONFIG_DMA_API_DEBUG=y -CONFIG_DEBUG_STACKOVERFLOW=y -CONFIG_VIRQ_DEBUG=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 307ccf6..37812b4 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -1,6 +1,5 @@ CONFIG_PPC_85xx=y CONFIG_PHYS_64BIT=y -CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_AUDIT=y @@ -8,7 +7,6 @@ CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_SPARSE_IRQ=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 @@ -20,6 +18,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y CONFIG_MPC8540_ADS=y CONFIG_MPC8560_ADS=y CONFIG_MPC85xx_CDS=y @@ -29,6 +29,7 @@ CONFIG_MPC85xx_DS=y CONFIG_MPC85xx_RDB=y CONFIG_P1010_RDB=y CONFIG_P1022_DS=y +CONFIG_P1022_RDK=y CONFIG_P1023_RDS=y CONFIG_SOCRATES=y CONFIG_KSI8560=y @@ -42,10 +43,7 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y CONFIG_FORCE_MAX_ZONEORDER=12 @@ -113,10 +111,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_MISC_DEVICES=y CONFIG_EEPROM_LEGACY=y -CONFIG_IDE=y -CONFIG_BLK_DEV_VIA82CXXX=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y CONFIG_BLK_DEV_SR=y @@ -126,8 +121,8 @@ CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y CONFIG_PATA_ALI=y +CONFIG_PATA_VIA=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_FS_ENET=y @@ -141,11 +136,6 @@ CONFIG_DAVICOM_PHY=y CONFIG_CICADA_PHY=y CONFIG_VITESSE_PHY=y CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_FS_ENET=y -CONFIG_GIANFAR=y -CONFIG_GIANFAR_L2SRAM=y -CONFIG_UCC_GETH=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set @@ -155,19 +145,18 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_QE=m CONFIG_NVRAM=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C=y CONFIG_I2C_CPM=m CONFIG_I2C_MPC=y CONFIG_SPI=y CONFIG_SPI_FSL_SPI=y CONFIG_SPI_FSL_ESPI=y +CONFIG_GPIO_MPC8XXX=y # CONFIG_HWMON is not set CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y @@ -185,6 +174,7 @@ CONFIG_SND_INTEL8X0=y # CONFIG_SND_PPC is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y +CONFIG_SND_POWERPC_SOC=y CONFIG_HID_A4TECH=y CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y @@ -202,7 +192,6 @@ CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_HID_SUNPLUS=y CONFIG_USB=y -CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y @@ -212,7 +201,7 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y @@ -250,10 +239,6 @@ CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y CONFIG_CRAMFS=y CONFIG_VXFS_FS=m CONFIG_HPFS_FS=m @@ -261,12 +246,9 @@ CONFIG_QNX4FS_FS=m CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y CONFIG_CRC_T10DIF=y CONFIG_CRC16=y CONFIG_ZLIB_DEFLATE=y @@ -275,13 +257,11 @@ CONFIG_LZO_DECOMPRESS=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_VIRQ_DEBUG=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_chk_defconfig b/arch/powerpc/configs/mpc85xx_smp_chk_defconfig deleted file mode 100644 index c4737fc..0000000 --- a/arch/powerpc/configs/mpc85xx_smp_chk_defconfig +++ /dev/null @@ -1,265 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_MPC8540_ADS=y -CONFIG_MPC8560_ADS=y -CONFIG_MPC85xx_CDS=y -CONFIG_MPC85xx_MDS=y -CONFIG_MPC8536_DS=y -CONFIG_MPC85xx_DS=y -CONFIG_MPC85xx_RDB=y -CONFIG_P1022_DS=y -CONFIG_P1023_RDS=y -CONFIG_SOCRATES=y -CONFIG_KSI8560=y -CONFIG_XES_MPC85xx=y -CONFIG_STX_GP3=y -CONFIG_TQM8540=y -CONFIG_TQM8541=y -CONFIG_TQM8548=y -CONFIG_TQM8555=y -CONFIG_TQM8560=y -CONFIG_SBC8548=y -CONFIG_QUICC_ENGINE=y -CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y -CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_LL=y -CONFIG_BINFMT_MISC=m -CONFIG_MATH_EMULATION=y -CONFIG_IRQ_ALL_CPUS=y -CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_RAPIDIO=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IP_SCTP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_MTD_UBI=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_MISC_DEVICES=y -CONFIG_EEPROM_LEGACY=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_PATA_ALI=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_FS_ENET=y -CONFIG_GIANFAR=y -CONFIG_GIANFAR_L2SRAM=y -CONFIG_UCC_GETH=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_QE=m -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_CPM=m -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_FSL_ESPI=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_FSL_DIU=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_INTEL8X0=y -# CONFIG_SND_PPC is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GYRATION=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PPC_OF_BE=y -CONFIG_USB_OHCI_HCD_PPC_OF_LE=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -# CONFIG_NET_DMA is not set -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_ADFS_FS=m -CONFIG_AFFS_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y -CONFIG_CRAMFS=y -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_CRC_T10DIF=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SPARSE_RCU_POINTER=y -CONFIG_DEBUG_LOCKDEP=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -CONFIG_DEBUG_PER_CPU_MAPS=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_FUNCTION_TRACER=y -CONFIG_DMA_API_DEBUG=y -CONFIG_DEBUG_STACKOVERFLOW=y -CONFIG_VIRQ_DEBUG=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index a3c124a..7fc3e6f 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC_85xx=y +CONFIG_PHYS_64BIT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_EXPERIMENTAL=y @@ -6,7 +7,9 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 @@ -18,6 +21,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y CONFIG_MPC8540_ADS=y CONFIG_MPC8560_ADS=y CONFIG_MPC85xx_CDS=y @@ -25,7 +30,9 @@ CONFIG_MPC85xx_MDS=y CONFIG_MPC8536_DS=y CONFIG_MPC85xx_DS=y CONFIG_MPC85xx_RDB=y +CONFIG_P1010_RDB=y CONFIG_P1022_DS=y +CONFIG_P1022_RDK=y CONFIG_P1023_RDS=y CONFIG_SOCRATES=y CONFIG_KSI8560=y @@ -39,13 +46,9 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y CONFIG_HIGHMEM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y -CONFIG_IRQ_ALL_CPUS=y CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_FSL_IFC=y CONFIG_PCI=y @@ -111,7 +114,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_MISC_DEVICES=y CONFIG_EEPROM_LEGACY=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y @@ -122,20 +124,17 @@ CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y CONFIG_PATA_ALI=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y +CONFIG_FS_ENET=y +CONFIG_UCC_GETH=y +CONFIG_GIANFAR=y CONFIG_MARVELL_PHY=y CONFIG_DAVICOM_PHY=y CONFIG_CICADA_PHY=y CONFIG_VITESSE_PHY=y CONFIG_FIXED_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_FS_ENET=y -CONFIG_GIANFAR=y -CONFIG_GIANFAR_L2SRAM=y -CONFIG_UCC_GETH=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set @@ -145,18 +144,19 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_QE=m CONFIG_NVRAM=y CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y CONFIG_I2C_CPM=m CONFIG_I2C_MPC=y CONFIG_SPI=y CONFIG_SPI_FSL_SPI=y CONFIG_SPI_FSL_ESPI=y +CONFIG_GPIO_MPC8XXX=y # CONFIG_HWMON is not set CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y @@ -174,6 +174,7 @@ CONFIG_SND_INTEL8X0=y # CONFIG_SND_PPC is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y +CONFIG_SND_POWERPC_SOC=y CONFIG_HID_A4TECH=y CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y @@ -191,7 +192,6 @@ CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_HID_SUNPLUS=y CONFIG_USB=y -CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y @@ -201,7 +201,7 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y @@ -239,10 +239,6 @@ CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y CONFIG_CRAMFS=y CONFIG_VXFS_FS=m CONFIG_HPFS_FS=m @@ -250,12 +246,9 @@ CONFIG_QNX4FS_FS=m CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y CONFIG_CRC_T10DIF=y CONFIG_CRC16=y CONFIG_ZLIB_DEFLATE=y @@ -264,14 +257,12 @@ CONFIG_LZO_DECOMPRESS=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_VIRQ_DEBUG=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_TALITOS=y |