aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/powerpc/booting-without-of.txt177
-rw-r--r--arch/powerpc/boot/Makefile5
-rw-r--r--arch/powerpc/boot/cuboot-85xx-cpm2.c66
-rw-r--r--arch/powerpc/boot/dts/mpc8313erdb.dts156
-rw-r--r--arch/powerpc/boot/dts/mpc8315erdb.dts287
-rw-r--r--arch/powerpc/boot/dts/mpc832x_mds.dts270
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts177
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitx.dts159
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitxgp.dts113
-rw-r--r--arch/powerpc/boot/dts/mpc834x_mds.dts260
-rw-r--r--arch/powerpc/boot/dts/mpc836x_mds.dts287
-rw-r--r--arch/powerpc/boot/dts/mpc8377_mds.dts141
-rw-r--r--arch/powerpc/boot/dts/mpc8377_rdb.dts296
-rw-r--r--arch/powerpc/boot/dts/mpc8378_mds.dts133
-rw-r--r--arch/powerpc/boot/dts/mpc8378_rdb.dts282
-rw-r--r--arch/powerpc/boot/dts/mpc8379_mds.dts149
-rw-r--r--arch/powerpc/boot/dts/mpc8379_rdb.dts310
-rw-r--r--arch/powerpc/boot/dts/mpc8568mds.dts24
-rw-r--r--arch/powerpc/boot/dts/mpc8610_hpcd.dts227
-rw-r--r--arch/powerpc/boot/dts/mpc8641_hpcn.dts333
-rw-r--r--arch/powerpc/boot/dts/sbc8349.dts244
-rw-r--r--arch/powerpc/boot/dts/sbc8548.dts244
-rw-r--r--arch/powerpc/boot/dts/sbc8560.dts330
-rw-r--r--arch/powerpc/boot/dts/storcenter.dts73
-rw-r--r--arch/powerpc/boot/dts/stx_gp3_8560.dts228
-rw-r--r--arch/powerpc/boot/dts/tqm8540.dts204
-rw-r--r--arch/powerpc/boot/dts/tqm8541.dts228
-rw-r--r--arch/powerpc/boot/dts/tqm8555.dts228
-rw-r--r--arch/powerpc/boot/dts/tqm8560.dts245
-rw-r--r--arch/powerpc/boot/libfdt-wrapper.c9
-rw-r--r--arch/powerpc/boot/ops.h11
-rw-r--r--arch/powerpc/configs/mpc8313_rdb_defconfig2
-rw-r--r--arch/powerpc/configs/mpc8315_rdb_defconfig1417
-rw-r--r--arch/powerpc/configs/mpc837x_rdb_defconfig887
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig887
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig1523
-rw-r--r--arch/powerpc/configs/sbc834x_defconfig800
-rw-r--r--arch/powerpc/configs/sbc8548_defconfig (renamed from arch/ppc/configs/mpc834x_sys_defconfig)715
-rw-r--r--arch/powerpc/configs/sbc8560_defconfig764
-rw-r--r--arch/powerpc/configs/stx_gp3_defconfig (renamed from arch/ppc/configs/stx_gp3_defconfig)990
-rw-r--r--arch/powerpc/configs/tqm8540_defconfig (renamed from arch/ppc/configs/TQM8540_defconfig)587
-rw-r--r--arch/powerpc/configs/tqm8541_defconfig (renamed from arch/ppc/configs/TQM8541_defconfig)608
-rw-r--r--arch/powerpc/configs/tqm8555_defconfig (renamed from arch/ppc/configs/TQM8555_defconfig)605
-rw-r--r--arch/powerpc/configs/tqm8560_defconfig (renamed from arch/ppc/configs/TQM8560_defconfig)598
-rw-r--r--arch/powerpc/kernel/legacy_serial.c45
-rw-r--r--arch/powerpc/kernel/misc_32.S10
-rw-r--r--arch/powerpc/platforms/82xx/mpc8272_ads.c5
-rw-r--r--arch/powerpc/platforms/82xx/pq2fads.c5
-rw-r--r--arch/powerpc/platforms/83xx/Kconfig62
-rw-r--r--arch/powerpc/platforms/83xx/Makefile4
-rw-r--r--arch/powerpc/platforms/83xx/mpc831x_rdb.c (renamed from arch/powerpc/platforms/83xx/mpc8313_rdb.c)38
-rw-r--r--arch/powerpc/platforms/83xx/mpc832x_mds.c11
-rw-r--r--arch/powerpc/platforms/83xx/mpc832x_rdb.c11
-rw-r--r--arch/powerpc/platforms/83xx/mpc836x_mds.c11
-rw-r--r--arch/powerpc/platforms/83xx/mpc837x_rdb.c99
-rw-r--r--arch/powerpc/platforms/83xx/sbc834x.c115
-rw-r--r--arch/powerpc/platforms/83xx/usb.c4
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig87
-rw-r--r--arch/powerpc/platforms/85xx/Makefile4
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_mds.c32
-rw-r--r--arch/powerpc/platforms/85xx/sbc8548.c167
-rw-r--r--arch/powerpc/platforms/85xx/sbc8560.c283
-rw-r--r--arch/powerpc/platforms/85xx/stx_gp3.c183
-rw-r--r--arch/powerpc/platforms/85xx/tqm85xx.c187
-rw-r--r--arch/powerpc/platforms/8xx/ep88xc.c5
-rw-r--r--arch/powerpc/platforms/8xx/m8xx_setup.c11
-rw-r--r--arch/powerpc/platforms/8xx/mpc86xads_setup.c8
-rw-r--r--arch/powerpc/platforms/8xx/mpc885ads_setup.c7
-rw-r--r--arch/powerpc/platforms/8xx/mpc8xx.h21
-rw-r--r--arch/powerpc/platforms/Kconfig6
-rw-r--r--arch/powerpc/platforms/Kconfig.cputype10
-rw-r--r--arch/powerpc/platforms/embedded6xx/ls_uart.c5
-rw-r--r--arch/powerpc/sysdev/Makefile4
-rw-r--r--arch/powerpc/sysdev/commproc.h12
-rw-r--r--arch/powerpc/sysdev/cpm1.c (renamed from arch/powerpc/sysdev/commproc.c)42
-rw-r--r--arch/powerpc/sysdev/cpm2.c (renamed from arch/powerpc/sysdev/cpm2_common.c)3
-rw-r--r--arch/powerpc/sysdev/fsl_soc.c99
-rw-r--r--arch/powerpc/sysdev/ipic.c6
-rw-r--r--arch/powerpc/sysdev/micropatch.c2
-rw-r--r--arch/powerpc/sysdev/mpc8xx_pic.c1
-rw-r--r--arch/powerpc/sysdev/qe_lib/qe.c63
-rw-r--r--arch/ppc/8260_io/enet.c2
-rw-r--r--arch/ppc/8xx_io/commproc.c40
-rw-r--r--arch/ppc/8xx_io/enet.c6
-rw-r--r--arch/ppc/8xx_io/fec.c2
-rw-r--r--arch/ppc/8xx_io/micropatch.c2
-rw-r--r--arch/ppc/Kconfig91
-rw-r--r--arch/ppc/Makefile9
-rw-r--r--arch/ppc/boot/simple/iic.c2
-rw-r--r--arch/ppc/boot/simple/m8xx_tty.c2
-rw-r--r--arch/ppc/configs/mpc8540_ads_defconfig706
-rw-r--r--arch/ppc/configs/mpc8548_cds_defconfig658
-rw-r--r--arch/ppc/configs/mpc8555_cds_defconfig784
-rw-r--r--arch/ppc/configs/mpc8560_ads_defconfig769
-rw-r--r--arch/ppc/kernel/Makefile1
-rw-r--r--arch/ppc/kernel/asm-offsets.c6
-rw-r--r--arch/ppc/kernel/entry.S12
-rw-r--r--arch/ppc/kernel/head_booke.h55
-rw-r--r--arch/ppc/kernel/head_fsl_booke.S1065
-rw-r--r--arch/ppc/kernel/misc.S46
-rw-r--r--arch/ppc/kernel/ppc_ksyms.c11
-rw-r--r--arch/ppc/kernel/setup.c3
-rw-r--r--arch/ppc/kernel/traps.c121
-rw-r--r--arch/ppc/mm/Makefile1
-rw-r--r--arch/ppc/mm/fsl_booke_mmu.c236
-rw-r--r--arch/ppc/mm/init.c6
-rw-r--r--arch/ppc/mm/mmu_context.c2
-rw-r--r--arch/ppc/mm/mmu_decl.h6
-rw-r--r--arch/ppc/mm/pgtable.c28
-rw-r--r--arch/ppc/mm/ppc_mmu.c2
-rw-r--r--arch/ppc/platforms/83xx/Makefile4
-rw-r--r--arch/ppc/platforms/83xx/mpc834x_sys.c346
-rw-r--r--arch/ppc/platforms/83xx/mpc834x_sys.h54
-rw-r--r--arch/ppc/platforms/85xx/Kconfig106
-rw-r--r--arch/ppc/platforms/85xx/Makefile13
-rw-r--r--arch/ppc/platforms/85xx/mpc8540_ads.c226
-rw-r--r--arch/ppc/platforms/85xx/mpc8540_ads.h22
-rw-r--r--arch/ppc/platforms/85xx/mpc8555_cds.h23
-rw-r--r--arch/ppc/platforms/85xx/mpc8560_ads.c303
-rw-r--r--arch/ppc/platforms/85xx/mpc8560_ads.h24
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_ads_common.c197
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_ads_common.h67
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_cds_common.c601
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_cds_common.h80
-rw-r--r--arch/ppc/platforms/85xx/sbc8560.c234
-rw-r--r--arch/ppc/platforms/85xx/sbc8560.h47
-rw-r--r--arch/ppc/platforms/85xx/sbc85xx.c166
-rw-r--r--arch/ppc/platforms/85xx/sbc85xx.h70
-rw-r--r--arch/ppc/platforms/85xx/stx_gp3.c339
-rw-r--r--arch/ppc/platforms/85xx/stx_gp3.h69
-rw-r--r--arch/ppc/platforms/85xx/tqm85xx.c412
-rw-r--r--arch/ppc/platforms/85xx/tqm85xx.h53
-rw-r--r--arch/ppc/platforms/mpc866ads_setup.c2
-rw-r--r--arch/ppc/platforms/mpc885ads_setup.c2
-rw-r--r--arch/ppc/syslib/Makefile13
-rw-r--r--arch/ppc/syslib/ipic.c646
-rw-r--r--arch/ppc/syslib/ipic.h47
-rw-r--r--arch/ppc/syslib/mpc83xx_devices.c251
-rw-r--r--arch/ppc/syslib/mpc83xx_sys.c122
-rw-r--r--arch/ppc/syslib/mpc85xx_devices.c826
-rw-r--r--arch/ppc/syslib/mpc85xx_sys.c233
-rw-r--r--arch/ppc/syslib/mpc8xx_devices.c2
-rw-r--r--arch/ppc/syslib/ocp.c2
-rw-r--r--arch/ppc/syslib/open_pic.c2
-rw-r--r--arch/ppc/syslib/ppc83xx_pci.h151
-rw-r--r--arch/ppc/syslib/ppc83xx_setup.c410
-rw-r--r--arch/ppc/syslib/ppc83xx_setup.h55
-rw-r--r--arch/ppc/syslib/ppc85xx_common.c38
-rw-r--r--arch/ppc/syslib/ppc85xx_common.h22
-rw-r--r--arch/ppc/syslib/ppc85xx_setup.c367
-rw-r--r--arch/ppc/syslib/ppc85xx_setup.h56
-rw-r--r--arch/ppc/syslib/ppc8xx_pic.h1
-rw-r--r--arch/ppc/xmon/start_8xx.c2
-rw-r--r--drivers/ata/Kconfig2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/fec_8xx/fec_8xx-netta.c2
-rw-r--r--drivers/net/fec_8xx/fec_main.c2
-rw-r--r--drivers/net/fec_8xx/fec_mii.c2
-rw-r--r--drivers/net/fs_enet/fs_enet.h2
-rw-r--r--drivers/net/fs_enet/mac-fec.c2
-rw-r--r--drivers/net/fs_enet/mac-scc.c2
-rw-r--r--drivers/net/ucc_geth_mii.c3
-rw-r--r--drivers/pci/Makefile2
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm1.h2
-rw-r--r--drivers/spi/spi_mpc83xx.c6
-rw-r--r--include/asm-powerpc/cpm.h73
-rw-r--r--include/asm-powerpc/cpm1.h (renamed from include/asm-powerpc/commproc.h)77
-rw-r--r--include/asm-powerpc/cpm2.h64
-rw-r--r--include/asm-powerpc/irq.h212
-rw-r--r--include/asm-powerpc/mpc8xx.h20
-rw-r--r--include/asm-ppc/cpm1.h (renamed from include/asm-ppc/commproc.h)12
-rw-r--r--include/asm-ppc/cpm2.h2
-rw-r--r--include/asm-ppc/immap_85xx.h126
-rw-r--r--include/asm-ppc/mmu_context.h5
-rw-r--r--include/asm-ppc/mpc83xx.h107
-rw-r--r--include/asm-ppc/mpc85xx.h192
-rw-r--r--include/asm-ppc/pgtable.h46
-rw-r--r--include/asm-ppc/ppc_sys.h4
-rw-r--r--include/asm-ppc/ppcboot.h8
-rw-r--r--include/asm-ppc/reg_booke.h26
-rw-r--r--include/asm-ppc/serial.h4
181 files changed, 14671 insertions, 15663 deletions
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index da98154328a0..b5e46efeba84 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1543,7 +1543,7 @@ platforms are moved over to use the flattened-device-tree model.
1543 i) Root QE device 1543 i) Root QE device
1544 1544
1545 Required properties: 1545 Required properties:
1546 - device_type : should be "qe"; 1546 - compatible : should be "fsl,qe";
1547 - model : precise model of the QE, Can be "QE", "CPM", or "CPM2" 1547 - model : precise model of the QE, Can be "QE", "CPM", or "CPM2"
1548 - reg : offset and length of the device registers. 1548 - reg : offset and length of the device registers.
1549 - bus-frequency : the clock frequency for QUICC Engine. 1549 - bus-frequency : the clock frequency for QUICC Engine.
@@ -1557,8 +1557,7 @@ platforms are moved over to use the flattened-device-tree model.
1557 #address-cells = <1>; 1557 #address-cells = <1>;
1558 #size-cells = <1>; 1558 #size-cells = <1>;
1559 #interrupt-cells = <2>; 1559 #interrupt-cells = <2>;
1560 device_type = "qe"; 1560 compatible = "fsl,qe";
1561 model = "QE";
1562 ranges = <0 e0100000 00100000>; 1561 ranges = <0 e0100000 00100000>;
1563 reg = <e0100000 480>; 1562 reg = <e0100000 480>;
1564 brg-frequency = <0>; 1563 brg-frequency = <0>;
@@ -1569,8 +1568,8 @@ platforms are moved over to use the flattened-device-tree model.
1569 ii) SPI (Serial Peripheral Interface) 1568 ii) SPI (Serial Peripheral Interface)
1570 1569
1571 Required properties: 1570 Required properties:
1572 - device_type : should be "spi". 1571 - cell-index : SPI controller index.
1573 - compatible : should be "fsl_spi". 1572 - compatible : should be "fsl,spi".
1574 - mode : the SPI operation mode, it can be "cpu" or "cpu-qe". 1573 - mode : the SPI operation mode, it can be "cpu" or "cpu-qe".
1575 - reg : Offset and length of the register set for the device 1574 - reg : Offset and length of the register set for the device
1576 - interrupts : <a b> where a is the interrupt number and b is a 1575 - interrupts : <a b> where a is the interrupt number and b is a
@@ -1583,8 +1582,8 @@ platforms are moved over to use the flattened-device-tree model.
1583 1582
1584 Example: 1583 Example:
1585 spi@4c0 { 1584 spi@4c0 {
1586 device_type = "spi"; 1585 cell-index = <0>;
1587 compatible = "fsl_spi"; 1586 compatible = "fsl,spi";
1588 reg = <4c0 40>; 1587 reg = <4c0 40>;
1589 interrupts = <82 0>; 1588 interrupts = <82 0>;
1590 interrupt-parent = <700>; 1589 interrupt-parent = <700>;
@@ -1781,7 +1780,7 @@ platforms are moved over to use the flattened-device-tree model.
1781 vii) Multi-User RAM (MURAM) 1780 vii) Multi-User RAM (MURAM)
1782 1781
1783 Required properties: 1782 Required properties:
1784 - device_type : should be "muram". 1783 - compatible : should be "fsl,qe-muram", "fsl,cpm-muram".
1785 - mode : the could be "host" or "slave". 1784 - mode : the could be "host" or "slave".
1786 - ranges : Should be defined as specified in 1) to describe the 1785 - ranges : Should be defined as specified in 1) to describe the
1787 translation of MURAM addresses. 1786 translation of MURAM addresses.
@@ -1791,10 +1790,12 @@ platforms are moved over to use the flattened-device-tree model.
1791 Example: 1790 Example:
1792 1791
1793 muram@10000 { 1792 muram@10000 {
1794 device_type = "muram"; 1793 compatible = "fsl,qe-muram", "fsl,cpm-muram";
1795 ranges = <0 00010000 0000c000>; 1794 ranges = <0 00010000 0000c000>;
1796 1795
1797 data-only@0{ 1796 data-only@0{
1797 compatible = "fsl,qe-muram-data",
1798 "fsl,cpm-muram-data";
1798 reg = <0 c000>; 1799 reg = <0 c000>;
1799 }; 1800 };
1800 }; 1801 };
@@ -2615,6 +2616,164 @@ platforms are moved over to use the flattened-device-tree model.
2615 - clock-frequency : The frequency of the input clock, which typically 2616 - clock-frequency : The frequency of the input clock, which typically
2616 comes from an on-board dedicated oscillator. 2617 comes from an on-board dedicated oscillator.
2617 2618
2619 * Freescale 83xx DMA Controller
2620
2621 Freescale PowerPC 83xx have on chip general purpose DMA controllers.
2622
2623 Required properties:
2624
2625 - compatible : compatible list, contains 2 entries, first is
2626 "fsl,CHIP-dma", where CHIP is the processor
2627 (mpc8349, mpc8360, etc.) and the second is
2628 "fsl,elo-dma"
2629 - reg : <registers mapping for DMA general status reg>
2630 - ranges : Should be defined as specified in 1) to describe the
2631 DMA controller channels.
2632 - cell-index : controller index. 0 for controller @ 0x8100
2633 - interrupts : <interrupt mapping for DMA IRQ>
2634 - interrupt-parent : optional, if needed for interrupt mapping
2635
2636
2637 - DMA channel nodes:
2638 - compatible : compatible list, contains 2 entries, first is
2639 "fsl,CHIP-dma-channel", where CHIP is the processor
2640 (mpc8349, mpc8350, etc.) and the second is
2641 "fsl,elo-dma-channel"
2642 - reg : <registers mapping for channel>
2643 - cell-index : dma channel index starts at 0.
2644
2645 Optional properties:
2646 - interrupts : <interrupt mapping for DMA channel IRQ>
2647 (on 83xx this is expected to be identical to
2648 the interrupts property of the parent node)
2649 - interrupt-parent : optional, if needed for interrupt mapping
2650
2651 Example:
2652 dma@82a8 {
2653 #address-cells = <1>;
2654 #size-cells = <1>;
2655 compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
2656 reg = <82a8 4>;
2657 ranges = <0 8100 1a4>;
2658 interrupt-parent = <&ipic>;
2659 interrupts = <47 8>;
2660 cell-index = <0>;
2661 dma-channel@0 {
2662 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
2663 cell-index = <0>;
2664 reg = <0 80>;
2665 };
2666 dma-channel@80 {
2667 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
2668 cell-index = <1>;
2669 reg = <80 80>;
2670 };
2671 dma-channel@100 {
2672 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
2673 cell-index = <2>;
2674 reg = <100 80>;
2675 };
2676 dma-channel@180 {
2677 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
2678 cell-index = <3>;
2679 reg = <180 80>;
2680 };
2681 };
2682
2683 * Freescale 85xx/86xx DMA Controller
2684
2685 Freescale PowerPC 85xx/86xx have on chip general purpose DMA controllers.
2686
2687 Required properties:
2688
2689 - compatible : compatible list, contains 2 entries, first is
2690 "fsl,CHIP-dma", where CHIP is the processor
2691 (mpc8540, mpc8540, etc.) and the second is
2692 "fsl,eloplus-dma"
2693 - reg : <registers mapping for DMA general status reg>
2694 - cell-index : controller index. 0 for controller @ 0x21000,
2695 1 for controller @ 0xc000
2696 - ranges : Should be defined as specified in 1) to describe the
2697 DMA controller channels.
2698
2699 - DMA channel nodes:
2700 - compatible : compatible list, contains 2 entries, first is
2701 "fsl,CHIP-dma-channel", where CHIP is the processor
2702 (mpc8540, mpc8560, etc.) and the second is
2703 "fsl,eloplus-dma-channel"
2704 - cell-index : dma channel index starts at 0.
2705 - reg : <registers mapping for channel>
2706 - interrupts : <interrupt mapping for DMA channel IRQ>
2707 - interrupt-parent : optional, if needed for interrupt mapping
2708
2709 Example:
2710 dma@21300 {
2711 #address-cells = <1>;
2712 #size-cells = <1>;
2713 compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
2714 reg = <21300 4>;
2715 ranges = <0 21100 200>;
2716 cell-index = <0>;
2717 dma-channel@0 {
2718 compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
2719 reg = <0 80>;
2720 cell-index = <0>;
2721 interrupt-parent = <&mpic>;
2722 interrupts = <14 2>;
2723 };
2724 dma-channel@80 {
2725 compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
2726 reg = <80 80>;
2727 cell-index = <1>;
2728 interrupt-parent = <&mpic>;
2729 interrupts = <15 2>;
2730 };
2731 dma-channel@100 {
2732 compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
2733 reg = <100 80>;
2734 cell-index = <2>;
2735 interrupt-parent = <&mpic>;
2736 interrupts = <16 2>;
2737 };
2738 dma-channel@180 {
2739 compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
2740 reg = <180 80>;
2741 cell-index = <3>;
2742 interrupt-parent = <&mpic>;
2743 interrupts = <17 2>;
2744 };
2745 };
2746
2747 * Freescale 8xxx/3.0 Gb/s SATA nodes
2748
2749 SATA nodes are defined to describe on-chip Serial ATA controllers.
2750 Each SATA port should have its own node.
2751
2752 Required properties:
2753 - compatible : compatible list, contains 2 entries, first is
2754 "fsl,CHIP-sata", where CHIP is the processor
2755 (mpc8315, mpc8379, etc.) and the second is
2756 "fsl,pq-sata"
2757 - interrupts : <interrupt mapping for SATA IRQ>
2758 - cell-index : controller index.
2759 1 for controller @ 0x18000
2760 2 for controller @ 0x19000
2761 3 for controller @ 0x1a000
2762 4 for controller @ 0x1b000
2763
2764 Optional properties:
2765 - interrupt-parent : optional, if needed for interrupt mapping
2766 - reg : <registers mapping>
2767
2768 Example:
2769
2770 sata@18000 {
2771 compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
2772 reg = <0x18000 0x1000>;
2773 cell-index = <1>;
2774 interrupts = <2c 8>;
2775 interrupt-parent = < &ipic >;
2776 };
2618 2777
2619 More devices will be defined as this spec matures. 2778 More devices will be defined as this spec matures.
2620 2779
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index b36f9113ad1f..7f6b07c30d69 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -63,7 +63,7 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c
63 cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \ 63 cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \
64 fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \ 64 fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \
65 cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \ 65 cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
66 cuboot-warp.c 66 cuboot-warp.c cuboot-85xx-cpm2.c
67src-boot := $(src-wlib) $(src-plat) empty.c 67src-boot := $(src-wlib) $(src-plat) empty.c
68 68
69src-boot := $(addprefix $(obj)/, $(src-boot)) 69src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -201,6 +201,9 @@ image-$(CONFIG_PPC_MPC52xx) += cuImage.52xx
201image-$(CONFIG_STORCENTER) += cuImage.824x 201image-$(CONFIG_STORCENTER) += cuImage.824x
202image-$(CONFIG_PPC_83xx) += cuImage.83xx 202image-$(CONFIG_PPC_83xx) += cuImage.83xx
203image-$(CONFIG_PPC_85xx) += cuImage.85xx 203image-$(CONFIG_PPC_85xx) += cuImage.85xx
204ifeq ($(CONFIG_CPM2),y)
205image-$(CONFIG_PPC_85xx) += cuImage.85xx-cpm2
206endif
204image-$(CONFIG_MPC7448HPC2) += cuImage.hpc2 207image-$(CONFIG_MPC7448HPC2) += cuImage.hpc2
205image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony 208image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
206image-$(CONFIG_BAMBOO) += treeImage.bamboo cuImage.bamboo 209image-$(CONFIG_BAMBOO) += treeImage.bamboo cuImage.bamboo
diff --git a/arch/powerpc/boot/cuboot-85xx-cpm2.c b/arch/powerpc/boot/cuboot-85xx-cpm2.c
new file mode 100644
index 000000000000..723872ddd447
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-85xx-cpm2.c
@@ -0,0 +1,66 @@
1/*
2 * Old U-boot compatibility for 85xx
3 *
4 * Author: Scott Wood <scottwood@freescale.com>
5 *
6 * Copyright (c) 2007 Freescale Semiconductor, Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License version 2 as published
10 * by the Free Software Foundation.
11 */
12
13#include "ops.h"
14#include "stdio.h"
15#include "cuboot.h"
16
17#define TARGET_85xx
18#define TARGET_CPM2
19#include "ppcboot.h"
20
21static bd_t bd;
22
23static void platform_fixups(void)
24{
25 void *devp;
26
27 dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
28 dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
29 dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
30 dt_fixup_mac_address_by_alias("ethernet2", bd.bi_enet2addr);
31 dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
32
33 /* Unfortunately, the specific model number is encoded in the
34 * soc node name in existing dts files -- once that is fixed,
35 * this can do a simple path lookup.
36 */
37 devp = find_node_by_devtype(NULL, "soc");
38 if (devp) {
39 void *serial = NULL;
40
41 setprop(devp, "bus-frequency", &bd.bi_busfreq,
42 sizeof(bd.bi_busfreq));
43
44 while ((serial = find_node_by_devtype(serial, "serial"))) {
45 if (get_parent(serial) != devp)
46 continue;
47
48 setprop(serial, "clock-frequency", &bd.bi_busfreq,
49 sizeof(bd.bi_busfreq));
50 }
51 }
52
53 devp = find_node_by_compatible(NULL, "fsl,cpm2-brg");
54 if (devp)
55 setprop(devp, "clock-frequency", &bd.bi_brgfreq,
56 sizeof(bd.bi_brgfreq));
57}
58
59void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
60 unsigned long r6, unsigned long r7)
61{
62 CUBOOT_INIT();
63 fdt_init(_dtb_start);
64 serial_console_init();
65 platform_ops.fixups = platform_fixups;
66}
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 9bcf2c92541f..2d6653fe72ff 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -9,6 +9,8 @@
9 * option) any later version. 9 * option) any later version.
10 */ 10 */
11 11
12/dts-v1/;
13
12/ { 14/ {
13 model = "MPC8313ERDB"; 15 model = "MPC8313ERDB";
14 compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB"; 16 compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB";
@@ -29,11 +31,11 @@
29 31
30 PowerPC,8313@0 { 32 PowerPC,8313@0 {
31 device_type = "cpu"; 33 device_type = "cpu";
32 reg = <0>; 34 reg = <0x0>;
33 d-cache-line-size = <20>; // 32 bytes 35 d-cache-line-size = <32>;
34 i-cache-line-size = <20>; // 32 bytes 36 i-cache-line-size = <32>;
35 d-cache-size = <4000>; // L1, 16K 37 d-cache-size = <16384>;
36 i-cache-size = <4000>; // L1, 16K 38 i-cache-size = <16384>;
37 timebase-frequency = <0>; // from bootloader 39 timebase-frequency = <0>; // from bootloader
38 bus-frequency = <0>; // from bootloader 40 bus-frequency = <0>; // from bootloader
39 clock-frequency = <0>; // from bootloader 41 clock-frequency = <0>; // from bootloader
@@ -42,30 +44,30 @@
42 44
43 memory { 45 memory {
44 device_type = "memory"; 46 device_type = "memory";
45 reg = <00000000 08000000>; // 128MB at 0 47 reg = <0x00000000 0x08000000>; // 128MB at 0
46 }; 48 };
47 49
48 localbus@e0005000 { 50 localbus@e0005000 {
49 #address-cells = <2>; 51 #address-cells = <2>;
50 #size-cells = <1>; 52 #size-cells = <1>;
51 compatible = "fsl,mpc8313-elbc", "fsl,elbc", "simple-bus"; 53 compatible = "fsl,mpc8313-elbc", "fsl,elbc", "simple-bus";
52 reg = <e0005000 1000>; 54 reg = <0xe0005000 0x1000>;
53 interrupts = <d#77 8>; 55 interrupts = <77 0x8>;
54 interrupt-parent = <&ipic>; 56 interrupt-parent = <&ipic>;
55 57
56 // CS0 and CS1 are swapped when 58 // CS0 and CS1 are swapped when
57 // booting from nand, but the 59 // booting from nand, but the
58 // addresses are the same. 60 // addresses are the same.
59 ranges = <0 0 fe000000 00800000 61 ranges = <0x0 0x0 0xfe000000 0x00800000
60 1 0 e2800000 00008000 62 0x1 0x0 0xe2800000 0x00008000
61 2 0 f0000000 00020000 63 0x2 0x0 0xf0000000 0x00020000
62 3 0 fa000000 00008000>; 64 0x3 0x0 0xfa000000 0x00008000>;
63 65
64 flash@0,0 { 66 flash@0,0 {
65 #address-cells = <1>; 67 #address-cells = <1>;
66 #size-cells = <1>; 68 #size-cells = <1>;
67 compatible = "cfi-flash"; 69 compatible = "cfi-flash";
68 reg = <0 0 800000>; 70 reg = <0x0 0x0 0x800000>;
69 bank-width = <2>; 71 bank-width = <2>;
70 device-width = <1>; 72 device-width = <1>;
71 }; 73 };
@@ -75,19 +77,19 @@
75 #size-cells = <1>; 77 #size-cells = <1>;
76 compatible = "fsl,mpc8313-fcm-nand", 78 compatible = "fsl,mpc8313-fcm-nand",
77 "fsl,elbc-fcm-nand"; 79 "fsl,elbc-fcm-nand";
78 reg = <1 0 2000>; 80 reg = <0x1 0x0 0x2000>;
79 81
80 u-boot@0 { 82 u-boot@0 {
81 reg = <0 100000>; 83 reg = <0x0 0x100000>;
82 read-only; 84 read-only;
83 }; 85 };
84 86
85 kernel@100000 { 87 kernel@100000 {
86 reg = <100000 300000>; 88 reg = <0x100000 0x300000>;
87 }; 89 };
88 90
89 fs@400000 { 91 fs@400000 {
90 reg = <400000 1c00000>; 92 reg = <0x400000 0x1c00000>;
91 }; 93 };
92 }; 94 };
93 }; 95 };
@@ -97,14 +99,14 @@
97 #size-cells = <1>; 99 #size-cells = <1>;
98 device_type = "soc"; 100 device_type = "soc";
99 compatible = "simple-bus"; 101 compatible = "simple-bus";
100 ranges = <0 e0000000 00100000>; 102 ranges = <0x0 0xe0000000 0x00100000>;
101 reg = <e0000000 00000200>; 103 reg = <0xe0000000 0x00000200>;
102 bus-frequency = <0>; 104 bus-frequency = <0>;
103 105
104 wdt@200 { 106 wdt@200 {
105 device_type = "watchdog"; 107 device_type = "watchdog";
106 compatible = "mpc83xx_wdt"; 108 compatible = "mpc83xx_wdt";
107 reg = <200 100>; 109 reg = <0x200 0x100>;
108 }; 110 };
109 111
110 i2c@3000 { 112 i2c@3000 {
@@ -112,9 +114,9 @@
112 #size-cells = <0>; 114 #size-cells = <0>;
113 cell-index = <0>; 115 cell-index = <0>;
114 compatible = "fsl-i2c"; 116 compatible = "fsl-i2c";
115 reg = <3000 100>; 117 reg = <0x3000 0x100>;
116 interrupts = <e 8>; 118 interrupts = <14 0x8>;
117 interrupt-parent = < &ipic >; 119 interrupt-parent = <&ipic>;
118 dfsrr; 120 dfsrr;
119 }; 121 };
120 122
@@ -123,29 +125,29 @@
123 #size-cells = <0>; 125 #size-cells = <0>;
124 cell-index = <1>; 126 cell-index = <1>;
125 compatible = "fsl-i2c"; 127 compatible = "fsl-i2c";
126 reg = <3100 100>; 128 reg = <0x3100 0x100>;
127 interrupts = <f 8>; 129 interrupts = <15 0x8>;
128 interrupt-parent = < &ipic >; 130 interrupt-parent = <&ipic>;
129 dfsrr; 131 dfsrr;
130 }; 132 };
131 133
132 spi@7000 { 134 spi@7000 {
133 device_type = "spi"; 135 cell-index = <0>;
134 compatible = "fsl_spi"; 136 compatible = "fsl,spi";
135 reg = <7000 1000>; 137 reg = <0x7000 0x1000>;
136 interrupts = <10 8>; 138 interrupts = <16 0x8>;
137 interrupt-parent = < &ipic >; 139 interrupt-parent = <&ipic>;
138 mode = "cpu"; 140 mode = "cpu";
139 }; 141 };
140 142
141 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ 143 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
142 usb@23000 { 144 usb@23000 {
143 compatible = "fsl-usb2-dr"; 145 compatible = "fsl-usb2-dr";
144 reg = <23000 1000>; 146 reg = <0x23000 0x1000>;
145 #address-cells = <1>; 147 #address-cells = <1>;
146 #size-cells = <0>; 148 #size-cells = <0>;
147 interrupt-parent = < &ipic >; 149 interrupt-parent = <&ipic>;
148 interrupts = <26 8>; 150 interrupts = <38 0x8>;
149 phy_type = "utmi_wide"; 151 phy_type = "utmi_wide";
150 }; 152 };
151 153
@@ -153,17 +155,17 @@
153 #address-cells = <1>; 155 #address-cells = <1>;
154 #size-cells = <0>; 156 #size-cells = <0>;
155 compatible = "fsl,gianfar-mdio"; 157 compatible = "fsl,gianfar-mdio";
156 reg = <24520 20>; 158 reg = <0x24520 0x20>;
157 phy1: ethernet-phy@1 { 159 phy1: ethernet-phy@1 {
158 interrupt-parent = < &ipic >; 160 interrupt-parent = <&ipic>;
159 interrupts = <13 8>; 161 interrupts = <19 0x8>;
160 reg = <1>; 162 reg = <0x1>;
161 device_type = "ethernet-phy"; 163 device_type = "ethernet-phy";
162 }; 164 };
163 phy4: ethernet-phy@4 { 165 phy4: ethernet-phy@4 {
164 interrupt-parent = < &ipic >; 166 interrupt-parent = <&ipic>;
165 interrupts = <14 8>; 167 interrupts = <20 0x8>;
166 reg = <4>; 168 reg = <0x4>;
167 device_type = "ethernet-phy"; 169 device_type = "ethernet-phy";
168 }; 170 };
169 }; 171 };
@@ -173,10 +175,10 @@
173 device_type = "network"; 175 device_type = "network";
174 model = "eTSEC"; 176 model = "eTSEC";
175 compatible = "gianfar"; 177 compatible = "gianfar";
176 reg = <24000 1000>; 178 reg = <0x24000 0x1000>;
177 local-mac-address = [ 00 00 00 00 00 00 ]; 179 local-mac-address = [ 00 00 00 00 00 00 ];
178 interrupts = <25 8 24 8 23 8>; 180 interrupts = <37 0x8 36 0x8 35 0x8>;
179 interrupt-parent = < &ipic >; 181 interrupt-parent = <&ipic>;
180 phy-handle = < &phy1 >; 182 phy-handle = < &phy1 >;
181 }; 183 };
182 184
@@ -185,10 +187,10 @@
185 device_type = "network"; 187 device_type = "network";
186 model = "eTSEC"; 188 model = "eTSEC";
187 compatible = "gianfar"; 189 compatible = "gianfar";
188 reg = <25000 1000>; 190 reg = <0x25000 0x1000>;
189 local-mac-address = [ 00 00 00 00 00 00 ]; 191 local-mac-address = [ 00 00 00 00 00 00 ];
190 interrupts = <22 8 21 8 20 8>; 192 interrupts = <34 0x8 33 0x8 32 0x8>;
191 interrupt-parent = < &ipic >; 193 interrupt-parent = <&ipic>;
192 phy-handle = < &phy4 >; 194 phy-handle = < &phy4 >;
193 }; 195 };
194 196
@@ -196,34 +198,34 @@
196 cell-index = <0>; 198 cell-index = <0>;
197 device_type = "serial"; 199 device_type = "serial";
198 compatible = "ns16550"; 200 compatible = "ns16550";
199 reg = <4500 100>; 201 reg = <0x4500 0x100>;
200 clock-frequency = <0>; 202 clock-frequency = <0>;
201 interrupts = <9 8>; 203 interrupts = <9 0x8>;
202 interrupt-parent = < &ipic >; 204 interrupt-parent = <&ipic>;
203 }; 205 };
204 206
205 serial1: serial@4600 { 207 serial1: serial@4600 {
206 cell-index = <1>; 208 cell-index = <1>;
207 device_type = "serial"; 209 device_type = "serial";
208 compatible = "ns16550"; 210 compatible = "ns16550";
209 reg = <4600 100>; 211 reg = <0x4600 0x100>;
210 clock-frequency = <0>; 212 clock-frequency = <0>;
211 interrupts = <a 8>; 213 interrupts = <10 0x8>;
212 interrupt-parent = < &ipic >; 214 interrupt-parent = <&ipic>;
213 }; 215 };
214 216
215 crypto@30000 { 217 crypto@30000 {
216 device_type = "crypto"; 218 device_type = "crypto";
217 model = "SEC2"; 219 model = "SEC2";
218 compatible = "talitos"; 220 compatible = "talitos";
219 reg = <30000 7000>; 221 reg = <0x30000 0x7000>;
220 interrupts = <b 8>; 222 interrupts = <11 0x8>;
221 interrupt-parent = < &ipic >; 223 interrupt-parent = <&ipic>;
222 /* Rev. 2.2 */ 224 /* Rev. 2.2 */
223 num-channels = <1>; 225 num-channels = <1>;
224 channel-fifo-len = <18>; 226 channel-fifo-len = <24>;
225 exec-units-mask = <0000004c>; 227 exec-units-mask = <0x0000004c>;
226 descriptor-types-mask = <0122003f>; 228 descriptor-types-mask = <0x0122003f>;
227 }; 229 };
228 230
229 /* IPIC 231 /* IPIC
@@ -236,38 +238,38 @@
236 interrupt-controller; 238 interrupt-controller;
237 #address-cells = <0>; 239 #address-cells = <0>;
238 #interrupt-cells = <2>; 240 #interrupt-cells = <2>;
239 reg = <700 100>; 241 reg = <0x700 0x100>;
240 device_type = "ipic"; 242 device_type = "ipic";
241 }; 243 };
242 }; 244 };
243 245
244 pci0: pci@e0008500 { 246 pci0: pci@e0008500 {
245 cell-index = <1>; 247 cell-index = <1>;
246 interrupt-map-mask = <f800 0 0 7>; 248 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
247 interrupt-map = < 249 interrupt-map = <
248 250
249 /* IDSEL 0x0E -mini PCI */ 251 /* IDSEL 0x0E -mini PCI */
250 7000 0 0 1 &ipic 12 8 252 0x7000 0x0 0x0 0x1 &ipic 18 0x8
251 7000 0 0 2 &ipic 12 8 253 0x7000 0x0 0x0 0x2 &ipic 18 0x8
252 7000 0 0 3 &ipic 12 8 254 0x7000 0x0 0x0 0x3 &ipic 18 0x8
253 7000 0 0 4 &ipic 12 8 255 0x7000 0x0 0x0 0x4 &ipic 18 0x8
254 256
255 /* IDSEL 0x0F - PCI slot */ 257 /* IDSEL 0x0F - PCI slot */
256 7800 0 0 1 &ipic 11 8 258 0x7800 0x0 0x0 0x1 &ipic 17 0x8
257 7800 0 0 2 &ipic 12 8 259 0x7800 0x0 0x0 0x2 &ipic 18 0x8
258 7800 0 0 3 &ipic 11 8 260 0x7800 0x0 0x0 0x3 &ipic 17 0x8
259 7800 0 0 4 &ipic 12 8>; 261 0x7800 0x0 0x0 0x4 &ipic 18 0x8>;
260 interrupt-parent = < &ipic >; 262 interrupt-parent = <&ipic>;
261 interrupts = <42 8>; 263 interrupts = <66 0x8>;
262 bus-range = <0 0>; 264 bus-range = <0x0 0x0>;
263 ranges = <02000000 0 90000000 90000000 0 10000000 265 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
264 42000000 0 80000000 80000000 0 10000000 266 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
265 01000000 0 00000000 e2000000 0 00100000>; 267 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
266 clock-frequency = <3f940aa>; 268 clock-frequency = <66666666>;
267 #interrupt-cells = <1>; 269 #interrupt-cells = <1>;
268 #size-cells = <2>; 270 #size-cells = <2>;
269 #address-cells = <3>; 271 #address-cells = <3>;
270 reg = <e0008500 100>; 272 reg = <0xe0008500 0x100>;
271 compatible = "fsl,mpc8349-pci"; 273 compatible = "fsl,mpc8349-pci";
272 device_type = "pci"; 274 device_type = "pci";
273 }; 275 };
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
new file mode 100644
index 000000000000..b582032ba3d6
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -0,0 +1,287 @@
1/*
2 * MPC8315E RDB Device Tree Source
3 *
4 * Copyright 2007 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 compatible = "fsl,mpc8315erdb";
16 #address-cells = <1>;
17 #size-cells = <1>;
18
19 aliases {
20 ethernet0 = &enet0;
21 ethernet1 = &enet1;
22 serial0 = &serial0;
23 serial1 = &serial1;
24 pci0 = &pci0;
25 };
26
27 cpus {
28 #address-cells = <1>;
29 #size-cells = <0>;
30
31 PowerPC,8315@0 {
32 device_type = "cpu";
33 reg = <0x0>;
34 d-cache-line-size = <32>;
35 i-cache-line-size = <32>;
36 d-cache-size = <16384>;
37 i-cache-size = <16384>;
38 timebase-frequency = <0>; // from bootloader
39 bus-frequency = <0>; // from bootloader
40 clock-frequency = <0>; // from bootloader
41 };
42 };
43
44 memory {
45 device_type = "memory";
46 reg = <0x00000000 0x08000000>; // 128MB at 0
47 };
48
49 localbus@e0005000 {
50 #address-cells = <2>;
51 #size-cells = <1>;
52 compatible = "fsl,mpc8315-elbc", "fsl,elbc", "simple-bus";
53 reg = <0xe0005000 0x1000>;
54 interrupts = <77 0x8>;
55 interrupt-parent = <&ipic>;
56
57 // CS0 and CS1 are swapped when
58 // booting from nand, but the
59 // addresses are the same.
60 ranges = <0x0 0x0 0xfe000000 0x00800000
61 0x1 0x0 0xe0600000 0x00002000
62 0x2 0x0 0xf0000000 0x00020000
63 0x3 0x0 0xfa000000 0x00008000>;
64
65 flash@0,0 {
66 #address-cells = <1>;
67 #size-cells = <1>;
68 compatible = "cfi-flash";
69 reg = <0x0 0x0 0x800000>;
70 bank-width = <2>;
71 device-width = <1>;
72 };
73
74 nand@1,0 {
75 #address-cells = <1>;
76 #size-cells = <1>;
77 compatible = "fsl,mpc8315-fcm-nand",
78 "fsl,elbc-fcm-nand";
79 reg = <0x1 0x0 0x2000>;
80
81 u-boot@0 {
82 reg = <0x0 0x100000>;
83 read-only;
84 };
85
86 kernel@100000 {
87 reg = <0x100000 0x300000>;
88 };
89 fs@400000 {
90 reg = <0x400000 0x1c00000>;
91 };
92 };
93 };
94
95 immr@e0000000 {
96 #address-cells = <1>;
97 #size-cells = <1>;
98 device_type = "soc";
99 compatible = "simple-bus";
100 ranges = <0 0xe0000000 0x00100000>;
101 reg = <0xe0000000 0x00000200>;
102 bus-frequency = <0>;
103
104 wdt@200 {
105 device_type = "watchdog";
106 compatible = "mpc83xx_wdt";
107 reg = <0x200 0x100>;
108 };
109
110 i2c@3000 {
111 #address-cells = <1>;
112 #size-cells = <0>;
113 cell-index = <0>;
114 compatible = "fsl-i2c";
115 reg = <0x3000 0x100>;
116 interrupts = <14 0x8>;
117 interrupt-parent = <&ipic>;
118 dfsrr;
119 rtc@68 {
120 device_type = "rtc";
121 compatible = "dallas,ds1339";
122 reg = <0x68>;
123 };
124 };
125
126 spi@7000 {
127 cell-index = <0>;
128 compatible = "fsl,spi";
129 reg = <0x7000 0x1000>;
130 interrupts = <16 0x8>;
131 interrupt-parent = <&ipic>;
132 mode = "cpu";
133 };
134
135 usb@23000 {
136 compatible = "fsl-usb2-dr";
137 reg = <0x23000 0x1000>;
138 #address-cells = <1>;
139 #size-cells = <0>;
140 interrupt-parent = <&ipic>;
141 interrupts = <38 0x8>;
142 phy_type = "utmi";
143 };
144
145 mdio@24520 {
146 #address-cells = <1>;
147 #size-cells = <0>;
148 compatible = "fsl,gianfar-mdio";
149 reg = <0x24520 0x20>;
150 phy0: ethernet-phy@0 {
151 interrupt-parent = <&ipic>;
152 interrupts = <20 0x8>;
153 reg = <0x0>;
154 device_type = "ethernet-phy";
155 };
156 phy1: ethernet-phy@1 {
157 interrupt-parent = <&ipic>;
158 interrupts = <19 0x8>;
159 reg = <0x1>;
160 device_type = "ethernet-phy";
161 };
162 };
163
164 enet0: ethernet@24000 {
165 cell-index = <0>;
166 device_type = "network";
167 model = "eTSEC";
168 compatible = "gianfar";
169 reg = <0x24000 0x1000>;
170 local-mac-address = [ 00 00 00 00 00 00 ];
171 interrupts = <32 0x8 33 0x8 34 0x8>;
172 interrupt-parent = <&ipic>;
173 phy-handle = < &phy0 >;
174 };
175
176 enet1: ethernet@25000 {
177 cell-index = <1>;
178 device_type = "network";
179 model = "eTSEC";
180 compatible = "gianfar";
181 reg = <0x25000 0x1000>;
182 local-mac-address = [ 00 00 00 00 00 00 ];
183 interrupts = <35 0x8 36 0x8 37 0x8>;
184 interrupt-parent = <&ipic>;
185 phy-handle = < &phy1 >;
186 };
187
188 serial0: serial@4500 {
189 cell-index = <0>;
190 device_type = "serial";
191 compatible = "ns16550";
192 reg = <0x4500 0x100>;
193 clock-frequency = <0>;
194 interrupts = <9 0x8>;
195 interrupt-parent = <&ipic>;
196 };
197
198 serial1: serial@4600 {
199 cell-index = <1>;
200 device_type = "serial";
201 compatible = "ns16550";
202 reg = <0x4600 0x100>;
203 clock-frequency = <0>;
204 interrupts = <10 0x8>;
205 interrupt-parent = <&ipic>;
206 };
207
208 crypto@30000 {
209 model = "SEC3";
210 device_type = "crypto";
211 compatible = "talitos";
212 reg = <0x30000 0x10000>;
213 interrupts = <11 0x8>;
214 interrupt-parent = <&ipic>;
215 /* Rev. 3.0 geometry */
216 num-channels = <4>;
217 channel-fifo-len = <24>;
218 exec-units-mask = <0x000001fe>;
219 descriptor-types-mask = <0x03ab0ebf>;
220 };
221
222 sata@18000 {
223 compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
224 reg = <0x18000 0x1000>;
225 cell-index = <1>;
226 interrupts = <44 0x8>;
227 interrupt-parent = <&ipic>;
228 };
229
230 sata@19000 {
231 compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
232 reg = <0x19000 0x1000>;
233 cell-index = <2>;
234 interrupts = <45 0x8>;
235 interrupt-parent = <&ipic>;
236 };
237
238 /* IPIC
239 * interrupts cell = <intr #, sense>
240 * sense values match linux IORESOURCE_IRQ_* defines:
241 * sense == 8: Level, low assertion
242 * sense == 2: Edge, high-to-low change
243 */
244 ipic: interrupt-controller@700 {
245 interrupt-controller;
246 #address-cells = <0>;
247 #interrupt-cells = <2>;
248 reg = <0x700 0x100>;
249 device_type = "ipic";
250 };
251 };
252
253 pci0: pci@e0008500 {
254 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
255 interrupt-map = <
256 /* IDSEL 0x0E -mini PCI */
257 0x7000 0x0 0x0 0x1 &ipic 18 0x8
258 0x7000 0x0 0x0 0x2 &ipic 18 0x8
259 0x7000 0x0 0x0 0x3 &ipic 18 0x8
260 0x7000 0x0 0x0 0x4 &ipic 18 0x8
261
262 /* IDSEL 0x0F -mini PCI */
263 0x7800 0x0 0x0 0x1 &ipic 17 0x8
264 0x7800 0x0 0x0 0x2 &ipic 17 0x8
265 0x7800 0x0 0x0 0x3 &ipic 17 0x8
266 0x7800 0x0 0x0 0x4 &ipic 17 0x8
267
268 /* IDSEL 0x10 - PCI slot */
269 0x8000 0x0 0x0 0x1 &ipic 48 0x8
270 0x8000 0x0 0x0 0x2 &ipic 17 0x8
271 0x8000 0x0 0x0 0x3 &ipic 48 0x8
272 0x8000 0x0 0x0 0x4 &ipic 17 0x8>;
273 interrupt-parent = <&ipic>;
274 interrupts = <66 0x8>;
275 bus-range = <0x0 0x0>;
276 ranges = <0x02000000 0 0x90000000 0x90000000 0 0x10000000
277 0x42000000 0 0x80000000 0x80000000 0 0x10000000
278 0x01000000 0 0x00000000 0xe0300000 0 0x00100000>;
279 clock-frequency = <66666666>;
280 #interrupt-cells = <1>;
281 #size-cells = <2>;
282 #address-cells = <3>;
283 reg = <0xe0008500 0x100>;
284 compatible = "fsl,mpc8349-pci";
285 device_type = "pci";
286 };
287};
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 690252456d3d..9bb408371bcd 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -21,6 +21,8 @@
21 * you're going by the schematic, the pin is called "P19J-K22". 21 * you're going by the schematic, the pin is called "P19J-K22".
22 */ 22 */
23 23
24/dts-v1/;
25
24/ { 26/ {
25 model = "MPC8323EMDS"; 27 model = "MPC8323EMDS";
26 compatible = "MPC8323EMDS", "MPC832xMDS", "MPC83xxMDS"; 28 compatible = "MPC8323EMDS", "MPC832xMDS", "MPC83xxMDS";
@@ -41,11 +43,11 @@
41 43
42 PowerPC,8323@0 { 44 PowerPC,8323@0 {
43 device_type = "cpu"; 45 device_type = "cpu";
44 reg = <0>; 46 reg = <0x0>;
45 d-cache-line-size = <20>; // 32 bytes 47 d-cache-line-size = <32>; // 32 bytes
46 i-cache-line-size = <20>; // 32 bytes 48 i-cache-line-size = <32>; // 32 bytes
47 d-cache-size = <4000>; // L1, 16K 49 d-cache-size = <16384>; // L1, 16K
48 i-cache-size = <4000>; // L1, 16K 50 i-cache-size = <16384>; // L1, 16K
49 timebase-frequency = <0>; 51 timebase-frequency = <0>;
50 bus-frequency = <0>; 52 bus-frequency = <0>;
51 clock-frequency = <0>; 53 clock-frequency = <0>;
@@ -54,26 +56,26 @@
54 56
55 memory { 57 memory {
56 device_type = "memory"; 58 device_type = "memory";
57 reg = <00000000 08000000>; 59 reg = <0x00000000 0x08000000>;
58 }; 60 };
59 61
60 bcsr@f8000000 { 62 bcsr@f8000000 {
61 device_type = "board-control"; 63 device_type = "board-control";
62 reg = <f8000000 8000>; 64 reg = <0xf8000000 0x8000>;
63 }; 65 };
64 66
65 soc8323@e0000000 { 67 soc8323@e0000000 {
66 #address-cells = <1>; 68 #address-cells = <1>;
67 #size-cells = <1>; 69 #size-cells = <1>;
68 device_type = "soc"; 70 device_type = "soc";
69 ranges = <0 e0000000 00100000>; 71 ranges = <0x0 0xe0000000 0x00100000>;
70 reg = <e0000000 00000200>; 72 reg = <0xe0000000 0x00000200>;
71 bus-frequency = <7DE2900>; 73 bus-frequency = <132000000>;
72 74
73 wdt@200 { 75 wdt@200 {
74 device_type = "watchdog"; 76 device_type = "watchdog";
75 compatible = "mpc83xx_wdt"; 77 compatible = "mpc83xx_wdt";
76 reg = <200 100>; 78 reg = <0x200 0x100>;
77 }; 79 };
78 80
79 i2c@3000 { 81 i2c@3000 {
@@ -81,14 +83,14 @@
81 #size-cells = <0>; 83 #size-cells = <0>;
82 cell-index = <0>; 84 cell-index = <0>;
83 compatible = "fsl-i2c"; 85 compatible = "fsl-i2c";
84 reg = <3000 100>; 86 reg = <0x3000 0x100>;
85 interrupts = <e 8>; 87 interrupts = <14 0x8>;
86 interrupt-parent = < &ipic >; 88 interrupt-parent = <&ipic>;
87 dfsrr; 89 dfsrr;
88 90
89 rtc@68 { 91 rtc@68 {
90 compatible = "dallas,ds1374"; 92 compatible = "dallas,ds1374";
91 reg = <68>; 93 reg = <0x68>;
92 }; 94 };
93 }; 95 };
94 96
@@ -96,46 +98,46 @@
96 cell-index = <0>; 98 cell-index = <0>;
97 device_type = "serial"; 99 device_type = "serial";
98 compatible = "ns16550"; 100 compatible = "ns16550";
99 reg = <4500 100>; 101 reg = <0x4500 0x100>;
100 clock-frequency = <0>; 102 clock-frequency = <0>;
101 interrupts = <9 8>; 103 interrupts = <9 0x8>;
102 interrupt-parent = < &ipic >; 104 interrupt-parent = <&ipic>;
103 }; 105 };
104 106
105 serial1: serial@4600 { 107 serial1: serial@4600 {
106 cell-index = <1>; 108 cell-index = <1>;
107 device_type = "serial"; 109 device_type = "serial";
108 compatible = "ns16550"; 110 compatible = "ns16550";
109 reg = <4600 100>; 111 reg = <0x4600 0x100>;
110 clock-frequency = <0>; 112 clock-frequency = <0>;
111 interrupts = <a 8>; 113 interrupts = <10 0x8>;
112 interrupt-parent = < &ipic >; 114 interrupt-parent = <&ipic>;
113 }; 115 };
114 116
115 crypto@30000 { 117 crypto@30000 {
116 device_type = "crypto"; 118 device_type = "crypto";
117 model = "SEC2"; 119 model = "SEC2";
118 compatible = "talitos"; 120 compatible = "talitos";
119 reg = <30000 7000>; 121 reg = <0x30000 0x7000>;
120 interrupts = <b 8>; 122 interrupts = <11 0x8>;
121 interrupt-parent = < &ipic >; 123 interrupt-parent = <&ipic>;
122 /* Rev. 2.2 */ 124 /* Rev. 2.2 */
123 num-channels = <1>; 125 num-channels = <1>;
124 channel-fifo-len = <18>; 126 channel-fifo-len = <24>;
125 exec-units-mask = <0000004c>; 127 exec-units-mask = <0x0000004c>;
126 descriptor-types-mask = <0122003f>; 128 descriptor-types-mask = <0x0122003f>;
127 }; 129 };
128 130
129 ipic: pic@700 { 131 ipic: pic@700 {
130 interrupt-controller; 132 interrupt-controller;
131 #address-cells = <0>; 133 #address-cells = <0>;
132 #interrupt-cells = <2>; 134 #interrupt-cells = <2>;
133 reg = <700 100>; 135 reg = <0x700 0x100>;
134 device_type = "ipic"; 136 device_type = "ipic";
135 }; 137 };
136 138
137 par_io@1400 { 139 par_io@1400 {
138 reg = <1400 100>; 140 reg = <0x1400 0x100>;
139 device_type = "par_io"; 141 device_type = "par_io";
140 num-ports = <7>; 142 num-ports = <7>;
141 143
@@ -144,8 +146,8 @@
144 /* port pin dir open_drain assignment has_irq */ 146 /* port pin dir open_drain assignment has_irq */
145 3 4 3 0 2 0 /* MDIO */ 147 3 4 3 0 2 0 /* MDIO */
146 3 5 1 0 2 0 /* MDC */ 148 3 5 1 0 2 0 /* MDC */
147 0 d 2 0 1 0 /* RX_CLK (CLK9) */ 149 0 13 2 0 1 0 /* RX_CLK (CLK9) */
148 3 18 2 0 1 0 /* TX_CLK (CLK10) */ 150 3 24 2 0 1 0 /* TX_CLK (CLK10) */
149 1 0 1 0 1 0 /* TxD0 */ 151 1 0 1 0 1 0 /* TxD0 */
150 1 1 1 0 1 0 /* TxD1 */ 152 1 1 1 0 1 0 /* TxD1 */
151 1 2 1 0 1 0 /* TxD2 */ 153 1 2 1 0 1 0 /* TxD2 */
@@ -156,30 +158,30 @@
156 1 7 2 0 1 0 /* RxD3 */ 158 1 7 2 0 1 0 /* RxD3 */
157 1 8 2 0 1 0 /* RX_ER */ 159 1 8 2 0 1 0 /* RX_ER */
158 1 9 1 0 1 0 /* TX_ER */ 160 1 9 1 0 1 0 /* TX_ER */
159 1 a 2 0 1 0 /* RX_DV */ 161 1 10 2 0 1 0 /* RX_DV */
160 1 b 2 0 1 0 /* COL */ 162 1 11 2 0 1 0 /* COL */
161 1 c 1 0 1 0 /* TX_EN */ 163 1 12 1 0 1 0 /* TX_EN */
162 1 d 2 0 1 0>;/* CRS */ 164 1 13 2 0 1 0>; /* CRS */
163 }; 165 };
164 pio4: ucc_pin@04 { 166 pio4: ucc_pin@04 {
165 pio-map = < 167 pio-map = <
166 /* port pin dir open_drain assignment has_irq */ 168 /* port pin dir open_drain assignment has_irq */
167 3 1f 2 0 1 0 /* RX_CLK (CLK7) */ 169 3 31 2 0 1 0 /* RX_CLK (CLK7) */
168 3 6 2 0 1 0 /* TX_CLK (CLK8) */ 170 3 6 2 0 1 0 /* TX_CLK (CLK8) */
169 1 12 1 0 1 0 /* TxD0 */ 171 1 18 1 0 1 0 /* TxD0 */
170 1 13 1 0 1 0 /* TxD1 */ 172 1 19 1 0 1 0 /* TxD1 */
171 1 14 1 0 1 0 /* TxD2 */ 173 1 20 1 0 1 0 /* TxD2 */
172 1 15 1 0 1 0 /* TxD3 */ 174 1 21 1 0 1 0 /* TxD3 */
173 1 16 2 0 1 0 /* RxD0 */ 175 1 22 2 0 1 0 /* RxD0 */
174 1 17 2 0 1 0 /* RxD1 */ 176 1 23 2 0 1 0 /* RxD1 */
175 1 18 2 0 1 0 /* RxD2 */ 177 1 24 2 0 1 0 /* RxD2 */
176 1 19 2 0 1 0 /* RxD3 */ 178 1 25 2 0 1 0 /* RxD3 */
177 1 1a 2 0 1 0 /* RX_ER */ 179 1 26 2 0 1 0 /* RX_ER */
178 1 1b 1 0 1 0 /* TX_ER */ 180 1 27 1 0 1 0 /* TX_ER */
179 1 1c 2 0 1 0 /* RX_DV */ 181 1 28 2 0 1 0 /* RX_DV */
180 1 1d 2 0 1 0 /* COL */ 182 1 29 2 0 1 0 /* COL */
181 1 1e 1 0 1 0 /* TX_EN */ 183 1 30 1 0 1 0 /* TX_EN */
182 1 1f 2 0 1 0>;/* CRS */ 184 1 31 2 0 1 0>; /* CRS */
183 }; 185 };
184 pio5: ucc_pin@05 { 186 pio5: ucc_pin@05 {
185 pio-map = < 187 pio-map = <
@@ -190,10 +192,10 @@
190 2 0 1 0 2 0 /* TxD5 */ 192 2 0 1 0 2 0 /* TxD5 */
191 2 8 2 0 2 0 /* RxD5 */ 193 2 8 2 0 2 0 /* RxD5 */
192 194
193 2 1d 2 0 0 0 /* CTS5 */ 195 2 29 2 0 0 0 /* CTS5 */
194 2 1f 1 0 2 0 /* RTS5 */ 196 2 31 1 0 2 0 /* RTS5 */
195 197
196 2 18 2 0 0 0 /* CD */ 198 2 24 2 0 0 0 /* CD */
197 199
198 >; 200 >;
199 }; 201 };
@@ -206,44 +208,47 @@
206 #size-cells = <1>; 208 #size-cells = <1>;
207 device_type = "qe"; 209 device_type = "qe";
208 compatible = "fsl,qe"; 210 compatible = "fsl,qe";
209 model = "QE"; 211 ranges = <0x0 0xe0100000 0x00100000>;
210 ranges = <0 e0100000 00100000>; 212 reg = <0xe0100000 0x480>;
211 reg = <e0100000 480>;
212 brg-frequency = <0>; 213 brg-frequency = <0>;
213 bus-frequency = <BCD3D80>; 214 bus-frequency = <198000000>;
214 215
215 muram@10000 { 216 muram@10000 {
216 device_type = "muram"; 217 #address-cells = <1>;
217 ranges = <0 00010000 00004000>; 218 #size-cells = <1>;
219 compatible = "fsl,qe-muram", "fsl,cpm-muram";
220 ranges = <0x0 0x00010000 0x00004000>;
218 221
219 data-only@0 { 222 data-only@0 {
220 reg = <0 4000>; 223 compatible = "fsl,qe-muram-data",
224 "fsl,cpm-muram-data";
225 reg = <0x0 0x4000>;
221 }; 226 };
222 }; 227 };
223 228
224 spi@4c0 { 229 spi@4c0 {
225 device_type = "spi"; 230 cell-index = <0>;
226 compatible = "fsl_spi"; 231 compatible = "fsl,spi";
227 reg = <4c0 40>; 232 reg = <0x4c0 0x40>;
228 interrupts = <2>; 233 interrupts = <2>;
229 interrupt-parent = < &qeic >; 234 interrupt-parent = <&qeic>;
230 mode = "cpu"; 235 mode = "cpu";
231 }; 236 };
232 237
233 spi@500 { 238 spi@500 {
234 device_type = "spi"; 239 cell-index = <1>;
235 compatible = "fsl_spi"; 240 compatible = "fsl,spi";
236 reg = <500 40>; 241 reg = <0x500 0x40>;
237 interrupts = <1>; 242 interrupts = <1>;
238 interrupt-parent = < &qeic >; 243 interrupt-parent = <&qeic>;
239 mode = "cpu"; 244 mode = "cpu";
240 }; 245 };
241 246
242 usb@6c0 { 247 usb@6c0 {
243 compatible = "qe_udc"; 248 compatible = "qe_udc";
244 reg = <6c0 40 8B00 100>; 249 reg = <0x6c0 0x40 0x8b00 0x100>;
245 interrupts = <b>; 250 interrupts = <11>;
246 interrupt-parent = < &qeic >; 251 interrupt-parent = <&qeic>;
247 mode = "slave"; 252 mode = "slave";
248 }; 253 };
249 254
@@ -253,14 +258,14 @@
253 model = "UCC"; 258 model = "UCC";
254 cell-index = <3>; 259 cell-index = <3>;
255 device-id = <3>; 260 device-id = <3>;
256 reg = <2200 200>; 261 reg = <0x2200 0x200>;
257 interrupts = <22>; 262 interrupts = <34>;
258 interrupt-parent = < &qeic >; 263 interrupt-parent = <&qeic>;
259 local-mac-address = [ 00 00 00 00 00 00 ]; 264 local-mac-address = [ 00 00 00 00 00 00 ];
260 rx-clock-name = "clk9"; 265 rx-clock-name = "clk9";
261 tx-clock-name = "clk10"; 266 tx-clock-name = "clk10";
262 phy-handle = < &phy3 >; 267 phy-handle = <&phy3>;
263 pio-handle = < &pio3 >; 268 pio-handle = <&pio3>;
264 }; 269 };
265 270
266 enet1: ucc@3200 { 271 enet1: ucc@3200 {
@@ -269,14 +274,14 @@
269 model = "UCC"; 274 model = "UCC";
270 cell-index = <4>; 275 cell-index = <4>;
271 device-id = <4>; 276 device-id = <4>;
272 reg = <3200 200>; 277 reg = <0x3200 0x200>;
273 interrupts = <23>; 278 interrupts = <35>;
274 interrupt-parent = < &qeic >; 279 interrupt-parent = <&qeic>;
275 local-mac-address = [ 00 00 00 00 00 00 ]; 280 local-mac-address = [ 00 00 00 00 00 00 ];
276 rx-clock-name = "clk7"; 281 rx-clock-name = "clk7";
277 tx-clock-name = "clk8"; 282 tx-clock-name = "clk8";
278 phy-handle = < &phy4 >; 283 phy-handle = <&phy4>;
279 pio-handle = < &pio4 >; 284 pio-handle = <&pio4>;
280 }; 285 };
281 286
282 ucc@2400 { 287 ucc@2400 {
@@ -286,8 +291,8 @@
286 device-id = <5>; /* The UCC number, 1-7*/ 291 device-id = <5>; /* The UCC number, 1-7*/
287 port-number = <0>; /* Which ttyQEx device */ 292 port-number = <0>; /* Which ttyQEx device */
288 soft-uart; /* We need Soft-UART */ 293 soft-uart; /* We need Soft-UART */
289 reg = <2400 200>; 294 reg = <0x2400 0x200>;
290 interrupts = <28>; /* From Table 18-12 */ 295 interrupts = <40>; /* From Table 18-12 */
291 interrupt-parent = < &qeic >; 296 interrupt-parent = < &qeic >;
292 /* 297 /*
293 * For Soft-UART, we need to set TX to 1X, which 298 * For Soft-UART, we need to set TX to 1X, which
@@ -302,92 +307,91 @@
302 mdio@2320 { 307 mdio@2320 {
303 #address-cells = <1>; 308 #address-cells = <1>;
304 #size-cells = <0>; 309 #size-cells = <0>;
305 reg = <2320 18>; 310 reg = <0x2320 0x18>;
306 device_type = "mdio"; 311 compatible = "fsl,ucc-mdio";
307 compatible = "ucc_geth_phy";
308 312
309 phy3: ethernet-phy@03 { 313 phy3: ethernet-phy@03 {
310 interrupt-parent = < &ipic >; 314 interrupt-parent = <&ipic>;
311 interrupts = <11 8>; 315 interrupts = <17 0x8>;
312 reg = <3>; 316 reg = <0x3>;
313 device_type = "ethernet-phy"; 317 device_type = "ethernet-phy";
314 }; 318 };
315 phy4: ethernet-phy@04 { 319 phy4: ethernet-phy@04 {
316 interrupt-parent = < &ipic >; 320 interrupt-parent = <&ipic>;
317 interrupts = <12 8>; 321 interrupts = <18 0x8>;
318 reg = <4>; 322 reg = <0x4>;
319 device_type = "ethernet-phy"; 323 device_type = "ethernet-phy";
320 }; 324 };
321 }; 325 };
322 326
323 qeic: qeic@80 { 327 qeic: interrupt-controller@80 {
324 interrupt-controller; 328 interrupt-controller;
325 device_type = "qeic"; 329 compatible = "fsl,qe-ic";
326 #address-cells = <0>; 330 #address-cells = <0>;
327 #interrupt-cells = <1>; 331 #interrupt-cells = <1>;
328 reg = <80 80>; 332 reg = <0x80 0x80>;
329 big-endian; 333 big-endian;
330 interrupts = <20 8 21 8>; //high:32 low:33 334 interrupts = <32 0x8 33 0x8>; //high:32 low:33
331 interrupt-parent = < &ipic >; 335 interrupt-parent = <&ipic>;
332 }; 336 };
333 }; 337 };
334 338
335 pci0: pci@e0008500 { 339 pci0: pci@e0008500 {
336 cell-index = <1>; 340 cell-index = <1>;
337 interrupt-map-mask = <f800 0 0 7>; 341 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
338 interrupt-map = < 342 interrupt-map = <
339 /* IDSEL 0x11 AD17 */ 343 /* IDSEL 0x11 AD17 */
340 8800 0 0 1 &ipic 14 8 344 0x8800 0x0 0x0 0x1 &ipic 20 0x8
341 8800 0 0 2 &ipic 15 8 345 0x8800 0x0 0x0 0x2 &ipic 21 0x8
342 8800 0 0 3 &ipic 16 8 346 0x8800 0x0 0x0 0x3 &ipic 22 0x8
343 8800 0 0 4 &ipic 17 8 347 0x8800 0x0 0x0 0x4 &ipic 23 0x8
344 348
345 /* IDSEL 0x12 AD18 */ 349 /* IDSEL 0x12 AD18 */
346 9000 0 0 1 &ipic 16 8 350 0x9000 0x0 0x0 0x1 &ipic 22 0x8
347 9000 0 0 2 &ipic 17 8 351 0x9000 0x0 0x0 0x2 &ipic 23 0x8
348 9000 0 0 3 &ipic 14 8 352 0x9000 0x0 0x0 0x3 &ipic 20 0x8
349 9000 0 0 4 &ipic 15 8 353 0x9000 0x0 0x0 0x4 &ipic 21 0x8
350 354
351 /* IDSEL 0x13 AD19 */ 355 /* IDSEL 0x13 AD19 */
352 9800 0 0 1 &ipic 17 8 356 0x9800 0x0 0x0 0x1 &ipic 23 0x8
353 9800 0 0 2 &ipic 14 8 357 0x9800 0x0 0x0 0x2 &ipic 20 0x8
354 9800 0 0 3 &ipic 15 8 358 0x9800 0x0 0x0 0x3 &ipic 21 0x8
355 9800 0 0 4 &ipic 16 8 359 0x9800 0x0 0x0 0x4 &ipic 22 0x8
356 360
357 /* IDSEL 0x15 AD21*/ 361 /* IDSEL 0x15 AD21*/
358 a800 0 0 1 &ipic 14 8 362 0xa800 0x0 0x0 0x1 &ipic 20 0x8
359 a800 0 0 2 &ipic 15 8 363 0xa800 0x0 0x0 0x2 &ipic 21 0x8
360 a800 0 0 3 &ipic 16 8 364 0xa800 0x0 0x0 0x3 &ipic 22 0x8
361 a800 0 0 4 &ipic 17 8 365 0xa800 0x0 0x0 0x4 &ipic 23 0x8
362 366
363 /* IDSEL 0x16 AD22*/ 367 /* IDSEL 0x16 AD22*/
364 b000 0 0 1 &ipic 17 8 368 0xb000 0x0 0x0 0x1 &ipic 23 0x8
365 b000 0 0 2 &ipic 14 8 369 0xb000 0x0 0x0 0x2 &ipic 20 0x8
366 b000 0 0 3 &ipic 15 8 370 0xb000 0x0 0x0 0x3 &ipic 21 0x8
367 b000 0 0 4 &ipic 16 8 371 0xb000 0x0 0x0 0x4 &ipic 22 0x8
368 372
369 /* IDSEL 0x17 AD23*/ 373 /* IDSEL 0x17 AD23*/
370 b800 0 0 1 &ipic 16 8 374 0xb800 0x0 0x0 0x1 &ipic 22 0x8
371 b800 0 0 2 &ipic 17 8 375 0xb800 0x0 0x0 0x2 &ipic 23 0x8
372 b800 0 0 3 &ipic 14 8 376 0xb800 0x0 0x0 0x3 &ipic 20 0x8
373 b800 0 0 4 &ipic 15 8 377 0xb800 0x0 0x0 0x4 &ipic 21 0x8
374 378
375 /* IDSEL 0x18 AD24*/ 379 /* IDSEL 0x18 AD24*/
376 c000 0 0 1 &ipic 15 8 380 0xc000 0x0 0x0 0x1 &ipic 21 0x8
377 c000 0 0 2 &ipic 16 8 381 0xc000 0x0 0x0 0x2 &ipic 22 0x8
378 c000 0 0 3 &ipic 17 8 382 0xc000 0x0 0x0 0x3 &ipic 23 0x8
379 c000 0 0 4 &ipic 14 8>; 383 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
380 interrupt-parent = < &ipic >; 384 interrupt-parent = <&ipic>;
381 interrupts = <42 8>; 385 interrupts = <66 0x8>;
382 bus-range = <0 0>; 386 bus-range = <0x0 0x0>;
383 ranges = <02000000 0 90000000 90000000 0 10000000 387 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
384 42000000 0 80000000 80000000 0 10000000 388 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
385 01000000 0 00000000 d0000000 0 00100000>; 389 0x01000000 0x0 0x00000000 0xd0000000 0x0 0x00100000>;
386 clock-frequency = <0>; 390 clock-frequency = <0>;
387 #interrupt-cells = <1>; 391 #interrupt-cells = <1>;
388 #size-cells = <2>; 392 #size-cells = <2>;
389 #address-cells = <3>; 393 #address-cells = <3>;
390 reg = <e0008500 100>; 394 reg = <0xe0008500 0x100>;
391 compatible = "fsl,mpc8349-pci"; 395 compatible = "fsl,mpc8349-pci";
392 device_type = "pci"; 396 device_type = "pci";
393 }; 397 };
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 10ff7aadf9dc..94f93d209de8 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -9,6 +9,8 @@
9 * option) any later version. 9 * option) any later version.
10 */ 10 */
11 11
12/dts-v1/;
13
12/ { 14/ {
13 model = "MPC8323ERDB"; 15 model = "MPC8323ERDB";
14 compatible = "MPC8323ERDB", "MPC832xRDB", "MPC83xxRDB"; 16 compatible = "MPC8323ERDB", "MPC832xRDB", "MPC83xxRDB";
@@ -29,11 +31,11 @@
29 31
30 PowerPC,8323@0 { 32 PowerPC,8323@0 {
31 device_type = "cpu"; 33 device_type = "cpu";
32 reg = <0>; 34 reg = <0x0>;
33 d-cache-line-size = <20>; // 32 bytes 35 d-cache-line-size = <0x20>; // 32 bytes
34 i-cache-line-size = <20>; // 32 bytes 36 i-cache-line-size = <0x20>; // 32 bytes
35 d-cache-size = <4000>; // L1, 16K 37 d-cache-size = <16384>; // L1, 16K
36 i-cache-size = <4000>; // L1, 16K 38 i-cache-size = <16384>; // L1, 16K
37 timebase-frequency = <0>; 39 timebase-frequency = <0>;
38 bus-frequency = <0>; 40 bus-frequency = <0>;
39 clock-frequency = <0>; 41 clock-frequency = <0>;
@@ -42,21 +44,21 @@
42 44
43 memory { 45 memory {
44 device_type = "memory"; 46 device_type = "memory";
45 reg = <00000000 04000000>; 47 reg = <0x00000000 0x04000000>;
46 }; 48 };
47 49
48 soc8323@e0000000 { 50 soc8323@e0000000 {
49 #address-cells = <1>; 51 #address-cells = <1>;
50 #size-cells = <1>; 52 #size-cells = <1>;
51 device_type = "soc"; 53 device_type = "soc";
52 ranges = <0 e0000000 00100000>; 54 ranges = <0x0 0xe0000000 0x00100000>;
53 reg = <e0000000 00000200>; 55 reg = <0xe0000000 0x00000200>;
54 bus-frequency = <0>; 56 bus-frequency = <0>;
55 57
56 wdt@200 { 58 wdt@200 {
57 device_type = "watchdog"; 59 device_type = "watchdog";
58 compatible = "mpc83xx_wdt"; 60 compatible = "mpc83xx_wdt";
59 reg = <200 100>; 61 reg = <0x200 0x100>;
60 }; 62 };
61 63
62 i2c@3000 { 64 i2c@3000 {
@@ -64,8 +66,8 @@
64 #size-cells = <0>; 66 #size-cells = <0>;
65 cell-index = <0>; 67 cell-index = <0>;
66 compatible = "fsl-i2c"; 68 compatible = "fsl-i2c";
67 reg = <3000 100>; 69 reg = <0x3000 0x100>;
68 interrupts = <e 8>; 70 interrupts = <14 0x8>;
69 interrupt-parent = <&pic>; 71 interrupt-parent = <&pic>;
70 dfsrr; 72 dfsrr;
71 }; 73 };
@@ -74,9 +76,9 @@
74 cell-index = <0>; 76 cell-index = <0>;
75 device_type = "serial"; 77 device_type = "serial";
76 compatible = "ns16550"; 78 compatible = "ns16550";
77 reg = <4500 100>; 79 reg = <0x4500 0x100>;
78 clock-frequency = <0>; 80 clock-frequency = <0>;
79 interrupts = <9 8>; 81 interrupts = <9 0x8>;
80 interrupt-parent = <&pic>; 82 interrupt-parent = <&pic>;
81 }; 83 };
82 84
@@ -84,9 +86,9 @@
84 cell-index = <1>; 86 cell-index = <1>;
85 device_type = "serial"; 87 device_type = "serial";
86 compatible = "ns16550"; 88 compatible = "ns16550";
87 reg = <4600 100>; 89 reg = <0x4600 0x100>;
88 clock-frequency = <0>; 90 clock-frequency = <0>;
89 interrupts = <a 8>; 91 interrupts = <10 0x8>;
90 interrupt-parent = <&pic>; 92 interrupt-parent = <&pic>;
91 }; 93 };
92 94
@@ -94,26 +96,26 @@
94 device_type = "crypto"; 96 device_type = "crypto";
95 model = "SEC2"; 97 model = "SEC2";
96 compatible = "talitos"; 98 compatible = "talitos";
97 reg = <30000 7000>; 99 reg = <0x30000 0x7000>;
98 interrupts = <b 8>; 100 interrupts = <11 0x8>;
99 interrupt-parent = <&pic>; 101 interrupt-parent = <&pic>;
100 /* Rev. 2.2 */ 102 /* Rev. 2.2 */
101 num-channels = <1>; 103 num-channels = <1>;
102 channel-fifo-len = <18>; 104 channel-fifo-len = <24>;
103 exec-units-mask = <0000004c>; 105 exec-units-mask = <0x0000004c>;
104 descriptor-types-mask = <0122003f>; 106 descriptor-types-mask = <0x0122003f>;
105 }; 107 };
106 108
107 pic:pic@700 { 109 pic:pic@700 {
108 interrupt-controller; 110 interrupt-controller;
109 #address-cells = <0>; 111 #address-cells = <0>;
110 #interrupt-cells = <2>; 112 #interrupt-cells = <2>;
111 reg = <700 100>; 113 reg = <0x700 0x100>;
112 device_type = "ipic"; 114 device_type = "ipic";
113 }; 115 };
114 116
115 par_io@1400 { 117 par_io@1400 {
116 reg = <1400 100>; 118 reg = <0x1400 0x100>;
117 device_type = "par_io"; 119 device_type = "par_io";
118 num-ports = <7>; 120 num-ports = <7>;
119 121
@@ -122,28 +124,28 @@
122 /* port pin dir open_drain assignment has_irq */ 124 /* port pin dir open_drain assignment has_irq */
123 3 4 3 0 2 0 /* MDIO */ 125 3 4 3 0 2 0 /* MDIO */
124 3 5 1 0 2 0 /* MDC */ 126 3 5 1 0 2 0 /* MDC */
125 3 15 2 0 1 0 /* RX_CLK (CLK16) */ 127 3 21 2 0 1 0 /* RX_CLK (CLK16) */
126 3 17 2 0 1 0 /* TX_CLK (CLK3) */ 128 3 23 2 0 1 0 /* TX_CLK (CLK3) */
127 0 12 1 0 1 0 /* TxD0 */ 129 0 18 1 0 1 0 /* TxD0 */
128 0 13 1 0 1 0 /* TxD1 */ 130 0 19 1 0 1 0 /* TxD1 */
129 0 14 1 0 1 0 /* TxD2 */ 131 0 20 1 0 1 0 /* TxD2 */
130 0 15 1 0 1 0 /* TxD3 */ 132 0 21 1 0 1 0 /* TxD3 */
131 0 16 2 0 1 0 /* RxD0 */ 133 0 22 2 0 1 0 /* RxD0 */
132 0 17 2 0 1 0 /* RxD1 */ 134 0 23 2 0 1 0 /* RxD1 */
133 0 18 2 0 1 0 /* RxD2 */ 135 0 24 2 0 1 0 /* RxD2 */
134 0 19 2 0 1 0 /* RxD3 */ 136 0 25 2 0 1 0 /* RxD3 */
135 0 1a 2 0 1 0 /* RX_ER */ 137 0 26 2 0 1 0 /* RX_ER */
136 0 1b 1 0 1 0 /* TX_ER */ 138 0 27 1 0 1 0 /* TX_ER */
137 0 1c 2 0 1 0 /* RX_DV */ 139 0 28 2 0 1 0 /* RX_DV */
138 0 1d 2 0 1 0 /* COL */ 140 0 29 2 0 1 0 /* COL */
139 0 1e 1 0 1 0 /* TX_EN */ 141 0 30 1 0 1 0 /* TX_EN */
140 0 1f 2 0 1 0>; /* CRS */ 142 0 31 2 0 1 0>; /* CRS */
141 }; 143 };
142 ucc3pio:ucc_pin@03 { 144 ucc3pio:ucc_pin@03 {
143 pio-map = < 145 pio-map = <
144 /* port pin dir open_drain assignment has_irq */ 146 /* port pin dir open_drain assignment has_irq */
145 0 d 2 0 1 0 /* RX_CLK (CLK9) */ 147 0 13 2 0 1 0 /* RX_CLK (CLK9) */
146 3 18 2 0 1 0 /* TX_CLK (CLK10) */ 148 3 24 2 0 1 0 /* TX_CLK (CLK10) */
147 1 0 1 0 1 0 /* TxD0 */ 149 1 0 1 0 1 0 /* TxD0 */
148 1 1 1 0 1 0 /* TxD1 */ 150 1 1 1 0 1 0 /* TxD1 */
149 1 2 1 0 1 0 /* TxD2 */ 151 1 2 1 0 1 0 /* TxD2 */
@@ -154,10 +156,10 @@
154 1 7 2 0 1 0 /* RxD3 */ 156 1 7 2 0 1 0 /* RxD3 */
155 1 8 2 0 1 0 /* RX_ER */ 157 1 8 2 0 1 0 /* RX_ER */
156 1 9 1 0 1 0 /* TX_ER */ 158 1 9 1 0 1 0 /* TX_ER */
157 1 a 2 0 1 0 /* RX_DV */ 159 1 10 2 0 1 0 /* RX_DV */
158 1 b 2 0 1 0 /* COL */ 160 1 11 2 0 1 0 /* COL */
159 1 c 1 0 1 0 /* TX_EN */ 161 1 12 1 0 1 0 /* TX_EN */
160 1 d 2 0 1 0>; /* CRS */ 162 1 13 2 0 1 0>; /* CRS */
161 }; 163 };
162 }; 164 };
163 }; 165 };
@@ -166,34 +168,38 @@
166 #address-cells = <1>; 168 #address-cells = <1>;
167 #size-cells = <1>; 169 #size-cells = <1>;
168 device_type = "qe"; 170 device_type = "qe";
169 model = "QE"; 171 compatible = "fsl,qe";
170 ranges = <0 e0100000 00100000>; 172 ranges = <0x0 0xe0100000 0x00100000>;
171 reg = <e0100000 480>; 173 reg = <0xe0100000 0x480>;
172 brg-frequency = <0>; 174 brg-frequency = <0>;
173 bus-frequency = <BCD3D80>; 175 bus-frequency = <198000000>;
174 176
175 muram@10000 { 177 muram@10000 {
176 device_type = "muram"; 178 #address-cells = <1>;
177 ranges = <0 00010000 00004000>; 179 #size-cells = <1>;
180 compatible = "fsl,qe-muram", "fsl,cpm-muram";
181 ranges = <0x0 0x00010000 0x00004000>;
178 182
179 data-only@0 { 183 data-only@0 {
180 reg = <0 4000>; 184 compatible = "fsl,qe-muram-data",
185 "fsl,cpm-muram-data";
186 reg = <0x0 0x4000>;
181 }; 187 };
182 }; 188 };
183 189
184 spi@4c0 { 190 spi@4c0 {
185 device_type = "spi"; 191 cell-index = <0>;
186 compatible = "fsl_spi"; 192 compatible = "fsl,spi";
187 reg = <4c0 40>; 193 reg = <0x4c0 0x40>;
188 interrupts = <2>; 194 interrupts = <2>;
189 interrupt-parent = <&qeic>; 195 interrupt-parent = <&qeic>;
190 mode = "cpu-qe"; 196 mode = "cpu-qe";
191 }; 197 };
192 198
193 spi@500 { 199 spi@500 {
194 device_type = "spi"; 200 cell-index = <1>;
195 compatible = "fsl_spi"; 201 compatible = "fsl,spi";
196 reg = <500 40>; 202 reg = <0x500 0x40>;
197 interrupts = <1>; 203 interrupts = <1>;
198 interrupt-parent = <&qeic>; 204 interrupt-parent = <&qeic>;
199 mode = "cpu"; 205 mode = "cpu";
@@ -205,8 +211,8 @@
205 model = "UCC"; 211 model = "UCC";
206 cell-index = <2>; 212 cell-index = <2>;
207 device-id = <2>; 213 device-id = <2>;
208 reg = <3000 200>; 214 reg = <0x3000 0x200>;
209 interrupts = <21>; 215 interrupts = <33>;
210 interrupt-parent = <&qeic>; 216 interrupt-parent = <&qeic>;
211 local-mac-address = [ 00 00 00 00 00 00 ]; 217 local-mac-address = [ 00 00 00 00 00 00 ];
212 rx-clock-name = "clk16"; 218 rx-clock-name = "clk16";
@@ -221,8 +227,8 @@
221 model = "UCC"; 227 model = "UCC";
222 cell-index = <3>; 228 cell-index = <3>;
223 device-id = <3>; 229 device-id = <3>;
224 reg = <2200 200>; 230 reg = <0x2200 0x200>;
225 interrupts = <22>; 231 interrupts = <34>;
226 interrupt-parent = <&qeic>; 232 interrupt-parent = <&qeic>;
227 local-mac-address = [ 00 00 00 00 00 00 ]; 233 local-mac-address = [ 00 00 00 00 00 00 ];
228 rx-clock-name = "clk9"; 234 rx-clock-name = "clk9";
@@ -234,66 +240,65 @@
234 mdio@3120 { 240 mdio@3120 {
235 #address-cells = <1>; 241 #address-cells = <1>;
236 #size-cells = <0>; 242 #size-cells = <0>;
237 reg = <3120 18>; 243 reg = <0x3120 0x18>;
238 device_type = "mdio"; 244 compatible = "fsl,ucc-mdio";
239 compatible = "ucc_geth_phy";
240 245
241 phy00:ethernet-phy@00 { 246 phy00:ethernet-phy@00 {
242 interrupt-parent = <&pic>; 247 interrupt-parent = <&pic>;
243 interrupts = <0>; 248 interrupts = <0>;
244 reg = <0>; 249 reg = <0x0>;
245 device_type = "ethernet-phy"; 250 device_type = "ethernet-phy";
246 }; 251 };
247 phy04:ethernet-phy@04 { 252 phy04:ethernet-phy@04 {
248 interrupt-parent = <&pic>; 253 interrupt-parent = <&pic>;
249 interrupts = <0>; 254 interrupts = <0>;
250 reg = <4>; 255 reg = <0x4>;
251 device_type = "ethernet-phy"; 256 device_type = "ethernet-phy";
252 }; 257 };
253 }; 258 };
254 259
255 qeic:qeic@80 { 260 qeic:interrupt-controller@80 {
256 interrupt-controller; 261 interrupt-controller;
257 device_type = "qeic"; 262 compatible = "fsl,qe-ic";
258 #address-cells = <0>; 263 #address-cells = <0>;
259 #interrupt-cells = <1>; 264 #interrupt-cells = <1>;
260 reg = <80 80>; 265 reg = <0x80 0x80>;
261 big-endian; 266 big-endian;
262 interrupts = <20 8 21 8>; //high:32 low:33 267 interrupts = <32 0x8 33 0x8>; //high:32 low:33
263 interrupt-parent = <&pic>; 268 interrupt-parent = <&pic>;
264 }; 269 };
265 }; 270 };
266 271
267 pci0: pci@e0008500 { 272 pci0: pci@e0008500 {
268 cell-index = <1>; 273 cell-index = <1>;
269 interrupt-map-mask = <f800 0 0 7>; 274 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
270 interrupt-map = < 275 interrupt-map = <
271 /* IDSEL 0x10 AD16 (USB) */ 276 /* IDSEL 0x10 AD16 (USB) */
272 8000 0 0 1 &pic 11 8 277 0x8000 0x0 0x0 0x1 &pic 17 0x8
273 278
274 /* IDSEL 0x11 AD17 (Mini1)*/ 279 /* IDSEL 0x11 AD17 (Mini1)*/
275 8800 0 0 1 &pic 12 8 280 0x8800 0x0 0x0 0x1 &pic 18 0x8
276 8800 0 0 2 &pic 13 8 281 0x8800 0x0 0x0 0x2 &pic 19 0x8
277 8800 0 0 3 &pic 14 8 282 0x8800 0x0 0x0 0x3 &pic 20 0x8
278 8800 0 0 4 &pic 30 8 283 0x8800 0x0 0x0 0x4 &pic 48 0x8
279 284
280 /* IDSEL 0x12 AD18 (PCI/Mini2) */ 285 /* IDSEL 0x12 AD18 (PCI/Mini2) */
281 9000 0 0 1 &pic 13 8 286 0x9000 0x0 0x0 0x1 &pic 19 0x8
282 9000 0 0 2 &pic 14 8 287 0x9000 0x0 0x0 0x2 &pic 20 0x8
283 9000 0 0 3 &pic 30 8 288 0x9000 0x0 0x0 0x3 &pic 48 0x8
284 9000 0 0 4 &pic 11 8>; 289 0x9000 0x0 0x0 0x4 &pic 17 0x8>;
285 290
286 interrupt-parent = <&pic>; 291 interrupt-parent = <&pic>;
287 interrupts = <42 8>; 292 interrupts = <66 0x8>;
288 bus-range = <0 0>; 293 bus-range = <0x0 0x0>;
289 ranges = <42000000 0 80000000 80000000 0 10000000 294 ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
290 02000000 0 90000000 90000000 0 10000000 295 0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
291 01000000 0 d0000000 d0000000 0 04000000>; 296 0x01000000 0x0 0xd0000000 0xd0000000 0x0 0x04000000>;
292 clock-frequency = <0>; 297 clock-frequency = <0>;
293 #interrupt-cells = <1>; 298 #interrupt-cells = <1>;
294 #size-cells = <2>; 299 #size-cells = <2>;
295 #address-cells = <3>; 300 #address-cells = <3>;
296 reg = <e0008500 100>; 301 reg = <0xe0008500 0x100>;
297 compatible = "fsl,mpc8349-pci"; 302 compatible = "fsl,mpc8349-pci";
298 device_type = "pci"; 303 device_type = "pci";
299 }; 304 };
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 04b8da4deb60..9426676b0b7d 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -8,6 +8,9 @@
8 * Free Software Foundation; either version 2 of the License, or (at your 8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 */ 10 */
11
12/dts-v1/;
13
11/ { 14/ {
12 model = "MPC8349EMITX"; 15 model = "MPC8349EMITX";
13 compatible = "MPC8349EMITX", "MPC834xMITX", "MPC83xxMITX"; 16 compatible = "MPC8349EMITX", "MPC834xMITX", "MPC83xxMITX";
@@ -29,11 +32,11 @@
29 32
30 PowerPC,8349@0 { 33 PowerPC,8349@0 {
31 device_type = "cpu"; 34 device_type = "cpu";
32 reg = <0>; 35 reg = <0x0>;
33 d-cache-line-size = <20>; 36 d-cache-line-size = <32>;
34 i-cache-line-size = <20>; 37 i-cache-line-size = <32>;
35 d-cache-size = <8000>; 38 d-cache-size = <32768>;
36 i-cache-size = <8000>; 39 i-cache-size = <32768>;
37 timebase-frequency = <0>; // from bootloader 40 timebase-frequency = <0>; // from bootloader
38 bus-frequency = <0>; // from bootloader 41 bus-frequency = <0>; // from bootloader
39 clock-frequency = <0>; // from bootloader 42 clock-frequency = <0>; // from bootloader
@@ -42,21 +45,21 @@
42 45
43 memory { 46 memory {
44 device_type = "memory"; 47 device_type = "memory";
45 reg = <00000000 10000000>; 48 reg = <0x00000000 0x10000000>;
46 }; 49 };
47 50
48 soc8349@e0000000 { 51 soc8349@e0000000 {
49 #address-cells = <1>; 52 #address-cells = <1>;
50 #size-cells = <1>; 53 #size-cells = <1>;
51 device_type = "soc"; 54 device_type = "soc";
52 ranges = <0 e0000000 00100000>; 55 ranges = <0x0 0xe0000000 0x00100000>;
53 reg = <e0000000 00000200>; 56 reg = <0xe0000000 0x00000200>;
54 bus-frequency = <0>; // from bootloader 57 bus-frequency = <0>; // from bootloader
55 58
56 wdt@200 { 59 wdt@200 {
57 device_type = "watchdog"; 60 device_type = "watchdog";
58 compatible = "mpc83xx_wdt"; 61 compatible = "mpc83xx_wdt";
59 reg = <200 100>; 62 reg = <0x200 0x100>;
60 }; 63 };
61 64
62 i2c@3000 { 65 i2c@3000 {
@@ -64,9 +67,9 @@
64 #size-cells = <0>; 67 #size-cells = <0>;
65 cell-index = <0>; 68 cell-index = <0>;
66 compatible = "fsl-i2c"; 69 compatible = "fsl-i2c";
67 reg = <3000 100>; 70 reg = <0x3000 0x100>;
68 interrupts = <e 8>; 71 interrupts = <14 0x8>;
69 interrupt-parent = < &ipic >; 72 interrupt-parent = <&ipic>;
70 dfsrr; 73 dfsrr;
71 }; 74 };
72 75
@@ -75,39 +78,39 @@
75 #size-cells = <0>; 78 #size-cells = <0>;
76 cell-index = <1>; 79 cell-index = <1>;
77 compatible = "fsl-i2c"; 80 compatible = "fsl-i2c";
78 reg = <3100 100>; 81 reg = <0x3100 0x100>;
79 interrupts = <f 8>; 82 interrupts = <15 0x8>;
80 interrupt-parent = < &ipic >; 83 interrupt-parent = <&ipic>;
81 dfsrr; 84 dfsrr;
82 }; 85 };
83 86
84 spi@7000 { 87 spi@7000 {
85 device_type = "spi"; 88 cell-index = <0>;
86 compatible = "fsl_spi"; 89 compatible = "fsl,spi";
87 reg = <7000 1000>; 90 reg = <0x7000 0x1000>;
88 interrupts = <10 8>; 91 interrupts = <16 0x8>;
89 interrupt-parent = < &ipic >; 92 interrupt-parent = <&ipic>;
90 mode = "cpu"; 93 mode = "cpu";
91 }; 94 };
92 95
93 usb@22000 { 96 usb@22000 {
94 compatible = "fsl-usb2-mph"; 97 compatible = "fsl-usb2-mph";
95 reg = <22000 1000>; 98 reg = <0x22000 0x1000>;
96 #address-cells = <1>; 99 #address-cells = <1>;
97 #size-cells = <0>; 100 #size-cells = <0>;
98 interrupt-parent = < &ipic >; 101 interrupt-parent = <&ipic>;
99 interrupts = <27 8>; 102 interrupts = <39 0x8>;
100 phy_type = "ulpi"; 103 phy_type = "ulpi";
101 port1; 104 port1;
102 }; 105 };
103 106
104 usb@23000 { 107 usb@23000 {
105 compatible = "fsl-usb2-dr"; 108 compatible = "fsl-usb2-dr";
106 reg = <23000 1000>; 109 reg = <0x23000 0x1000>;
107 #address-cells = <1>; 110 #address-cells = <1>;
108 #size-cells = <0>; 111 #size-cells = <0>;
109 interrupt-parent = < &ipic >; 112 interrupt-parent = <&ipic>;
110 interrupts = <26 8>; 113 interrupts = <38 0x8>;
111 dr_mode = "peripheral"; 114 dr_mode = "peripheral";
112 phy_type = "ulpi"; 115 phy_type = "ulpi";
113 }; 116 };
@@ -116,13 +119,13 @@
116 #address-cells = <1>; 119 #address-cells = <1>;
117 #size-cells = <0>; 120 #size-cells = <0>;
118 compatible = "fsl,gianfar-mdio"; 121 compatible = "fsl,gianfar-mdio";
119 reg = <24520 20>; 122 reg = <0x24520 0x20>;
120 123
121 /* Vitesse 8201 */ 124 /* Vitesse 8201 */
122 phy1c: ethernet-phy@1c { 125 phy1c: ethernet-phy@1c {
123 interrupt-parent = < &ipic >; 126 interrupt-parent = <&ipic>;
124 interrupts = <12 8>; 127 interrupts = <18 0x8>;
125 reg = <1c>; 128 reg = <0x1c>;
126 device_type = "ethernet-phy"; 129 device_type = "ethernet-phy";
127 }; 130 };
128 }; 131 };
@@ -132,11 +135,11 @@
132 device_type = "network"; 135 device_type = "network";
133 model = "TSEC"; 136 model = "TSEC";
134 compatible = "gianfar"; 137 compatible = "gianfar";
135 reg = <24000 1000>; 138 reg = <0x24000 0x1000>;
136 local-mac-address = [ 00 00 00 00 00 00 ]; 139 local-mac-address = [ 00 00 00 00 00 00 ];
137 interrupts = <20 8 21 8 22 8>; 140 interrupts = <32 0x8 33 0x8 34 0x8>;
138 interrupt-parent = < &ipic >; 141 interrupt-parent = <&ipic>;
139 phy-handle = < &phy1c >; 142 phy-handle = <&phy1c>;
140 linux,network-index = <0>; 143 linux,network-index = <0>;
141 }; 144 };
142 145
@@ -145,12 +148,12 @@
145 device_type = "network"; 148 device_type = "network";
146 model = "TSEC"; 149 model = "TSEC";
147 compatible = "gianfar"; 150 compatible = "gianfar";
148 reg = <25000 1000>; 151 reg = <0x25000 0x1000>;
149 local-mac-address = [ 00 00 00 00 00 00 ]; 152 local-mac-address = [ 00 00 00 00 00 00 ];
150 interrupts = <23 8 24 8 25 8>; 153 interrupts = <35 0x8 36 0x8 37 0x8>;
151 interrupt-parent = < &ipic >; 154 interrupt-parent = <&ipic>;
152 /* Vitesse 7385 isn't on the MDIO bus */ 155 /* Vitesse 7385 isn't on the MDIO bus */
153 fixed-link = <1 1 d#1000 0 0>; 156 fixed-link = <1 1 1000 0 0>;
154 linux,network-index = <1>; 157 linux,network-index = <1>;
155 }; 158 };
156 159
@@ -158,88 +161,88 @@
158 cell-index = <0>; 161 cell-index = <0>;
159 device_type = "serial"; 162 device_type = "serial";
160 compatible = "ns16550"; 163 compatible = "ns16550";
161 reg = <4500 100>; 164 reg = <0x4500 0x100>;
162 clock-frequency = <0>; // from bootloader 165 clock-frequency = <0>; // from bootloader
163 interrupts = <9 8>; 166 interrupts = <9 0x8>;
164 interrupt-parent = < &ipic >; 167 interrupt-parent = <&ipic>;
165 }; 168 };
166 169
167 serial1: serial@4600 { 170 serial1: serial@4600 {
168 cell-index = <1>; 171 cell-index = <1>;
169 device_type = "serial"; 172 device_type = "serial";
170 compatible = "ns16550"; 173 compatible = "ns16550";
171 reg = <4600 100>; 174 reg = <0x4600 0x100>;
172 clock-frequency = <0>; // from bootloader 175 clock-frequency = <0>; // from bootloader
173 interrupts = <a 8>; 176 interrupts = <10 0x8>;
174 interrupt-parent = < &ipic >; 177 interrupt-parent = <&ipic>;
175 }; 178 };
176 179
177 crypto@30000 { 180 crypto@30000 {
178 device_type = "crypto"; 181 device_type = "crypto";
179 model = "SEC2"; 182 model = "SEC2";
180 compatible = "talitos"; 183 compatible = "talitos";
181 reg = <30000 10000>; 184 reg = <0x30000 0x10000>;
182 interrupts = <b 8>; 185 interrupts = <11 0x8>;
183 interrupt-parent = < &ipic >; 186 interrupt-parent = <&ipic>;
184 num-channels = <4>; 187 num-channels = <4>;
185 channel-fifo-len = <18>; 188 channel-fifo-len = <24>;
186 exec-units-mask = <0000007e>; 189 exec-units-mask = <0x0000007e>;
187 descriptor-types-mask = <01010ebf>; 190 descriptor-types-mask = <0x01010ebf>;
188 }; 191 };
189 192
190 ipic: pic@700 { 193 ipic: pic@700 {
191 interrupt-controller; 194 interrupt-controller;
192 #address-cells = <0>; 195 #address-cells = <0>;
193 #interrupt-cells = <2>; 196 #interrupt-cells = <2>;
194 reg = <700 100>; 197 reg = <0x700 0x100>;
195 device_type = "ipic"; 198 device_type = "ipic";
196 }; 199 };
197 }; 200 };
198 201
199 pci0: pci@e0008500 { 202 pci0: pci@e0008500 {
200 cell-index = <1>; 203 cell-index = <1>;
201 interrupt-map-mask = <f800 0 0 7>; 204 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
202 interrupt-map = < 205 interrupt-map = <
203 /* IDSEL 0x10 - SATA */ 206 /* IDSEL 0x10 - SATA */
204 8000 0 0 1 &ipic 16 8 /* SATA_INTA */ 207 0x8000 0x0 0x0 0x1 &ipic 22 0x8 /* SATA_INTA */
205 >; 208 >;
206 interrupt-parent = < &ipic >; 209 interrupt-parent = <&ipic>;
207 interrupts = <42 8>; 210 interrupts = <66 0x8>;
208 bus-range = <0 0>; 211 bus-range = <0x0 0x0>;
209 ranges = <42000000 0 80000000 80000000 0 10000000 212 ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
210 02000000 0 90000000 90000000 0 10000000 213 0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
211 01000000 0 00000000 e2000000 0 01000000>; 214 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x01000000>;
212 clock-frequency = <3f940aa>; 215 clock-frequency = <66666666>;
213 #interrupt-cells = <1>; 216 #interrupt-cells = <1>;
214 #size-cells = <2>; 217 #size-cells = <2>;
215 #address-cells = <3>; 218 #address-cells = <3>;
216 reg = <e0008500 100>; 219 reg = <0xe0008500 0x100>;
217 compatible = "fsl,mpc8349-pci"; 220 compatible = "fsl,mpc8349-pci";
218 device_type = "pci"; 221 device_type = "pci";
219 }; 222 };
220 223
221 pci1: pci@e0008600 { 224 pci1: pci@e0008600 {
222 cell-index = <2>; 225 cell-index = <2>;
223 interrupt-map-mask = <f800 0 0 7>; 226 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
224 interrupt-map = < 227 interrupt-map = <
225 /* IDSEL 0x0E - MiniPCI Slot */ 228 /* IDSEL 0x0E - MiniPCI Slot */
226 7000 0 0 1 &ipic 15 8 /* PCI_INTA */ 229 0x7000 0x0 0x0 0x1 &ipic 21 0x8 /* PCI_INTA */
227 230
228 /* IDSEL 0x0F - PCI Slot */ 231 /* IDSEL 0x0F - PCI Slot */
229 7800 0 0 1 &ipic 14 8 /* PCI_INTA */ 232 0x7800 0x0 0x0 0x1 &ipic 20 0x8 /* PCI_INTA */
230 7800 0 0 2 &ipic 15 8 /* PCI_INTB */ 233 0x7800 0x0 0x0 0x2 &ipic 21 0x8 /* PCI_INTB */
231 >; 234 >;
232 interrupt-parent = < &ipic >; 235 interrupt-parent = <&ipic>;
233 interrupts = <43 8>; 236 interrupts = <67 0x8>;
234 bus-range = <0 0>; 237 bus-range = <0x0 0x0>;
235 ranges = <42000000 0 a0000000 a0000000 0 10000000 238 ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
236 02000000 0 b0000000 b0000000 0 10000000 239 0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
237 01000000 0 00000000 e3000000 0 01000000>; 240 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x01000000>;
238 clock-frequency = <3f940aa>; 241 clock-frequency = <66666666>;
239 #interrupt-cells = <1>; 242 #interrupt-cells = <1>;
240 #size-cells = <2>; 243 #size-cells = <2>;
241 #address-cells = <3>; 244 #address-cells = <3>;
242 reg = <e0008600 100>; 245 reg = <0xe0008600 0x100>;
243 compatible = "fsl,mpc8349-pci"; 246 compatible = "fsl,mpc8349-pci";
244 device_type = "pci"; 247 device_type = "pci";
245 }; 248 };
@@ -249,15 +252,15 @@
249 #size-cells = <1>; 252 #size-cells = <1>;
250 compatible = "fsl,mpc8349e-localbus", 253 compatible = "fsl,mpc8349e-localbus",
251 "fsl,pq2pro-localbus"; 254 "fsl,pq2pro-localbus";
252 reg = <e0005000 d8>; 255 reg = <0xe0005000 0xd8>;
253 ranges = <3 0 f0000000 210>; 256 ranges = <0x3 0x0 0xf0000000 0x210>;
254 257
255 pata@3,0 { 258 pata@3,0 {
256 compatible = "fsl,mpc8349emitx-pata", "ata-generic"; 259 compatible = "fsl,mpc8349emitx-pata", "ata-generic";
257 reg = <3 0 10 3 20c 4>; 260 reg = <0x3 0x0 0x10 0x3 0x20c 0x4>;
258 reg-shift = <1>; 261 reg-shift = <1>;
259 pio-mode = <6>; 262 pio-mode = <6>;
260 interrupts = <17 8>; 263 interrupts = <23 0x8>;
261 interrupt-parent = <&ipic>; 264 interrupt-parent = <&ipic>;
262 }; 265 };
263 }; 266 };
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index a06ff92cf0b1..f81d735e6e72 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -8,6 +8,9 @@
8 * Free Software Foundation; either version 2 of the License, or (at your 8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 */ 10 */
11
12/dts-v1/;
13
11/ { 14/ {
12 model = "MPC8349EMITXGP"; 15 model = "MPC8349EMITXGP";
13 compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX"; 16 compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX";
@@ -27,11 +30,11 @@
27 30
28 PowerPC,8349@0 { 31 PowerPC,8349@0 {
29 device_type = "cpu"; 32 device_type = "cpu";
30 reg = <0>; 33 reg = <0x0>;
31 d-cache-line-size = <20>; 34 d-cache-line-size = <32>;
32 i-cache-line-size = <20>; 35 i-cache-line-size = <32>;
33 d-cache-size = <8000>; 36 d-cache-size = <32768>;
34 i-cache-size = <8000>; 37 i-cache-size = <32768>;
35 timebase-frequency = <0>; // from bootloader 38 timebase-frequency = <0>; // from bootloader
36 bus-frequency = <0>; // from bootloader 39 bus-frequency = <0>; // from bootloader
37 clock-frequency = <0>; // from bootloader 40 clock-frequency = <0>; // from bootloader
@@ -40,21 +43,21 @@
40 43
41 memory { 44 memory {
42 device_type = "memory"; 45 device_type = "memory";
43 reg = <00000000 10000000>; 46 reg = <0x00000000 0x10000000>;
44 }; 47 };
45 48
46 soc8349@e0000000 { 49 soc8349@e0000000 {
47 #address-cells = <1>; 50 #address-cells = <1>;
48 #size-cells = <1>; 51 #size-cells = <1>;
49 device_type = "soc"; 52 device_type = "soc";
50 ranges = <0 e0000000 00100000>; 53 ranges = <0x0 0xe0000000 0x00100000>;
51 reg = <e0000000 00000200>; 54 reg = <0xe0000000 0x00000200>;
52 bus-frequency = <0>; // from bootloader 55 bus-frequency = <0>; // from bootloader
53 56
54 wdt@200 { 57 wdt@200 {
55 device_type = "watchdog"; 58 device_type = "watchdog";
56 compatible = "mpc83xx_wdt"; 59 compatible = "mpc83xx_wdt";
57 reg = <200 100>; 60 reg = <0x200 0x100>;
58 }; 61 };
59 62
60 i2c@3000 { 63 i2c@3000 {
@@ -62,9 +65,9 @@
62 #size-cells = <0>; 65 #size-cells = <0>;
63 cell-index = <0>; 66 cell-index = <0>;
64 compatible = "fsl-i2c"; 67 compatible = "fsl-i2c";
65 reg = <3000 100>; 68 reg = <0x3000 0x100>;
66 interrupts = <e 8>; 69 interrupts = <14 0x8>;
67 interrupt-parent = < &ipic >; 70 interrupt-parent = <&ipic>;
68 dfsrr; 71 dfsrr;
69 }; 72 };
70 73
@@ -73,28 +76,28 @@
73 #size-cells = <0>; 76 #size-cells = <0>;
74 cell-index = <1>; 77 cell-index = <1>;
75 compatible = "fsl-i2c"; 78 compatible = "fsl-i2c";
76 reg = <3100 100>; 79 reg = <0x3100 0x100>;
77 interrupts = <f 8>; 80 interrupts = <15 0x8>;
78 interrupt-parent = < &ipic >; 81 interrupt-parent = <&ipic>;
79 dfsrr; 82 dfsrr;
80 }; 83 };
81 84
82 spi@7000 { 85 spi@7000 {
83 device_type = "spi"; 86 cell-index = <0>;
84 compatible = "fsl_spi"; 87 compatible = "fsl,spi";
85 reg = <7000 1000>; 88 reg = <0x7000 0x1000>;
86 interrupts = <10 8>; 89 interrupts = <16 0x8>;
87 interrupt-parent = < &ipic >; 90 interrupt-parent = <&ipic>;
88 mode = "cpu"; 91 mode = "cpu";
89 }; 92 };
90 93
91 usb@23000 { 94 usb@23000 {
92 compatible = "fsl-usb2-dr"; 95 compatible = "fsl-usb2-dr";
93 reg = <23000 1000>; 96 reg = <0x23000 0x1000>;
94 #address-cells = <1>; 97 #address-cells = <1>;
95 #size-cells = <0>; 98 #size-cells = <0>;
96 interrupt-parent = < &ipic >; 99 interrupt-parent = <&ipic>;
97 interrupts = <26 8>; 100 interrupts = <38 0x8>;
98 dr_mode = "otg"; 101 dr_mode = "otg";
99 phy_type = "ulpi"; 102 phy_type = "ulpi";
100 }; 103 };
@@ -103,13 +106,13 @@
103 #address-cells = <1>; 106 #address-cells = <1>;
104 #size-cells = <0>; 107 #size-cells = <0>;
105 compatible = "fsl,gianfar-mdio"; 108 compatible = "fsl,gianfar-mdio";
106 reg = <24520 20>; 109 reg = <0x24520 0x20>;
107 110
108 /* Vitesse 8201 */ 111 /* Vitesse 8201 */
109 phy1c: ethernet-phy@1c { 112 phy1c: ethernet-phy@1c {
110 interrupt-parent = < &ipic >; 113 interrupt-parent = <&ipic>;
111 interrupts = <12 8>; 114 interrupts = <18 0x8>;
112 reg = <1c>; 115 reg = <0x1c>;
113 device_type = "ethernet-phy"; 116 device_type = "ethernet-phy";
114 }; 117 };
115 }; 118 };
@@ -119,11 +122,11 @@
119 device_type = "network"; 122 device_type = "network";
120 model = "TSEC"; 123 model = "TSEC";
121 compatible = "gianfar"; 124 compatible = "gianfar";
122 reg = <24000 1000>; 125 reg = <0x24000 0x1000>;
123 local-mac-address = [ 00 00 00 00 00 00 ]; 126 local-mac-address = [ 00 00 00 00 00 00 ];
124 interrupts = <20 8 21 8 22 8>; 127 interrupts = <32 0x8 33 0x8 34 0x8>;
125 interrupt-parent = < &ipic >; 128 interrupt-parent = <&ipic>;
126 phy-handle = < &phy1c >; 129 phy-handle = <&phy1c>;
127 linux,network-index = <0>; 130 linux,network-index = <0>;
128 }; 131 };
129 132
@@ -131,63 +134,63 @@
131 cell-index = <0>; 134 cell-index = <0>;
132 device_type = "serial"; 135 device_type = "serial";
133 compatible = "ns16550"; 136 compatible = "ns16550";
134 reg = <4500 100>; 137 reg = <0x4500 0x100>;
135 clock-frequency = <0>; // from bootloader 138 clock-frequency = <0>; // from bootloader
136 interrupts = <9 8>; 139 interrupts = <9 0x8>;
137 interrupt-parent = < &ipic >; 140 interrupt-parent = <&ipic>;
138 }; 141 };
139 142
140 serial1: serial@4600 { 143 serial1: serial@4600 {
141 cell-index = <1>; 144 cell-index = <1>;
142 device_type = "serial"; 145 device_type = "serial";
143 compatible = "ns16550"; 146 compatible = "ns16550";
144 reg = <4600 100>; 147 reg = <0x4600 0x100>;
145 clock-frequency = <0>; // from bootloader 148 clock-frequency = <0>; // from bootloader
146 interrupts = <a 8>; 149 interrupts = <10 0x8>;
147 interrupt-parent = < &ipic >; 150 interrupt-parent = <&ipic>;
148 }; 151 };
149 152
150 crypto@30000 { 153 crypto@30000 {
151 device_type = "crypto"; 154 device_type = "crypto";
152 model = "SEC2"; 155 model = "SEC2";
153 compatible = "talitos"; 156 compatible = "talitos";
154 reg = <30000 10000>; 157 reg = <0x30000 0x10000>;
155 interrupts = <b 8>; 158 interrupts = <11 0x8>;
156 interrupt-parent = < &ipic >; 159 interrupt-parent = <&ipic>;
157 num-channels = <4>; 160 num-channels = <4>;
158 channel-fifo-len = <18>; 161 channel-fifo-len = <24>;
159 exec-units-mask = <0000007e>; 162 exec-units-mask = <0x0000007e>;
160 descriptor-types-mask = <01010ebf>; 163 descriptor-types-mask = <0x01010ebf>;
161 }; 164 };
162 165
163 ipic: pic@700 { 166 ipic: pic@700 {
164 interrupt-controller; 167 interrupt-controller;
165 #address-cells = <0>; 168 #address-cells = <0>;
166 #interrupt-cells = <2>; 169 #interrupt-cells = <2>;
167 reg = <700 100>; 170 reg = <0x700 0x100>;
168 device_type = "ipic"; 171 device_type = "ipic";
169 }; 172 };
170 }; 173 };
171 174
172 pci0: pci@e0008600 { 175 pci0: pci@e0008600 {
173 cell-index = <2>; 176 cell-index = <2>;
174 interrupt-map-mask = <f800 0 0 7>; 177 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
175 interrupt-map = < 178 interrupt-map = <
176 /* IDSEL 0x0F - PCI Slot */ 179 /* IDSEL 0x0F - PCI Slot */
177 7800 0 0 1 &ipic 14 8 /* PCI_INTA */ 180 0x7800 0x0 0x0 0x1 &ipic 20 0x8 /* PCI_INTA */
178 7800 0 0 2 &ipic 15 8 /* PCI_INTB */ 181 0x7800 0x0 0x0 0x2 &ipic 21 0x8 /* PCI_INTB */
179 >; 182 >;
180 interrupt-parent = < &ipic >; 183 interrupt-parent = <&ipic>;
181 interrupts = <43 8>; 184 interrupts = <67 0x8>;
182 bus-range = <1 1>; 185 bus-range = <0x1 0x1>;
183 ranges = <42000000 0 a0000000 a0000000 0 10000000 186 ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
184 02000000 0 b0000000 b0000000 0 10000000 187 0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
185 01000000 0 00000000 e3000000 0 01000000>; 188 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x01000000>;
186 clock-frequency = <3f940aa>; 189 clock-frequency = <66666666>;
187 #interrupt-cells = <1>; 190 #interrupt-cells = <1>;
188 #size-cells = <2>; 191 #size-cells = <2>;
189 #address-cells = <3>; 192 #address-cells = <3>;
190 reg = <e0008600 100>; 193 reg = <0xe0008600 0x100>;
191 compatible = "fsl,mpc8349-pci"; 194 compatible = "fsl,mpc8349-pci";
192 device_type = "pci"; 195 device_type = "pci";
193 }; 196 };
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 4120e92fcecf..7480edae85ed 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -9,6 +9,8 @@
9 * option) any later version. 9 * option) any later version.
10 */ 10 */
11 11
12/dts-v1/;
13
12/ { 14/ {
13 model = "MPC8349EMDS"; 15 model = "MPC8349EMDS";
14 compatible = "MPC8349EMDS", "MPC834xMDS", "MPC83xxMDS"; 16 compatible = "MPC8349EMDS", "MPC834xMDS", "MPC83xxMDS";
@@ -30,11 +32,11 @@
30 32
31 PowerPC,8349@0 { 33 PowerPC,8349@0 {
32 device_type = "cpu"; 34 device_type = "cpu";
33 reg = <0>; 35 reg = <0x0>;
34 d-cache-line-size = <20>; // 32 bytes 36 d-cache-line-size = <32>;
35 i-cache-line-size = <20>; // 32 bytes 37 i-cache-line-size = <32>;
36 d-cache-size = <8000>; // L1, 32K 38 d-cache-size = <32768>;
37 i-cache-size = <8000>; // L1, 32K 39 i-cache-size = <32768>;
38 timebase-frequency = <0>; // from bootloader 40 timebase-frequency = <0>; // from bootloader
39 bus-frequency = <0>; // from bootloader 41 bus-frequency = <0>; // from bootloader
40 clock-frequency = <0>; // from bootloader 42 clock-frequency = <0>; // from bootloader
@@ -43,26 +45,26 @@
43 45
44 memory { 46 memory {
45 device_type = "memory"; 47 device_type = "memory";
46 reg = <00000000 10000000>; // 256MB at 0 48 reg = <0x00000000 0x10000000>; // 256MB at 0
47 }; 49 };
48 50
49 bcsr@e2400000 { 51 bcsr@e2400000 {
50 device_type = "board-control"; 52 device_type = "board-control";
51 reg = <e2400000 8000>; 53 reg = <0xe2400000 0x8000>;
52 }; 54 };
53 55
54 soc8349@e0000000 { 56 soc8349@e0000000 {
55 #address-cells = <1>; 57 #address-cells = <1>;
56 #size-cells = <1>; 58 #size-cells = <1>;
57 device_type = "soc"; 59 device_type = "soc";
58 ranges = <0 e0000000 00100000>; 60 ranges = <0x0 0xe0000000 0x00100000>;
59 reg = <e0000000 00000200>; 61 reg = <0xe0000000 0x00000200>;
60 bus-frequency = <0>; 62 bus-frequency = <0>;
61 63
62 wdt@200 { 64 wdt@200 {
63 device_type = "watchdog"; 65 device_type = "watchdog";
64 compatible = "mpc83xx_wdt"; 66 compatible = "mpc83xx_wdt";
65 reg = <200 100>; 67 reg = <0x200 0x100>;
66 }; 68 };
67 69
68 i2c@3000 { 70 i2c@3000 {
@@ -70,14 +72,14 @@
70 #size-cells = <0>; 72 #size-cells = <0>;
71 cell-index = <0>; 73 cell-index = <0>;
72 compatible = "fsl-i2c"; 74 compatible = "fsl-i2c";
73 reg = <3000 100>; 75 reg = <0x3000 0x100>;
74 interrupts = <e 8>; 76 interrupts = <14 0x8>;
75 interrupt-parent = < &ipic >; 77 interrupt-parent = <&ipic>;
76 dfsrr; 78 dfsrr;
77 79
78 rtc@68 { 80 rtc@68 {
79 compatible = "dallas,ds1374"; 81 compatible = "dallas,ds1374";
80 reg = <68>; 82 reg = <0x68>;
81 }; 83 };
82 }; 84 };
83 85
@@ -86,41 +88,41 @@
86 #size-cells = <0>; 88 #size-cells = <0>;
87 cell-index = <1>; 89 cell-index = <1>;
88 compatible = "fsl-i2c"; 90 compatible = "fsl-i2c";
89 reg = <3100 100>; 91 reg = <0x3100 0x100>;
90 interrupts = <f 8>; 92 interrupts = <15 0x8>;
91 interrupt-parent = < &ipic >; 93 interrupt-parent = <&ipic>;
92 dfsrr; 94 dfsrr;
93 }; 95 };
94 96
95 spi@7000 { 97 spi@7000 {
96 device_type = "spi"; 98 cell-index = <0>;
97 compatible = "fsl_spi"; 99 compatible = "fsl,spi";
98 reg = <7000 1000>; 100 reg = <0x7000 0x1000>;
99 interrupts = <10 8>; 101 interrupts = <16 0x8>;
100 interrupt-parent = < &ipic >; 102 interrupt-parent = <&ipic>;
101 mode = "cpu"; 103 mode = "cpu";
102 }; 104 };
103 105
104 /* phy type (ULPI or SERIAL) are only types supportted for MPH */ 106 /* phy type (ULPI or SERIAL) are only types supported for MPH */
105 /* port = 0 or 1 */ 107 /* port = 0 or 1 */
106 usb@22000 { 108 usb@22000 {
107 compatible = "fsl-usb2-mph"; 109 compatible = "fsl-usb2-mph";
108 reg = <22000 1000>; 110 reg = <0x22000 0x1000>;
109 #address-cells = <1>; 111 #address-cells = <1>;
110 #size-cells = <0>; 112 #size-cells = <0>;
111 interrupt-parent = < &ipic >; 113 interrupt-parent = <&ipic>;
112 interrupts = <27 8>; 114 interrupts = <39 0x8>;
113 phy_type = "ulpi"; 115 phy_type = "ulpi";
114 port1; 116 port1;
115 }; 117 };
116 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ 118 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
117 usb@23000 { 119 usb@23000 {
118 compatible = "fsl-usb2-dr"; 120 compatible = "fsl-usb2-dr";
119 reg = <23000 1000>; 121 reg = <0x23000 0x1000>;
120 #address-cells = <1>; 122 #address-cells = <1>;
121 #size-cells = <0>; 123 #size-cells = <0>;
122 interrupt-parent = < &ipic >; 124 interrupt-parent = <&ipic>;
123 interrupts = <26 8>; 125 interrupts = <38 0x8>;
124 dr_mode = "otg"; 126 dr_mode = "otg";
125 phy_type = "ulpi"; 127 phy_type = "ulpi";
126 }; 128 };
@@ -129,18 +131,18 @@
129 #address-cells = <1>; 131 #address-cells = <1>;
130 #size-cells = <0>; 132 #size-cells = <0>;
131 compatible = "fsl,gianfar-mdio"; 133 compatible = "fsl,gianfar-mdio";
132 reg = <24520 20>; 134 reg = <0x24520 0x20>;
133 135
134 phy0: ethernet-phy@0 { 136 phy0: ethernet-phy@0 {
135 interrupt-parent = < &ipic >; 137 interrupt-parent = <&ipic>;
136 interrupts = <11 8>; 138 interrupts = <17 0x8>;
137 reg = <0>; 139 reg = <0x0>;
138 device_type = "ethernet-phy"; 140 device_type = "ethernet-phy";
139 }; 141 };
140 phy1: ethernet-phy@1 { 142 phy1: ethernet-phy@1 {
141 interrupt-parent = < &ipic >; 143 interrupt-parent = <&ipic>;
142 interrupts = <12 8>; 144 interrupts = <18 0x8>;
143 reg = <1>; 145 reg = <0x1>;
144 device_type = "ethernet-phy"; 146 device_type = "ethernet-phy";
145 }; 147 };
146 }; 148 };
@@ -150,11 +152,11 @@
150 device_type = "network"; 152 device_type = "network";
151 model = "TSEC"; 153 model = "TSEC";
152 compatible = "gianfar"; 154 compatible = "gianfar";
153 reg = <24000 1000>; 155 reg = <0x24000 0x1000>;
154 local-mac-address = [ 00 00 00 00 00 00 ]; 156 local-mac-address = [ 00 00 00 00 00 00 ];
155 interrupts = <20 8 21 8 22 8>; 157 interrupts = <32 0x8 33 0x8 34 0x8>;
156 interrupt-parent = < &ipic >; 158 interrupt-parent = <&ipic>;
157 phy-handle = < &phy0 >; 159 phy-handle = <&phy0>;
158 linux,network-index = <0>; 160 linux,network-index = <0>;
159 }; 161 };
160 162
@@ -163,11 +165,11 @@
163 device_type = "network"; 165 device_type = "network";
164 model = "TSEC"; 166 model = "TSEC";
165 compatible = "gianfar"; 167 compatible = "gianfar";
166 reg = <25000 1000>; 168 reg = <0x25000 0x1000>;
167 local-mac-address = [ 00 00 00 00 00 00 ]; 169 local-mac-address = [ 00 00 00 00 00 00 ];
168 interrupts = <23 8 24 8 25 8>; 170 interrupts = <35 0x8 36 0x8 37 0x8>;
169 interrupt-parent = < &ipic >; 171 interrupt-parent = <&ipic>;
170 phy-handle = < &phy1 >; 172 phy-handle = <&phy1>;
171 linux,network-index = <1>; 173 linux,network-index = <1>;
172 }; 174 };
173 175
@@ -175,20 +177,20 @@
175 cell-index = <0>; 177 cell-index = <0>;
176 device_type = "serial"; 178 device_type = "serial";
177 compatible = "ns16550"; 179 compatible = "ns16550";
178 reg = <4500 100>; 180 reg = <0x4500 0x100>;
179 clock-frequency = <0>; 181 clock-frequency = <0>;
180 interrupts = <9 8>; 182 interrupts = <9 0x8>;
181 interrupt-parent = < &ipic >; 183 interrupt-parent = <&ipic>;
182 }; 184 };
183 185
184 serial1: serial@4600 { 186 serial1: serial@4600 {
185 cell-index = <1>; 187 cell-index = <1>;
186 device_type = "serial"; 188 device_type = "serial";
187 compatible = "ns16550"; 189 compatible = "ns16550";
188 reg = <4600 100>; 190 reg = <0x4600 0x100>;
189 clock-frequency = <0>; 191 clock-frequency = <0>;
190 interrupts = <a 8>; 192 interrupts = <10 0x8>;
191 interrupt-parent = < &ipic >; 193 interrupt-parent = <&ipic>;
192 }; 194 };
193 195
194 /* May need to remove if on a part without crypto engine */ 196 /* May need to remove if on a part without crypto engine */
@@ -196,15 +198,15 @@
196 device_type = "crypto"; 198 device_type = "crypto";
197 model = "SEC2"; 199 model = "SEC2";
198 compatible = "talitos"; 200 compatible = "talitos";
199 reg = <30000 10000>; 201 reg = <0x30000 0x10000>;
200 interrupts = <b 8>; 202 interrupts = <11 0x8>;
201 interrupt-parent = < &ipic >; 203 interrupt-parent = <&ipic>;
202 num-channels = <4>; 204 num-channels = <4>;
203 channel-fifo-len = <18>; 205 channel-fifo-len = <24>;
204 exec-units-mask = <0000007e>; 206 exec-units-mask = <0x0000007e>;
205 /* desc mask is for rev2.0, 207 /* desc mask is for rev2.0,
206 * we need runtime fixup for >2.0 */ 208 * we need runtime fixup for >2.0 */
207 descriptor-types-mask = <01010ebf>; 209 descriptor-types-mask = <0x01010ebf>;
208 }; 210 };
209 211
210 /* IPIC 212 /* IPIC
@@ -217,129 +219,129 @@
217 interrupt-controller; 219 interrupt-controller;
218 #address-cells = <0>; 220 #address-cells = <0>;
219 #interrupt-cells = <2>; 221 #interrupt-cells = <2>;
220 reg = <700 100>; 222 reg = <0x700 0x100>;
221 device_type = "ipic"; 223 device_type = "ipic";
222 }; 224 };
223 }; 225 };
224 226
225 pci0: pci@e0008500 { 227 pci0: pci@e0008500 {
226 cell-index = <1>; 228 cell-index = <1>;
227 interrupt-map-mask = <f800 0 0 7>; 229 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
228 interrupt-map = < 230 interrupt-map = <
229 231
230 /* IDSEL 0x11 */ 232 /* IDSEL 0x11 */
231 8800 0 0 1 &ipic 14 8 233 0x8800 0x0 0x0 0x1 &ipic 20 0x8
232 8800 0 0 2 &ipic 15 8 234 0x8800 0x0 0x0 0x2 &ipic 21 0x8
233 8800 0 0 3 &ipic 16 8 235 0x8800 0x0 0x0 0x3 &ipic 22 0x8
234 8800 0 0 4 &ipic 17 8 236 0x8800 0x0 0x0 0x4 &ipic 23 0x8
235 237
236 /* IDSEL 0x12 */ 238 /* IDSEL 0x12 */
237 9000 0 0 1 &ipic 16 8 239 0x9000 0x0 0x0 0x1 &ipic 22 0x8
238 9000 0 0 2 &ipic 17 8 240 0x9000 0x0 0x0 0x2 &ipic 23 0x8
239 9000 0 0 3 &ipic 14 8 241 0x9000 0x0 0x0 0x3 &ipic 20 0x8
240 9000 0 0 4 &ipic 15 8 242 0x9000 0x0 0x0 0x4 &ipic 21 0x8
241 243
242 /* IDSEL 0x13 */ 244 /* IDSEL 0x13 */
243 9800 0 0 1 &ipic 17 8 245 0x9800 0x0 0x0 0x1 &ipic 23 0x8
244 9800 0 0 2 &ipic 14 8 246 0x9800 0x0 0x0 0x2 &ipic 20 0x8
245 9800 0 0 3 &ipic 15 8 247 0x9800 0x0 0x0 0x3 &ipic 21 0x8
246 9800 0 0 4 &ipic 16 8 248 0x9800 0x0 0x0 0x4 &ipic 22 0x8
247 249
248 /* IDSEL 0x15 */ 250 /* IDSEL 0x15 */
249 a800 0 0 1 &ipic 14 8 251 0xa800 0x0 0x0 0x1 &ipic 20 0x8
250 a800 0 0 2 &ipic 15 8 252 0xa800 0x0 0x0 0x2 &ipic 21 0x8
251 a800 0 0 3 &ipic 16 8 253 0xa800 0x0 0x0 0x3 &ipic 22 0x8
252 a800 0 0 4 &ipic 17 8 254 0xa800 0x0 0x0 0x4 &ipic 23 0x8
253 255
254 /* IDSEL 0x16 */ 256 /* IDSEL 0x16 */
255 b000 0 0 1 &ipic 17 8 257 0xb000 0x0 0x0 0x1 &ipic 23 0x8
256 b000 0 0 2 &ipic 14 8 258 0xb000 0x0 0x0 0x2 &ipic 20 0x8
257 b000 0 0 3 &ipic 15 8 259 0xb000 0x0 0x0 0x3 &ipic 21 0x8
258 b000 0 0 4 &ipic 16 8 260 0xb000 0x0 0x0 0x4 &ipic 22 0x8
259 261
260 /* IDSEL 0x17 */ 262 /* IDSEL 0x17 */
261 b800 0 0 1 &ipic 16 8 263 0xb800 0x0 0x0 0x1 &ipic 22 0x8
262 b800 0 0 2 &ipic 17 8 264 0xb800 0x0 0x0 0x2 &ipic 23 0x8
263 b800 0 0 3 &ipic 14 8 265 0xb800 0x0 0x0 0x3 &ipic 20 0x8
264 b800 0 0 4 &ipic 15 8 266 0xb800 0x0 0x0 0x4 &ipic 21 0x8
265 267
266 /* IDSEL 0x18 */ 268 /* IDSEL 0x18 */
267 c000 0 0 1 &ipic 15 8 269 0xc000 0x0 0x0 0x1 &ipic 21 0x8
268 c000 0 0 2 &ipic 16 8 270 0xc000 0x0 0x0 0x2 &ipic 22 0x8
269 c000 0 0 3 &ipic 17 8 271 0xc000 0x0 0x0 0x3 &ipic 23 0x8
270 c000 0 0 4 &ipic 14 8>; 272 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
271 interrupt-parent = < &ipic >; 273 interrupt-parent = <&ipic>;
272 interrupts = <42 8>; 274 interrupts = <66 0x8>;
273 bus-range = <0 0>; 275 bus-range = <0 0>;
274 ranges = <02000000 0 90000000 90000000 0 10000000 276 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
275 42000000 0 80000000 80000000 0 10000000 277 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
276 01000000 0 00000000 e2000000 0 00100000>; 278 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
277 clock-frequency = <3f940aa>; 279 clock-frequency = <66666666>;
278 #interrupt-cells = <1>; 280 #interrupt-cells = <1>;
279 #size-cells = <2>; 281 #size-cells = <2>;
280 #address-cells = <3>; 282 #address-cells = <3>;
281 reg = <e0008500 100>; 283 reg = <0xe0008500 0x100>;
282 compatible = "fsl,mpc8349-pci"; 284 compatible = "fsl,mpc8349-pci";
283 device_type = "pci"; 285 device_type = "pci";
284 }; 286 };
285 287
286 pci1: pci@e0008600 { 288 pci1: pci@e0008600 {
287 cell-index = <2>; 289 cell-index = <2>;
288 interrupt-map-mask = <f800 0 0 7>; 290 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
289 interrupt-map = < 291 interrupt-map = <
290 292
291 /* IDSEL 0x11 */ 293 /* IDSEL 0x11 */
292 8800 0 0 1 &ipic 14 8 294 0x8800 0x0 0x0 0x1 &ipic 20 0x8
293 8800 0 0 2 &ipic 15 8 295 0x8800 0x0 0x0 0x2 &ipic 21 0x8
294 8800 0 0 3 &ipic 16 8 296 0x8800 0x0 0x0 0x3 &ipic 22 0x8
295 8800 0 0 4 &ipic 17 8 297 0x8800 0x0 0x0 0x4 &ipic 23 0x8
296 298
297 /* IDSEL 0x12 */ 299 /* IDSEL 0x12 */
298 9000 0 0 1 &ipic 16 8 300 0x9000 0x0 0x0 0x1 &ipic 22 0x8
299 9000 0 0 2 &ipic 17 8 301 0x9000 0x0 0x0 0x2 &ipic 23 0x8
300 9000 0 0 3 &ipic 14 8 302 0x9000 0x0 0x0 0x3 &ipic 20 0x8
301 9000 0 0 4 &ipic 15 8 303 0x9000 0x0 0x0 0x4 &ipic 21 0x8
302 304
303 /* IDSEL 0x13 */ 305 /* IDSEL 0x13 */
304 9800 0 0 1 &ipic 17 8 306 0x9800 0x0 0x0 0x1 &ipic 23 0x8
305 9800 0 0 2 &ipic 14 8 307 0x9800 0x0 0x0 0x2 &ipic 20 0x8
306 9800 0 0 3 &ipic 15 8 308 0x9800 0x0 0x0 0x3 &ipic 21 0x8
307 9800 0 0 4 &ipic 16 8 309 0x9800 0x0 0x0 0x4 &ipic 22 0x8
308 310
309 /* IDSEL 0x15 */ 311 /* IDSEL 0x15 */
310 a800 0 0 1 &ipic 14 8 312 0xa800 0x0 0x0 0x1 &ipic 20 0x8
311 a800 0 0 2 &ipic 15 8 313 0xa800 0x0 0x0 0x2 &ipic 21 0x8
312 a800 0 0 3 &ipic 16 8 314 0xa800 0x0 0x0 0x3 &ipic 22 0x8
313 a800 0 0 4 &ipic 17 8 315 0xa800 0x0 0x0 0x4 &ipic 23 0x8
314 316
315 /* IDSEL 0x16 */ 317 /* IDSEL 0x16 */
316 b000 0 0 1 &ipic 17 8 318 0xb000 0x0 0x0 0x1 &ipic 23 0x8
317 b000 0 0 2 &ipic 14 8 319 0xb000 0x0 0x0 0x2 &ipic 20 0x8
318 b000 0 0 3 &ipic 15 8 320 0xb000 0x0 0x0 0x3 &ipic 21 0x8
319 b000 0 0 4 &ipic 16 8 321 0xb000 0x0 0x0 0x4 &ipic 22 0x8
320 322
321 /* IDSEL 0x17 */ 323 /* IDSEL 0x17 */
322 b800 0 0 1 &ipic 16 8 324 0xb800 0x0 0x0 0x1 &ipic 22 0x8
323 b800 0 0 2 &ipic 17 8 325 0xb800 0x0 0x0 0x2 &ipic 23 0x8
324 b800 0 0 3 &ipic 14 8 326 0xb800 0x0 0x0 0x3 &ipic 20 0x8
325 b800 0 0 4 &ipic 15 8 327 0xb800 0x0 0x0 0x4 &ipic 21 0x8
326 328
327 /* IDSEL 0x18 */ 329 /* IDSEL 0x18 */
328 c000 0 0 1 &ipic 15 8 330 0xc000 0x0 0x0 0x1 &ipic 21 0x8
329 c000 0 0 2 &ipic 16 8 331 0xc000 0x0 0x0 0x2 &ipic 22 0x8
330 c000 0 0 3 &ipic 17 8 332 0xc000 0x0 0x0 0x3 &ipic 23 0x8
331 c000 0 0 4 &ipic 14 8>; 333 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
332 interrupt-parent = < &ipic >; 334 interrupt-parent = <&ipic>;
333 interrupts = <42 8>; 335 interrupts = <66 0x8>;
334 bus-range = <0 0>; 336 bus-range = <0 0>;
335 ranges = <02000000 0 b0000000 b0000000 0 10000000 337 ranges = <0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
336 42000000 0 a0000000 a0000000 0 10000000 338 0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
337 01000000 0 00000000 e2100000 0 00100000>; 339 0x01000000 0x0 0x00000000 0xe2100000 0x0 0x00100000>;
338 clock-frequency = <3f940aa>; 340 clock-frequency = <66666666>;
339 #interrupt-cells = <1>; 341 #interrupt-cells = <1>;
340 #size-cells = <2>; 342 #size-cells = <2>;
341 #address-cells = <3>; 343 #address-cells = <3>;
342 reg = <e0008600 100>; 344 reg = <0xe0008600 0x100>;
343 compatible = "fsl,mpc8349-pci"; 345 compatible = "fsl,mpc8349-pci";
344 device_type = "pci"; 346 device_type = "pci";
345 }; 347 };
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 2181d2cdbff2..55f03e8dc97f 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -14,6 +14,8 @@
14/memreserve/ 00000000 1000000; 14/memreserve/ 00000000 1000000;
15*/ 15*/
16 16
17/dts-v1/;
18
17/ { 19/ {
18 model = "MPC8360MDS"; 20 model = "MPC8360MDS";
19 compatible = "MPC8360EMDS", "MPC836xMDS", "MPC83xxMDS"; 21 compatible = "MPC8360EMDS", "MPC836xMDS", "MPC83xxMDS";
@@ -34,39 +36,39 @@
34 36
35 PowerPC,8360@0 { 37 PowerPC,8360@0 {
36 device_type = "cpu"; 38 device_type = "cpu";
37 reg = <0>; 39 reg = <0x0>;
38 d-cache-line-size = <20>; // 32 bytes 40 d-cache-line-size = <32>; // 32 bytes
39 i-cache-line-size = <20>; // 32 bytes 41 i-cache-line-size = <32>; // 32 bytes
40 d-cache-size = <8000>; // L1, 32K 42 d-cache-size = <32768>; // L1, 32K
41 i-cache-size = <8000>; // L1, 32K 43 i-cache-size = <32768>; // L1, 32K
42 timebase-frequency = <3EF1480>; 44 timebase-frequency = <66000000>;
43 bus-frequency = <FBC5200>; 45 bus-frequency = <264000000>;
44 clock-frequency = <1F78A400>; 46 clock-frequency = <528000000>;
45 }; 47 };
46 }; 48 };
47 49
48 memory { 50 memory {
49 device_type = "memory"; 51 device_type = "memory";
50 reg = <00000000 10000000>; 52 reg = <0x00000000 0x10000000>;
51 }; 53 };
52 54
53 bcsr@f8000000 { 55 bcsr@f8000000 {
54 device_type = "board-control"; 56 device_type = "board-control";
55 reg = <f8000000 8000>; 57 reg = <0xf8000000 0x8000>;
56 }; 58 };
57 59
58 soc8360@e0000000 { 60 soc8360@e0000000 {
59 #address-cells = <1>; 61 #address-cells = <1>;
60 #size-cells = <1>; 62 #size-cells = <1>;
61 device_type = "soc"; 63 device_type = "soc";
62 ranges = <0 e0000000 00100000>; 64 ranges = <0x0 0xe0000000 0x00100000>;
63 reg = <e0000000 00000200>; 65 reg = <0xe0000000 0x00000200>;
64 bus-frequency = <FBC5200>; 66 bus-frequency = <264000000>;
65 67
66 wdt@200 { 68 wdt@200 {
67 device_type = "watchdog"; 69 device_type = "watchdog";
68 compatible = "mpc83xx_wdt"; 70 compatible = "mpc83xx_wdt";
69 reg = <200 100>; 71 reg = <0x200 0x100>;
70 }; 72 };
71 73
72 i2c@3000 { 74 i2c@3000 {
@@ -74,14 +76,14 @@
74 #size-cells = <0>; 76 #size-cells = <0>;
75 cell-index = <0>; 77 cell-index = <0>;
76 compatible = "fsl-i2c"; 78 compatible = "fsl-i2c";
77 reg = <3000 100>; 79 reg = <0x3000 0x100>;
78 interrupts = <e 8>; 80 interrupts = <14 0x8>;
79 interrupt-parent = < &ipic >; 81 interrupt-parent = <&ipic>;
80 dfsrr; 82 dfsrr;
81 83
82 rtc@68 { 84 rtc@68 {
83 compatible = "dallas,ds1374"; 85 compatible = "dallas,ds1374";
84 reg = <68>; 86 reg = <0x68>;
85 }; 87 };
86 }; 88 };
87 89
@@ -90,9 +92,9 @@
90 #size-cells = <0>; 92 #size-cells = <0>;
91 cell-index = <1>; 93 cell-index = <1>;
92 compatible = "fsl-i2c"; 94 compatible = "fsl-i2c";
93 reg = <3100 100>; 95 reg = <0x3100 0x100>;
94 interrupts = <f 8>; 96 interrupts = <15 0x8>;
95 interrupt-parent = < &ipic >; 97 interrupt-parent = <&ipic>;
96 dfsrr; 98 dfsrr;
97 }; 99 };
98 100
@@ -100,46 +102,46 @@
100 cell-index = <0>; 102 cell-index = <0>;
101 device_type = "serial"; 103 device_type = "serial";
102 compatible = "ns16550"; 104 compatible = "ns16550";
103 reg = <4500 100>; 105 reg = <0x4500 0x100>;
104 clock-frequency = <FBC5200>; 106 clock-frequency = <264000000>;
105 interrupts = <9 8>; 107 interrupts = <9 0x8>;
106 interrupt-parent = < &ipic >; 108 interrupt-parent = <&ipic>;
107 }; 109 };
108 110
109 serial1: serial@4600 { 111 serial1: serial@4600 {
110 cell-index = <1>; 112 cell-index = <1>;
111 device_type = "serial"; 113 device_type = "serial";
112 compatible = "ns16550"; 114 compatible = "ns16550";
113 reg = <4600 100>; 115 reg = <0x4600 0x100>;
114 clock-frequency = <FBC5200>; 116 clock-frequency = <264000000>;
115 interrupts = <a 8>; 117 interrupts = <10 0x8>;
116 interrupt-parent = < &ipic >; 118 interrupt-parent = <&ipic>;
117 }; 119 };
118 120
119 crypto@30000 { 121 crypto@30000 {
120 device_type = "crypto"; 122 device_type = "crypto";
121 model = "SEC2"; 123 model = "SEC2";
122 compatible = "talitos"; 124 compatible = "talitos";
123 reg = <30000 10000>; 125 reg = <0x30000 0x10000>;
124 interrupts = <b 8>; 126 interrupts = <11 0x8>;
125 interrupt-parent = < &ipic >; 127 interrupt-parent = <&ipic>;
126 num-channels = <4>; 128 num-channels = <4>;
127 channel-fifo-len = <18>; 129 channel-fifo-len = <24>;
128 exec-units-mask = <0000007e>; 130 exec-units-mask = <0x0000007e>;
129 /* desc mask is for rev1.x, we need runtime fixup for >=2.x */ 131 /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
130 descriptor-types-mask = <01010ebf>; 132 descriptor-types-mask = <0x01010ebf>;
131 }; 133 };
132 134
133 ipic: pic@700 { 135 ipic: pic@700 {
134 interrupt-controller; 136 interrupt-controller;
135 #address-cells = <0>; 137 #address-cells = <0>;
136 #interrupt-cells = <2>; 138 #interrupt-cells = <2>;
137 reg = <700 100>; 139 reg = <0x700 0x100>;
138 device_type = "ipic"; 140 device_type = "ipic";
139 }; 141 };
140 142
141 par_io@1400 { 143 par_io@1400 {
142 reg = <1400 100>; 144 reg = <0x1400 0x100>;
143 device_type = "par_io"; 145 device_type = "par_io";
144 num-ports = <7>; 146 num-ports = <7>;
145 147
@@ -153,19 +155,19 @@
153 1 6 1 0 3 0 /* TxD4 */ 155 1 6 1 0 3 0 /* TxD4 */
154 1 7 1 0 1 0 /* TxD5 */ 156 1 7 1 0 1 0 /* TxD5 */
155 1 9 1 0 2 0 /* TxD6 */ 157 1 9 1 0 2 0 /* TxD6 */
156 1 a 1 0 2 0 /* TxD7 */ 158 1 10 1 0 2 0 /* TxD7 */
157 0 9 2 0 1 0 /* RxD0 */ 159 0 9 2 0 1 0 /* RxD0 */
158 0 a 2 0 1 0 /* RxD1 */ 160 0 10 2 0 1 0 /* RxD1 */
159 0 b 2 0 1 0 /* RxD2 */ 161 0 11 2 0 1 0 /* RxD2 */
160 0 c 2 0 1 0 /* RxD3 */ 162 0 12 2 0 1 0 /* RxD3 */
161 0 d 2 0 1 0 /* RxD4 */ 163 0 13 2 0 1 0 /* RxD4 */
162 1 1 2 0 2 0 /* RxD5 */ 164 1 1 2 0 2 0 /* RxD5 */
163 1 0 2 0 2 0 /* RxD6 */ 165 1 0 2 0 2 0 /* RxD6 */
164 1 4 2 0 2 0 /* RxD7 */ 166 1 4 2 0 2 0 /* RxD7 */
165 0 7 1 0 1 0 /* TX_EN */ 167 0 7 1 0 1 0 /* TX_EN */
166 0 8 1 0 1 0 /* TX_ER */ 168 0 8 1 0 1 0 /* TX_ER */
167 0 f 2 0 1 0 /* RX_DV */ 169 0 15 2 0 1 0 /* RX_DV */
168 0 10 2 0 1 0 /* RX_ER */ 170 0 16 2 0 1 0 /* RX_ER */
169 0 0 2 0 1 0 /* RX_CLK */ 171 0 0 2 0 1 0 /* RX_CLK */
170 2 9 1 0 3 0 /* GTX_CLK - CLK10 */ 172 2 9 1 0 3 0 /* GTX_CLK - CLK10 */
171 2 8 2 0 1 0>; /* GTX125 - CLK9 */ 173 2 8 2 0 1 0>; /* GTX125 - CLK9 */
@@ -173,27 +175,27 @@
173 pio2: ucc_pin@02 { 175 pio2: ucc_pin@02 {
174 pio-map = < 176 pio-map = <
175 /* port pin dir open_drain assignment has_irq */ 177 /* port pin dir open_drain assignment has_irq */
176 0 11 1 0 1 0 /* TxD0 */ 178 0 17 1 0 1 0 /* TxD0 */
177 0 12 1 0 1 0 /* TxD1 */ 179 0 18 1 0 1 0 /* TxD1 */
178 0 13 1 0 1 0 /* TxD2 */ 180 0 19 1 0 1 0 /* TxD2 */
179 0 14 1 0 1 0 /* TxD3 */ 181 0 20 1 0 1 0 /* TxD3 */
180 1 2 1 0 1 0 /* TxD4 */ 182 1 2 1 0 1 0 /* TxD4 */
181 1 3 1 0 2 0 /* TxD5 */ 183 1 3 1 0 2 0 /* TxD5 */
182 1 5 1 0 3 0 /* TxD6 */ 184 1 5 1 0 3 0 /* TxD6 */
183 1 8 1 0 3 0 /* TxD7 */ 185 1 8 1 0 3 0 /* TxD7 */
184 0 17 2 0 1 0 /* RxD0 */ 186 0 23 2 0 1 0 /* RxD0 */
185 0 18 2 0 1 0 /* RxD1 */ 187 0 24 2 0 1 0 /* RxD1 */
186 0 19 2 0 1 0 /* RxD2 */ 188 0 25 2 0 1 0 /* RxD2 */
187 0 1a 2 0 1 0 /* RxD3 */ 189 0 26 2 0 1 0 /* RxD3 */
188 0 1b 2 0 1 0 /* RxD4 */ 190 0 27 2 0 1 0 /* RxD4 */
189 1 c 2 0 2 0 /* RxD5 */ 191 1 12 2 0 2 0 /* RxD5 */
190 1 d 2 0 3 0 /* RxD6 */ 192 1 13 2 0 3 0 /* RxD6 */
191 1 b 2 0 2 0 /* RxD7 */ 193 1 11 2 0 2 0 /* RxD7 */
192 0 15 1 0 1 0 /* TX_EN */ 194 0 21 1 0 1 0 /* TX_EN */
193 0 16 1 0 1 0 /* TX_ER */ 195 0 22 1 0 1 0 /* TX_ER */
194 0 1d 2 0 1 0 /* RX_DV */ 196 0 29 2 0 1 0 /* RX_DV */
195 0 1e 2 0 1 0 /* RX_ER */ 197 0 30 2 0 1 0 /* RX_ER */
196 0 1f 2 0 1 0 /* RX_CLK */ 198 0 31 2 0 1 0 /* RX_CLK */
197 2 2 1 0 2 0 /* GTX_CLK - CLK10 */ 199 2 2 1 0 2 0 /* GTX_CLK - CLK10 */
198 2 3 2 0 1 0 /* GTX125 - CLK4 */ 200 2 3 2 0 1 0 /* GTX125 - CLK4 */
199 0 1 3 0 2 0 /* MDIO */ 201 0 1 3 0 2 0 /* MDIO */
@@ -207,44 +209,48 @@
207 #address-cells = <1>; 209 #address-cells = <1>;
208 #size-cells = <1>; 210 #size-cells = <1>;
209 device_type = "qe"; 211 device_type = "qe";
210 model = "QE"; 212 compatible = "fsl,qe";
211 ranges = <0 e0100000 00100000>; 213 ranges = <0x0 0xe0100000 0x00100000>;
212 reg = <e0100000 480>; 214 reg = <0xe0100000 0x480>;
213 brg-frequency = <0>; 215 brg-frequency = <0>;
214 bus-frequency = <179A7B00>; 216 bus-frequency = <396000000>;
215 217
216 muram@10000 { 218 muram@10000 {
217 device_type = "muram"; 219 #address-cells = <1>;
218 ranges = <0 00010000 0000c000>; 220 #size-cells = <1>;
219 221 compatible = "fsl,qe-muram", "fsl,cpm-muram";
220 data-only@0{ 222 ranges = <0x0 0x00010000 0x0000c000>;
221 reg = <0 c000>; 223
224 data-only@0 {
225 compatible = "fsl,qe-muram-data",
226 "fsl,cpm-muram-data";
227 reg = <0x0 0xc000>;
222 }; 228 };
223 }; 229 };
224 230
225 spi@4c0 { 231 spi@4c0 {
226 device_type = "spi"; 232 cell-index = <0>;
227 compatible = "fsl_spi"; 233 compatible = "fsl,spi";
228 reg = <4c0 40>; 234 reg = <0x4c0 0x40>;
229 interrupts = <2>; 235 interrupts = <2>;
230 interrupt-parent = < &qeic >; 236 interrupt-parent = <&qeic>;
231 mode = "cpu"; 237 mode = "cpu";
232 }; 238 };
233 239
234 spi@500 { 240 spi@500 {
235 device_type = "spi"; 241 cell-index = <1>;
236 compatible = "fsl_spi"; 242 compatible = "fsl,spi";
237 reg = <500 40>; 243 reg = <0x500 0x40>;
238 interrupts = <1>; 244 interrupts = <1>;
239 interrupt-parent = < &qeic >; 245 interrupt-parent = <&qeic>;
240 mode = "cpu"; 246 mode = "cpu";
241 }; 247 };
242 248
243 usb@6c0 { 249 usb@6c0 {
244 compatible = "qe_udc"; 250 compatible = "qe_udc";
245 reg = <6c0 40 8B00 100>; 251 reg = <0x6c0 0x40 0x8b00 0x100>;
246 interrupts = <b>; 252 interrupts = <11>;
247 interrupt-parent = < &qeic >; 253 interrupt-parent = <&qeic>;
248 mode = "slave"; 254 mode = "slave";
249 }; 255 };
250 256
@@ -254,15 +260,15 @@
254 model = "UCC"; 260 model = "UCC";
255 cell-index = <1>; 261 cell-index = <1>;
256 device-id = <1>; 262 device-id = <1>;
257 reg = <2000 200>; 263 reg = <0x2000 0x200>;
258 interrupts = <20>; 264 interrupts = <32>;
259 interrupt-parent = < &qeic >; 265 interrupt-parent = <&qeic>;
260 local-mac-address = [ 00 00 00 00 00 00 ]; 266 local-mac-address = [ 00 00 00 00 00 00 ];
261 rx-clock-name = "none"; 267 rx-clock-name = "none";
262 tx-clock-name = "clk9"; 268 tx-clock-name = "clk9";
263 phy-handle = < &phy0 >; 269 phy-handle = <&phy0>;
264 phy-connection-type = "rgmii-id"; 270 phy-connection-type = "rgmii-id";
265 pio-handle = < &pio1 >; 271 pio-handle = <&pio1>;
266 }; 272 };
267 273
268 enet1: ucc@3000 { 274 enet1: ucc@3000 {
@@ -271,107 +277,106 @@
271 model = "UCC"; 277 model = "UCC";
272 cell-index = <2>; 278 cell-index = <2>;
273 device-id = <2>; 279 device-id = <2>;
274 reg = <3000 200>; 280 reg = <0x3000 0x200>;
275 interrupts = <21>; 281 interrupts = <33>;
276 interrupt-parent = < &qeic >; 282 interrupt-parent = <&qeic>;
277 local-mac-address = [ 00 00 00 00 00 00 ]; 283 local-mac-address = [ 00 00 00 00 00 00 ];
278 rx-clock-name = "none"; 284 rx-clock-name = "none";
279 tx-clock-name = "clk4"; 285 tx-clock-name = "clk4";
280 phy-handle = < &phy1 >; 286 phy-handle = <&phy1>;
281 phy-connection-type = "rgmii-id"; 287 phy-connection-type = "rgmii-id";
282 pio-handle = < &pio2 >; 288 pio-handle = <&pio2>;
283 }; 289 };
284 290
285 mdio@2120 { 291 mdio@2120 {
286 #address-cells = <1>; 292 #address-cells = <1>;
287 #size-cells = <0>; 293 #size-cells = <0>;
288 reg = <2120 18>; 294 reg = <0x2120 0x18>;
289 device_type = "mdio"; 295 compatible = "fsl,ucc-mdio";
290 compatible = "ucc_geth_phy";
291 296
292 phy0: ethernet-phy@00 { 297 phy0: ethernet-phy@00 {
293 interrupt-parent = < &ipic >; 298 interrupt-parent = <&ipic>;
294 interrupts = <11 8>; 299 interrupts = <17 0x8>;
295 reg = <0>; 300 reg = <0x0>;
296 device_type = "ethernet-phy"; 301 device_type = "ethernet-phy";
297 }; 302 };
298 phy1: ethernet-phy@01 { 303 phy1: ethernet-phy@01 {
299 interrupt-parent = < &ipic >; 304 interrupt-parent = <&ipic>;
300 interrupts = <12 8>; 305 interrupts = <18 0x8>;
301 reg = <1>; 306 reg = <0x1>;
302 device_type = "ethernet-phy"; 307 device_type = "ethernet-phy";
303 }; 308 };
304 }; 309 };
305 310
306 qeic: qeic@80 { 311 qeic: interrupt-controller@80 {
307 interrupt-controller; 312 interrupt-controller;
308 device_type = "qeic"; 313 compatible = "fsl,qe-ic";
309 #address-cells = <0>; 314 #address-cells = <0>;
310 #interrupt-cells = <1>; 315 #interrupt-cells = <1>;
311 reg = <80 80>; 316 reg = <0x80 0x80>;
312 big-endian; 317 big-endian;
313 interrupts = <20 8 21 8>; //high:32 low:33 318 interrupts = <32 0x8 33 0x8>; // high:32 low:33
314 interrupt-parent = < &ipic >; 319 interrupt-parent = <&ipic>;
315 }; 320 };
316 }; 321 };
317 322
318 pci0: pci@e0008500 { 323 pci0: pci@e0008500 {
319 cell-index = <1>; 324 cell-index = <1>;
320 interrupt-map-mask = <f800 0 0 7>; 325 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
321 interrupt-map = < 326 interrupt-map = <
322 327
323 /* IDSEL 0x11 AD17 */ 328 /* IDSEL 0x11 AD17 */
324 8800 0 0 1 &ipic 14 8 329 0x8800 0x0 0x0 0x1 &ipic 20 0x8
325 8800 0 0 2 &ipic 15 8 330 0x8800 0x0 0x0 0x2 &ipic 21 0x8
326 8800 0 0 3 &ipic 16 8 331 0x8800 0x0 0x0 0x3 &ipic 22 0x8
327 8800 0 0 4 &ipic 17 8 332 0x8800 0x0 0x0 0x4 &ipic 23 0x8
328 333
329 /* IDSEL 0x12 AD18 */ 334 /* IDSEL 0x12 AD18 */
330 9000 0 0 1 &ipic 16 8 335 0x9000 0x0 0x0 0x1 &ipic 22 0x8
331 9000 0 0 2 &ipic 17 8 336 0x9000 0x0 0x0 0x2 &ipic 23 0x8
332 9000 0 0 3 &ipic 14 8 337 0x9000 0x0 0x0 0x3 &ipic 20 0x8
333 9000 0 0 4 &ipic 15 8 338 0x9000 0x0 0x0 0x4 &ipic 21 0x8
334 339
335 /* IDSEL 0x13 AD19 */ 340 /* IDSEL 0x13 AD19 */
336 9800 0 0 1 &ipic 17 8 341 0x9800 0x0 0x0 0x1 &ipic 23 0x8
337 9800 0 0 2 &ipic 14 8 342 0x9800 0x0 0x0 0x2 &ipic 20 0x8
338 9800 0 0 3 &ipic 15 8 343 0x9800 0x0 0x0 0x3 &ipic 21 0x8
339 9800 0 0 4 &ipic 16 8 344 0x9800 0x0 0x0 0x4 &ipic 22 0x8
340 345
341 /* IDSEL 0x15 AD21*/ 346 /* IDSEL 0x15 AD21*/
342 a800 0 0 1 &ipic 14 8 347 0xa800 0x0 0x0 0x1 &ipic 20 0x8
343 a800 0 0 2 &ipic 15 8 348 0xa800 0x0 0x0 0x2 &ipic 21 0x8
344 a800 0 0 3 &ipic 16 8 349 0xa800 0x0 0x0 0x3 &ipic 22 0x8
345 a800 0 0 4 &ipic 17 8 350 0xa800 0x0 0x0 0x4 &ipic 23 0x8
346 351
347 /* IDSEL 0x16 AD22*/ 352 /* IDSEL 0x16 AD22*/
348 b000 0 0 1 &ipic 17 8 353 0xb000 0x0 0x0 0x1 &ipic 23 0x8
349 b000 0 0 2 &ipic 14 8 354 0xb000 0x0 0x0 0x2 &ipic 20 0x8
350 b000 0 0 3 &ipic 15 8 355 0xb000 0x0 0x0 0x3 &ipic 21 0x8
351 b000 0 0 4 &ipic 16 8 356 0xb000 0x0 0x0 0x4 &ipic 22 0x8
352 357
353 /* IDSEL 0x17 AD23*/ 358 /* IDSEL 0x17 AD23*/
354 b800 0 0 1 &ipic 16 8 359 0xb800 0x0 0x0 0x1 &ipic 22 0x8
355 b800 0 0 2 &ipic 17 8 360 0xb800 0x0 0x0 0x2 &ipic 23 0x8
356 b800 0 0 3 &ipic 14 8 361 0xb800 0x0 0x0 0x3 &ipic 20 0x8
357 b800 0 0 4 &ipic 15 8 362 0xb800 0x0 0x0 0x4 &ipic 21 0x8
358 363
359 /* IDSEL 0x18 AD24*/ 364 /* IDSEL 0x18 AD24*/
360 c000 0 0 1 &ipic 15 8 365 0xc000 0x0 0x0 0x1 &ipic 21 0x8
361 c000 0 0 2 &ipic 16 8 366 0xc000 0x0 0x0 0x2 &ipic 22 0x8
362 c000 0 0 3 &ipic 17 8 367 0xc000 0x0 0x0 0x3 &ipic 23 0x8
363 c000 0 0 4 &ipic 14 8>; 368 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
364 interrupt-parent = < &ipic >; 369 interrupt-parent = <&ipic>;
365 interrupts = <42 8>; 370 interrupts = <66 0x8>;
366 bus-range = <0 0>; 371 bus-range = <0 0>;
367 ranges = <02000000 0 a0000000 a0000000 0 10000000 372 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
368 42000000 0 80000000 80000000 0 10000000 373 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
369 01000000 0 00000000 e2000000 0 00100000>; 374 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
370 clock-frequency = <3f940aa>; 375 clock-frequency = <66666666>;
371 #interrupt-cells = <1>; 376 #interrupt-cells = <1>;
372 #size-cells = <2>; 377 #size-cells = <2>;
373 #address-cells = <3>; 378 #address-cells = <3>;
374 reg = <e0008500 100>; 379 reg = <0xe0008500 0x100>;
375 compatible = "fsl,mpc8349-pci"; 380 compatible = "fsl,mpc8349-pci";
376 device_type = "pci"; 381 device_type = "pci";
377 }; 382 };
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 98b46065f45a..a3637fff73cc 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -31,11 +31,11 @@
31 31
32 PowerPC,8377@0 { 32 PowerPC,8377@0 {
33 device_type = "cpu"; 33 device_type = "cpu";
34 reg = <0>; 34 reg = <0x0>;
35 d-cache-line-size = <0x20>; 35 d-cache-line-size = <32>;
36 i-cache-line-size = <0x20>; 36 i-cache-line-size = <32>;
37 d-cache-size = <0x8000>; // L1, 32K 37 d-cache-size = <32768>;
38 i-cache-size = <0x8000>; // L1, 32K 38 i-cache-size = <32768>;
39 timebase-frequency = <0>; 39 timebase-frequency = <0>;
40 bus-frequency = <0>; 40 bus-frequency = <0>;
41 clock-frequency = <0>; 41 clock-frequency = <0>;
@@ -66,8 +66,8 @@
66 cell-index = <0>; 66 cell-index = <0>;
67 compatible = "fsl-i2c"; 67 compatible = "fsl-i2c";
68 reg = <0x3000 0x100>; 68 reg = <0x3000 0x100>;
69 interrupts = <0xe 0x8>; 69 interrupts = <14 0x8>;
70 interrupt-parent = < &ipic >; 70 interrupt-parent = <&ipic>;
71 dfsrr; 71 dfsrr;
72 }; 72 };
73 73
@@ -77,16 +77,17 @@
77 cell-index = <1>; 77 cell-index = <1>;
78 compatible = "fsl-i2c"; 78 compatible = "fsl-i2c";
79 reg = <0x3100 0x100>; 79 reg = <0x3100 0x100>;
80 interrupts = <0xf 0x8>; 80 interrupts = <15 0x8>;
81 interrupt-parent = < &ipic >; 81 interrupt-parent = <&ipic>;
82 dfsrr; 82 dfsrr;
83 }; 83 };
84 84
85 spi@7000 { 85 spi@7000 {
86 compatible = "fsl_spi"; 86 cell-index = <0>;
87 compatible = "fsl,spi";
87 reg = <0x7000 0x1000>; 88 reg = <0x7000 0x1000>;
88 interrupts = <0x10 0x8>; 89 interrupts = <16 0x8>;
89 interrupt-parent = < &ipic >; 90 interrupt-parent = <&ipic>;
90 mode = "cpu"; 91 mode = "cpu";
91 }; 92 };
92 93
@@ -96,8 +97,8 @@
96 reg = <0x23000 0x1000>; 97 reg = <0x23000 0x1000>;
97 #address-cells = <1>; 98 #address-cells = <1>;
98 #size-cells = <0>; 99 #size-cells = <0>;
99 interrupt-parent = < &ipic >; 100 interrupt-parent = <&ipic>;
100 interrupts = <0x26 0x8>; 101 interrupts = <38 0x8>;
101 phy_type = "utmi_wide"; 102 phy_type = "utmi_wide";
102 }; 103 };
103 104
@@ -107,15 +108,15 @@
107 compatible = "fsl,gianfar-mdio"; 108 compatible = "fsl,gianfar-mdio";
108 reg = <0x24520 0x20>; 109 reg = <0x24520 0x20>;
109 phy2: ethernet-phy@2 { 110 phy2: ethernet-phy@2 {
110 interrupt-parent = < &ipic >; 111 interrupt-parent = <&ipic>;
111 interrupts = <0x11 0x8>; 112 interrupts = <17 0x8>;
112 reg = <2>; 113 reg = <0x2>;
113 device_type = "ethernet-phy"; 114 device_type = "ethernet-phy";
114 }; 115 };
115 phy3: ethernet-phy@3 { 116 phy3: ethernet-phy@3 {
116 interrupt-parent = < &ipic >; 117 interrupt-parent = <&ipic>;
117 interrupts = <0x12 0x8>; 118 interrupts = <18 0x8>;
118 reg = <3>; 119 reg = <0x3>;
119 device_type = "ethernet-phy"; 120 device_type = "ethernet-phy";
120 }; 121 };
121 }; 122 };
@@ -127,10 +128,10 @@
127 compatible = "gianfar"; 128 compatible = "gianfar";
128 reg = <0x24000 0x1000>; 129 reg = <0x24000 0x1000>;
129 local-mac-address = [ 00 00 00 00 00 00 ]; 130 local-mac-address = [ 00 00 00 00 00 00 ];
130 interrupts = <0x20 0x8 0x21 0x8 0x22 0x8>; 131 interrupts = <32 0x8 33 0x8 34 0x8>;
131 phy-connection-type = "mii"; 132 phy-connection-type = "mii";
132 interrupt-parent = < &ipic >; 133 interrupt-parent = <&ipic>;
133 phy-handle = < &phy2 >; 134 phy-handle = <&phy2>;
134 }; 135 };
135 136
136 enet1: ethernet@25000 { 137 enet1: ethernet@25000 {
@@ -140,10 +141,10 @@
140 compatible = "gianfar"; 141 compatible = "gianfar";
141 reg = <0x25000 0x1000>; 142 reg = <0x25000 0x1000>;
142 local-mac-address = [ 00 00 00 00 00 00 ]; 143 local-mac-address = [ 00 00 00 00 00 00 ];
143 interrupts = <0x23 0x8 0x24 0x8 0x25 0x8>; 144 interrupts = <35 0x8 36 0x8 37 0x8>;
144 phy-connection-type = "mii"; 145 phy-connection-type = "mii";
145 interrupt-parent = < &ipic >; 146 interrupt-parent = <&ipic>;
146 phy-handle = < &phy3 >; 147 phy-handle = <&phy3>;
147 }; 148 };
148 149
149 serial0: serial@4500 { 150 serial0: serial@4500 {
@@ -152,8 +153,8 @@
152 compatible = "ns16550"; 153 compatible = "ns16550";
153 reg = <0x4500 0x100>; 154 reg = <0x4500 0x100>;
154 clock-frequency = <0>; 155 clock-frequency = <0>;
155 interrupts = <0x9 0x8>; 156 interrupts = <9 0x8>;
156 interrupt-parent = < &ipic >; 157 interrupt-parent = <&ipic>;
157 }; 158 };
158 159
159 serial1: serial@4600 { 160 serial1: serial@4600 {
@@ -162,19 +163,19 @@
162 compatible = "ns16550"; 163 compatible = "ns16550";
163 reg = <0x4600 0x100>; 164 reg = <0x4600 0x100>;
164 clock-frequency = <0>; 165 clock-frequency = <0>;
165 interrupts = <0xa 0x8>; 166 interrupts = <10 0x8>;
166 interrupt-parent = < &ipic >; 167 interrupt-parent = <&ipic>;
167 }; 168 };
168 169
169 crypto@30000 { 170 crypto@30000 {
170 model = "SEC3"; 171 model = "SEC3";
171 compatible = "talitos"; 172 compatible = "talitos";
172 reg = <0x30000 0x10000>; 173 reg = <0x30000 0x10000>;
173 interrupts = <0xb 0x8>; 174 interrupts = <11 0x8>;
174 interrupt-parent = < &ipic >; 175 interrupt-parent = <&ipic>;
175 /* Rev. 3.0 geometry */ 176 /* Rev. 3.0 geometry */
176 num-channels = <4>; 177 num-channels = <4>;
177 channel-fifo-len = <0x18>; 178 channel-fifo-len = <24>;
178 exec-units-mask = <0x000001fe>; 179 exec-units-mask = <0x000001fe>;
179 descriptor-types-mask = <0x03ab0ebf>; 180 descriptor-types-mask = <0x03ab0ebf>;
180 }; 181 };
@@ -183,22 +184,22 @@
183 model = "eSDHC"; 184 model = "eSDHC";
184 compatible = "fsl,esdhc"; 185 compatible = "fsl,esdhc";
185 reg = <0x2e000 0x1000>; 186 reg = <0x2e000 0x1000>;
186 interrupts = <0x2a 0x8>; 187 interrupts = <42 0x8>;
187 interrupt-parent = < &ipic >; 188 interrupt-parent = <&ipic>;
188 }; 189 };
189 190
190 sata@18000 { 191 sata@18000 {
191 compatible = "fsl,mpc8379-sata"; 192 compatible = "fsl,mpc8379-sata";
192 reg = <0x18000 0x1000>; 193 reg = <0x18000 0x1000>;
193 interrupts = <0x2c 0x8>; 194 interrupts = <44 0x8>;
194 interrupt-parent = < &ipic >; 195 interrupt-parent = <&ipic>;
195 }; 196 };
196 197
197 sata@19000 { 198 sata@19000 {
198 compatible = "fsl,mpc8379-sata"; 199 compatible = "fsl,mpc8379-sata";
199 reg = <0x19000 0x1000>; 200 reg = <0x19000 0x1000>;
200 interrupts = <0x2d 0x8>; 201 interrupts = <45 0x8>;
201 interrupt-parent = < &ipic >; 202 interrupt-parent = <&ipic>;
202 }; 203 };
203 204
204 /* IPIC 205 /* IPIC
@@ -222,49 +223,49 @@
222 interrupt-map = < 223 interrupt-map = <
223 224
224 /* IDSEL 0x11 */ 225 /* IDSEL 0x11 */
225 0x8800 0x0 0x0 0x1 &ipic 0x14 0x8 226 0x8800 0x0 0x0 0x1 &ipic 20 0x8
226 0x8800 0x0 0x0 0x2 &ipic 0x15 0x8 227 0x8800 0x0 0x0 0x2 &ipic 21 0x8
227 0x8800 0x0 0x0 0x3 &ipic 0x16 0x8 228 0x8800 0x0 0x0 0x3 &ipic 22 0x8
228 0x8800 0x0 0x0 0x4 &ipic 0x17 0x8 229 0x8800 0x0 0x0 0x4 &ipic 23 0x8
229 230
230 /* IDSEL 0x12 */ 231 /* IDSEL 0x12 */
231 0x9000 0x0 0x0 0x1 &ipic 0x16 0x8 232 0x9000 0x0 0x0 0x1 &ipic 22 0x8
232 0x9000 0x0 0x0 0x2 &ipic 0x17 0x8 233 0x9000 0x0 0x0 0x2 &ipic 23 0x8
233 0x9000 0x0 0x0 0x3 &ipic 0x14 0x8 234 0x9000 0x0 0x0 0x3 &ipic 20 0x8
234 0x9000 0x0 0x0 0x4 &ipic 0x15 0x8 235 0x9000 0x0 0x0 0x4 &ipic 21 0x8
235 236
236 /* IDSEL 0x13 */ 237 /* IDSEL 0x13 */
237 0x9800 0x0 0x0 0x1 &ipic 0x17 0x8 238 0x9800 0x0 0x0 0x1 &ipic 23 0x8
238 0x9800 0x0 0x0 0x2 &ipic 0x14 0x8 239 0x9800 0x0 0x0 0x2 &ipic 20 0x8
239 0x9800 0x0 0x0 0x3 &ipic 0x15 0x8 240 0x9800 0x0 0x0 0x3 &ipic 21 0x8
240 0x9800 0x0 0x0 0x4 &ipic 0x16 0x8 241 0x9800 0x0 0x0 0x4 &ipic 22 0x8
241 242
242 /* IDSEL 0x15 */ 243 /* IDSEL 0x15 */
243 0xa800 0x0 0x0 0x1 &ipic 0x14 0x8 244 0xa800 0x0 0x0 0x1 &ipic 20 0x8
244 0xa800 0x0 0x0 0x2 &ipic 0x15 0x8 245 0xa800 0x0 0x0 0x2 &ipic 21 0x8
245 0xa800 0x0 0x0 0x3 &ipic 0x16 0x8 246 0xa800 0x0 0x0 0x3 &ipic 22 0x8
246 0xa800 0x0 0x0 0x4 &ipic 0x17 0x8 247 0xa800 0x0 0x0 0x4 &ipic 23 0x8
247 248
248 /* IDSEL 0x16 */ 249 /* IDSEL 0x16 */
249 0xb000 0x0 0x0 0x1 &ipic 0x17 0x8 250 0xb000 0x0 0x0 0x1 &ipic 23 0x8
250 0xb000 0x0 0x0 0x2 &ipic 0x14 0x8 251 0xb000 0x0 0x0 0x2 &ipic 20 0x8
251 0xb000 0x0 0x0 0x3 &ipic 0x15 0x8 252 0xb000 0x0 0x0 0x3 &ipic 21 0x8
252 0xb000 0x0 0x0 0x4 &ipic 0x16 0x8 253 0xb000 0x0 0x0 0x4 &ipic 22 0x8
253 254
254 /* IDSEL 0x17 */ 255 /* IDSEL 0x17 */
255 0xb800 0x0 0x0 0x1 &ipic 0x16 0x8 256 0xb800 0x0 0x0 0x1 &ipic 22 0x8
256 0xb800 0x0 0x0 0x2 &ipic 0x17 0x8 257 0xb800 0x0 0x0 0x2 &ipic 23 0x8
257 0xb800 0x0 0x0 0x3 &ipic 0x14 0x8 258 0xb800 0x0 0x0 0x3 &ipic 20 0x8
258 0xb800 0x0 0x0 0x4 &ipic 0x15 0x8 259 0xb800 0x0 0x0 0x4 &ipic 21 0x8
259 260
260 /* IDSEL 0x18 */ 261 /* IDSEL 0x18 */
261 0xc000 0x0 0x0 0x1 &ipic 0x15 0x8 262 0xc000 0x0 0x0 0x1 &ipic 21 0x8
262 0xc000 0x0 0x0 0x2 &ipic 0x16 0x8 263 0xc000 0x0 0x0 0x2 &ipic 22 0x8
263 0xc000 0x0 0x0 0x3 &ipic 0x17 0x8 264 0xc000 0x0 0x0 0x3 &ipic 23 0x8
264 0xc000 0x0 0x0 0x4 &ipic 0x14 0x8>; 265 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
265 interrupt-parent = < &ipic >; 266 interrupt-parent = <&ipic>;
266 interrupts = <0x42 0x8>; 267 interrupts = <66 0x8>;
267 bus-range = <0 0>; 268 bus-range = <0x0 0x0>;
268 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 269 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
269 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 270 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
270 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; 271 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
new file mode 100644
index 000000000000..440aa4dfab0c
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -0,0 +1,296 @@
1/*
2 * MPC8377E RDB Device Tree Source
3 *
4 * Copyright 2007, 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 compatible = "fsl,mpc8377rdb";
16 #address-cells = <1>;
17 #size-cells = <1>;
18
19 aliases {
20 ethernet0 = &enet0;
21 ethernet1 = &enet1;
22 serial0 = &serial0;
23 serial1 = &serial1;
24 pci0 = &pci0;
25 };
26
27 cpus {
28 #address-cells = <1>;
29 #size-cells = <0>;
30
31 PowerPC,8377@0 {
32 device_type = "cpu";
33 reg = <0x0>;
34 d-cache-line-size = <32>;
35 i-cache-line-size = <32>;
36 d-cache-size = <32768>;
37 i-cache-size = <32768>;
38 timebase-frequency = <0>;
39 bus-frequency = <0>;
40 clock-frequency = <0>;
41 };
42 };
43
44 memory {
45 device_type = "memory";
46 reg = <0x00000000 0x10000000>; // 256MB at 0
47 };
48
49 localbus@e0005000 {
50 #address-cells = <2>;
51 #size-cells = <1>;
52 compatible = "fsl,mpc8377-elbc", "fsl,elbc", "simple-bus";
53 reg = <0xe0005000 0x1000>;
54 interrupts = <77 0x8>;
55 interrupt-parent = <&ipic>;
56
57 // CS0 and CS1 are swapped when
58 // booting from nand, but the
59 // addresses are the same.
60 ranges = <0x0 0x0 0xfe000000 0x00800000
61 0x1 0x0 0xe0600000 0x00008000
62 0x2 0x0 0xf0000000 0x00020000
63 0x3 0x0 0xfa000000 0x00008000>;
64
65 flash@0,0 {
66 #address-cells = <1>;
67 #size-cells = <1>;
68 compatible = "cfi-flash";
69 reg = <0x0 0x0 0x800000>;
70 bank-width = <2>;
71 device-width = <1>;
72 };
73
74 nand@1,0 {
75 #address-cells = <1>;
76 #size-cells = <1>;
77 compatible = "fsl,mpc8377-fcm-nand",
78 "fsl,elbc-fcm-nand";
79 reg = <0x1 0x0 0x8000>;
80
81 u-boot@0 {
82 reg = <0x0 0x100000>;
83 read-only;
84 };
85
86 kernel@100000 {
87 reg = <0x100000 0x300000>;
88 };
89 fs@400000 {
90 reg = <0x400000 0x1c00000>;
91 };
92 };
93 };
94
95 immr@e0000000 {
96 #address-cells = <1>;
97 #size-cells = <1>;
98 device_type = "soc";
99 compatible = "simple-bus";
100 ranges = <0x0 0xe0000000 0x00100000>;
101 reg = <0xe0000000 0x00000200>;
102 bus-frequency = <0>;
103
104 wdt@200 {
105 device_type = "watchdog";
106 compatible = "mpc83xx_wdt";
107 reg = <0x200 0x100>;
108 };
109
110 i2c@3000 {
111 #address-cells = <1>;
112 #size-cells = <0>;
113 cell-index = <0>;
114 compatible = "fsl-i2c";
115 reg = <0x3000 0x100>;
116 interrupts = <14 0x8>;
117 interrupt-parent = <&ipic>;
118 dfsrr;
119 rtc@68 {
120 device_type = "rtc";
121 compatible = "dallas,ds1339";
122 reg = <0x68>;
123 };
124 };
125
126 i2c@3100 {
127 #address-cells = <1>;
128 #size-cells = <0>;
129 cell-index = <1>;
130 compatible = "fsl-i2c";
131 reg = <0x3100 0x100>;
132 interrupts = <15 0x8>;
133 interrupt-parent = <&ipic>;
134 dfsrr;
135 };
136
137 spi@7000 {
138 cell-index = <0>;
139 compatible = "fsl,spi";
140 reg = <0x7000 0x1000>;
141 interrupts = <16 0x8>;
142 interrupt-parent = <&ipic>;
143 mode = "cpu";
144 };
145
146 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
147 usb@23000 {
148 compatible = "fsl-usb2-dr";
149 reg = <0x23000 0x1000>;
150 #address-cells = <1>;
151 #size-cells = <0>;
152 interrupt-parent = <&ipic>;
153 interrupts = <38 0x8>;
154 phy_type = "utmi";
155 };
156
157 mdio@24520 {
158 #address-cells = <1>;
159 #size-cells = <0>;
160 compatible = "fsl,gianfar-mdio";
161 reg = <0x24520 0x20>;
162 phy2: ethernet-phy@2 {
163 interrupt-parent = <&ipic>;
164 interrupts = <17 0x8>;
165 reg = <0x2>;
166 device_type = "ethernet-phy";
167 };
168 phy3: ethernet-phy@3 {
169 interrupt-parent = <&ipic>;
170 interrupts = <18 0x8>;
171 reg = <0x3>;
172 device_type = "ethernet-phy";
173 };
174 };
175
176 enet0: ethernet@24000 {
177 cell-index = <0>;
178 device_type = "network";
179 model = "eTSEC";
180 compatible = "gianfar";
181 reg = <0x24000 0x1000>;
182 local-mac-address = [ 00 00 00 00 00 00 ];
183 interrupts = <32 0x8 33 0x8 34 0x8>;
184 phy-connection-type = "mii";
185 interrupt-parent = <&ipic>;
186 phy-handle = <&phy2>;
187 };
188
189 enet1: ethernet@25000 {
190 cell-index = <1>;
191 device_type = "network";
192 model = "eTSEC";
193 compatible = "gianfar";
194 reg = <0x25000 0x1000>;
195 local-mac-address = [ 00 00 00 00 00 00 ];
196 interrupts = <35 0x8 36 0x8 37 0x8>;
197 phy-connection-type = "mii";
198 interrupt-parent = <&ipic>;
199 phy-handle = <&phy3>;
200 };
201
202 serial0: serial@4500 {
203 cell-index = <0>;
204 device_type = "serial";
205 compatible = "ns16550";
206 reg = <0x4500 0x100>;
207 clock-frequency = <0>;
208 interrupts = <9 0x8>;
209 interrupt-parent = <&ipic>;
210 };
211
212 serial1: serial@4600 {
213 cell-index = <1>;
214 device_type = "serial";
215 compatible = "ns16550";
216 reg = <0x4600 0x100>;
217 clock-frequency = <0>;
218 interrupts = <10 0x8>;
219 interrupt-parent = <&ipic>;
220 };
221
222 crypto@30000 {
223 model = "SEC3";
224 device_type = "crypto";
225 compatible = "talitos";
226 reg = <0x30000 0x10000>;
227 interrupts = <11 0x8>;
228 interrupt-parent = <&ipic>;
229 /* Rev. 3.0 geometry */
230 num-channels = <4>;
231 channel-fifo-len = <24>;
232 exec-units-mask = <0x000001fe>;
233 descriptor-types-mask = <0x03ab0ebf>;
234 };
235
236 sata@18000 {
237 compatible = "fsl,mpc8377-sata", "fsl,pq-sata";
238 reg = <0x18000 0x1000>;
239 interrupts = <44 0x8>;
240 interrupt-parent = <&ipic>;
241 };
242
243 sata@19000 {
244 compatible = "fsl,mpc8377-sata", "fsl,pq-sata";
245 reg = <0x19000 0x1000>;
246 interrupts = <45 0x8>;
247 interrupt-parent = <&ipic>;
248 };
249
250 /* IPIC
251 * interrupts cell = <intr #, sense>
252 * sense values match linux IORESOURCE_IRQ_* defines:
253 * sense == 8: Level, low assertion
254 * sense == 2: Edge, high-to-low change
255 */
256 ipic: interrupt-controller@700 {
257 compatible = "fsl,ipic";
258 interrupt-controller;
259 #address-cells = <0>;
260 #interrupt-cells = <2>;
261 reg = <0x700 0x100>;
262 };
263 };
264
265 pci0: pci@e0008500 {
266 interrupt-map-mask = <0xf800 0 0 7>;
267 interrupt-map = <
268 /* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
269
270 /* IDSEL AD14 IRQ6 inta */
271 0x7000 0x0 0x0 0x1 &ipic 22 0x8
272
273 /* IDSEL AD15 IRQ5 inta, IRQ6 intb, IRQ7 intd */
274 0x7800 0x0 0x0 0x1 &ipic 21 0x8
275 0x7800 0x0 0x0 0x2 &ipic 22 0x8
276 0x7800 0x0 0x0 0x4 &ipic 23 0x8
277
278 /* IDSEL AD28 IRQ7 inta, IRQ5 intb IRQ6 intc*/
279 0xE000 0x0 0x0 0x1 &ipic 23 0x8
280 0xE000 0x0 0x0 0x2 &ipic 21 0x8
281 0xE000 0x0 0x0 0x3 &ipic 22 0x8>;
282 interrupt-parent = <&ipic>;
283 interrupts = <66 0x8>;
284 bus-range = <0 0>;
285 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
286 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
287 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
288 clock-frequency = <66666666>;
289 #interrupt-cells = <1>;
290 #size-cells = <2>;
291 #address-cells = <3>;
292 reg = <0xe0008500 0x100>;
293 compatible = "fsl,mpc8349-pci";
294 device_type = "pci";
295 };
296};
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index c117a6a3a8e6..533e9b06cc8f 100644
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -31,11 +31,11 @@
31 31
32 PowerPC,8378@0 { 32 PowerPC,8378@0 {
33 device_type = "cpu"; 33 device_type = "cpu";
34 reg = <0>; 34 reg = <0x0>;
35 d-cache-line-size = <0x20>; 35 d-cache-line-size = <32>;
36 i-cache-line-size = <0x20>; 36 i-cache-line-size = <32>;
37 d-cache-size = <0x8000>; // L1, 32K 37 d-cache-size = <32768>;
38 i-cache-size = <0x8000>; // L1, 32K 38 i-cache-size = <32768>;
39 timebase-frequency = <0>; 39 timebase-frequency = <0>;
40 bus-frequency = <0>; 40 bus-frequency = <0>;
41 clock-frequency = <0>; 41 clock-frequency = <0>;
@@ -66,8 +66,8 @@
66 cell-index = <0>; 66 cell-index = <0>;
67 compatible = "fsl-i2c"; 67 compatible = "fsl-i2c";
68 reg = <0x3000 0x100>; 68 reg = <0x3000 0x100>;
69 interrupts = <0xe 0x8>; 69 interrupts = <14 0x8>;
70 interrupt-parent = < &ipic >; 70 interrupt-parent = <&ipic>;
71 dfsrr; 71 dfsrr;
72 }; 72 };
73 73
@@ -77,16 +77,17 @@
77 cell-index = <1>; 77 cell-index = <1>;
78 compatible = "fsl-i2c"; 78 compatible = "fsl-i2c";
79 reg = <0x3100 0x100>; 79 reg = <0x3100 0x100>;
80 interrupts = <0xf 0x8>; 80 interrupts = <15 0x8>;
81 interrupt-parent = < &ipic >; 81 interrupt-parent = <&ipic>;
82 dfsrr; 82 dfsrr;
83 }; 83 };
84 84
85 spi@7000 { 85 spi@7000 {
86 compatible = "fsl_spi"; 86 cell-index = <0>;
87 compatible = "fsl,spi";
87 reg = <0x7000 0x1000>; 88 reg = <0x7000 0x1000>;
88 interrupts = <0x10 0x8>; 89 interrupts = <16 0x8>;
89 interrupt-parent = < &ipic >; 90 interrupt-parent = <&ipic>;
90 mode = "cpu"; 91 mode = "cpu";
91 }; 92 };
92 93
@@ -96,8 +97,8 @@
96 reg = <0x23000 0x1000>; 97 reg = <0x23000 0x1000>;
97 #address-cells = <1>; 98 #address-cells = <1>;
98 #size-cells = <0>; 99 #size-cells = <0>;
99 interrupt-parent = < &ipic >; 100 interrupt-parent = <&ipic>;
100 interrupts = <0x26 0x8>; 101 interrupts = <38 0x8>;
101 phy_type = "utmi_wide"; 102 phy_type = "utmi_wide";
102 }; 103 };
103 104
@@ -107,15 +108,15 @@
107 compatible = "fsl,gianfar-mdio"; 108 compatible = "fsl,gianfar-mdio";
108 reg = <0x24520 0x20>; 109 reg = <0x24520 0x20>;
109 phy2: ethernet-phy@2 { 110 phy2: ethernet-phy@2 {
110 interrupt-parent = < &ipic >; 111 interrupt-parent = <&ipic>;
111 interrupts = <0x11 0x8>; 112 interrupts = <17 0x8>;
112 reg = <2>; 113 reg = <0x2>;
113 device_type = "ethernet-phy"; 114 device_type = "ethernet-phy";
114 }; 115 };
115 phy3: ethernet-phy@3 { 116 phy3: ethernet-phy@3 {
116 interrupt-parent = < &ipic >; 117 interrupt-parent = <&ipic>;
117 interrupts = <0x12 0x8>; 118 interrupts = <18 0x8>;
118 reg = <3>; 119 reg = <0x3>;
119 device_type = "ethernet-phy"; 120 device_type = "ethernet-phy";
120 }; 121 };
121 }; 122 };
@@ -127,10 +128,10 @@
127 compatible = "gianfar"; 128 compatible = "gianfar";
128 reg = <0x24000 0x1000>; 129 reg = <0x24000 0x1000>;
129 local-mac-address = [ 00 00 00 00 00 00 ]; 130 local-mac-address = [ 00 00 00 00 00 00 ];
130 interrupts = <0x20 0x8 0x21 0x8 0x22 0x8>; 131 interrupts = <32 0x8 33 0x8 34 0x8>;
131 phy-connection-type = "mii"; 132 phy-connection-type = "mii";
132 interrupt-parent = < &ipic >; 133 interrupt-parent = <&ipic>;
133 phy-handle = < &phy2 >; 134 phy-handle = <&phy2>;
134 }; 135 };
135 136
136 enet1: ethernet@25000 { 137 enet1: ethernet@25000 {
@@ -140,10 +141,10 @@
140 compatible = "gianfar"; 141 compatible = "gianfar";
141 reg = <0x25000 0x1000>; 142 reg = <0x25000 0x1000>;
142 local-mac-address = [ 00 00 00 00 00 00 ]; 143 local-mac-address = [ 00 00 00 00 00 00 ];
143 interrupts = <0x23 0x8 0x24 0x8 0x25 0x8>; 144 interrupts = <35 0x8 36 0x8 37 0x8>;
144 phy-connection-type = "mii"; 145 phy-connection-type = "mii";
145 interrupt-parent = < &ipic >; 146 interrupt-parent = <&ipic>;
146 phy-handle = < &phy3 >; 147 phy-handle = <&phy3>;
147 }; 148 };
148 149
149 serial0: serial@4500 { 150 serial0: serial@4500 {
@@ -152,8 +153,8 @@
152 compatible = "ns16550"; 153 compatible = "ns16550";
153 reg = <0x4500 0x100>; 154 reg = <0x4500 0x100>;
154 clock-frequency = <0>; 155 clock-frequency = <0>;
155 interrupts = <0x9 0x8>; 156 interrupts = <9 0x8>;
156 interrupt-parent = < &ipic >; 157 interrupt-parent = <&ipic>;
157 }; 158 };
158 159
159 serial1: serial@4600 { 160 serial1: serial@4600 {
@@ -162,19 +163,19 @@
162 compatible = "ns16550"; 163 compatible = "ns16550";
163 reg = <0x4600 0x100>; 164 reg = <0x4600 0x100>;
164 clock-frequency = <0>; 165 clock-frequency = <0>;
165 interrupts = <0xa 0x8>; 166 interrupts = <10 0x8>;
166 interrupt-parent = < &ipic >; 167 interrupt-parent = <&ipic>;
167 }; 168 };
168 169
169 crypto@30000 { 170 crypto@30000 {
170 model = "SEC3"; 171 model = "SEC3";
171 compatible = "talitos"; 172 compatible = "talitos";
172 reg = <0x30000 0x10000>; 173 reg = <0x30000 0x10000>;
173 interrupts = <0xb 0x8>; 174 interrupts = <11 0x8>;
174 interrupt-parent = < &ipic >; 175 interrupt-parent = <&ipic>;
175 /* Rev. 3.0 geometry */ 176 /* Rev. 3.0 geometry */
176 num-channels = <4>; 177 num-channels = <4>;
177 channel-fifo-len = <0x18>; 178 channel-fifo-len = <24>;
178 exec-units-mask = <0x000001fe>; 179 exec-units-mask = <0x000001fe>;
179 descriptor-types-mask = <0x03ab0ebf>; 180 descriptor-types-mask = <0x03ab0ebf>;
180 }; 181 };
@@ -183,8 +184,8 @@
183 model = "eSDHC"; 184 model = "eSDHC";
184 compatible = "fsl,esdhc"; 185 compatible = "fsl,esdhc";
185 reg = <0x2e000 0x1000>; 186 reg = <0x2e000 0x1000>;
186 interrupts = <0x2a 0x8>; 187 interrupts = <42 0x8>;
187 interrupt-parent = < &ipic >; 188 interrupt-parent = <&ipic>;
188 }; 189 };
189 190
190 /* IPIC 191 /* IPIC
@@ -208,49 +209,49 @@
208 interrupt-map = < 209 interrupt-map = <
209 210
210 /* IDSEL 0x11 */ 211 /* IDSEL 0x11 */
211 0x8800 0x0 0x0 0x1 &ipic 0x14 0x8 212 0x8800 0x0 0x0 0x1 &ipic 20 0x8
212 0x8800 0x0 0x0 0x2 &ipic 0x15 0x8 213 0x8800 0x0 0x0 0x2 &ipic 21 0x8
213 0x8800 0x0 0x0 0x3 &ipic 0x16 0x8 214 0x8800 0x0 0x0 0x3 &ipic 22 0x8
214 0x8800 0x0 0x0 0x4 &ipic 0x17 0x8 215 0x8800 0x0 0x0 0x4 &ipic 23 0x8
215 216
216 /* IDSEL 0x12 */ 217 /* IDSEL 0x12 */
217 0x9000 0x0 0x0 0x1 &ipic 0x16 0x8 218 0x9000 0x0 0x0 0x1 &ipic 22 0x8
218 0x9000 0x0 0x0 0x2 &ipic 0x17 0x8 219 0x9000 0x0 0x0 0x2 &ipic 23 0x8
219 0x9000 0x0 0x0 0x3 &ipic 0x14 0x8 220 0x9000 0x0 0x0 0x3 &ipic 20 0x8
220 0x9000 0x0 0x0 0x4 &ipic 0x15 0x8 221 0x9000 0x0 0x0 0x4 &ipic 21 0x8
221 222
222 /* IDSEL 0x13 */ 223 /* IDSEL 0x13 */
223 0x9800 0x0 0x0 0x1 &ipic 0x17 0x8 224 0x9800 0x0 0x0 0x1 &ipic 23 0x8
224 0x9800 0x0 0x0 0x2 &ipic 0x14 0x8 225 0x9800 0x0 0x0 0x2 &ipic 20 0x8
225 0x9800 0x0 0x0 0x3 &ipic 0x15 0x8 226 0x9800 0x0 0x0 0x3 &ipic 21 0x8
226 0x9800 0x0 0x0 0x4 &ipic 0x16 0x8 227 0x9800 0x0 0x0 0x4 &ipic 22 0x8
227 228
228 /* IDSEL 0x15 */ 229 /* IDSEL 0x15 */
229 0xa800 0x0 0x0 0x1 &ipic 0x14 0x8 230 0xa800 0x0 0x0 0x1 &ipic 20 0x8
230 0xa800 0x0 0x0 0x2 &ipic 0x15 0x8 231 0xa800 0x0 0x0 0x2 &ipic 21 0x8
231 0xa800 0x0 0x0 0x3 &ipic 0x16 0x8 232 0xa800 0x0 0x0 0x3 &ipic 22 0x8
232 0xa800 0x0 0x0 0x4 &ipic 0x17 0x8 233 0xa800 0x0 0x0 0x4 &ipic 23 0x8
233 234
234 /* IDSEL 0x16 */ 235 /* IDSEL 0x16 */
235 0xb000 0x0 0x0 0x1 &ipic 0x17 0x8 236 0xb000 0x0 0x0 0x1 &ipic 23 0x8
236 0xb000 0x0 0x0 0x2 &ipic 0x14 0x8 237 0xb000 0x0 0x0 0x2 &ipic 20 0x8
237 0xb000 0x0 0x0 0x3 &ipic 0x15 0x8 238 0xb000 0x0 0x0 0x3 &ipic 21 0x8
238 0xb000 0x0 0x0 0x4 &ipic 0x16 0x8 239 0xb000 0x0 0x0 0x4 &ipic 22 0x8
239 240
240 /* IDSEL 0x17 */ 241 /* IDSEL 0x17 */
241 0xb800 0x0 0x0 0x1 &ipic 0x16 0x8 242 0xb800 0x0 0x0 0x1 &ipic 22 0x8
242 0xb800 0x0 0x0 0x2 &ipic 0x17 0x8 243 0xb800 0x0 0x0 0x2 &ipic 23 0x8
243 0xb800 0x0 0x0 0x3 &ipic 0x14 0x8 244 0xb800 0x0 0x0 0x3 &ipic 20 0x8
244 0xb800 0x0 0x0 0x4 &ipic 0x15 0x8 245 0xb800 0x0 0x0 0x4 &ipic 21 0x8
245 246
246 /* IDSEL 0x18 */ 247 /* IDSEL 0x18 */
247 0xc000 0x0 0x0 0x1 &ipic 0x15 0x8 248 0xc000 0x0 0x0 0x1 &ipic 21 0x8
248 0xc000 0x0 0x0 0x2 &ipic 0x16 0x8 249 0xc000 0x0 0x0 0x2 &ipic 22 0x8
249 0xc000 0x0 0x0 0x3 &ipic 0x17 0x8 250 0xc000 0x0 0x0 0x3 &ipic 23 0x8
250 0xc000 0x0 0x0 0x4 &ipic 0x14 0x8>; 251 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
251 interrupt-parent = < &ipic >; 252 interrupt-parent = <&ipic>;
252 interrupts = <0x42 0x8>; 253 interrupts = <66 0x8>;
253 bus-range = <0 0>; 254 bus-range = <0x0 0x0>;
254 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 255 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
255 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 256 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
256 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; 257 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
new file mode 100644
index 000000000000..92711534b179
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -0,0 +1,282 @@
1/*
2 * MPC8378E RDB Device Tree Source
3 *
4 * Copyright 2007, 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 compatible = "fsl,mpc8378rdb";
16 #address-cells = <1>;
17 #size-cells = <1>;
18
19 aliases {
20 ethernet0 = &enet0;
21 ethernet1 = &enet1;
22 serial0 = &serial0;
23 serial1 = &serial1;
24 pci0 = &pci0;
25 };
26
27 cpus {
28 #address-cells = <1>;
29 #size-cells = <0>;
30
31 PowerPC,8378@0 {
32 device_type = "cpu";
33 reg = <0x0>;
34 d-cache-line-size = <32>;
35 i-cache-line-size = <32>;
36 d-cache-size = <32768>;
37 i-cache-size = <32768>;
38 timebase-frequency = <0>;
39 bus-frequency = <0>;
40 clock-frequency = <0>;
41 };
42 };
43
44 memory {
45 device_type = "memory";
46 reg = <0x00000000 0x10000000>; // 256MB at 0
47 };
48
49 localbus@e0005000 {
50 #address-cells = <2>;
51 #size-cells = <1>;
52 compatible = "fsl,mpc8378-elbc", "fsl,elbc", "simple-bus";
53 reg = <0xe0005000 0x1000>;
54 interrupts = <77 0x8>;
55 interrupt-parent = <&ipic>;
56
57 // CS0 and CS1 are swapped when
58 // booting from nand, but the
59 // addresses are the same.
60 ranges = <0x0 0x0 0xfe000000 0x00800000
61 0x1 0x0 0xe0600000 0x00008000
62 0x2 0x0 0xf0000000 0x00020000
63 0x3 0x0 0xfa000000 0x00008000>;
64
65 flash@0,0 {
66 #address-cells = <1>;
67 #size-cells = <1>;
68 compatible = "cfi-flash";
69 reg = <0x0 0x0 0x800000>;
70 bank-width = <2>;
71 device-width = <1>;
72 };
73
74 nand@1,0 {
75 #address-cells = <1>;
76 #size-cells = <1>;
77 compatible = "fsl,mpc8378-fcm-nand",
78 "fsl,elbc-fcm-nand";
79 reg = <0x1 0x0 0x8000>;
80
81 u-boot@0 {
82 reg = <0x0 0x100000>;
83 read-only;
84 };
85
86 kernel@100000 {
87 reg = <0x100000 0x300000>;
88 };
89 fs@400000 {
90 reg = <0x400000 0x1c00000>;
91 };
92 };
93 };
94
95 immr@e0000000 {
96 #address-cells = <1>;
97 #size-cells = <1>;
98 device_type = "soc";
99 compatible = "simple-bus";
100 ranges = <0x0 0xe0000000 0x00100000>;
101 reg = <0xe0000000 0x00000200>;
102 bus-frequency = <0>;
103
104 wdt@200 {
105 device_type = "watchdog";
106 compatible = "mpc83xx_wdt";
107 reg = <0x200 0x100>;
108 };
109
110 i2c@3000 {
111 #address-cells = <1>;
112 #size-cells = <0>;
113 cell-index = <0>;
114 compatible = "fsl-i2c";
115 reg = <0x3000 0x100>;
116 interrupts = <14 0x8>;
117 interrupt-parent = <&ipic>;
118 dfsrr;
119 rtc@68 {
120 device_type = "rtc";
121 compatible = "dallas,ds1339";
122 reg = <0x68>;
123 };
124 };
125
126 i2c@3100 {
127 #address-cells = <1>;
128 #size-cells = <0>;
129 cell-index = <1>;
130 compatible = "fsl-i2c";
131 reg = <0x3100 0x100>;
132 interrupts = <15 0x8>;
133 interrupt-parent = <&ipic>;
134 dfsrr;
135 };
136
137 spi@7000 {
138 cell-index = <0>;
139 compatible = "fsl,spi";
140 reg = <0x7000 0x1000>;
141 interrupts = <16 0x8>;
142 interrupt-parent = <&ipic>;
143 mode = "cpu";
144 };
145
146 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
147 usb@23000 {
148 compatible = "fsl-usb2-dr";
149 reg = <0x23000 0x1000>;
150 #address-cells = <1>;
151 #size-cells = <0>;
152 interrupt-parent = <&ipic>;
153 interrupts = <38 0x8>;
154 phy_type = "utmi";
155 };
156
157 mdio@24520 {
158 #address-cells = <1>;
159 #size-cells = <0>;
160 compatible = "fsl,gianfar-mdio";
161 reg = <0x24520 0x20>;
162 phy2: ethernet-phy@2 {
163 interrupt-parent = <&ipic>;
164 interrupts = <17 0x8>;
165 reg = <0x2>;
166 device_type = "ethernet-phy";
167 };
168 phy3: ethernet-phy@3 {
169 interrupt-parent = <&ipic>;
170 interrupts = <18 0x8>;
171 reg = <0x3>;
172 device_type = "ethernet-phy";
173 };
174 };
175
176 enet0: ethernet@24000 {
177 cell-index = <0>;
178 device_type = "network";
179 model = "eTSEC";
180 compatible = "gianfar";
181 reg = <0x24000 0x1000>;
182 local-mac-address = [ 00 00 00 00 00 00 ];
183 interrupts = <32 0x8 33 0x8 34 0x8>;
184 phy-connection-type = "mii";
185 interrupt-parent = <&ipic>;
186 phy-handle = <&phy2>;
187 };
188
189 enet1: ethernet@25000 {
190 cell-index = <1>;
191 device_type = "network";
192 model = "eTSEC";
193 compatible = "gianfar";
194 reg = <0x25000 0x1000>;
195 local-mac-address = [ 00 00 00 00 00 00 ];
196 interrupts = <35 0x8 36 0x8 37 0x8>;
197 phy-connection-type = "mii";
198 interrupt-parent = <&ipic>;
199 phy-handle = <&phy3>;
200 };
201
202 serial0: serial@4500 {
203 cell-index = <0>;
204 device_type = "serial";
205 compatible = "ns16550";
206 reg = <0x4500 0x100>;
207 clock-frequency = <0>;
208 interrupts = <9 0x8>;
209 interrupt-parent = <&ipic>;
210 };
211
212 serial1: serial@4600 {
213 cell-index = <1>;
214 device_type = "serial";
215 compatible = "ns16550";
216 reg = <0x4600 0x100>;
217 clock-frequency = <0>;
218 interrupts = <10 0x8>;
219 interrupt-parent = <&ipic>;
220 };
221
222 crypto@30000 {
223 model = "SEC3";
224 device_type = "crypto";
225 compatible = "talitos";
226 reg = <0x30000 0x10000>;
227 interrupts = <11 0x8>;
228 interrupt-parent = <&ipic>;
229 /* Rev. 3.0 geometry */
230 num-channels = <4>;
231 channel-fifo-len = <24>;
232 exec-units-mask = <0x000001fe>;
233 descriptor-types-mask = <0x03ab0ebf>;
234 };
235
236 /* IPIC
237 * interrupts cell = <intr #, sense>
238 * sense values match linux IORESOURCE_IRQ_* defines:
239 * sense == 8: Level, low assertion
240 * sense == 2: Edge, high-to-low change
241 */
242 ipic: interrupt-controller@700 {
243 compatible = "fsl,ipic";
244 interrupt-controller;
245 #address-cells = <0>;
246 #interrupt-cells = <2>;
247 reg = <0x700 0x100>;
248 };
249 };
250
251 pci0: pci@e0008500 {
252 interrupt-map-mask = <0xf800 0 0 7>;
253 interrupt-map = <
254 /* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
255
256 /* IDSEL AD14 IRQ6 inta */
257 0x7000 0x0 0x0 0x1 &ipic 22 0x8
258
259 /* IDSEL AD15 IRQ5 inta, IRQ6 intb, IRQ7 intd */
260 0x7800 0x0 0x0 0x1 &ipic 21 0x8
261 0x7800 0x0 0x0 0x2 &ipic 22 0x8
262 0x7800 0x0 0x0 0x4 &ipic 23 0x8
263
264 /* IDSEL AD28 IRQ7 inta, IRQ5 intb IRQ6 intc*/
265 0xE000 0x0 0x0 0x1 &ipic 23 0x8
266 0xE000 0x0 0x0 0x2 &ipic 21 0x8
267 0xE000 0x0 0x0 0x3 &ipic 22 0x8>;
268 interrupt-parent = <&ipic>;
269 interrupts = <66 0x8>;
270 bus-range = <0 0>;
271 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
272 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
273 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
274 clock-frequency = <66666666>;
275 #interrupt-cells = <1>;
276 #size-cells = <2>;
277 #address-cells = <3>;
278 reg = <0xe0008500 0x100>;
279 compatible = "fsl,mpc8349-pci";
280 device_type = "pci";
281 };
282};
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index fc3ba79fb684..c270685bbde4 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -31,11 +31,11 @@
31 31
32 PowerPC,8379@0 { 32 PowerPC,8379@0 {
33 device_type = "cpu"; 33 device_type = "cpu";
34 reg = <0>; 34 reg = <0x0>;
35 d-cache-line-size = <0x20>; 35 d-cache-line-size = <32>;
36 i-cache-line-size = <0x20>; 36 i-cache-line-size = <32>;
37 d-cache-size = <0x8000>; // L1, 32K 37 d-cache-size = <32768>;
38 i-cache-size = <0x8000>; // L1, 32K 38 i-cache-size = <32768>;
39 timebase-frequency = <0>; 39 timebase-frequency = <0>;
40 bus-frequency = <0>; 40 bus-frequency = <0>;
41 clock-frequency = <0>; 41 clock-frequency = <0>;
@@ -66,8 +66,8 @@
66 cell-index = <0>; 66 cell-index = <0>;
67 compatible = "fsl-i2c"; 67 compatible = "fsl-i2c";
68 reg = <0x3000 0x100>; 68 reg = <0x3000 0x100>;
69 interrupts = <0xe 0x8>; 69 interrupts = <14 0x8>;
70 interrupt-parent = < &ipic >; 70 interrupt-parent = <&ipic>;
71 dfsrr; 71 dfsrr;
72 }; 72 };
73 73
@@ -77,16 +77,17 @@
77 cell-index = <1>; 77 cell-index = <1>;
78 compatible = "fsl-i2c"; 78 compatible = "fsl-i2c";
79 reg = <0x3100 0x100>; 79 reg = <0x3100 0x100>;
80 interrupts = <0xf 0x8>; 80 interrupts = <15 0x8>;
81 interrupt-parent = < &ipic >; 81 interrupt-parent = <&ipic>;
82 dfsrr; 82 dfsrr;
83 }; 83 };
84 84
85 spi@7000 { 85 spi@7000 {
86 compatible = "fsl_spi"; 86 cell-index = <0>;
87 compatible = "fsl,spi";
87 reg = <0x7000 0x1000>; 88 reg = <0x7000 0x1000>;
88 interrupts = <0x10 0x8>; 89 interrupts = <16 0x8>;
89 interrupt-parent = < &ipic >; 90 interrupt-parent = <&ipic>;
90 mode = "cpu"; 91 mode = "cpu";
91 }; 92 };
92 93
@@ -96,8 +97,8 @@
96 reg = <0x23000 0x1000>; 97 reg = <0x23000 0x1000>;
97 #address-cells = <1>; 98 #address-cells = <1>;
98 #size-cells = <0>; 99 #size-cells = <0>;
99 interrupt-parent = < &ipic >; 100 interrupt-parent = <&ipic>;
100 interrupts = <0x26 0x8>; 101 interrupts = <38 0x8>;
101 phy_type = "utmi_wide"; 102 phy_type = "utmi_wide";
102 }; 103 };
103 104
@@ -107,15 +108,15 @@
107 compatible = "fsl,gianfar-mdio"; 108 compatible = "fsl,gianfar-mdio";
108 reg = <0x24520 0x20>; 109 reg = <0x24520 0x20>;
109 phy2: ethernet-phy@2 { 110 phy2: ethernet-phy@2 {
110 interrupt-parent = < &ipic >; 111 interrupt-parent = <&ipic>;
111 interrupts = <0x11 0x8>; 112 interrupts = <17 0x8>;
112 reg = <2>; 113 reg = <0x2>;
113 device_type = "ethernet-phy"; 114 device_type = "ethernet-phy";
114 }; 115 };
115 phy3: ethernet-phy@3 { 116 phy3: ethernet-phy@3 {
116 interrupt-parent = < &ipic >; 117 interrupt-parent = <&ipic>;
117 interrupts = <0x12 0x8>; 118 interrupts = <18 0x8>;
118 reg = <3>; 119 reg = <0x3>;
119 device_type = "ethernet-phy"; 120 device_type = "ethernet-phy";
120 }; 121 };
121 }; 122 };
@@ -127,10 +128,10 @@
127 compatible = "gianfar"; 128 compatible = "gianfar";
128 reg = <0x24000 0x1000>; 129 reg = <0x24000 0x1000>;
129 local-mac-address = [ 00 00 00 00 00 00 ]; 130 local-mac-address = [ 00 00 00 00 00 00 ];
130 interrupts = <0x20 0x8 0x21 0x8 0x22 0x8>; 131 interrupts = <32 0x8 33 0x8 34 0x8>;
131 phy-connection-type = "mii"; 132 phy-connection-type = "mii";
132 interrupt-parent = < &ipic >; 133 interrupt-parent = <&ipic>;
133 phy-handle = < &phy2 >; 134 phy-handle = <&phy2>;
134 }; 135 };
135 136
136 enet1: ethernet@25000 { 137 enet1: ethernet@25000 {
@@ -140,10 +141,10 @@
140 compatible = "gianfar"; 141 compatible = "gianfar";
141 reg = <0x25000 0x1000>; 142 reg = <0x25000 0x1000>;
142 local-mac-address = [ 00 00 00 00 00 00 ]; 143 local-mac-address = [ 00 00 00 00 00 00 ];
143 interrupts = <0x23 0x8 0x24 0x8 0x25 0x8>; 144 interrupts = <35 0x8 36 0x8 37 0x8>;
144 phy-connection-type = "mii"; 145 phy-connection-type = "mii";
145 interrupt-parent = < &ipic >; 146 interrupt-parent = <&ipic>;
146 phy-handle = < &phy3 >; 147 phy-handle = <&phy3>;
147 }; 148 };
148 149
149 serial0: serial@4500 { 150 serial0: serial@4500 {
@@ -152,8 +153,8 @@
152 compatible = "ns16550"; 153 compatible = "ns16550";
153 reg = <0x4500 0x100>; 154 reg = <0x4500 0x100>;
154 clock-frequency = <0>; 155 clock-frequency = <0>;
155 interrupts = <0x9 0x8>; 156 interrupts = <9 0x8>;
156 interrupt-parent = < &ipic >; 157 interrupt-parent = <&ipic>;
157 }; 158 };
158 159
159 serial1: serial@4600 { 160 serial1: serial@4600 {
@@ -162,19 +163,19 @@
162 compatible = "ns16550"; 163 compatible = "ns16550";
163 reg = <0x4600 0x100>; 164 reg = <0x4600 0x100>;
164 clock-frequency = <0>; 165 clock-frequency = <0>;
165 interrupts = <0xa 0x8>; 166 interrupts = <10 0x8>;
166 interrupt-parent = < &ipic >; 167 interrupt-parent = <&ipic>;
167 }; 168 };
168 169
169 crypto@30000 { 170 crypto@30000 {
170 model = "SEC3"; 171 model = "SEC3";
171 compatible = "talitos"; 172 compatible = "talitos";
172 reg = <0x30000 0x10000>; 173 reg = <0x30000 0x10000>;
173 interrupts = <0xb 0x8>; 174 interrupts = <11 0x8>;
174 interrupt-parent = < &ipic >; 175 interrupt-parent = <&ipic>;
175 /* Rev. 3.0 geometry */ 176 /* Rev. 3.0 geometry */
176 num-channels = <4>; 177 num-channels = <4>;
177 channel-fifo-len = <0x18>; 178 channel-fifo-len = <24>;
178 exec-units-mask = <0x000001fe>; 179 exec-units-mask = <0x000001fe>;
179 descriptor-types-mask = <0x03ab0ebf>; 180 descriptor-types-mask = <0x03ab0ebf>;
180 }; 181 };
@@ -183,36 +184,36 @@
183 model = "eSDHC"; 184 model = "eSDHC";
184 compatible = "fsl,esdhc"; 185 compatible = "fsl,esdhc";
185 reg = <0x2e000 0x1000>; 186 reg = <0x2e000 0x1000>;
186 interrupts = <0x2a 0x8>; 187 interrupts = <42 0x8>;
187 interrupt-parent = < &ipic >; 188 interrupt-parent = <&ipic>;
188 }; 189 };
189 190
190 sata@18000 { 191 sata@18000 {
191 compatible = "fsl,mpc8379-sata"; 192 compatible = "fsl,mpc8379-sata";
192 reg = <0x18000 0x1000>; 193 reg = <0x18000 0x1000>;
193 interrupts = <0x2c 0x8>; 194 interrupts = <44 0x8>;
194 interrupt-parent = < &ipic >; 195 interrupt-parent = <&ipic>;
195 }; 196 };
196 197
197 sata@19000 { 198 sata@19000 {
198 compatible = "fsl,mpc8379-sata"; 199 compatible = "fsl,mpc8379-sata";
199 reg = <0x19000 0x1000>; 200 reg = <0x19000 0x1000>;
200 interrupts = <0x2d 0x8>; 201 interrupts = <45 0x8>;
201 interrupt-parent = < &ipic >; 202 interrupt-parent = <&ipic>;
202 }; 203 };
203 204
204 sata@1a000 { 205 sata@1a000 {
205 compatible = "fsl,mpc8379-sata"; 206 compatible = "fsl,mpc8379-sata";
206 reg = <0x1a000 0x1000>; 207 reg = <0x1a000 0x1000>;
207 interrupts = <0x2e 0x8>; 208 interrupts = <46 0x8>;
208 interrupt-parent = < &ipic >; 209 interrupt-parent = <&ipic>;
209 }; 210 };
210 211
211 sata@1b000 { 212 sata@1b000 {
212 compatible = "fsl,mpc8379-sata"; 213 compatible = "fsl,mpc8379-sata";
213 reg = <0x1b000 0x1000>; 214 reg = <0x1b000 0x1000>;
214 interrupts = <0x2f 0x8>; 215 interrupts = <47 0x8>;
215 interrupt-parent = < &ipic >; 216 interrupt-parent = <&ipic>;
216 }; 217 };
217 218
218 /* IPIC 219 /* IPIC
@@ -236,49 +237,49 @@
236 interrupt-map = < 237 interrupt-map = <
237 238
238 /* IDSEL 0x11 */ 239 /* IDSEL 0x11 */
239 0x8800 0x0 0x0 0x1 &ipic 0x14 0x8 240 0x8800 0x0 0x0 0x1 &ipic 20 0x8
240 0x8800 0x0 0x0 0x2 &ipic 0x15 0x8 241 0x8800 0x0 0x0 0x2 &ipic 21 0x8
241 0x8800 0x0 0x0 0x3 &ipic 0x16 0x8 242 0x8800 0x0 0x0 0x3 &ipic 22 0x8
242 0x8800 0x0 0x0 0x4 &ipic 0x17 0x8 243 0x8800 0x0 0x0 0x4 &ipic 23 0x8
243 244
244 /* IDSEL 0x12 */ 245 /* IDSEL 0x12 */
245 0x9000 0x0 0x0 0x1 &ipic 0x16 0x8 246 0x9000 0x0 0x0 0x1 &ipic 22 0x8
246 0x9000 0x0 0x0 0x2 &ipic 0x17 0x8 247 0x9000 0x0 0x0 0x2 &ipic 23 0x8
247 0x9000 0x0 0x0 0x3 &ipic 0x14 0x8 248 0x9000 0x0 0x0 0x3 &ipic 20 0x8
248 0x9000 0x0 0x0 0x4 &ipic 0x15 0x8 249 0x9000 0x0 0x0 0x4 &ipic 21 0x8
249 250
250 /* IDSEL 0x13 */ 251 /* IDSEL 0x13 */
251 0x9800 0x0 0x0 0x1 &ipic 0x17 0x8 252 0x9800 0x0 0x0 0x1 &ipic 23 0x8
252 0x9800 0x0 0x0 0x2 &ipic 0x14 0x8 253 0x9800 0x0 0x0 0x2 &ipic 20 0x8
253 0x9800 0x0 0x0 0x3 &ipic 0x15 0x8 254 0x9800 0x0 0x0 0x3 &ipic 21 0x8
254 0x9800 0x0 0x0 0x4 &ipic 0x16 0x8 255 0x9800 0x0 0x0 0x4 &ipic 22 0x8
255 256
256 /* IDSEL 0x15 */ 257 /* IDSEL 0x15 */
257 0xa800 0x0 0x0 0x1 &ipic 0x14 0x8 258 0xa800 0x0 0x0 0x1 &ipic 20 0x8
258 0xa800 0x0 0x0 0x2 &ipic 0x15 0x8 259 0xa800 0x0 0x0 0x2 &ipic 21 0x8
259 0xa800 0x0 0x0 0x3 &ipic 0x16 0x8 260 0xa800 0x0 0x0 0x3 &ipic 22 0x8
260 0xa800 0x0 0x0 0x4 &ipic 0x17 0x8 261 0xa800 0x0 0x0 0x4 &ipic 23 0x8
261 262
262 /* IDSEL 0x16 */ 263 /* IDSEL 0x16 */
263 0xb000 0x0 0x0 0x1 &ipic 0x17 0x8 264 0xb000 0x0 0x0 0x1 &ipic 23 0x8
264 0xb000 0x0 0x0 0x2 &ipic 0x14 0x8 265 0xb000 0x0 0x0 0x2 &ipic 20 0x8
265 0xb000 0x0 0x0 0x3 &ipic 0x15 0x8 266 0xb000 0x0 0x0 0x3 &ipic 21 0x8
266 0xb000 0x0 0x0 0x4 &ipic 0x16 0x8 267 0xb000 0x0 0x0 0x4 &ipic 22 0x8
267 268
268 /* IDSEL 0x17 */ 269 /* IDSEL 0x17 */
269 0xb800 0x0 0x0 0x1 &ipic 0x16 0x8 270 0xb800 0x0 0x0 0x1 &ipic 22 0x8
270 0xb800 0x0 0x0 0x2 &ipic 0x17 0x8 271 0xb800 0x0 0x0 0x2 &ipic 23 0x8
271 0xb800 0x0 0x0 0x3 &ipic 0x14 0x8 272 0xb800 0x0 0x0 0x3 &ipic 20 0x8
272 0xb800 0x0 0x0 0x4 &ipic 0x15 0x8 273 0xb800 0x0 0x0 0x4 &ipic 21 0x8
273 274
274 /* IDSEL 0x18 */ 275 /* IDSEL 0x18 */
275 0xc000 0x0 0x0 0x1 &ipic 0x15 0x8 276 0xc000 0x0 0x0 0x1 &ipic 21 0x8
276 0xc000 0x0 0x0 0x2 &ipic 0x16 0x8 277 0xc000 0x0 0x0 0x2 &ipic 22 0x8
277 0xc000 0x0 0x0 0x3 &ipic 0x17 0x8 278 0xc000 0x0 0x0 0x3 &ipic 23 0x8
278 0xc000 0x0 0x0 0x4 &ipic 0x14 0x8>; 279 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
279 interrupt-parent = < &ipic >; 280 interrupt-parent = <&ipic>;
280 interrupts = <0x42 0x8>; 281 interrupts = <66 0x8>;
281 bus-range = <0 0>; 282 bus-range = <0x0 0x0>;
282 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 283 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
283 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 284 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
284 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; 285 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
new file mode 100644
index 000000000000..0dda2fc558f8
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -0,0 +1,310 @@
1/*
2 * MPC8379E RDB Device Tree Source
3 *
4 * Copyright 2007, 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 compatible = "fsl,mpc8379rdb";
16 #address-cells = <1>;
17 #size-cells = <1>;
18
19 aliases {
20 ethernet0 = &enet0;
21 ethernet1 = &enet1;
22 serial0 = &serial0;
23 serial1 = &serial1;
24 pci0 = &pci0;
25 };
26
27 cpus {
28 #address-cells = <1>;
29 #size-cells = <0>;
30
31 PowerPC,8379@0 {
32 device_type = "cpu";
33 reg = <0x0>;
34 d-cache-line-size = <32>;
35 i-cache-line-size = <32>;
36 d-cache-size = <32768>;
37 i-cache-size = <32768>;
38 timebase-frequency = <0>;
39 bus-frequency = <0>;
40 clock-frequency = <0>;
41 };
42 };
43
44 memory {
45 device_type = "memory";
46 reg = <0x00000000 0x10000000>; // 256MB at 0
47 };
48
49 localbus@e0005000 {
50 #address-cells = <2>;
51 #size-cells = <1>;
52 compatible = "fsl,mpc8379-elbc", "fsl,elbc", "simple-bus";
53 reg = <0xe0005000 0x1000>;
54 interrupts = <77 0x8>;
55 interrupt-parent = <&ipic>;
56
57 // CS0 and CS1 are swapped when
58 // booting from nand, but the
59 // addresses are the same.
60 ranges = <0x0 0x0 0xfe000000 0x00800000
61 0x1 0x0 0xe0600000 0x00008000
62 0x2 0x0 0xf0000000 0x00020000
63 0x3 0x0 0xfa000000 0x00008000>;
64
65 flash@0,0 {
66 #address-cells = <1>;
67 #size-cells = <1>;
68 compatible = "cfi-flash";
69 reg = <0x0 0x0 0x800000>;
70 bank-width = <2>;
71 device-width = <1>;
72 };
73
74 nand@1,0 {
75 #address-cells = <1>;
76 #size-cells = <1>;
77 compatible = "fsl,mpc8379-fcm-nand",
78 "fsl,elbc-fcm-nand";
79 reg = <0x1 0x0 0x8000>;
80
81 u-boot@0 {
82 reg = <0x0 0x100000>;
83 read-only;
84 };
85
86 kernel@100000 {
87 reg = <0x100000 0x300000>;
88 };
89 fs@400000 {
90 reg = <0x400000 0x1c00000>;
91 };
92 };
93 };
94
95 immr@e0000000 {
96 #address-cells = <1>;
97 #size-cells = <1>;
98 device_type = "soc";
99 compatible = "simple-bus";
100 ranges = <0x0 0xe0000000 0x00100000>;
101 reg = <0xe0000000 0x00000200>;
102 bus-frequency = <0>;
103
104 wdt@200 {
105 device_type = "watchdog";
106 compatible = "mpc83xx_wdt";
107 reg = <0x200 0x100>;
108 };
109
110 i2c@3000 {
111 #address-cells = <1>;
112 #size-cells = <0>;
113 cell-index = <0>;
114 compatible = "fsl-i2c";
115 reg = <0x3000 0x100>;
116 interrupts = <14 0x8>;
117 interrupt-parent = <&ipic>;
118 dfsrr;
119 rtc@68 {
120 device_type = "rtc";
121 compatible = "dallas,ds1339";
122 reg = <0x68>;
123 };
124 };
125
126 i2c@3100 {
127 #address-cells = <1>;
128 #size-cells = <0>;
129 cell-index = <1>;
130 compatible = "fsl-i2c";
131 reg = <0x3100 0x100>;
132 interrupts = <15 0x8>;
133 interrupt-parent = <&ipic>;
134 dfsrr;
135 };
136
137 spi@7000 {
138 cell-index = <0>;
139 compatible = "fsl,spi";
140 reg = <0x7000 0x1000>;
141 interrupts = <16 0x8>;
142 interrupt-parent = <&ipic>;
143 mode = "cpu";
144 };
145
146 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
147 usb@23000 {
148 compatible = "fsl-usb2-dr";
149 reg = <0x23000 0x1000>;
150 #address-cells = <1>;
151 #size-cells = <0>;
152 interrupt-parent = <&ipic>;
153 interrupts = <38 0x8>;
154 phy_type = "utmi";
155 };
156
157 mdio@24520 {
158 #address-cells = <1>;
159 #size-cells = <0>;
160 compatible = "fsl,gianfar-mdio";
161 reg = <0x24520 0x20>;
162 phy2: ethernet-phy@2 {
163 interrupt-parent = <&ipic>;
164 interrupts = <17 0x8>;
165 reg = <0x2>;
166 device_type = "ethernet-phy";
167 };
168 phy3: ethernet-phy@3 {
169 interrupt-parent = <&ipic>;
170 interrupts = <18 0x8>;
171 reg = <0x3>;
172 device_type = "ethernet-phy";
173 };
174 };
175
176 enet0: ethernet@24000 {
177 cell-index = <0>;
178 device_type = "network";
179 model = "eTSEC";
180 compatible = "gianfar";
181 reg = <0x24000 0x1000>;
182 local-mac-address = [ 00 00 00 00 00 00 ];
183 interrupts = <32 0x8 33 0x8 34 0x8>;
184 phy-connection-type = "mii";
185 interrupt-parent = <&ipic>;
186 phy-handle = <&phy2>;
187 };
188
189 enet1: ethernet@25000 {
190 cell-index = <1>;
191 device_type = "network";
192 model = "eTSEC";
193 compatible = "gianfar";
194 reg = <0x25000 0x1000>;
195 local-mac-address = [ 00 00 00 00 00 00 ];
196 interrupts = <35 0x8 36 0x8 37 0x8>;
197 phy-connection-type = "mii";
198 interrupt-parent = <&ipic>;
199 phy-handle = <&phy3>;
200 };
201
202 serial0: serial@4500 {
203 cell-index = <0>;
204 device_type = "serial";
205 compatible = "ns16550";
206 reg = <0x4500 0x100>;
207 clock-frequency = <0>;
208 interrupts = <9 0x8>;
209 interrupt-parent = <&ipic>;
210 };
211
212 serial1: serial@4600 {
213 cell-index = <1>;
214 device_type = "serial";
215 compatible = "ns16550";
216 reg = <0x4600 0x100>;
217 clock-frequency = <0>;
218 interrupts = <10 0x8>;
219 interrupt-parent = <&ipic>;
220 };
221
222 crypto@30000 {
223 model = "SEC3";
224 device_type = "crypto";
225 compatible = "talitos";
226 reg = <0x30000 0x10000>;
227 interrupts = <11 0x8>;
228 interrupt-parent = <&ipic>;
229 /* Rev. 3.0 geometry */
230 num-channels = <4>;
231 channel-fifo-len = <24>;
232 exec-units-mask = <0x000001fe>;
233 descriptor-types-mask = <0x03ab0ebf>;
234 };
235
236 sata@18000 {
237 compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
238 reg = <0x18000 0x1000>;
239 interrupts = <44 0x8>;
240 interrupt-parent = <&ipic>;
241 };
242
243 sata@19000 {
244 compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
245 reg = <0x19000 0x1000>;
246 interrupts = <45 0x8>;
247 interrupt-parent = <&ipic>;
248 };
249
250 sata@1a000 {
251 compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
252 reg = <0x1a000 0x1000>;
253 interrupts = <46 0x8>;
254 interrupt-parent = <&ipic>;
255 };
256
257 sata@1b000 {
258 compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
259 reg = <0x1b000 0x1000>;
260 interrupts = <47 0x8>;
261 interrupt-parent = <&ipic>;
262 };
263
264 /* IPIC
265 * interrupts cell = <intr #, sense>
266 * sense values match linux IORESOURCE_IRQ_* defines:
267 * sense == 8: Level, low assertion
268 * sense == 2: Edge, high-to-low change
269 */
270 ipic: interrupt-controller@700 {
271 compatible = "fsl,ipic";
272 interrupt-controller;
273 #address-cells = <0>;
274 #interrupt-cells = <2>;
275 reg = <0x700 0x100>;
276 };
277 };
278
279 pci0: pci@e0008500 {
280 interrupt-map-mask = <0xf800 0 0 7>;
281 interrupt-map = <
282 /* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
283
284 /* IDSEL AD14 IRQ6 inta */
285 0x7000 0x0 0x0 0x1 &ipic 22 0x8
286
287 /* IDSEL AD15 IRQ5 inta, IRQ6 intb, IRQ7 intd */
288 0x7800 0x0 0x0 0x1 &ipic 21 0x8
289 0x7800 0x0 0x0 0x2 &ipic 22 0x8
290 0x7800 0x0 0x0 0x4 &ipic 23 0x8
291
292 /* IDSEL AD28 IRQ7 inta, IRQ5 intb IRQ6 intc*/
293 0xE000 0x0 0x0 0x1 &ipic 23 0x8
294 0xE000 0x0 0x0 0x2 &ipic 21 0x8
295 0xE000 0x0 0x0 0x3 &ipic 22 0x8>;
296 interrupt-parent = <&ipic>;
297 interrupts = <66 0x8>;
298 bus-range = <0x0 0x0>;
299 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
300 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
301 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
302 clock-frequency = <66666666>;
303 #interrupt-cells = <1>;
304 #size-cells = <2>;
305 #address-cells = <3>;
306 reg = <0xe0008500 0x100>;
307 compatible = "fsl,mpc8349-pci";
308 device_type = "pci";
309 };
310};
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 5818a7c861e7..97bc048f2158 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -284,24 +284,28 @@
284 #address-cells = <1>; 284 #address-cells = <1>;
285 #size-cells = <1>; 285 #size-cells = <1>;
286 device_type = "qe"; 286 device_type = "qe";
287 model = "QE"; 287 compatible = "fsl,qe";
288 ranges = <0 e0080000 00040000>; 288 ranges = <0 e0080000 00040000>;
289 reg = <e0080000 480>; 289 reg = <e0080000 480>;
290 brg-frequency = <0>; 290 brg-frequency = <0>;
291 bus-frequency = <179A7B00>; 291 bus-frequency = <179A7B00>;
292 292
293 muram@10000 { 293 muram@10000 {
294 device_type = "muram"; 294 #address-cells = <1>;
295 #size-cells = <1>;
296 compatible = "fsl,qe-muram", "fsl,cpm-muram";
295 ranges = <0 00010000 0000c000>; 297 ranges = <0 00010000 0000c000>;
296 298
297 data-only@0{ 299 data-only@0 {
300 compatible = "fsl,qe-muram-data",
301 "fsl,cpm-muram-data";
298 reg = <0 c000>; 302 reg = <0 c000>;
299 }; 303 };
300 }; 304 };
301 305
302 spi@4c0 { 306 spi@4c0 {
303 device_type = "spi"; 307 cell-index = <0>;
304 compatible = "fsl_spi"; 308 compatible = "fsl,spi";
305 reg = <4c0 40>; 309 reg = <4c0 40>;
306 interrupts = <2>; 310 interrupts = <2>;
307 interrupt-parent = <&qeic>; 311 interrupt-parent = <&qeic>;
@@ -309,8 +313,8 @@
309 }; 313 };
310 314
311 spi@500 { 315 spi@500 {
312 device_type = "spi"; 316 cell-index = <1>;
313 compatible = "fsl_spi"; 317 compatible = "fsl,spi";
314 reg = <500 40>; 318 reg = <500 40>;
315 interrupts = <1>; 319 interrupts = <1>;
316 interrupt-parent = <&qeic>; 320 interrupt-parent = <&qeic>;
@@ -355,7 +359,7 @@
355 #address-cells = <1>; 359 #address-cells = <1>;
356 #size-cells = <0>; 360 #size-cells = <0>;
357 reg = <2120 18>; 361 reg = <2120 18>;
358 compatible = "ucc_geth_phy"; 362 compatible = "fsl,ucc-mdio";
359 363
360 /* These are the same PHYs as on 364 /* These are the same PHYs as on
361 * gianfar's MDIO bus */ 365 * gianfar's MDIO bus */
@@ -385,9 +389,9 @@
385 }; 389 };
386 }; 390 };
387 391
388 qeic: qeic@80 { 392 qeic: interrupt-controller@80 {
389 interrupt-controller; 393 interrupt-controller;
390 device_type = "qeic"; 394 compatible = "fsl,qe-ic";
391 #address-cells = <0>; 395 #address-cells = <0>;
392 #interrupt-cells = <1>; 396 #interrupt-cells = <1>;
393 reg = <80 80>; 397 reg = <80 80>;
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index d98715cbda28..16c947b8a721 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -8,6 +8,7 @@
8 * by the Free Software Foundation. 8 * by the Free Software Foundation.
9 */ 9 */
10 10
11/dts-v1/;
11 12
12/ { 13/ {
13 model = "MPC8610HPCD"; 14 model = "MPC8610HPCD";
@@ -29,11 +30,11 @@
29 PowerPC,8610@0 { 30 PowerPC,8610@0 {
30 device_type = "cpu"; 31 device_type = "cpu";
31 reg = <0>; 32 reg = <0>;
32 d-cache-line-size = <d# 32>; // bytes 33 d-cache-line-size = <32>;
33 i-cache-line-size = <d# 32>; // bytes 34 i-cache-line-size = <32>;
34 d-cache-size = <8000>; // L1, 32K 35 d-cache-size = <32768>; // L1
35 i-cache-size = <8000>; // L1, 32K 36 i-cache-size = <32768>; // L1
36 timebase-frequency = <0>; // 33 MHz, from uboot 37 timebase-frequency = <0>; // From uboot
37 bus-frequency = <0>; // From uboot 38 bus-frequency = <0>; // From uboot
38 clock-frequency = <0>; // From uboot 39 clock-frequency = <0>; // From uboot
39 }; 40 };
@@ -41,7 +42,7 @@
41 42
42 memory { 43 memory {
43 device_type = "memory"; 44 device_type = "memory";
44 reg = <00000000 20000000>; // 512M at 0x0 45 reg = <0x00000000 0x20000000>; // 512M at 0x0
45 }; 46 };
46 47
47 soc@e0000000 { 48 soc@e0000000 {
@@ -50,8 +51,8 @@
50 #interrupt-cells = <2>; 51 #interrupt-cells = <2>;
51 device_type = "soc"; 52 device_type = "soc";
52 compatible = "fsl,mpc8610-immr", "simple-bus"; 53 compatible = "fsl,mpc8610-immr", "simple-bus";
53 ranges = <0 e0000000 00100000>; 54 ranges = <0x0 0xe0000000 0x00100000>;
54 reg = <e0000000 1000>; 55 reg = <0xe0000000 0x1000>;
55 bus-frequency = <0>; 56 bus-frequency = <0>;
56 57
57 i2c@3000 { 58 i2c@3000 {
@@ -59,17 +60,17 @@
59 #size-cells = <0>; 60 #size-cells = <0>;
60 cell-index = <0>; 61 cell-index = <0>;
61 compatible = "fsl-i2c"; 62 compatible = "fsl-i2c";
62 reg = <3000 100>; 63 reg = <0x3000 0x100>;
63 interrupts = <2b 2>; 64 interrupts = <43 2>;
64 interrupt-parent = <&mpic>; 65 interrupt-parent = <&mpic>;
65 dfsrr; 66 dfsrr;
66 67
67 cs4270:codec@4f { 68 cs4270:codec@4f {
68 compatible = "cirrus,cs4270"; 69 compatible = "cirrus,cs4270";
69 reg = <4f>; 70 reg = <0x4f>;
70 /* MCLK source is a stand-alone oscillator */ 71 /* MCLK source is a stand-alone oscillator */
71 clock-frequency = <bb8000>; 72 clock-frequency = <12288000>;
72 }; 73 };
73 }; 74 };
74 75
75 i2c@3100 { 76 i2c@3100 {
@@ -77,8 +78,8 @@
77 #size-cells = <0>; 78 #size-cells = <0>;
78 cell-index = <1>; 79 cell-index = <1>;
79 compatible = "fsl-i2c"; 80 compatible = "fsl-i2c";
80 reg = <3100 100>; 81 reg = <0x3100 0x100>;
81 interrupts = <2b 2>; 82 interrupts = <43 2>;
82 interrupt-parent = <&mpic>; 83 interrupt-parent = <&mpic>;
83 dfsrr; 84 dfsrr;
84 }; 85 };
@@ -87,9 +88,9 @@
87 cell-index = <0>; 88 cell-index = <0>;
88 device_type = "serial"; 89 device_type = "serial";
89 compatible = "ns16550"; 90 compatible = "ns16550";
90 reg = <4500 100>; 91 reg = <0x4500 0x100>;
91 clock-frequency = <0>; 92 clock-frequency = <0>;
92 interrupts = <2a 2>; 93 interrupts = <42 2>;
93 interrupt-parent = <&mpic>; 94 interrupt-parent = <&mpic>;
94 }; 95 };
95 96
@@ -97,9 +98,9 @@
97 cell-index = <1>; 98 cell-index = <1>;
98 device_type = "serial"; 99 device_type = "serial";
99 compatible = "ns16550"; 100 compatible = "ns16550";
100 reg = <4600 100>; 101 reg = <0x4600 0x100>;
101 clock-frequency = <0>; 102 clock-frequency = <0>;
102 interrupts = <1c 2>; 103 interrupts = <28 2>;
103 interrupt-parent = <&mpic>; 104 interrupt-parent = <&mpic>;
104 }; 105 };
105 106
@@ -108,7 +109,7 @@
108 interrupt-controller; 109 interrupt-controller;
109 #address-cells = <0>; 110 #address-cells = <0>;
110 #interrupt-cells = <2>; 111 #interrupt-cells = <2>;
111 reg = <40000 40000>; 112 reg = <0x40000 0x40000>;
112 compatible = "chrp,open-pic"; 113 compatible = "chrp,open-pic";
113 device_type = "open-pic"; 114 device_type = "open-pic";
114 big-endian; 115 big-endian;
@@ -116,16 +117,16 @@
116 117
117 global-utilities@e0000 { 118 global-utilities@e0000 {
118 compatible = "fsl,mpc8610-guts"; 119 compatible = "fsl,mpc8610-guts";
119 reg = <e0000 1000>; 120 reg = <0xe0000 0x1000>;
120 fsl,has-rstcr; 121 fsl,has-rstcr;
121 }; 122 };
122 123
123 i2s@16000 { 124 i2s@16000 {
124 compatible = "fsl,mpc8610-ssi"; 125 compatible = "fsl,mpc8610-ssi";
125 cell-index = <0>; 126 cell-index = <0>;
126 reg = <16000 100>; 127 reg = <0x16000 0x100>;
127 interrupt-parent = <&mpic>; 128 interrupt-parent = <&mpic>;
128 interrupts = <3e 2>; 129 interrupts = <62 2>;
129 fsl,mode = "i2s-slave"; 130 fsl,mode = "i2s-slave";
130 codec-handle = <&cs4270>; 131 codec-handle = <&cs4270>;
131 }; 132 };
@@ -133,94 +134,94 @@
133 ssi@16100 { 134 ssi@16100 {
134 compatible = "fsl,mpc8610-ssi"; 135 compatible = "fsl,mpc8610-ssi";
135 cell-index = <1>; 136 cell-index = <1>;
136 reg = <16100 100>; 137 reg = <0x16100 0x100>;
137 interrupt-parent = <&mpic>; 138 interrupt-parent = <&mpic>;
138 interrupts = <3f 2>; 139 interrupts = <63 2>;
139 }; 140 };
140 141
141 dma@21300 { 142 dma@21300 {
142 #address-cells = <1>; 143 #address-cells = <1>;
143 #size-cells = <1>; 144 #size-cells = <1>;
144 compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; 145 compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
145 cell-index = <0>; 146 cell-index = <0>;
146 reg = <21300 4>; /* DMA general status register */ 147 reg = <0x21300 0x4>; /* DMA general status register */
147 ranges = <0 21100 200>; 148 ranges = <0x0 0x21100 0x200>;
148 149
149 dma-channel@0 { 150 dma-channel@0 {
150 compatible = "fsl,mpc8610-dma-channel", 151 compatible = "fsl,mpc8610-dma-channel",
151 "fsl,eloplus-dma-channel"; 152 "fsl,eloplus-dma-channel";
152 cell-index = <0>; 153 cell-index = <0>;
153 reg = <0 80>; 154 reg = <0x0 0x80>;
154 interrupt-parent = <&mpic>; 155 interrupt-parent = <&mpic>;
155 interrupts = <14 2>; 156 interrupts = <20 2>;
156 }; 157 };
157 dma-channel@1 { 158 dma-channel@1 {
158 compatible = "fsl,mpc8610-dma-channel", 159 compatible = "fsl,mpc8610-dma-channel",
159 "fsl,eloplus-dma-channel"; 160 "fsl,eloplus-dma-channel";
160 cell-index = <1>; 161 cell-index = <1>;
161 reg = <80 80>; 162 reg = <0x80 0x80>;
162 interrupt-parent = <&mpic>; 163 interrupt-parent = <&mpic>;
163 interrupts = <15 2>; 164 interrupts = <21 2>;
164 }; 165 };
165 dma-channel@2 { 166 dma-channel@2 {
166 compatible = "fsl,mpc8610-dma-channel", 167 compatible = "fsl,mpc8610-dma-channel",
167 "fsl,eloplus-dma-channel"; 168 "fsl,eloplus-dma-channel";
168 cell-index = <2>; 169 cell-index = <2>;
169 reg = <100 80>; 170 reg = <0x100 0x80>;
170 interrupt-parent = <&mpic>; 171 interrupt-parent = <&mpic>;
171 interrupts = <16 2>; 172 interrupts = <22 2>;
172 }; 173 };
173 dma-channel@3 { 174 dma-channel@3 {
174 compatible = "fsl,mpc8610-dma-channel", 175 compatible = "fsl,mpc8610-dma-channel",
175 "fsl,eloplus-dma-channel"; 176 "fsl,eloplus-dma-channel";
176 cell-index = <3>; 177 cell-index = <3>;
177 reg = <180 80>; 178 reg = <0x180 0x80>;
178 interrupt-parent = <&mpic>; 179 interrupt-parent = <&mpic>;
179 interrupts = <17 2>; 180 interrupts = <23 2>;
180 }; 181 };
181 }; 182 };
182 183
183 dma@c300 { 184 dma@c300 {
184 #address-cells = <1>; 185 #address-cells = <1>;
185 #size-cells = <1>; 186 #size-cells = <1>;
186 compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; 187 compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";
187 cell-index = <1>; 188 cell-index = <1>;
188 reg = <c300 4>; /* DMA general status register */ 189 reg = <0xc300 0x4>; /* DMA general status register */
189 ranges = <0 c100 200>; 190 ranges = <0x0 0xc100 0x200>;
190 191
191 dma-channel@0 { 192 dma-channel@0 {
192 compatible = "fsl,mpc8610-dma-channel", 193 compatible = "fsl,mpc8610-dma-channel",
193 "fsl,mpc8540-dma-channel"; 194 "fsl,mpc8540-dma-channel";
194 cell-index = <0>; 195 cell-index = <0>;
195 reg = <0 80>; 196 reg = <0x0 0x80>;
196 interrupt-parent = <&mpic>; 197 interrupt-parent = <&mpic>;
197 interrupts = <3c 2>; 198 interrupts = <60 2>;
198 }; 199 };
199 dma-channel@1 { 200 dma-channel@1 {
200 compatible = "fsl,mpc8610-dma-channel", 201 compatible = "fsl,mpc8610-dma-channel",
201 "fsl,mpc8540-dma-channel"; 202 "fsl,mpc8540-dma-channel";
202 cell-index = <1>; 203 cell-index = <1>;
203 reg = <80 80>; 204 reg = <0x80 0x80>;
204 interrupt-parent = <&mpic>; 205 interrupt-parent = <&mpic>;
205 interrupts = <3d 2>; 206 interrupts = <61 2>;
206 }; 207 };
207 dma-channel@2 { 208 dma-channel@2 {
208 compatible = "fsl,mpc8610-dma-channel", 209 compatible = "fsl,mpc8610-dma-channel",
209 "fsl,mpc8540-dma-channel"; 210 "fsl,mpc8540-dma-channel";
210 cell-index = <2>; 211 cell-index = <2>;
211 reg = <100 80>; 212 reg = <0x100 0x80>;
212 interrupt-parent = <&mpic>; 213 interrupt-parent = <&mpic>;
213 interrupts = <3e 2>; 214 interrupts = <62 2>;
214 }; 215 };
215 dma-channel@3 { 216 dma-channel@3 {
216 compatible = "fsl,mpc8610-dma-channel", 217 compatible = "fsl,mpc8610-dma-channel",
217 "fsl,mpc8540-dma-channel"; 218 "fsl,mpc8540-dma-channel";
218 cell-index = <3>; 219 cell-index = <3>;
219 reg = <180 80>; 220 reg = <0x180 0x80>;
220 interrupt-parent = <&mpic>; 221 interrupt-parent = <&mpic>;
221 interrupts = <3f 2>; 222 interrupts = <63 2>;
222 }; 223 };
223 }; 224 };
224 225
225 }; 226 };
226 227
@@ -231,26 +232,26 @@
231 #interrupt-cells = <1>; 232 #interrupt-cells = <1>;
232 #size-cells = <2>; 233 #size-cells = <2>;
233 #address-cells = <3>; 234 #address-cells = <3>;
234 reg = <e0008000 1000>; 235 reg = <0xe0008000 0x1000>;
235 bus-range = <0 0>; 236 bus-range = <0 0>;
236 ranges = <02000000 0 80000000 80000000 0 10000000 237 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
237 01000000 0 00000000 e1000000 0 00100000>; 238 0x01000000 0x0 0x00000000 0xe1000000 0x0 0x00100000>;
238 clock-frequency = <1fca055>; 239 clock-frequency = <33333333>;
239 interrupt-parent = <&mpic>; 240 interrupt-parent = <&mpic>;
240 interrupts = <18 2>; 241 interrupts = <24 2>;
241 interrupt-map-mask = <f800 0 0 7>; 242 interrupt-map-mask = <0xf800 0 0 7>;
242 interrupt-map = < 243 interrupt-map = <
243 /* IDSEL 0x11 */ 244 /* IDSEL 0x11 */
244 8800 0 0 1 &mpic 4 1 245 0x8800 0 0 1 &mpic 4 1
245 8800 0 0 2 &mpic 5 1 246 0x8800 0 0 2 &mpic 5 1
246 8800 0 0 3 &mpic 6 1 247 0x8800 0 0 3 &mpic 6 1
247 8800 0 0 4 &mpic 7 1 248 0x8800 0 0 4 &mpic 7 1
248 249
249 /* IDSEL 0x12 */ 250 /* IDSEL 0x12 */
250 9000 0 0 1 &mpic 5 1 251 0x9000 0 0 1 &mpic 5 1
251 9000 0 0 2 &mpic 6 1 252 0x9000 0 0 2 &mpic 6 1
252 9000 0 0 3 &mpic 7 1 253 0x9000 0 0 3 &mpic 7 1
253 9000 0 0 4 &mpic 4 1 254 0x9000 0 0 4 &mpic 4 1
254 >; 255 >;
255 }; 256 };
256 257
@@ -261,28 +262,28 @@
261 #interrupt-cells = <1>; 262 #interrupt-cells = <1>;
262 #size-cells = <2>; 263 #size-cells = <2>;
263 #address-cells = <3>; 264 #address-cells = <3>;
264 reg = <e000a000 1000>; 265 reg = <0xe000a000 0x1000>;
265 bus-range = <1 3>; 266 bus-range = <1 3>;
266 ranges = <02000000 0 a0000000 a0000000 0 10000000 267 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
267 01000000 0 00000000 e3000000 0 00100000>; 268 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
268 clock-frequency = <1fca055>; 269 clock-frequency = <33333333>;
269 interrupt-parent = <&mpic>; 270 interrupt-parent = <&mpic>;
270 interrupts = <1a 2>; 271 interrupts = <26 2>;
271 interrupt-map-mask = <f800 0 0 7>; 272 interrupt-map-mask = <0xf800 0 0 7>;
272 273
273 interrupt-map = < 274 interrupt-map = <
274 /* IDSEL 0x1b */ 275 /* IDSEL 0x1b */
275 d800 0 0 1 &mpic 2 1 276 0xd800 0 0 1 &mpic 2 1
276 277
277 /* IDSEL 0x1c*/ 278 /* IDSEL 0x1c*/
278 e000 0 0 1 &mpic 1 1 279 0xe000 0 0 1 &mpic 1 1
279 e000 0 0 2 &mpic 1 1 280 0xe000 0 0 2 &mpic 1 1
280 e000 0 0 3 &mpic 1 1 281 0xe000 0 0 3 &mpic 1 1
281 e000 0 0 4 &mpic 1 1 282 0xe000 0 0 4 &mpic 1 1
282 283
283 /* IDSEL 0x1f */ 284 /* IDSEL 0x1f */
284 f800 0 0 1 &mpic 3 0 285 0xf800 0 0 1 &mpic 3 0
285 f800 0 0 2 &mpic 0 1 286 0xf800 0 0 2 &mpic 0 1
286 >; 287 >;
287 288
288 pcie@0 { 289 pcie@0 {
@@ -290,22 +291,22 @@
290 #size-cells = <2>; 291 #size-cells = <2>;
291 #address-cells = <3>; 292 #address-cells = <3>;
292 device_type = "pci"; 293 device_type = "pci";
293 ranges = <02000000 0 a0000000 294 ranges = <0x02000000 0x0 0xa0000000
294 02000000 0 a0000000 295 0x02000000 0x0 0xa0000000
295 0 10000000 296 0x0 0x10000000
296 01000000 0 00000000 297 0x01000000 0x0 0x00000000
297 01000000 0 00000000 298 0x01000000 0x0 0x00000000
298 0 00100000>; 299 0x0 0x00100000>;
299 uli1575@0 { 300 uli1575@0 {
300 reg = <0 0 0 0 0>; 301 reg = <0 0 0 0 0>;
301 #size-cells = <2>; 302 #size-cells = <2>;
302 #address-cells = <3>; 303 #address-cells = <3>;
303 ranges = <02000000 0 a0000000 304 ranges = <0x02000000 0x0 0xa0000000
304 02000000 0 a0000000 305 0x02000000 0x0 0xa0000000
305 0 10000000 306 0x0 0x10000000
306 01000000 0 00000000 307 0x01000000 0x0 0x00000000
307 01000000 0 00000000 308 0x01000000 0x0 0x00000000
308 0 00100000>; 309 0x0 0x00100000>;
309 }; 310 };
310 }; 311 };
311 }; 312 };
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 556a9cac0793..79385bcd5c5f 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -9,6 +9,7 @@
9 * option) any later version. 9 * option) any later version.
10 */ 10 */
11 11
12/dts-v1/;
12 13
13/ { 14/ {
14 model = "MPC8641HPCN"; 15 model = "MPC8641HPCN";
@@ -34,22 +35,22 @@
34 PowerPC,8641@0 { 35 PowerPC,8641@0 {
35 device_type = "cpu"; 36 device_type = "cpu";
36 reg = <0>; 37 reg = <0>;
37 d-cache-line-size = <20>; // 32 bytes 38 d-cache-line-size = <32>;
38 i-cache-line-size = <20>; // 32 bytes 39 i-cache-line-size = <32>;
39 d-cache-size = <8000>; // L1, 32K 40 d-cache-size = <32768>; // L1
40 i-cache-size = <8000>; // L1, 32K 41 i-cache-size = <32768>; // L1
41 timebase-frequency = <0>; // 33 MHz, from uboot 42 timebase-frequency = <0>; // From uboot
42 bus-frequency = <0>; // From uboot 43 bus-frequency = <0>; // From uboot
43 clock-frequency = <0>; // From uboot 44 clock-frequency = <0>; // From uboot
44 }; 45 };
45 PowerPC,8641@1 { 46 PowerPC,8641@1 {
46 device_type = "cpu"; 47 device_type = "cpu";
47 reg = <1>; 48 reg = <1>;
48 d-cache-line-size = <20>; // 32 bytes 49 d-cache-line-size = <32>;
49 i-cache-line-size = <20>; // 32 bytes 50 i-cache-line-size = <32>;
50 d-cache-size = <8000>; // L1, 32K 51 d-cache-size = <32768>;
51 i-cache-size = <8000>; // L1, 32K 52 i-cache-size = <32768>;
52 timebase-frequency = <0>; // 33 MHz, from uboot 53 timebase-frequency = <0>; // From uboot
53 bus-frequency = <0>; // From uboot 54 bus-frequency = <0>; // From uboot
54 clock-frequency = <0>; // From uboot 55 clock-frequency = <0>; // From uboot
55 }; 56 };
@@ -57,45 +58,45 @@
57 58
58 memory { 59 memory {
59 device_type = "memory"; 60 device_type = "memory";
60 reg = <00000000 40000000>; // 1G at 0x0 61 reg = <0x00000000 0x40000000>; // 1G at 0x0
61 }; 62 };
62 63
63 localbus@f8005000 { 64 localbus@f8005000 {
64 #address-cells = <2>; 65 #address-cells = <2>;
65 #size-cells = <1>; 66 #size-cells = <1>;
66 compatible = "fsl,mpc8641-localbus", "simple-bus"; 67 compatible = "fsl,mpc8641-localbus", "simple-bus";
67 reg = <f8005000 1000>; 68 reg = <0xf8005000 0x1000>;
68 interrupts = <13 2>; 69 interrupts = <19 2>;
69 interrupt-parent = <&mpic>; 70 interrupt-parent = <&mpic>;
70 71
71 ranges = <0 0 ff800000 00800000 72 ranges = <0 0 0xff800000 0x00800000
72 1 0 fe000000 01000000 73 1 0 0xfe000000 0x01000000
73 2 0 f8200000 00100000 74 2 0 0xf8200000 0x00100000
74 3 0 f8100000 00100000>; 75 3 0 0xf8100000 0x00100000>;
75 76
76 flash@0,0 { 77 flash@0,0 {
77 compatible = "cfi-flash"; 78 compatible = "cfi-flash";
78 reg = <0 0 00800000>; 79 reg = <0 0 0x00800000>;
79 bank-width = <2>; 80 bank-width = <2>;
80 device-width = <2>; 81 device-width = <2>;
81 #address-cells = <1>; 82 #address-cells = <1>;
82 #size-cells = <1>; 83 #size-cells = <1>;
83 partition@0 { 84 partition@0 {
84 label = "kernel"; 85 label = "kernel";
85 reg = <00000000 00300000>; 86 reg = <0x00000000 0x00300000>;
86 }; 87 };
87 partition@300000 { 88 partition@300000 {
88 label = "firmware b"; 89 label = "firmware b";
89 reg = <00300000 00100000>; 90 reg = <0x00300000 0x00100000>;
90 read-only; 91 read-only;
91 }; 92 };
92 partition@400000 { 93 partition@400000 {
93 label = "fs"; 94 label = "fs";
94 reg = <00400000 00300000>; 95 reg = <0x00400000 0x00300000>;
95 }; 96 };
96 partition@700000 { 97 partition@700000 {
97 label = "firmware a"; 98 label = "firmware a";
98 reg = <00700000 00100000>; 99 reg = <0x00700000 0x00100000>;
99 read-only; 100 read-only;
100 }; 101 };
101 }; 102 };
@@ -106,8 +107,8 @@
106 #size-cells = <1>; 107 #size-cells = <1>;
107 device_type = "soc"; 108 device_type = "soc";
108 compatible = "simple-bus"; 109 compatible = "simple-bus";
109 ranges = <00000000 f8000000 00100000>; 110 ranges = <0x00000000 0xf8000000 0x00100000>;
110 reg = <f8000000 00001000>; // CCSRBAR 111 reg = <0xf8000000 0x00001000>; // CCSRBAR
111 bus-frequency = <0>; 112 bus-frequency = <0>;
112 113
113 i2c@3000 { 114 i2c@3000 {
@@ -115,8 +116,8 @@
115 #size-cells = <0>; 116 #size-cells = <0>;
116 cell-index = <0>; 117 cell-index = <0>;
117 compatible = "fsl-i2c"; 118 compatible = "fsl-i2c";
118 reg = <3000 100>; 119 reg = <0x3000 0x100>;
119 interrupts = <2b 2>; 120 interrupts = <43 2>;
120 interrupt-parent = <&mpic>; 121 interrupt-parent = <&mpic>;
121 dfsrr; 122 dfsrr;
122 }; 123 };
@@ -126,8 +127,8 @@
126 #size-cells = <0>; 127 #size-cells = <0>;
127 cell-index = <1>; 128 cell-index = <1>;
128 compatible = "fsl-i2c"; 129 compatible = "fsl-i2c";
129 reg = <3100 100>; 130 reg = <0x3100 0x100>;
130 interrupts = <2b 2>; 131 interrupts = <43 2>;
131 interrupt-parent = <&mpic>; 132 interrupt-parent = <&mpic>;
132 dfsrr; 133 dfsrr;
133 }; 134 };
@@ -136,29 +137,29 @@
136 #address-cells = <1>; 137 #address-cells = <1>;
137 #size-cells = <0>; 138 #size-cells = <0>;
138 compatible = "fsl,gianfar-mdio"; 139 compatible = "fsl,gianfar-mdio";
139 reg = <24520 20>; 140 reg = <0x24520 0x20>;
140 141
141 phy0: ethernet-phy@0 { 142 phy0: ethernet-phy@0 {
142 interrupt-parent = <&mpic>; 143 interrupt-parent = <&mpic>;
143 interrupts = <a 1>; 144 interrupts = <10 1>;
144 reg = <0>; 145 reg = <0>;
145 device_type = "ethernet-phy"; 146 device_type = "ethernet-phy";
146 }; 147 };
147 phy1: ethernet-phy@1 { 148 phy1: ethernet-phy@1 {
148 interrupt-parent = <&mpic>; 149 interrupt-parent = <&mpic>;
149 interrupts = <a 1>; 150 interrupts = <10 1>;
150 reg = <1>; 151 reg = <1>;
151 device_type = "ethernet-phy"; 152 device_type = "ethernet-phy";
152 }; 153 };
153 phy2: ethernet-phy@2 { 154 phy2: ethernet-phy@2 {
154 interrupt-parent = <&mpic>; 155 interrupt-parent = <&mpic>;
155 interrupts = <a 1>; 156 interrupts = <10 1>;
156 reg = <2>; 157 reg = <2>;
157 device_type = "ethernet-phy"; 158 device_type = "ethernet-phy";
158 }; 159 };
159 phy3: ethernet-phy@3 { 160 phy3: ethernet-phy@3 {
160 interrupt-parent = <&mpic>; 161 interrupt-parent = <&mpic>;
161 interrupts = <a 1>; 162 interrupts = <10 1>;
162 reg = <3>; 163 reg = <3>;
163 device_type = "ethernet-phy"; 164 device_type = "ethernet-phy";
164 }; 165 };
@@ -169,9 +170,9 @@
169 device_type = "network"; 170 device_type = "network";
170 model = "TSEC"; 171 model = "TSEC";
171 compatible = "gianfar"; 172 compatible = "gianfar";
172 reg = <24000 1000>; 173 reg = <0x24000 0x1000>;
173 local-mac-address = [ 00 00 00 00 00 00 ]; 174 local-mac-address = [ 00 00 00 00 00 00 ];
174 interrupts = <1d 2 1e 2 22 2>; 175 interrupts = <29 2 30 2 34 2>;
175 interrupt-parent = <&mpic>; 176 interrupt-parent = <&mpic>;
176 phy-handle = <&phy0>; 177 phy-handle = <&phy0>;
177 phy-connection-type = "rgmii-id"; 178 phy-connection-type = "rgmii-id";
@@ -182,9 +183,9 @@
182 device_type = "network"; 183 device_type = "network";
183 model = "TSEC"; 184 model = "TSEC";
184 compatible = "gianfar"; 185 compatible = "gianfar";
185 reg = <25000 1000>; 186 reg = <0x25000 0x1000>;
186 local-mac-address = [ 00 00 00 00 00 00 ]; 187 local-mac-address = [ 00 00 00 00 00 00 ];
187 interrupts = <23 2 24 2 28 2>; 188 interrupts = <35 2 36 2 40 2>;
188 interrupt-parent = <&mpic>; 189 interrupt-parent = <&mpic>;
189 phy-handle = <&phy1>; 190 phy-handle = <&phy1>;
190 phy-connection-type = "rgmii-id"; 191 phy-connection-type = "rgmii-id";
@@ -195,9 +196,9 @@
195 device_type = "network"; 196 device_type = "network";
196 model = "TSEC"; 197 model = "TSEC";
197 compatible = "gianfar"; 198 compatible = "gianfar";
198 reg = <26000 1000>; 199 reg = <0x26000 0x1000>;
199 local-mac-address = [ 00 00 00 00 00 00 ]; 200 local-mac-address = [ 00 00 00 00 00 00 ];
200 interrupts = <1F 2 20 2 21 2>; 201 interrupts = <31 2 32 2 33 2>;
201 interrupt-parent = <&mpic>; 202 interrupt-parent = <&mpic>;
202 phy-handle = <&phy2>; 203 phy-handle = <&phy2>;
203 phy-connection-type = "rgmii-id"; 204 phy-connection-type = "rgmii-id";
@@ -208,9 +209,9 @@
208 device_type = "network"; 209 device_type = "network";
209 model = "TSEC"; 210 model = "TSEC";
210 compatible = "gianfar"; 211 compatible = "gianfar";
211 reg = <27000 1000>; 212 reg = <0x27000 0x1000>;
212 local-mac-address = [ 00 00 00 00 00 00 ]; 213 local-mac-address = [ 00 00 00 00 00 00 ];
213 interrupts = <25 2 26 2 27 2>; 214 interrupts = <37 2 38 2 39 2>;
214 interrupt-parent = <&mpic>; 215 interrupt-parent = <&mpic>;
215 phy-handle = <&phy3>; 216 phy-handle = <&phy3>;
216 phy-connection-type = "rgmii-id"; 217 phy-connection-type = "rgmii-id";
@@ -220,9 +221,9 @@
220 cell-index = <0>; 221 cell-index = <0>;
221 device_type = "serial"; 222 device_type = "serial";
222 compatible = "ns16550"; 223 compatible = "ns16550";
223 reg = <4500 100>; 224 reg = <0x4500 0x100>;
224 clock-frequency = <0>; 225 clock-frequency = <0>;
225 interrupts = <2a 2>; 226 interrupts = <42 2>;
226 interrupt-parent = <&mpic>; 227 interrupt-parent = <&mpic>;
227 }; 228 };
228 229
@@ -230,9 +231,9 @@
230 cell-index = <1>; 231 cell-index = <1>;
231 device_type = "serial"; 232 device_type = "serial";
232 compatible = "ns16550"; 233 compatible = "ns16550";
233 reg = <4600 100>; 234 reg = <0x4600 0x100>;
234 clock-frequency = <0>; 235 clock-frequency = <0>;
235 interrupts = <1c 2>; 236 interrupts = <28 2>;
236 interrupt-parent = <&mpic>; 237 interrupt-parent = <&mpic>;
237 }; 238 };
238 239
@@ -241,7 +242,7 @@
241 interrupt-controller; 242 interrupt-controller;
242 #address-cells = <0>; 243 #address-cells = <0>;
243 #interrupt-cells = <2>; 244 #interrupt-cells = <2>;
244 reg = <40000 40000>; 245 reg = <0x40000 0x40000>;
245 compatible = "chrp,open-pic"; 246 compatible = "chrp,open-pic";
246 device_type = "open-pic"; 247 device_type = "open-pic";
247 big-endian; 248 big-endian;
@@ -249,7 +250,7 @@
249 250
250 global-utilities@e0000 { 251 global-utilities@e0000 {
251 compatible = "fsl,mpc8641-guts"; 252 compatible = "fsl,mpc8641-guts";
252 reg = <e0000 1000>; 253 reg = <0xe0000 0x1000>;
253 fsl,has-rstcr; 254 fsl,has-rstcr;
254 }; 255 };
255 }; 256 };
@@ -261,127 +262,127 @@
261 #interrupt-cells = <1>; 262 #interrupt-cells = <1>;
262 #size-cells = <2>; 263 #size-cells = <2>;
263 #address-cells = <3>; 264 #address-cells = <3>;
264 reg = <f8008000 1000>; 265 reg = <0xf8008000 0x1000>;
265 bus-range = <0 ff>; 266 bus-range = <0x0 0xff>;
266 ranges = <02000000 0 80000000 80000000 0 20000000 267 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
267 01000000 0 00000000 e2000000 0 00100000>; 268 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
268 clock-frequency = <1fca055>; 269 clock-frequency = <33333333>;
269 interrupt-parent = <&mpic>; 270 interrupt-parent = <&mpic>;
270 interrupts = <18 2>; 271 interrupts = <24 2>;
271 interrupt-map-mask = <ff00 0 0 7>; 272 interrupt-map-mask = <0xff00 0 0 7>;
272 interrupt-map = < 273 interrupt-map = <
273 /* IDSEL 0x11 func 0 - PCI slot 1 */ 274 /* IDSEL 0x11 func 0 - PCI slot 1 */
274 8800 0 0 1 &mpic 2 1 275 0x8800 0 0 1 &mpic 2 1
275 8800 0 0 2 &mpic 3 1 276 0x8800 0 0 2 &mpic 3 1
276 8800 0 0 3 &mpic 4 1 277 0x8800 0 0 3 &mpic 4 1
277 8800 0 0 4 &mpic 1 1 278 0x8800 0 0 4 &mpic 1 1
278 279
279 /* IDSEL 0x11 func 1 - PCI slot 1 */ 280 /* IDSEL 0x11 func 1 - PCI slot 1 */
280 8900 0 0 1 &mpic 2 1 281 0x8900 0 0 1 &mpic 2 1
281 8900 0 0 2 &mpic 3 1 282 0x8900 0 0 2 &mpic 3 1
282 8900 0 0 3 &mpic 4 1 283 0x8900 0 0 3 &mpic 4 1
283 8900 0 0 4 &mpic 1 1 284 0x8900 0 0 4 &mpic 1 1
284 285
285 /* IDSEL 0x11 func 2 - PCI slot 1 */ 286 /* IDSEL 0x11 func 2 - PCI slot 1 */
286 8a00 0 0 1 &mpic 2 1 287 0x8a00 0 0 1 &mpic 2 1
287 8a00 0 0 2 &mpic 3 1 288 0x8a00 0 0 2 &mpic 3 1
288 8a00 0 0 3 &mpic 4 1 289 0x8a00 0 0 3 &mpic 4 1
289 8a00 0 0 4 &mpic 1 1 290 0x8a00 0 0 4 &mpic 1 1
290 291
291 /* IDSEL 0x11 func 3 - PCI slot 1 */ 292 /* IDSEL 0x11 func 3 - PCI slot 1 */
292 8b00 0 0 1 &mpic 2 1 293 0x8b00 0 0 1 &mpic 2 1
293 8b00 0 0 2 &mpic 3 1 294 0x8b00 0 0 2 &mpic 3 1
294 8b00 0 0 3 &mpic 4 1 295 0x8b00 0 0 3 &mpic 4 1
295 8b00 0 0 4 &mpic 1 1 296 0x8b00 0 0 4 &mpic 1 1
296 297
297 /* IDSEL 0x11 func 4 - PCI slot 1 */ 298 /* IDSEL 0x11 func 4 - PCI slot 1 */
298 8c00 0 0 1 &mpic 2 1 299 0x8c00 0 0 1 &mpic 2 1
299 8c00 0 0 2 &mpic 3 1 300 0x8c00 0 0 2 &mpic 3 1
300 8c00 0 0 3 &mpic 4 1 301 0x8c00 0 0 3 &mpic 4 1
301 8c00 0 0 4 &mpic 1 1 302 0x8c00 0 0 4 &mpic 1 1
302 303
303 /* IDSEL 0x11 func 5 - PCI slot 1 */ 304 /* IDSEL 0x11 func 5 - PCI slot 1 */
304 8d00 0 0 1 &mpic 2 1 305 0x8d00 0 0 1 &mpic 2 1
305 8d00 0 0 2 &mpic 3 1 306 0x8d00 0 0 2 &mpic 3 1
306 8d00 0 0 3 &mpic 4 1 307 0x8d00 0 0 3 &mpic 4 1
307 8d00 0 0 4 &mpic 1 1 308 0x8d00 0 0 4 &mpic 1 1
308 309
309 /* IDSEL 0x11 func 6 - PCI slot 1 */ 310 /* IDSEL 0x11 func 6 - PCI slot 1 */
310 8e00 0 0 1 &mpic 2 1 311 0x8e00 0 0 1 &mpic 2 1
311 8e00 0 0 2 &mpic 3 1 312 0x8e00 0 0 2 &mpic 3 1
312 8e00 0 0 3 &mpic 4 1 313 0x8e00 0 0 3 &mpic 4 1
313 8e00 0 0 4 &mpic 1 1 314 0x8e00 0 0 4 &mpic 1 1
314 315
315 /* IDSEL 0x11 func 7 - PCI slot 1 */ 316 /* IDSEL 0x11 func 7 - PCI slot 1 */
316 8f00 0 0 1 &mpic 2 1 317 0x8f00 0 0 1 &mpic 2 1
317 8f00 0 0 2 &mpic 3 1 318 0x8f00 0 0 2 &mpic 3 1
318 8f00 0 0 3 &mpic 4 1 319 0x8f00 0 0 3 &mpic 4 1
319 8f00 0 0 4 &mpic 1 1 320 0x8f00 0 0 4 &mpic 1 1
320 321
321 /* IDSEL 0x12 func 0 - PCI slot 2 */ 322 /* IDSEL 0x12 func 0 - PCI slot 2 */
322 9000 0 0 1 &mpic 3 1 323 0x9000 0 0 1 &mpic 3 1
323 9000 0 0 2 &mpic 4 1 324 0x9000 0 0 2 &mpic 4 1
324 9000 0 0 3 &mpic 1 1 325 0x9000 0 0 3 &mpic 1 1
325 9000 0 0 4 &mpic 2 1 326 0x9000 0 0 4 &mpic 2 1
326 327
327 /* IDSEL 0x12 func 1 - PCI slot 2 */ 328 /* IDSEL 0x12 func 1 - PCI slot 2 */
328 9100 0 0 1 &mpic 3 1 329 0x9100 0 0 1 &mpic 3 1
329 9100 0 0 2 &mpic 4 1 330 0x9100 0 0 2 &mpic 4 1
330 9100 0 0 3 &mpic 1 1 331 0x9100 0 0 3 &mpic 1 1
331 9100 0 0 4 &mpic 2 1 332 0x9100 0 0 4 &mpic 2 1
332 333
333 /* IDSEL 0x12 func 2 - PCI slot 2 */ 334 /* IDSEL 0x12 func 2 - PCI slot 2 */
334 9200 0 0 1 &mpic 3 1 335 0x9200 0 0 1 &mpic 3 1
335 9200 0 0 2 &mpic 4 1 336 0x9200 0 0 2 &mpic 4 1
336 9200 0 0 3 &mpic 1 1 337 0x9200 0 0 3 &mpic 1 1
337 9200 0 0 4 &mpic 2 1 338 0x9200 0 0 4 &mpic 2 1
338 339
339 /* IDSEL 0x12 func 3 - PCI slot 2 */ 340 /* IDSEL 0x12 func 3 - PCI slot 2 */
340 9300 0 0 1 &mpic 3 1 341 0x9300 0 0 1 &mpic 3 1
341 9300 0 0 2 &mpic 4 1 342 0x9300 0 0 2 &mpic 4 1
342 9300 0 0 3 &mpic 1 1 343 0x9300 0 0 3 &mpic 1 1
343 9300 0 0 4 &mpic 2 1 344 0x9300 0 0 4 &mpic 2 1
344 345
345 /* IDSEL 0x12 func 4 - PCI slot 2 */ 346 /* IDSEL 0x12 func 4 - PCI slot 2 */
346 9400 0 0 1 &mpic 3 1 347 0x9400 0 0 1 &mpic 3 1
347 9400 0 0 2 &mpic 4 1 348 0x9400 0 0 2 &mpic 4 1
348 9400 0 0 3 &mpic 1 1 349 0x9400 0 0 3 &mpic 1 1
349 9400 0 0 4 &mpic 2 1 350 0x9400 0 0 4 &mpic 2 1
350 351
351 /* IDSEL 0x12 func 5 - PCI slot 2 */ 352 /* IDSEL 0x12 func 5 - PCI slot 2 */
352 9500 0 0 1 &mpic 3 1 353 0x9500 0 0 1 &mpic 3 1
353 9500 0 0 2 &mpic 4 1 354 0x9500 0 0 2 &mpic 4 1
354 9500 0 0 3 &mpic 1 1 355 0x9500 0 0 3 &mpic 1 1
355 9500 0 0 4 &mpic 2 1 356 0x9500 0 0 4 &mpic 2 1
356 357
357 /* IDSEL 0x12 func 6 - PCI slot 2 */ 358 /* IDSEL 0x12 func 6 - PCI slot 2 */
358 9600 0 0 1 &mpic 3 1 359 0x9600 0 0 1 &mpic 3 1
359 9600 0 0 2 &mpic 4 1 360 0x9600 0 0 2 &mpic 4 1
360 9600 0 0 3 &mpic 1 1 361 0x9600 0 0 3 &mpic 1 1
361 9600 0 0 4 &mpic 2 1 362 0x9600 0 0 4 &mpic 2 1
362 363
363 /* IDSEL 0x12 func 7 - PCI slot 2 */ 364 /* IDSEL 0x12 func 7 - PCI slot 2 */
364 9700 0 0 1 &mpic 3 1 365 0x9700 0 0 1 &mpic 3 1
365 9700 0 0 2 &mpic 4 1 366 0x9700 0 0 2 &mpic 4 1
366 9700 0 0 3 &mpic 1 1 367 0x9700 0 0 3 &mpic 1 1
367 9700 0 0 4 &mpic 2 1 368 0x9700 0 0 4 &mpic 2 1
368 369
369 // IDSEL 0x1c USB 370 // IDSEL 0x1c USB
370 e000 0 0 1 &i8259 c 2 371 0xe000 0 0 1 &i8259 12 2
371 e100 0 0 2 &i8259 9 2 372 0xe100 0 0 2 &i8259 9 2
372 e200 0 0 3 &i8259 a 2 373 0xe200 0 0 3 &i8259 10 2
373 e300 0 0 4 &i8259 b 2 374 0xe300 0 0 4 &i8259 112
374 375
375 // IDSEL 0x1d Audio 376 // IDSEL 0x1d Audio
376 e800 0 0 1 &i8259 6 2 377 0xe800 0 0 1 &i8259 6 2
377 378
378 // IDSEL 0x1e Legacy 379 // IDSEL 0x1e Legacy
379 f000 0 0 1 &i8259 7 2 380 0xf000 0 0 1 &i8259 7 2
380 f100 0 0 1 &i8259 7 2 381 0xf100 0 0 1 &i8259 7 2
381 382
382 // IDSEL 0x1f IDE/SATA 383 // IDSEL 0x1f IDE/SATA
383 f800 0 0 1 &i8259 e 2 384 0xf800 0 0 1 &i8259 14 2
384 f900 0 0 1 &i8259 5 2 385 0xf900 0 0 1 &i8259 5 2
385 >; 386 >;
386 387
387 pcie@0 { 388 pcie@0 {
@@ -389,37 +390,37 @@
389 #size-cells = <2>; 390 #size-cells = <2>;
390 #address-cells = <3>; 391 #address-cells = <3>;
391 device_type = "pci"; 392 device_type = "pci";
392 ranges = <02000000 0 80000000 393 ranges = <0x02000000 0x0 0x80000000
393 02000000 0 80000000 394 0x02000000 0x0 0x80000000
394 0 20000000 395 0x0 0x20000000
395 396
396 01000000 0 00000000 397 0x01000000 0x0 0x00000000
397 01000000 0 00000000 398 0x01000000 0x0 0x00000000
398 0 00100000>; 399 0x0 0x00100000>;
399 uli1575@0 { 400 uli1575@0 {
400 reg = <0 0 0 0 0>; 401 reg = <0 0 0 0 0>;
401 #size-cells = <2>; 402 #size-cells = <2>;
402 #address-cells = <3>; 403 #address-cells = <3>;
403 ranges = <02000000 0 80000000 404 ranges = <0x02000000 0x0 0x80000000
404 02000000 0 80000000 405 0x02000000 0x0 0x80000000
405 0 20000000 406 0x0 0x20000000
406 01000000 0 00000000 407 0x01000000 0x0 0x00000000
407 01000000 0 00000000 408 0x01000000 0x0 0x00000000
408 0 00100000>; 409 0x0 0x00100000>;
409 isa@1e { 410 isa@1e {
410 device_type = "isa"; 411 device_type = "isa";
411 #interrupt-cells = <2>; 412 #interrupt-cells = <2>;
412 #size-cells = <1>; 413 #size-cells = <1>;
413 #address-cells = <2>; 414 #address-cells = <2>;
414 reg = <f000 0 0 0 0>; 415 reg = <0xf000 0 0 0 0>;
415 ranges = <1 0 01000000 0 0 416 ranges = <1 0 0x01000000 0 0
416 00001000>; 417 0x00001000>;
417 interrupt-parent = <&i8259>; 418 interrupt-parent = <&i8259>;
418 419
419 i8259: interrupt-controller@20 { 420 i8259: interrupt-controller@20 {
420 reg = <1 20 2 421 reg = <1 0x20 2
421 1 a0 2 422 1 0xa0 2
422 1 4d0 2>; 423 1 0x4d0 2>;
423 interrupt-controller; 424 interrupt-controller;
424 device_type = "interrupt-controller"; 425 device_type = "interrupt-controller";
425 #address-cells = <0>; 426 #address-cells = <0>;
@@ -432,8 +433,8 @@
432 i8042@60 { 433 i8042@60 {
433 #size-cells = <0>; 434 #size-cells = <0>;
434 #address-cells = <1>; 435 #address-cells = <1>;
435 reg = <1 60 1 1 64 1>; 436 reg = <1 0x60 1 1 0x64 1>;
436 interrupts = <1 3 c 3>; 437 interrupts = <1 3 12 3>;
437 interrupt-parent = 438 interrupt-parent =
438 <&i8259>; 439 <&i8259>;
439 440
@@ -451,11 +452,11 @@
451 rtc@70 { 452 rtc@70 {
452 compatible = 453 compatible =
453 "pnpPNP,b00"; 454 "pnpPNP,b00";
454 reg = <1 70 2>; 455 reg = <1 0x70 2>;
455 }; 456 };
456 457
457 gpio@400 { 458 gpio@400 {
458 reg = <1 400 80>; 459 reg = <1 0x400 0x80>;
459 }; 460 };
460 }; 461 };
461 }; 462 };
@@ -470,33 +471,33 @@
470 #interrupt-cells = <1>; 471 #interrupt-cells = <1>;
471 #size-cells = <2>; 472 #size-cells = <2>;
472 #address-cells = <3>; 473 #address-cells = <3>;
473 reg = <f8009000 1000>; 474 reg = <0xf8009000 0x1000>;
474 bus-range = <0 ff>; 475 bus-range = <0 0xff>;
475 ranges = <02000000 0 a0000000 a0000000 0 20000000 476 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
476 01000000 0 00000000 e3000000 0 00100000>; 477 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
477 clock-frequency = <1fca055>; 478 clock-frequency = <33333333>;
478 interrupt-parent = <&mpic>; 479 interrupt-parent = <&mpic>;
479 interrupts = <19 2>; 480 interrupts = <25 2>;
480 interrupt-map-mask = <f800 0 0 7>; 481 interrupt-map-mask = <0xf800 0 0 7>;
481 interrupt-map = < 482 interrupt-map = <
482 /* IDSEL 0x0 */ 483 /* IDSEL 0x0 */
483 0000 0 0 1 &mpic 4 1 484 0x0000 0 0 1 &mpic 4 1
484 0000 0 0 2 &mpic 5 1 485 0x0000 0 0 2 &mpic 5 1
485 0000 0 0 3 &mpic 6 1 486 0x0000 0 0 3 &mpic 6 1
486 0000 0 0 4 &mpic 7 1 487 0x0000 0 0 4 &mpic 7 1
487 >; 488 >;
488 pcie@0 { 489 pcie@0 {
489 reg = <0 0 0 0 0>; 490 reg = <0 0 0 0 0>;
490 #size-cells = <2>; 491 #size-cells = <2>;
491 #address-cells = <3>; 492 #address-cells = <3>;
492 device_type = "pci"; 493 device_type = "pci";
493 ranges = <02000000 0 a0000000 494 ranges = <0x02000000 0x0 0xa0000000
494 02000000 0 a0000000 495 0x02000000 0x0 0xa0000000
495 0 20000000 496 0x0 0x20000000
496 497
497 01000000 0 00000000 498 0x01000000 0x0 0x00000000
498 01000000 0 00000000 499 0x01000000 0x0 0x00000000
499 0 00100000>; 500 0x0 0x00100000>;
500 }; 501 };
501 }; 502 };
502}; 503};
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
new file mode 100644
index 000000000000..3839d4b7d6a7
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -0,0 +1,244 @@
1/*
2 * SBC8349E Device Tree Source
3 *
4 * Copyright 2007 Wind River Inc.
5 *
6 * Paul Gortmaker (see MAINTAINERS for contact information)
7 *
8 * -based largely on the Freescale MPC834x_MDS dts.
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16/dts-v1/;
17
18/ {
19 model = "SBC8349E";
20 compatible = "SBC834xE";
21 #address-cells = <1>;
22 #size-cells = <1>;
23
24 aliases {
25 ethernet0 = &enet0;
26 ethernet1 = &enet1;
27 serial0 = &serial0;
28 serial1 = &serial1;
29 pci0 = &pci0;
30 };
31
32 cpus {
33 #address-cells = <1>;
34 #size-cells = <0>;
35
36 PowerPC,8349@0 {
37 device_type = "cpu";
38 reg = <0x0>;
39 d-cache-line-size = <32>;
40 i-cache-line-size = <32>;
41 d-cache-size = <32768>;
42 i-cache-size = <32768>;
43 timebase-frequency = <0>; // from bootloader
44 bus-frequency = <0>; // from bootloader
45 clock-frequency = <0>; // from bootloader
46 };
47 };
48
49 memory {
50 device_type = "memory";
51 reg = <0x00000000 0x10000000>; // 256MB at 0
52 };
53
54 soc8349@e0000000 {
55 #address-cells = <1>;
56 #size-cells = <1>;
57 device_type = "soc";
58 ranges = <0x0 0xe0000000 0x00100000>;
59 reg = <0xe0000000 0x00000200>;
60 bus-frequency = <0>;
61
62 wdt@200 {
63 compatible = "mpc83xx_wdt";
64 reg = <0x200 0x100>;
65 };
66
67 i2c@3000 {
68 #address-cells = <1>;
69 #size-cells = <0>;
70 cell-index = <0>;
71 compatible = "fsl-i2c";
72 reg = <0x3000 0x100>;
73 interrupts = <14 0x8>;
74 interrupt-parent = <&ipic>;
75 dfsrr;
76 };
77
78 i2c@3100 {
79 #address-cells = <1>;
80 #size-cells = <0>;
81 cell-index = <1>;
82 compatible = "fsl-i2c";
83 reg = <0x3100 0x100>;
84 interrupts = <15 0x8>;
85 interrupt-parent = <&ipic>;
86 dfsrr;
87 };
88
89 spi@7000 {
90 cell-index = <0>;
91 compatible = "fsl,spi";
92 reg = <0x7000 0x1000>;
93 interrupts = <16 0x8>;
94 interrupt-parent = <&ipic>;
95 mode = "cpu";
96 };
97
98 /* phy type (ULPI or SERIAL) are only types supported for MPH */
99 /* port = 0 or 1 */
100 usb@22000 {
101 compatible = "fsl-usb2-mph";
102 reg = <0x22000 0x1000>;
103 #address-cells = <1>;
104 #size-cells = <0>;
105 interrupt-parent = <&ipic>;
106 interrupts = <39 0x8>;
107 phy_type = "ulpi";
108 port1;
109 };
110 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
111 usb@23000 {
112 device_type = "usb";
113 compatible = "fsl-usb2-dr";
114 reg = <0x23000 0x1000>;
115 #address-cells = <1>;
116 #size-cells = <0>;
117 interrupt-parent = <&ipic>;
118 interrupts = <38 0x8>;
119 dr_mode = "otg";
120 phy_type = "ulpi";
121 };
122
123 mdio@24520 {
124 #address-cells = <1>;
125 #size-cells = <0>;
126 compatible = "fsl,gianfar-mdio";
127 reg = <0x24520 0x20>;
128
129 phy0: ethernet-phy@19 {
130 interrupt-parent = <&ipic>;
131 interrupts = <20 0x8>;
132 reg = <0x19>;
133 device_type = "ethernet-phy";
134 };
135 phy1: ethernet-phy@1a {
136 interrupt-parent = <&ipic>;
137 interrupts = <21 0x8>;
138 reg = <0x1a>;
139 device_type = "ethernet-phy";
140 };
141 };
142
143 enet0: ethernet@24000 {
144 cell-index = <0>;
145 device_type = "network";
146 model = "TSEC";
147 compatible = "gianfar";
148 reg = <0x24000 0x1000>;
149 local-mac-address = [ 00 00 00 00 00 00 ];
150 interrupts = <32 0x8 33 0x8 34 0x8>;
151 interrupt-parent = <&ipic>;
152 phy-handle = <&phy0>;
153 linux,network-index = <0>;
154 };
155
156 enet1: ethernet@25000 {
157 cell-index = <1>;
158 device_type = "network";
159 model = "TSEC";
160 compatible = "gianfar";
161 reg = <0x25000 0x1000>;
162 local-mac-address = [ 00 00 00 00 00 00 ];
163 interrupts = <35 0x8 36 0x8 37 0x8>;
164 interrupt-parent = <&ipic>;
165 phy-handle = <&phy1>;
166 linux,network-index = <1>;
167 };
168
169 serial0: serial@4500 {
170 cell-index = <0>;
171 device_type = "serial";
172 compatible = "ns16550";
173 reg = <0x4500 0x100>;
174 clock-frequency = <0>;
175 interrupts = <9 0x8>;
176 interrupt-parent = <&ipic>;
177 };
178
179 serial1: serial@4600 {
180 cell-index = <1>;
181 device_type = "serial";
182 compatible = "ns16550";
183 reg = <0x4600 0x100>;
184 clock-frequency = <0>;
185 interrupts = <10 0x8>;
186 interrupt-parent = <&ipic>;
187 };
188
189 /* May need to remove if on a part without crypto engine */
190 crypto@30000 {
191 model = "SEC2";
192 compatible = "talitos";
193 reg = <0x30000 0x10000>;
194 interrupts = <11 0x8>;
195 interrupt-parent = <&ipic>;
196 num-channels = <4>;
197 channel-fifo-len = <24>;
198 exec-units-mask = <0x0000007e>;
199 /* desc mask is for rev2.0,
200 * we need runtime fixup for >2.0 */
201 descriptor-types-mask = <0x01010ebf>;
202 };
203
204 /* IPIC
205 * interrupts cell = <intr #, sense>
206 * sense values match linux IORESOURCE_IRQ_* defines:
207 * sense == 8: Level, low assertion
208 * sense == 2: Edge, high-to-low change
209 */
210 ipic: pic@700 {
211 interrupt-controller;
212 #address-cells = <0>;
213 #interrupt-cells = <2>;
214 reg = <0x700 0x100>;
215 device_type = "ipic";
216 };
217 };
218
219 pci0: pci@e0008500 {
220 cell-index = <1>;
221 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
222 interrupt-map = <
223
224 /* IDSEL 0x11 */
225 0x8800 0x0 0x0 0x1 &ipic 20 0x8
226 0x8800 0x0 0x0 0x2 &ipic 21 0x8
227 0x8800 0x0 0x0 0x3 &ipic 22 0x8
228 0x8800 0x0 0x0 0x4 &ipic 23 0x8>;
229
230 interrupt-parent = <&ipic>;
231 interrupts = <0x42 0x8>;
232 bus-range = <0 0>;
233 ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
234 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
235 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
236 clock-frequency = <66666666>;
237 #interrupt-cells = <1>;
238 #size-cells = <2>;
239 #address-cells = <3>;
240 reg = <0xe0008500 0x100>;
241 compatible = "fsl,mpc8349-pci";
242 device_type = "pci";
243 };
244};
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
new file mode 100644
index 000000000000..14be38ad5d4b
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -0,0 +1,244 @@
1/*
2 * SBC8548 Device Tree Source
3 *
4 * Copyright 2007 Wind River Systems Inc.
5 *
6 * Paul Gortmaker (see MAINTAINERS for contact information)
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14
15/dts-v1/;
16
17/ {
18 model = "SBC8548";
19 compatible = "SBC8548";
20 #address-cells = <1>;
21 #size-cells = <1>;
22
23 aliases {
24 ethernet0 = &enet0;
25 ethernet1 = &enet1;
26 serial0 = &serial0;
27 serial1 = &serial1;
28 pci0 = &pci0;
29 /* pci1 doesn't have a corresponding physical connector */
30 pci2 = &pci2;
31 };
32
33 cpus {
34 #address-cells = <1>;
35 #size-cells = <0>;
36
37 PowerPC,8548@0 {
38 device_type = "cpu";
39 reg = <0>;
40 d-cache-line-size = <0x20>; // 32 bytes
41 i-cache-line-size = <0x20>; // 32 bytes
42 d-cache-size = <0x8000>; // L1, 32K
43 i-cache-size = <0x8000>; // L1, 32K
44 timebase-frequency = <0>; // From uboot
45 bus-frequency = <0>;
46 clock-frequency = <0>;
47 };
48 };
49
50 memory {
51 device_type = "memory";
52 reg = <0x00000000 0x10000000>;
53 };
54
55 soc8548@e0000000 {
56 #address-cells = <1>;
57 #size-cells = <1>;
58 device_type = "soc";
59 ranges = <0x00000000 0xe0000000 0x00100000>;
60 reg = <0xe0000000 0x00001000>; // CCSRBAR
61 bus-frequency = <0>;
62
63 memory-controller@2000 {
64 compatible = "fsl,8548-memory-controller";
65 reg = <0x2000 0x1000>;
66 interrupt-parent = <&mpic>;
67 interrupts = <0x12 0x2>;
68 };
69
70 l2-cache-controller@20000 {
71 compatible = "fsl,8548-l2-cache-controller";
72 reg = <0x20000 0x1000>;
73 cache-line-size = <0x20>; // 32 bytes
74 cache-size = <0x80000>; // L2, 512K
75 interrupt-parent = <&mpic>;
76 interrupts = <0x10 0x2>;
77 };
78
79 i2c@3000 {
80 #address-cells = <1>;
81 #size-cells = <0>;
82 cell-index = <0>;
83 compatible = "fsl-i2c";
84 reg = <0x3000 0x100>;
85 interrupts = <0x2b 0x2>;
86 interrupt-parent = <&mpic>;
87 dfsrr;
88 };
89
90 i2c@3100 {
91 #address-cells = <1>;
92 #size-cells = <0>;
93 cell-index = <1>;
94 compatible = "fsl-i2c";
95 reg = <0x3100 0x100>;
96 interrupts = <0x2b 0x2>;
97 interrupt-parent = <&mpic>;
98 dfsrr;
99 };
100
101 mdio@24520 {
102 #address-cells = <1>;
103 #size-cells = <0>;
104 compatible = "fsl,gianfar-mdio";
105 reg = <0x24520 0x20>;
106
107 phy0: ethernet-phy@19 {
108 interrupt-parent = <&mpic>;
109 interrupts = <0x6 0x1>;
110 reg = <0x19>;
111 device_type = "ethernet-phy";
112 };
113 phy1: ethernet-phy@1a {
114 interrupt-parent = <&mpic>;
115 interrupts = <0x7 0x1>;
116 reg = <0x1a>;
117 device_type = "ethernet-phy";
118 };
119 };
120
121 enet0: ethernet@24000 {
122 cell-index = <0>;
123 device_type = "network";
124 model = "eTSEC";
125 compatible = "gianfar";
126 reg = <0x24000 0x1000>;
127 local-mac-address = [ 00 00 00 00 00 00 ];
128 interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
129 interrupt-parent = <&mpic>;
130 phy-handle = <&phy0>;
131 };
132
133 enet1: ethernet@25000 {
134 cell-index = <1>;
135 device_type = "network";
136 model = "eTSEC";
137 compatible = "gianfar";
138 reg = <0x25000 0x1000>;
139 local-mac-address = [ 00 00 00 00 00 00 ];
140 interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
141 interrupt-parent = <&mpic>;
142 phy-handle = <&phy1>;
143 };
144
145 serial0: serial@4500 {
146 cell-index = <0>;
147 device_type = "serial";
148 compatible = "ns16550";
149 reg = <0x4500 0x100>; // reg base, size
150 clock-frequency = <0>; // should we fill in in uboot?
151 interrupts = <0x2a 0x2>;
152 interrupt-parent = <&mpic>;
153 };
154
155 serial1: serial@4600 {
156 cell-index = <1>;
157 device_type = "serial";
158 compatible = "ns16550";
159 reg = <0x4600 0x100>; // reg base, size
160 clock-frequency = <0>; // should we fill in in uboot?
161 interrupts = <0x2a 0x2>;
162 interrupt-parent = <&mpic>;
163 };
164
165 global-utilities@e0000 { //global utilities reg
166 compatible = "fsl,mpc8548-guts";
167 reg = <0xe0000 0x1000>;
168 fsl,has-rstcr;
169 };
170
171 mpic: pic@40000 {
172 interrupt-controller;
173 #address-cells = <0>;
174 #size-cells = <0>;
175 #interrupt-cells = <2>;
176 reg = <0x40000 0x40000>;
177 compatible = "chrp,open-pic";
178 device_type = "open-pic";
179 big-endian;
180 };
181 };
182
183 pci0: pci@e0008000 {
184 cell-index = <0>;
185 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
186 interrupt-map = <
187 /* IDSEL 0x01 (PCI-X slot) */
188 0x0800 0x0 0x0 0x1 &mpic 0x0 0x1
189 0x0800 0x0 0x0 0x2 &mpic 0x1 0x1
190 0x0800 0x0 0x0 0x3 &mpic 0x2 0x1
191 0x0800 0x0 0x0 0x4 &mpic 0x3 0x1>;
192
193 interrupt-parent = <&mpic>;
194 interrupts = <0x18 0x2>;
195 bus-range = <0 0>;
196 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
197 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>;
198 clock-frequency = <66666666>;
199 #interrupt-cells = <1>;
200 #size-cells = <2>;
201 #address-cells = <3>;
202 reg = <0xe0008000 0x1000>;
203 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
204 device_type = "pci";
205 };
206
207 pci2: pcie@e000a000 {
208 cell-index = <2>;
209 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
210 interrupt-map = <
211
212 /* IDSEL 0x0 (PEX) */
213 0x0000 0x0 0x0 0x1 &mpic 0x0 0x1
214 0x0000 0x0 0x0 0x2 &mpic 0x1 0x1
215 0x0000 0x0 0x0 0x3 &mpic 0x2 0x1
216 0x0000 0x0 0x0 0x4 &mpic 0x3 0x1>;
217
218 interrupt-parent = <&mpic>;
219 interrupts = <0x1a 0x2>;
220 bus-range = <0x0 0xff>;
221 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
222 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x08000000>;
223 clock-frequency = <33333333>;
224 #interrupt-cells = <1>;
225 #size-cells = <2>;
226 #address-cells = <3>;
227 reg = <0xe000a000 0x1000>;
228 compatible = "fsl,mpc8548-pcie";
229 device_type = "pci";
230 pcie@0 {
231 reg = <0x0 0x0 0x0 0x0 0x0>;
232 #size-cells = <2>;
233 #address-cells = <3>;
234 device_type = "pci";
235 ranges = <0x02000000 0x0 0xa0000000
236 0x02000000 0x0 0xa0000000
237 0x0 0x20000000
238
239 0x01000000 0x0 0x00000000
240 0x01000000 0x0 0x00000000
241 0x0 0x08000000>;
242 };
243 };
244};
diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts
new file mode 100644
index 000000000000..0476802fba60
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8560.dts
@@ -0,0 +1,330 @@
1/*
2 * SBC8560 Device Tree Source
3 *
4 * Copyright 2007 Wind River Systems Inc.
5 *
6 * Paul Gortmaker (see MAINTAINERS for contact information)
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14/dts-v1/;
15
16/ {
17 model = "SBC8560";
18 compatible = "SBC8560";
19 #address-cells = <1>;
20 #size-cells = <1>;
21
22 aliases {
23 ethernet0 = &enet0;
24 ethernet1 = &enet1;
25 ethernet2 = &enet2;
26 ethernet3 = &enet3;
27 serial0 = &serial0;
28 serial1 = &serial1;
29 pci0 = &pci0;
30 };
31
32 cpus {
33 #address-cells = <1>;
34 #size-cells = <0>;
35
36 PowerPC,8560@0 {
37 device_type = "cpu";
38 reg = <0>;
39 d-cache-line-size = <0x20>; // 32 bytes
40 i-cache-line-size = <0x20>; // 32 bytes
41 d-cache-size = <0x8000>; // L1, 32K
42 i-cache-size = <0x8000>; // L1, 32K
43 timebase-frequency = <0>; // From uboot
44 bus-frequency = <0>;
45 clock-frequency = <0>;
46 };
47 };
48
49 memory {
50 device_type = "memory";
51 reg = <0x00000000 0x20000000>;
52 };
53
54 soc@ff700000 {
55 #address-cells = <1>;
56 #size-cells = <1>;
57 device_type = "soc";
58 ranges = <0x0 0xff700000 0x00100000>;
59 reg = <0xff700000 0x00100000>;
60 clock-frequency = <0>;
61
62 memory-controller@2000 {
63 compatible = "fsl,8560-memory-controller";
64 reg = <0x2000 0x1000>;
65 interrupt-parent = <&mpic>;
66 interrupts = <0x12 0x2>;
67 };
68
69 l2-cache-controller@20000 {
70 compatible = "fsl,8560-l2-cache-controller";
71 reg = <0x20000 0x1000>;
72 cache-line-size = <0x20>; // 32 bytes
73 cache-size = <0x40000>; // L2, 256K
74 interrupt-parent = <&mpic>;
75 interrupts = <0x10 0x2>;
76 };
77
78 i2c@3000 {
79 #address-cells = <1>;
80 #size-cells = <0>;
81 cell-index = <0>;
82 compatible = "fsl-i2c";
83 reg = <0x3000 0x100>;
84 interrupts = <0x2b 0x2>;
85 interrupt-parent = <&mpic>;
86 dfsrr;
87 };
88
89 i2c@3100 {
90 #address-cells = <1>;
91 #size-cells = <0>;
92 cell-index = <1>;
93 compatible = "fsl-i2c";
94 reg = <0x3100 0x100>;
95 interrupts = <0x2b 0x2>;
96 interrupt-parent = <&mpic>;
97 dfsrr;
98 };
99
100 mdio@24520 {
101 #address-cells = <1>;
102 #size-cells = <0>;
103 compatible = "fsl,gianfar-mdio";
104 reg = <0x24520 0x20>;
105 phy0: ethernet-phy@19 {
106 interrupt-parent = <&mpic>;
107 interrupts = <0x6 0x1>;
108 reg = <0x19>;
109 device_type = "ethernet-phy";
110 };
111 phy1: ethernet-phy@1a {
112 interrupt-parent = <&mpic>;
113 interrupts = <0x7 0x1>;
114 reg = <0x1a>;
115 device_type = "ethernet-phy";
116 };
117 phy2: ethernet-phy@1b {
118 interrupt-parent = <&mpic>;
119 interrupts = <0x8 0x1>;
120 reg = <0x1b>;
121 device_type = "ethernet-phy";
122 };
123 phy3: ethernet-phy@1c {
124 interrupt-parent = <&mpic>;
125 interrupts = <0x8 0x1>;
126 reg = <0x1c>;
127 device_type = "ethernet-phy";
128 };
129 };
130
131 enet0: ethernet@24000 {
132 cell-index = <0>;
133 device_type = "network";
134 model = "TSEC";
135 compatible = "gianfar";
136 reg = <0x24000 0x1000>;
137 local-mac-address = [ 00 00 00 00 00 00 ];
138 interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
139 interrupt-parent = <&mpic>;
140 phy-handle = <&phy0>;
141 };
142
143 enet1: ethernet@25000 {
144 cell-index = <1>;
145 device_type = "network";
146 model = "TSEC";
147 compatible = "gianfar";
148 reg = <0x25000 0x1000>;
149 local-mac-address = [ 00 00 00 00 00 00 ];
150 interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
151 interrupt-parent = <&mpic>;
152 phy-handle = <&phy1>;
153 };
154
155 mpic: pic@40000 {
156 interrupt-controller;
157 #address-cells = <0>;
158 #size-cells = <0>;
159 #interrupt-cells = <2>;
160 reg = <0x40000 0x40000>;
161 device_type = "open-pic";
162 };
163
164 cpm@919c0 {
165 #address-cells = <1>;
166 #size-cells = <1>;
167 compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
168 reg = <0x919c0 0x30>;
169 ranges;
170
171 muram@80000 {
172 #address-cells = <1>;
173 #size-cells = <1>;
174 ranges = <0x0 0x80000 0x10000>;
175
176 data@0 {
177 compatible = "fsl,cpm-muram-data";
178 reg = <0x0 0x4000 0x9000 0x2000>;
179 };
180 };
181
182 brg@919f0 {
183 compatible = "fsl,mpc8560-brg",
184 "fsl,cpm2-brg",
185 "fsl,cpm-brg";
186 reg = <0x919f0 0x10 0x915f0 0x10>;
187 clock-frequency = <165000000>;
188 };
189
190 cpmpic: pic@90c00 {
191 interrupt-controller;
192 #address-cells = <0>;
193 #interrupt-cells = <2>;
194 interrupts = <0x2e 0x2>;
195 interrupt-parent = <&mpic>;
196 reg = <0x90c00 0x80>;
197 compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
198 };
199
200 enet2: ethernet@91320 {
201 device_type = "network";
202 compatible = "fsl,mpc8560-fcc-enet",
203 "fsl,cpm2-fcc-enet";
204 reg = <0x91320 0x20 0x88500 0x100 0x913b0 0x1>;
205 local-mac-address = [ 00 00 00 00 00 00 ];
206 fsl,cpm-command = <0x16200300>;
207 interrupts = <0x21 0x8>;
208 interrupt-parent = <&cpmpic>;
209 phy-handle = <&phy2>;
210 };
211
212 enet3: ethernet@91340 {
213 device_type = "network";
214 compatible = "fsl,mpc8560-fcc-enet",
215 "fsl,cpm2-fcc-enet";
216 reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
217 local-mac-address = [ 00 00 00 00 00 00 ];
218 fsl,cpm-command = <0x1a400300>;
219 interrupts = <0x22 0x8>;
220 interrupt-parent = <&cpmpic>;
221 phy-handle = <&phy3>;
222 };
223 };
224
225 global-utilities@e0000 {
226 compatible = "fsl,mpc8560-guts";
227 reg = <0xe0000 0x1000>;
228 fsl,has-rstcr;
229 };
230 };
231
232 pci0: pci@ff708000 {
233 cell-index = <0>;
234 #interrupt-cells = <1>;
235 #size-cells = <2>;
236 #address-cells = <3>;
237 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
238 device_type = "pci";
239 reg = <0xff708000 0x1000>;
240 clock-frequency = <66666666>;
241 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
242 interrupt-map = <
243
244 /* IDSEL 0x02 */
245 0x1000 0x0 0x0 0x1 &mpic 0x2 0x1
246 0x1000 0x0 0x0 0x2 &mpic 0x3 0x1
247 0x1000 0x0 0x0 0x3 &mpic 0x4 0x1
248 0x1000 0x0 0x0 0x4 &mpic 0x5 0x1>;
249
250 interrupt-parent = <&mpic>;
251 interrupts = <0x18 0x2>;
252 bus-range = <0x0 0x0>;
253 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
254 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
255 };
256
257 localbus@ff705000 {
258 compatible = "fsl,mpc8560-localbus";
259 #address-cells = <2>;
260 #size-cells = <1>;
261 reg = <0xff705000 0x100>; // BRx, ORx, etc.
262
263 ranges = <
264 0x0 0x0 0xff800000 0x0800000 // 8MB boot flash
265 0x1 0x0 0xe4000000 0x4000000 // 64MB flash
266 0x3 0x0 0x20000000 0x4000000 // 64MB SDRAM
267 0x4 0x0 0x24000000 0x4000000 // 64MB SDRAM
268 0x5 0x0 0xfc000000 0x0c00000 // EPLD
269 0x6 0x0 0xe0000000 0x4000000 // 64MB flash
270 0x7 0x0 0x80000000 0x0200000 // ATM1,2
271 >;
272
273 epld@5,0 {
274 compatible = "wrs,epld-localbus";
275 #address-cells = <2>;
276 #size-cells = <1>;
277 reg = <0x5 0x0 0xc00000>;
278 ranges = <
279 0x0 0x0 0x5 0x000000 0x1fff // LED disp.
280 0x1 0x0 0x5 0x100000 0x1fff // switches
281 0x2 0x0 0x5 0x200000 0x1fff // ID reg.
282 0x3 0x0 0x5 0x300000 0x1fff // status reg.
283 0x4 0x0 0x5 0x400000 0x1fff // reset reg.
284 0x5 0x0 0x5 0x500000 0x1fff // Wind port
285 0x7 0x0 0x5 0x700000 0x1fff // UART #1
286 0x8 0x0 0x5 0x800000 0x1fff // UART #2
287 0x9 0x0 0x5 0x900000 0x1fff // RTC
288 0xb 0x0 0x5 0xb00000 0x1fff // EEPROM
289 >;
290
291 bidr@2,0 {
292 compatible = "wrs,sbc8560-bidr";
293 reg = <0x2 0x0 0x10>;
294 };
295
296 bcsr@3,0 {
297 compatible = "wrs,sbc8560-bcsr";
298 reg = <0x3 0x0 0x10>;
299 };
300
301 brstcr@4,0 {
302 compatible = "wrs,sbc8560-brstcr";
303 reg = <0x4 0x0 0x10>;
304 };
305
306 serial0: serial@7,0 {
307 device_type = "serial";
308 compatible = "ns16550";
309 reg = <0x7 0x0 0x100>;
310 clock-frequency = <1843200>;
311 interrupts = <0x9 0x2>;
312 interrupt-parent = <&mpic>;
313 };
314
315 serial1: serial@8,0 {
316 device_type = "serial";
317 compatible = "ns16550";
318 reg = <0x8 0x0 0x100>;
319 clock-frequency = <1843200>;
320 interrupts = <0xa 0x2>;
321 interrupt-parent = <&mpic>;
322 };
323
324 rtc@9,0 {
325 compatible = "m48t59";
326 reg = <0x9 0x0 0x1fff>;
327 };
328 };
329 };
330};
diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts
index 6aa1d695e644..2204874ac5f3 100644
--- a/arch/powerpc/boot/dts/storcenter.dts
+++ b/arch/powerpc/boot/dts/storcenter.dts
@@ -11,6 +11,8 @@
11 * warranty of any kind, whether express or implied. 11 * warranty of any kind, whether express or implied.
12 */ 12 */
13 13
14/dts-v1/;
15
14/ { 16/ {
15 model = "StorCenter"; 17 model = "StorCenter";
16 compatible = "storcenter"; 18 compatible = "storcenter";
@@ -30,19 +32,19 @@
30 PowerPC,8241@0 { 32 PowerPC,8241@0 {
31 device_type = "cpu"; 33 device_type = "cpu";
32 reg = <0>; 34 reg = <0>;
33 clock-frequency = <d# 200000000>; /* Hz */ 35 clock-frequency = <200000000>;
34 timebase-frequency = <d# 25000000>; /* Hz */ 36 timebase-frequency = <25000000>;
35 bus-frequency = <0>; /* from bootwrapper */ 37 bus-frequency = <0>; /* from bootwrapper */
36 i-cache-line-size = <d# 32>; /* bytes */ 38 i-cache-line-size = <32>;
37 d-cache-line-size = <d# 32>; /* bytes */ 39 d-cache-line-size = <32>;
38 i-cache-size = <4000>; 40 i-cache-size = <16384>;
39 d-cache-size = <4000>; 41 d-cache-size = <16384>;
40 }; 42 };
41 }; 43 };
42 44
43 memory { 45 memory {
44 device_type = "memory"; 46 device_type = "memory";
45 reg = <00000000 04000000>; /* 64MB @ 0x0 */ 47 reg = <0x00000000 0x04000000>; /* 64MB @ 0x0 */
46 }; 48 };
47 49
48 soc@fc000000 { 50 soc@fc000000 {
@@ -51,15 +53,15 @@
51 device_type = "soc"; 53 device_type = "soc";
52 compatible = "fsl,mpc8241", "mpc10x"; 54 compatible = "fsl,mpc8241", "mpc10x";
53 store-gathering = <0>; /* 0 == off, !0 == on */ 55 store-gathering = <0>; /* 0 == off, !0 == on */
54 ranges = <0 fc000000 100000>; 56 ranges = <0x0 0xfc000000 0x100000>;
55 reg = <fc000000 100000>; /* EUMB */ 57 reg = <0xfc000000 0x100000>; /* EUMB */
56 bus-frequency = <0>; /* fixed by loader */ 58 bus-frequency = <0>; /* fixed by loader */
57 59
58 i2c@3000 { 60 i2c@3000 {
59 #address-cells = <1>; 61 #address-cells = <1>;
60 #size-cells = <0>; 62 #size-cells = <0>;
61 compatible = "fsl-i2c"; 63 compatible = "fsl-i2c";
62 reg = <3000 100>; 64 reg = <0x3000 0x100>;
63 interrupts = <5 2>; 65 interrupts = <5 2>;
64 interrupt-parent = <&mpic>; 66 interrupt-parent = <&mpic>;
65 67
@@ -73,9 +75,9 @@
73 cell-index = <0>; 75 cell-index = <0>;
74 device_type = "serial"; 76 device_type = "serial";
75 compatible = "ns16550"; 77 compatible = "ns16550";
76 reg = <4500 20>; 78 reg = <0x4500 0x20>;
77 clock-frequency = <d# 97553800>; /* Hz */ 79 clock-frequency = <97553800>; /* Hz */
78 current-speed = <d# 115200>; 80 current-speed = <115200>;
79 interrupts = <9 2>; 81 interrupts = <9 2>;
80 interrupt-parent = <&mpic>; 82 interrupt-parent = <&mpic>;
81 }; 83 };
@@ -84,10 +86,10 @@
84 cell-index = <1>; 86 cell-index = <1>;
85 device_type = "serial"; 87 device_type = "serial";
86 compatible = "ns16550"; 88 compatible = "ns16550";
87 reg = <4600 20>; 89 reg = <0x4600 0x20>;
88 clock-frequency = <d# 97553800>; /* Hz */ 90 clock-frequency = <97553800>; /* Hz */
89 current-speed = <d# 9600>; 91 current-speed = <9600>;
90 interrupts = <a 2>; 92 interrupts = <10 2>;
91 interrupt-parent = <&mpic>; 93 interrupt-parent = <&mpic>;
92 }; 94 };
93 95
@@ -96,7 +98,7 @@
96 device_type = "open-pic"; 98 device_type = "open-pic";
97 compatible = "chrp,open-pic"; 99 compatible = "chrp,open-pic";
98 interrupt-controller; 100 interrupt-controller;
99 reg = <40000 40000>; 101 reg = <0x40000 0x40000>;
100 }; 102 };
101 103
102 }; 104 };
@@ -107,28 +109,29 @@
107 #interrupt-cells = <1>; 109 #interrupt-cells = <1>;
108 device_type = "pci"; 110 device_type = "pci";
109 compatible = "mpc10x-pci"; 111 compatible = "mpc10x-pci";
110 reg = <fe800000 1000>; 112 reg = <0xfe800000 0x1000>;
111 ranges = <01000000 0 0 fe000000 0 00c00000 113 ranges = <0x01000000 0x0 0x0 0xfe000000 0x0 0x00c00000
112 02000000 0 80000000 80000000 0 70000000>; 114 0x02000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
113 bus-range = <0 ff>; 115 bus-range = <0 0xff>;
114 clock-frequency = <d# 97553800>; /* Hz */ 116 clock-frequency = <97553800>;
115 interrupt-parent = <&mpic>; 117 interrupt-parent = <&mpic>;
116 interrupt-map-mask = <f800 0 0 7>; 118 interrupt-map-mask = <0xf800 0 0 7>;
117 interrupt-map = < 119 interrupt-map = <
118 /* IDSEL 13 - IDE */ 120 /* IDSEL 13 - IDE */
119 6800 0 0 1 &mpic 0 1 121 0x6800 0 0 1 &mpic 0 1
120 6800 0 0 2 &mpic 0 1 122 0x6800 0 0 2 &mpic 0 1
121 6800 0 0 3 &mpic 0 1 123 0x6800 0 0 3 &mpic 0 1
124 0x6800 0 0 4 &mpic 0 1
122 /* IDSEL 14 - USB */ 125 /* IDSEL 14 - USB */
123 7000 0 0 1 &mpic 0 1 126 0x7000 0 0 1 &mpic 0 1
124 7000 0 0 2 &mpic 0 1 127 0x7000 0 0 2 &mpic 0 1
125 7000 0 0 3 &mpic 0 1 128 0x7000 0 0 3 &mpic 0 1
126 7000 0 0 4 &mpic 0 1 129 0x7000 0 0 4 &mpic 0 1
127 /* IDSEL 15 - ETH */ 130 /* IDSEL 15 - ETH */
128 7800 0 0 1 &mpic 0 1 131 0x7800 0 0 1 &mpic 0 1
129 7800 0 0 2 &mpic 0 1 132 0x7800 0 0 2 &mpic 0 1
130 7800 0 0 3 &mpic 0 1 133 0x7800 0 0 3 &mpic 0 1
131 7800 0 0 4 &mpic 0 1 134 0x7800 0 0 4 &mpic 0 1
132 >; 135 >;
133 }; 136 };
134 137
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
new file mode 100644
index 000000000000..f81fd7fdb29e
--- /dev/null
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -0,0 +1,228 @@
1/*
2 * STX GP3 - 8560 ADS Device Tree Source
3 *
4 * Copyright 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 model = "stx,gp3";
16 compatible = "stx,gp3-8560", "stx,gp3";
17 #address-cells = <1>;
18 #size-cells = <1>;
19
20 aliases {
21 ethernet0 = &enet0;
22 ethernet1 = &enet1;
23 serial0 = &serial0;
24 pci0 = &pci0;
25 };
26
27 cpus {
28 #address-cells = <1>;
29 #size-cells = <0>;
30
31 PowerPC,8560@0 {
32 device_type = "cpu";
33 reg = <0>;
34 d-cache-line-size = <32>;
35 i-cache-line-size = <32>;
36 d-cache-size = <32768>;
37 i-cache-size = <32768>;
38 timebase-frequency = <0>;
39 bus-frequency = <0>;
40 clock-frequency = <0>;
41 };
42 };
43
44 memory {
45 device_type = "memory";
46 reg = <0x00000000 0x10000000>;
47 };
48
49 soc@fdf00000 {
50 #address-cells = <1>;
51 #size-cells = <1>;
52 device_type = "soc";
53 ranges = <0 0xfdf00000 0x100000>;
54 reg = <0xfdf00000 0x1000>;
55 bus-frequency = <0>;
56 compatible = "fsl,mpc8560-immr", "simple-bus";
57
58 memory-controller@2000 {
59 compatible = "fsl,8540-memory-controller";
60 reg = <0x2000 0x1000>;
61 interrupt-parent = <&mpic>;
62 interrupts = <18 2>;
63 };
64
65 l2-cache-controller@20000 {
66 compatible = "fsl,8540-l2-cache-controller";
67 reg = <0x20000 0x1000>;
68 cache-line-size = <32>;
69 cache-size = <0x40000>; // L2, 256K
70 interrupt-parent = <&mpic>;
71 interrupts = <16 2>;
72 };
73
74 i2c@3000 {
75 #address-cells = <1>;
76 #size-cells = <0>;
77 cell-index = <0>;
78 compatible = "fsl-i2c";
79 reg = <0x3000 0x100>;
80 interrupts = <43 2>;
81 interrupt-parent = <&mpic>;
82 dfsrr;
83 };
84
85 mdio@24520 {
86 #address-cells = <1>;
87 #size-cells = <0>;
88 compatible = "fsl,gianfar-mdio";
89 reg = <0x24520 0x20>;
90
91 phy2: ethernet-phy@2 {
92 interrupt-parent = <&mpic>;
93 interrupts = <5 4>;
94 reg = <2>;
95 device_type = "ethernet-phy";
96 };
97 phy4: ethernet-phy@4 {
98 interrupt-parent = <&mpic>;
99 interrupts = <5 4>;
100 reg = <4>;
101 device_type = "ethernet-phy";
102 };
103 };
104
105 enet0: ethernet@24000 {
106 cell-index = <0>;
107 device_type = "network";
108 model = "TSEC";
109 compatible = "gianfar";
110 reg = <0x24000 0x1000>;
111 local-mac-address = [ 00 00 00 00 00 00 ];
112 interrupts = <29 2 30 2 34 2>;
113 interrupt-parent = <&mpic>;
114 phy-handle = <&phy2>;
115 };
116
117 enet1: ethernet@25000 {
118 cell-index = <1>;
119 device_type = "network";
120 model = "TSEC";
121 compatible = "gianfar";
122 reg = <0x25000 0x1000>;
123 local-mac-address = [ 00 00 00 00 00 00 ];
124 interrupts = <35 2 36 2 40 2>;
125 interrupt-parent = <&mpic>;
126 phy-handle = <&phy4>;
127 };
128
129 mpic: pic@40000 {
130 interrupt-controller;
131 #address-cells = <0>;
132 #interrupt-cells = <2>;
133 reg = <0x40000 0x40000>;
134 device_type = "open-pic";
135 };
136
137 cpm@919c0 {
138 #address-cells = <1>;
139 #size-cells = <1>;
140 compatible = "fsl,mpc8560-cpm", "fsl,cpm2", "simple-bus";
141 reg = <0x919c0 0x30>;
142 ranges;
143
144 muram@80000 {
145 #address-cells = <1>;
146 #size-cells = <1>;
147 ranges = <0 0x80000 0x10000>;
148
149 data@0 {
150 compatible = "fsl,cpm-muram-data";
151 reg = <0 0x4000 0x9000 0x2000>;
152 };
153 };
154
155 brg@919f0 {
156 compatible = "fsl,mpc8560-brg",
157 "fsl,cpm2-brg",
158 "fsl,cpm-brg";
159 reg = <0x919f0 0x10 0x915f0 0x10>;
160 clock-frequency = <0>;
161 };
162
163 cpmpic: pic@90c00 {
164 interrupt-controller;
165 #address-cells = <0>;
166 #interrupt-cells = <2>;
167 interrupts = <46 2>;
168 interrupt-parent = <&mpic>;
169 reg = <0x90c00 0x80>;
170 compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
171 };
172
173 serial0: serial@91a20 {
174 device_type = "serial";
175 compatible = "fsl,mpc8560-scc-uart",
176 "fsl,cpm2-scc-uart";
177 reg = <0x91a20 0x20 0x88100 0x100>;
178 fsl,cpm-brg = <2>;
179 fsl,cpm-command = <0x4a00000>;
180 interrupts = <41 8>;
181 interrupt-parent = <&cpmpic>;
182 };
183 };
184 };
185
186 pci0: pci@fdf08000 {
187 cell-index = <0>;
188 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
189 interrupt-map = <
190
191 /* IDSEL 0x0c */
192 0x6000 0 0 1 &mpic 1 1
193 0x6000 0 0 2 &mpic 2 1
194 0x6000 0 0 3 &mpic 3 1
195 0x6000 0 0 4 &mpic 4 1
196
197 /* IDSEL 0x0d */
198 0x6800 0 0 1 &mpic 4 1
199 0x6800 0 0 2 &mpic 1 1
200 0x6800 0 0 3 &mpic 2 1
201 0x6800 0 0 4 &mpic 3 1
202
203 /* IDSEL 0x0e */
204 0x7000 0 0 1 &mpic 3 1
205 0x7000 0 0 2 &mpic 4 1
206 0x7000 0 0 3 &mpic 1 1
207 0x7000 0 0 4 &mpic 2 1
208
209 /* IDSEL 0x0f */
210 0x7800 0 0 1 &mpic 2 1
211 0x7800 0 0 2 &mpic 3 1
212 0x7800 0 0 3 &mpic 4 1
213 0x7800 0 0 4 &mpic 1 1>;
214
215 interrupt-parent = <&mpic>;
216 interrupts = <24 2>;
217 bus-range = <0 0>;
218 ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
219 0x01000000 0 0x00000000 0xe2000000 0 0x00100000>;
220 clock-frequency = <66666666>;
221 #interrupt-cells = <1>;
222 #size-cells = <2>;
223 #address-cells = <3>;
224 reg = <0xfdf08000 0x1000>;
225 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
226 device_type = "pci";
227 };
228};
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
new file mode 100644
index 000000000000..1addb3ae719e
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -0,0 +1,204 @@
1/*
2 * TQM 8540 Device Tree Source
3 *
4 * Copyright 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 model = "tqm,8540";
16 compatible = "tqm,8540", "tqm,85xx";
17 #address-cells = <1>;
18 #size-cells = <1>;
19
20 aliases {
21 ethernet0 = &enet0;
22 ethernet1 = &enet1;
23 ethernet2 = &enet2;
24 serial0 = &serial0;
25 serial1 = &serial1;
26 pci0 = &pci0;
27 };
28
29 cpus {
30 #address-cells = <1>;
31 #size-cells = <0>;
32
33 PowerPC,8540@0 {
34 device_type = "cpu";
35 reg = <0>;
36 d-cache-line-size = <32>;
37 i-cache-line-size = <32>;
38 d-cache-size = <32768>;
39 i-cache-size = <32768>;
40 timebase-frequency = <0>;
41 bus-frequency = <0>;
42 clock-frequency = <0>;
43 };
44 };
45
46 memory {
47 device_type = "memory";
48 reg = <0x00000000 0x10000000>;
49 };
50
51 soc@e0000000 {
52 #address-cells = <1>;
53 #size-cells = <1>;
54 device_type = "soc";
55 ranges = <0x0 0xe0000000 0x100000>;
56 reg = <0xe0000000 0x200>;
57 bus-frequency = <0>;
58 compatible = "fsl,mpc8540-immr", "simple-bus";
59
60 memory-controller@2000 {
61 compatible = "fsl,8540-memory-controller";
62 reg = <0x2000 0x1000>;
63 interrupt-parent = <&mpic>;
64 interrupts = <18 2>;
65 };
66
67 l2-cache-controller@20000 {
68 compatible = "fsl,8540-l2-cache-controller";
69 reg = <0x20000 0x1000>;
70 cache-line-size = <32>;
71 cache-size = <0x40000>; // L2, 256K
72 interrupt-parent = <&mpic>;
73 interrupts = <16 2>;
74 };
75
76 i2c@3000 {
77 #address-cells = <1>;
78 #size-cells = <0>;
79 cell-index = <0>;
80 compatible = "fsl-i2c";
81 reg = <0x3000 0x100>;
82 interrupts = <43 2>;
83 interrupt-parent = <&mpic>;
84 dfsrr;
85
86 rtc@68 {
87 compatible = "dallas,ds1337";
88 reg = <0x68>;
89 };
90 };
91
92 mdio@24520 {
93 #address-cells = <1>;
94 #size-cells = <0>;
95 compatible = "fsl,gianfar-mdio";
96 reg = <0x24520 0x20>;
97
98 phy1: ethernet-phy@1 {
99 interrupt-parent = <&mpic>;
100 interrupts = <8 1>;
101 reg = <1>;
102 device_type = "ethernet-phy";
103 };
104 phy2: ethernet-phy@2 {
105 interrupt-parent = <&mpic>;
106 interrupts = <8 1>;
107 reg = <2>;
108 device_type = "ethernet-phy";
109 };
110 phy3: ethernet-phy@3 {
111 interrupt-parent = <&mpic>;
112 interrupts = <8 1>;
113 reg = <3>;
114 device_type = "ethernet-phy";
115 };
116 };
117
118 enet0: ethernet@24000 {
119 cell-index = <0>;
120 device_type = "network";
121 model = "TSEC";
122 compatible = "gianfar";
123 reg = <0x24000 0x1000>;
124 local-mac-address = [ 00 00 00 00 00 00 ];
125 interrupts = <29 2 30 2 34 2>;
126 interrupt-parent = <&mpic>;
127 phy-handle = <&phy2>;
128 };
129
130 enet1: ethernet@25000 {
131 cell-index = <1>;
132 device_type = "network";
133 model = "TSEC";
134 compatible = "gianfar";
135 reg = <0x25000 0x1000>;
136 local-mac-address = [ 00 00 00 00 00 00 ];
137 interrupts = <35 2 36 2 40 2>;
138 interrupt-parent = <&mpic>;
139 phy-handle = <&phy1>;
140 };
141
142 enet2: ethernet@26000 {
143 cell-index = <2>;
144 device_type = "network";
145 model = "FEC";
146 compatible = "gianfar";
147 reg = <0x26000 0x1000>;
148 local-mac-address = [ 00 00 00 00 00 00 ];
149 interrupts = <41 2>;
150 interrupt-parent = <&mpic>;
151 phy-handle = <&phy3>;
152 };
153
154 serial0: serial@4500 {
155 cell-index = <0>;
156 device_type = "serial";
157 compatible = "ns16550";
158 reg = <0x4500 0x100>; // reg base, size
159 clock-frequency = <0>; // should we fill in in uboot?
160 interrupts = <42 2>;
161 interrupt-parent = <&mpic>;
162 };
163
164 serial1: serial@4600 {
165 cell-index = <1>;
166 device_type = "serial";
167 compatible = "ns16550";
168 reg = <0x4600 0x100>; // reg base, size
169 clock-frequency = <0>; // should we fill in in uboot?
170 interrupts = <42 2>;
171 interrupt-parent = <&mpic>;
172 };
173
174 mpic: pic@40000 {
175 interrupt-controller;
176 #address-cells = <0>;
177 #interrupt-cells = <2>;
178 reg = <0x40000 0x40000>;
179 device_type = "open-pic";
180 };
181 };
182
183 pci0: pci@e0008000 {
184 cell-index = <0>;
185 #interrupt-cells = <1>;
186 #size-cells = <2>;
187 #address-cells = <3>;
188 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
189 device_type = "pci";
190 reg = <0xe0008000 0x1000>;
191 clock-frequency = <66666666>;
192 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
193 interrupt-map = <
194 /* IDSEL 28 */
195 0xe000 0 0 1 &mpic 2 1
196 0xe000 0 0 2 &mpic 3 1>;
197
198 interrupt-parent = <&mpic>;
199 interrupts = <24 2>;
200 bus-range = <0 0>;
201 ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
202 0x01000000 0 0x00000000 0xe2000000 0 0x01000000>;
203 };
204};
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
new file mode 100644
index 000000000000..9e01093f496e
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -0,0 +1,228 @@
1/*
2 * TQM 8541 Device Tree Source
3 *
4 * Copyright 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 model = "tqm,8541";
16 compatible = "tqm,8541", "tqm,85xx";
17 #address-cells = <1>;
18 #size-cells = <1>;
19
20 aliases {
21 ethernet0 = &enet0;
22 ethernet1 = &enet1;
23 serial0 = &serial0;
24 serial1 = &serial1;
25 pci0 = &pci0;
26 };
27
28 cpus {
29 #address-cells = <1>;
30 #size-cells = <0>;
31
32 PowerPC,8541@0 {
33 device_type = "cpu";
34 reg = <0>;
35 d-cache-line-size = <32>;
36 i-cache-line-size = <32>;
37 d-cache-size = <32768>;
38 i-cache-size = <32768>;
39 timebase-frequency = <0>;
40 bus-frequency = <0>;
41 clock-frequency = <0>;
42 };
43 };
44
45 memory {
46 device_type = "memory";
47 reg = <0x00000000 0x10000000>;
48 };
49
50 soc@e0000000 {
51 #address-cells = <1>;
52 #size-cells = <1>;
53 device_type = "soc";
54 ranges = <0x0 0xe0000000 0x100000>;
55 reg = <0xe0000000 0x200>;
56 bus-frequency = <0>;
57 compatible = "fsl,mpc8541-immr", "simple-bus";
58
59 memory-controller@2000 {
60 compatible = "fsl,8540-memory-controller";
61 reg = <0x2000 0x1000>;
62 interrupt-parent = <&mpic>;
63 interrupts = <18 2>;
64 };
65
66 l2-cache-controller@20000 {
67 compatible = "fsl,8540-l2-cache-controller";
68 reg = <0x20000 0x1000>;
69 cache-line-size = <32>;
70 cache-size = <0x40000>; // L2, 256K
71 interrupt-parent = <&mpic>;
72 interrupts = <16 2>;
73 };
74
75 i2c@3000 {
76 #address-cells = <1>;
77 #size-cells = <0>;
78 cell-index = <0>;
79 compatible = "fsl-i2c";
80 reg = <0x3000 0x100>;
81 interrupts = <43 2>;
82 interrupt-parent = <&mpic>;
83 dfsrr;
84
85 rtc@68 {
86 compatible = "dallas,ds1337";
87 reg = <0x68>;
88 };
89 };
90
91 mdio@24520 {
92 #address-cells = <1>;
93 #size-cells = <0>;
94 compatible = "fsl,gianfar-mdio";
95 reg = <0x24520 0x20>;
96
97 phy1: ethernet-phy@1 {
98 interrupt-parent = <&mpic>;
99 interrupts = <8 1>;
100 reg = <1>;
101 device_type = "ethernet-phy";
102 };
103 phy2: ethernet-phy@2 {
104 interrupt-parent = <&mpic>;
105 interrupts = <8 1>;
106 reg = <2>;
107 device_type = "ethernet-phy";
108 };
109 phy3: ethernet-phy@3 {
110 interrupt-parent = <&mpic>;
111 interrupts = <8 1>;
112 reg = <3>;
113 device_type = "ethernet-phy";
114 };
115 };
116
117 enet0: ethernet@24000 {
118 cell-index = <0>;
119 device_type = "network";
120 model = "TSEC";
121 compatible = "gianfar";
122 reg = <0x24000 0x1000>;
123 local-mac-address = [ 00 00 00 00 00 00 ];
124 interrupts = <29 2 30 2 34 2>;
125 interrupt-parent = <&mpic>;
126 phy-handle = <&phy2>;
127 };
128
129 enet1: ethernet@25000 {
130 cell-index = <1>;
131 device_type = "network";
132 model = "TSEC";
133 compatible = "gianfar";
134 reg = <0x25000 0x1000>;
135 local-mac-address = [ 00 00 00 00 00 00 ];
136 interrupts = <35 2 36 2 40 2>;
137 interrupt-parent = <&mpic>;
138 phy-handle = <&phy1>;
139 };
140
141 serial0: serial@4500 {
142 cell-index = <0>;
143 device_type = "serial";
144 compatible = "ns16550";
145 reg = <0x4500 0x100>; // reg base, size
146 clock-frequency = <0>; // should we fill in in uboot?
147 interrupts = <42 2>;
148 interrupt-parent = <&mpic>;
149 };
150
151 serial1: serial@4600 {
152 cell-index = <1>;
153 device_type = "serial";
154 compatible = "ns16550";
155 reg = <0x4600 0x100>; // reg base, size
156 clock-frequency = <0>; // should we fill in in uboot?
157 interrupts = <42 2>;
158 interrupt-parent = <&mpic>;
159 };
160
161 mpic: pic@40000 {
162 interrupt-controller;
163 #address-cells = <0>;
164 #interrupt-cells = <2>;
165 reg = <0x40000 0x40000>;
166 device_type = "open-pic";
167 };
168
169 cpm@919c0 {
170 #address-cells = <1>;
171 #size-cells = <1>;
172 compatible = "fsl,mpc8541-cpm", "fsl,cpm2", "simple-bus";
173 reg = <0x919c0 0x30>;
174 ranges;
175
176 muram@80000 {
177 #address-cells = <1>;
178 #size-cells = <1>;
179 ranges = <0 0x80000 0x10000>;
180
181 data@0 {
182 compatible = "fsl,cpm-muram-data";
183 reg = <0 0x2000 0x9000 0x1000>;
184 };
185 };
186
187 brg@919f0 {
188 compatible = "fsl,mpc8541-brg",
189 "fsl,cpm2-brg",
190 "fsl,cpm-brg";
191 reg = <0x919f0 0x10 0x915f0 0x10>;
192 clock-frequency = <0>;
193 };
194
195 cpmpic: pic@90c00 {
196 interrupt-controller;
197 #address-cells = <0>;
198 #interrupt-cells = <2>;
199 interrupts = <46 2>;
200 interrupt-parent = <&mpic>;
201 reg = <0x90c00 0x80>;
202 compatible = "fsl,mpc8541-cpm-pic", "fsl,cpm2-pic";
203 };
204 };
205 };
206
207 pci0: pci@e0008000 {
208 cell-index = <0>;
209 #interrupt-cells = <1>;
210 #size-cells = <2>;
211 #address-cells = <3>;
212 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
213 device_type = "pci";
214 reg = <0xe0008000 0x1000>;
215 clock-frequency = <66666666>;
216 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
217 interrupt-map = <
218 /* IDSEL 28 */
219 0xe000 0 0 1 &mpic 2 1
220 0xe000 0 0 2 &mpic 3 1>;
221
222 interrupt-parent = <&mpic>;
223 interrupts = <24 2>;
224 bus-range = <0 0>;
225 ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
226 0x01000000 0 0x00000000 0xe2000000 0 0x01000000>;
227 };
228};
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
new file mode 100644
index 000000000000..a20eb06c482f
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -0,0 +1,228 @@
1/*
2 * TQM 8555 Device Tree Source
3 *
4 * Copyright 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 model = "tqm,8555";
16 compatible = "tqm,8555", "tqm,85xx";
17 #address-cells = <1>;
18 #size-cells = <1>;
19
20 aliases {
21 ethernet0 = &enet0;
22 ethernet1 = &enet1;
23 serial0 = &serial0;
24 serial1 = &serial1;
25 pci0 = &pci0;
26 };
27
28 cpus {
29 #address-cells = <1>;
30 #size-cells = <0>;
31
32 PowerPC,8555@0 {
33 device_type = "cpu";
34 reg = <0>;
35 d-cache-line-size = <32>;
36 i-cache-line-size = <32>;
37 d-cache-size = <32768>;
38 i-cache-size = <32768>;
39 timebase-frequency = <0>;
40 bus-frequency = <0>;
41 clock-frequency = <0>;
42 };
43 };
44
45 memory {
46 device_type = "memory";
47 reg = <0x00000000 0x10000000>;
48 };
49
50 soc@e0000000 {
51 #address-cells = <1>;
52 #size-cells = <1>;
53 device_type = "soc";
54 ranges = <0x0 0xe0000000 0x100000>;
55 reg = <0xe0000000 0x200>;
56 bus-frequency = <0>;
57 compatible = "fsl,mpc8555-immr", "simple-bus";
58
59 memory-controller@2000 {
60 compatible = "fsl,8540-memory-controller";
61 reg = <0x2000 0x1000>;
62 interrupt-parent = <&mpic>;
63 interrupts = <18 2>;
64 };
65
66 l2-cache-controller@20000 {
67 compatible = "fsl,8540-l2-cache-controller";
68 reg = <0x20000 0x1000>;
69 cache-line-size = <32>;
70 cache-size = <0x40000>; // L2, 256K
71 interrupt-parent = <&mpic>;
72 interrupts = <16 2>;
73 };
74
75 i2c@3000 {
76 #address-cells = <1>;
77 #size-cells = <0>;
78 cell-index = <0>;
79 compatible = "fsl-i2c";
80 reg = <0x3000 0x100>;
81 interrupts = <43 2>;
82 interrupt-parent = <&mpic>;
83 dfsrr;
84
85 rtc@68 {
86 compatible = "dallas,ds1337";
87 reg = <0x68>;
88 };
89 };
90
91 mdio@24520 {
92 #address-cells = <1>;
93 #size-cells = <0>;
94 compatible = "fsl,gianfar-mdio";
95 reg = <0x24520 0x20>;
96
97 phy1: ethernet-phy@1 {
98 interrupt-parent = <&mpic>;
99 interrupts = <8 1>;
100 reg = <1>;
101 device_type = "ethernet-phy";
102 };
103 phy2: ethernet-phy@2 {
104 interrupt-parent = <&mpic>;
105 interrupts = <8 1>;
106 reg = <2>;
107 device_type = "ethernet-phy";
108 };
109 phy3: ethernet-phy@3 {
110 interrupt-parent = <&mpic>;
111 interrupts = <8 1>;
112 reg = <3>;
113 device_type = "ethernet-phy";
114 };
115 };
116
117 enet0: ethernet@24000 {
118 cell-index = <0>;
119 device_type = "network";
120 model = "TSEC";
121 compatible = "gianfar";
122 reg = <0x24000 0x1000>;
123 local-mac-address = [ 00 00 00 00 00 00 ];
124 interrupts = <29 2 30 2 34 2>;
125 interrupt-parent = <&mpic>;
126 phy-handle = <&phy2>;
127 };
128
129 enet1: ethernet@25000 {
130 cell-index = <1>;
131 device_type = "network";
132 model = "TSEC";
133 compatible = "gianfar";
134 reg = <0x25000 0x1000>;
135 local-mac-address = [ 00 00 00 00 00 00 ];
136 interrupts = <35 2 36 2 40 2>;
137 interrupt-parent = <&mpic>;
138 phy-handle = <&phy1>;
139 };
140
141 serial0: serial@4500 {
142 cell-index = <0>;
143 device_type = "serial";
144 compatible = "ns16550";
145 reg = <0x4500 0x100>; // reg base, size
146 clock-frequency = <0>; // should we fill in in uboot?
147 interrupts = <42 2>;
148 interrupt-parent = <&mpic>;
149 };
150
151 serial1: serial@4600 {
152 cell-index = <1>;
153 device_type = "serial";
154 compatible = "ns16550";
155 reg = <0x4600 0x100>; // reg base, size
156 clock-frequency = <0>; // should we fill in in uboot?
157 interrupts = <42 2>;
158 interrupt-parent = <&mpic>;
159 };
160
161 mpic: pic@40000 {
162 interrupt-controller;
163 #address-cells = <0>;
164 #interrupt-cells = <2>;
165 reg = <0x40000 0x40000>;
166 device_type = "open-pic";
167 };
168
169 cpm@919c0 {
170 #address-cells = <1>;
171 #size-cells = <1>;
172 compatible = "fsl,mpc8555-cpm", "fsl,cpm2", "simple-bus";
173 reg = <0x919c0 0x30>;
174 ranges;
175
176 muram@80000 {
177 #address-cells = <1>;
178 #size-cells = <1>;
179 ranges = <0 0x80000 0x10000>;
180
181 data@0 {
182 compatible = "fsl,cpm-muram-data";
183 reg = <0 0x2000 0x9000 0x1000>;
184 };
185 };
186
187 brg@919f0 {
188 compatible = "fsl,mpc8555-brg",
189 "fsl,cpm2-brg",
190 "fsl,cpm-brg";
191 reg = <0x919f0 0x10 0x915f0 0x10>;
192 clock-frequency = <0>;
193 };
194
195 cpmpic: pic@90c00 {
196 interrupt-controller;
197 #address-cells = <0>;
198 #interrupt-cells = <2>;
199 interrupts = <46 2>;
200 interrupt-parent = <&mpic>;
201 reg = <0x90c00 0x80>;
202 compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
203 };
204 };
205 };
206
207 pci0: pci@e0008000 {
208 cell-index = <0>;
209 #interrupt-cells = <1>;
210 #size-cells = <2>;
211 #address-cells = <3>;
212 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
213 device_type = "pci";
214 reg = <0xe0008000 0x1000>;
215 clock-frequency = <66666666>;
216 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
217 interrupt-map = <
218 /* IDSEL 28 */
219 0xe000 0 0 1 &mpic 2 1
220 0xe000 0 0 2 &mpic 3 1>;
221
222 interrupt-parent = <&mpic>;
223 interrupts = <24 2>;
224 bus-range = <0 0>;
225 ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
226 0x01000000 0 0x00000000 0xe2000000 0 0x01000000>;
227 };
228};
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
new file mode 100644
index 000000000000..b9ac6c943b89
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -0,0 +1,245 @@
1/*
2 * TQM 8560 Device Tree Source
3 *
4 * Copyright 2008 Freescale Semiconductor Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 */
11
12/dts-v1/;
13
14/ {
15 model = "tqm,8560";
16 compatible = "tqm,8560", "tqm,85xx";
17 #address-cells = <1>;
18 #size-cells = <1>;
19
20 aliases {
21 ethernet0 = &enet0;
22 ethernet1 = &enet1;
23 ethernet2 = &enet2;
24 serial0 = &serial0;
25 serial1 = &serial1;
26 pci0 = &pci0;
27 };
28
29 cpus {
30 #address-cells = <1>;
31 #size-cells = <0>;
32
33 PowerPC,8560@0 {
34 device_type = "cpu";
35 reg = <0>;
36 d-cache-line-size = <32>;
37 i-cache-line-size = <32>;
38 d-cache-size = <32768>;
39 i-cache-size = <32768>;
40 timebase-frequency = <0>;
41 bus-frequency = <0>;
42 clock-frequency = <0>;
43 };
44 };
45
46 memory {
47 device_type = "memory";
48 reg = <0x00000000 0x10000000>;
49 };
50
51 soc@e0000000 {
52 #address-cells = <1>;
53 #size-cells = <1>;
54 device_type = "soc";
55 ranges = <0x0 0xe0000000 0x100000>;
56 reg = <0xe0000000 0x200>;
57 bus-frequency = <0>;
58 compatible = "fsl,mpc8560-immr", "simple-bus";
59
60 memory-controller@2000 {
61 compatible = "fsl,8540-memory-controller";
62 reg = <0x2000 0x1000>;
63 interrupt-parent = <&mpic>;
64 interrupts = <18 2>;
65 };
66
67 l2-cache-controller@20000 {
68 compatible = "fsl,8540-l2-cache-controller";
69 reg = <0x20000 0x1000>;
70 cache-line-size = <32>;
71 cache-size = <0x40000>; // L2, 256K
72 interrupt-parent = <&mpic>;
73 interrupts = <16 2>;
74 };
75
76 i2c@3000 {
77 #address-cells = <1>;
78 #size-cells = <0>;
79 cell-index = <0>;
80 compatible = "fsl-i2c";
81 reg = <0x3000 0x100>;
82 interrupts = <43 2>;
83 interrupt-parent = <&mpic>;
84 dfsrr;
85
86 rtc@68 {
87 compatible = "dallas,ds1337";
88 reg = <0x68>;
89 };
90 };
91
92 mdio@24520 {
93 #address-cells = <1>;
94 #size-cells = <0>;
95 compatible = "fsl,gianfar-mdio";
96 reg = <0x24520 0x20>;
97
98 phy1: ethernet-phy@1 {
99 interrupt-parent = <&mpic>;
100 interrupts = <8 1>;
101 reg = <1>;
102 device_type = "ethernet-phy";
103 };
104 phy2: ethernet-phy@2 {
105 interrupt-parent = <&mpic>;
106 interrupts = <8 1>;
107 reg = <2>;
108 device_type = "ethernet-phy";
109 };
110 phy3: ethernet-phy@3 {
111 interrupt-parent = <&mpic>;
112 interrupts = <8 1>;
113 reg = <3>;
114 device_type = "ethernet-phy";
115 };
116 };
117
118 enet0: ethernet@24000 {
119 cell-index = <0>;
120 device_type = "network";
121 model = "TSEC";
122 compatible = "gianfar";
123 reg = <0x24000 0x1000>;
124 local-mac-address = [ 00 00 00 00 00 00 ];
125 interrupts = <29 2 30 2 34 2>;
126 interrupt-parent = <&mpic>;
127 phy-handle = <&phy2>;
128 };
129
130 enet1: ethernet@25000 {
131 cell-index = <1>;
132 device_type = "network";
133 model = "TSEC";
134 compatible = "gianfar";
135 reg = <0x25000 0x1000>;
136 local-mac-address = [ 00 00 00 00 00 00 ];
137 interrupts = <35 2 36 2 40 2>;
138 interrupt-parent = <&mpic>;
139 phy-handle = <&phy1>;
140 };
141
142 mpic: pic@40000 {
143 interrupt-controller;
144 #address-cells = <0>;
145 #interrupt-cells = <2>;
146 reg = <0x40000 0x40000>;
147 device_type = "open-pic";
148 };
149
150 cpm@919c0 {
151 #address-cells = <1>;
152 #size-cells = <1>;
153 compatible = "fsl,mpc8560-cpm", "fsl,cpm2", "simple-bus";
154 reg = <0x919c0 0x30>;
155 ranges;
156
157 muram@80000 {
158 #address-cells = <1>;
159 #size-cells = <1>;
160 ranges = <0 0x80000 0x10000>;
161
162 data@0 {
163 compatible = "fsl,cpm-muram-data";
164 reg = <0 0x4000 0x9000 0x2000>;
165 };
166 };
167
168 brg@919f0 {
169 compatible = "fsl,mpc8560-brg",
170 "fsl,cpm2-brg",
171 "fsl,cpm-brg";
172 reg = <0x919f0 0x10 0x915f0 0x10>;
173 clock-frequency = <0>;
174 };
175
176 cpmpic: pic@90c00 {
177 interrupt-controller;
178 #address-cells = <0>;
179 #interrupt-cells = <2>;
180 interrupts = <46 2>;
181 interrupt-parent = <&mpic>;
182 reg = <0x90c00 0x80>;
183 compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
184 };
185
186 serial0: serial@91a00 {
187 device_type = "serial";
188 compatible = "fsl,mpc8560-scc-uart",
189 "fsl,cpm2-scc-uart";
190 reg = <0x91a00 0x20 0x88000 0x100>;
191 fsl,cpm-brg = <1>;
192 fsl,cpm-command = <0x800000>;
193 current-speed = <115200>;
194 interrupts = <40 8>;
195 interrupt-parent = <&cpmpic>;
196 };
197
198 serial1: serial@91a20 {
199 device_type = "serial";
200 compatible = "fsl,mpc8560-scc-uart",
201 "fsl,cpm2-scc-uart";
202 reg = <0x91a20 0x20 0x88100 0x100>;
203 fsl,cpm-brg = <2>;
204 fsl,cpm-command = <0x4a00000>;
205 current-speed = <115200>;
206 interrupts = <41 8>;
207 interrupt-parent = <&cpmpic>;
208 };
209
210 enet2: ethernet@91340 {
211 device_type = "network";
212 compatible = "fsl,mpc8560-fcc-enet",
213 "fsl,cpm2-fcc-enet";
214 reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
215 local-mac-address = [ 00 00 00 00 00 00 ];
216 fsl,cpm-command = <0x1a400300>;
217 interrupts = <34 8>;
218 interrupt-parent = <&cpmpic>;
219 phy-handle = <&phy3>;
220 };
221 };
222 };
223
224 pci0: pci@e0008000 {
225 cell-index = <0>;
226 #interrupt-cells = <1>;
227 #size-cells = <2>;
228 #address-cells = <3>;
229 compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
230 device_type = "pci";
231 reg = <0xe0008000 0x1000>;
232 clock-frequency = <66666666>;
233 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
234 interrupt-map = <
235 /* IDSEL 28 */
236 0xe000 0 0 1 &mpic 2 1
237 0xe000 0 0 2 &mpic 3 1>;
238
239 interrupt-parent = <&mpic>;
240 interrupts = <24 2>;
241 bus-range = <0 0>;
242 ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
243 0x01000000 0 0x00000000 0xe2000000 0 0x01000000>;
244 };
245};
diff --git a/arch/powerpc/boot/libfdt-wrapper.c b/arch/powerpc/boot/libfdt-wrapper.c
index 97af36c224bd..59016bef1391 100644
--- a/arch/powerpc/boot/libfdt-wrapper.c
+++ b/arch/powerpc/boot/libfdt-wrapper.c
@@ -133,6 +133,14 @@ static void *fdt_wrapper_find_node_by_prop_value(const void *prev,
133 return offset_devp(offset); 133 return offset_devp(offset);
134} 134}
135 135
136static void *fdt_wrapper_find_node_by_compatible(const void *prev,
137 const char *val)
138{
139 int offset = fdt_node_offset_by_compatible(fdt, devp_offset_find(prev),
140 val);
141 return offset_devp(offset);
142}
143
136static char *fdt_wrapper_get_path(const void *devp, char *buf, int len) 144static char *fdt_wrapper_get_path(const void *devp, char *buf, int len)
137{ 145{
138 int rc; 146 int rc;
@@ -164,6 +172,7 @@ void fdt_init(void *blob)
164 dt_ops.get_parent = fdt_wrapper_get_parent; 172 dt_ops.get_parent = fdt_wrapper_get_parent;
165 dt_ops.create_node = fdt_wrapper_create_node; 173 dt_ops.create_node = fdt_wrapper_create_node;
166 dt_ops.find_node_by_prop_value = fdt_wrapper_find_node_by_prop_value; 174 dt_ops.find_node_by_prop_value = fdt_wrapper_find_node_by_prop_value;
175 dt_ops.find_node_by_compatible = fdt_wrapper_find_node_by_compatible;
167 dt_ops.get_path = fdt_wrapper_get_path; 176 dt_ops.get_path = fdt_wrapper_get_path;
168 dt_ops.finalize = fdt_wrapper_finalize; 177 dt_ops.finalize = fdt_wrapper_finalize;
169 178
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 5872ef1779ae..4b0544b03c64 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -46,6 +46,8 @@ struct dt_ops {
46 void *(*find_node_by_prop_value)(const void *prev, 46 void *(*find_node_by_prop_value)(const void *prev,
47 const char *propname, 47 const char *propname,
48 const char *propval, int proplen); 48 const char *propval, int proplen);
49 void *(*find_node_by_compatible)(const void *prev,
50 const char *compat);
49 unsigned long (*finalize)(void); 51 unsigned long (*finalize)(void);
50 char *(*get_path)(const void *phandle, char *buf, int len); 52 char *(*get_path)(const void *phandle, char *buf, int len);
51}; 53};
@@ -172,6 +174,15 @@ static inline void *find_node_by_alias(const char *alias)
172 return NULL; 174 return NULL;
173} 175}
174 176
177static inline void *find_node_by_compatible(const void *prev,
178 const char *compat)
179{
180 if (dt_ops.find_node_by_compatible)
181 return dt_ops.find_node_by_compatible(prev, compat);
182
183 return NULL;
184}
185
175void dt_fixup_memory(u64 start, u64 size); 186void dt_fixup_memory(u64 start, u64 size);
176void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq); 187void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq);
177void dt_fixup_clock(const char *path, u32 freq); 188void dt_fixup_clock(const char *path, u32 freq);
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index db08e736c0ac..3b29ac53844e 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_defconfig
@@ -138,7 +138,7 @@ CONFIG_PPC_83xx=y
138# CONFIG_PPC_CELL is not set 138# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 139# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 140# CONFIG_PQ2ADS is not set
141CONFIG_MPC8313_RDB=y 141CONFIG_MPC831x_RDB=y
142# CONFIG_MPC832x_MDS is not set 142# CONFIG_MPC832x_MDS is not set
143# CONFIG_MPC832x_RDB is not set 143# CONFIG_MPC832x_RDB is not set
144# CONFIG_MPC834x_MDS is not set 144# CONFIG_MPC834x_MDS is not set
diff --git a/arch/powerpc/configs/mpc8315_rdb_defconfig b/arch/powerpc/configs/mpc8315_rdb_defconfig
new file mode 100644
index 000000000000..9adf7f98f675
--- /dev/null
+++ b/arch/powerpc/configs/mpc8315_rdb_defconfig
@@ -0,0 +1,1417 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc8
4# Wed Jan 23 20:02:25 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y
19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set
23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y
26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y
32CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y
35CONFIG_GENERIC_HWEIGHT=y
36CONFIG_GENERIC_CALIBRATE_DELAY=y
37CONFIG_GENERIC_FIND_NEXT_BIT=y
38# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
39CONFIG_PPC=y
40CONFIG_EARLY_PRINTK=y
41CONFIG_GENERIC_NVRAM=y
42CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
43CONFIG_ARCH_MAY_HAVE_PC_FDC=y
44CONFIG_PPC_OF=y
45CONFIG_OF=y
46CONFIG_PPC_UDBG_16550=y
47# CONFIG_GENERIC_TBSYNC is not set
48CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y
50CONFIG_DEFAULT_UIMAGE=y
51# CONFIG_PPC_DCR_NATIVE is not set
52# CONFIG_PPC_DCR_MMIO is not set
53CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
54
55#
56# General setup
57#
58CONFIG_EXPERIMENTAL=y
59CONFIG_BROKEN_ON_SMP=y
60CONFIG_INIT_ENV_ARG_LIMIT=32
61CONFIG_LOCALVERSION=""
62CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y
64CONFIG_SYSVIPC=y
65CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y
77# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
81CONFIG_SYSCTL=y
82CONFIG_EMBEDDED=y
83CONFIG_SYSCTL_SYSCALL=y
84# CONFIG_KALLSYMS is not set
85CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y
87CONFIG_BUG=y
88CONFIG_ELF_CORE=y
89CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y
94CONFIG_EVENTFD=y
95CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set
99CONFIG_SLUB=y
100# CONFIG_SLOB is not set
101CONFIG_SLABINFO=y
102CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0
105CONFIG_MODULES=y
106CONFIG_MODULE_UNLOAD=y
107# CONFIG_MODULE_FORCE_UNLOAD is not set
108# CONFIG_MODVERSIONS is not set
109# CONFIG_MODULE_SRCVERSION_ALL is not set
110# CONFIG_KMOD is not set
111CONFIG_BLOCK=y
112# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_LSF is not set
115# CONFIG_BLK_DEV_BSG is not set
116
117#
118# IO Schedulers
119#
120CONFIG_IOSCHED_NOOP=y
121CONFIG_IOSCHED_AS=y
122CONFIG_IOSCHED_DEADLINE=y
123CONFIG_IOSCHED_CFQ=y
124CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_DEADLINE is not set
126# CONFIG_DEFAULT_CFQ is not set
127# CONFIG_DEFAULT_NOOP is not set
128CONFIG_DEFAULT_IOSCHED="anticipatory"
129
130#
131# Platform support
132#
133# CONFIG_PPC_MULTIPLATFORM is not set
134# CONFIG_PPC_82xx is not set
135CONFIG_PPC_83xx=y
136# CONFIG_PPC_86xx is not set
137# CONFIG_PPC_MPC52xx is not set
138# CONFIG_PPC_MPC5200 is not set
139# CONFIG_PPC_CELL is not set
140# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PQ2ADS is not set
142CONFIG_MPC831x_RDB=y
143# CONFIG_MPC832x_MDS is not set
144# CONFIG_MPC832x_RDB is not set
145# CONFIG_MPC834x_MDS is not set
146# CONFIG_MPC834x_ITX is not set
147# CONFIG_MPC836x_MDS is not set
148# CONFIG_MPC837x_MDS is not set
149CONFIG_PPC_MPC831x=y
150CONFIG_IPIC=y
151# CONFIG_MPIC is not set
152# CONFIG_MPIC_WEIRD is not set
153# CONFIG_PPC_I8259 is not set
154# CONFIG_PPC_RTAS is not set
155# CONFIG_MMIO_NVRAM is not set
156# CONFIG_PPC_MPC106 is not set
157# CONFIG_PPC_970_NAP is not set
158# CONFIG_PPC_INDIRECT_IO is not set
159# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set
161# CONFIG_CPM2 is not set
162# CONFIG_FSL_ULI1575 is not set
163
164#
165# Kernel options
166#
167# CONFIG_HIGHMEM is not set
168CONFIG_TICK_ONESHOT=y
169CONFIG_NO_HZ=y
170CONFIG_HIGH_RES_TIMERS=y
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
172# CONFIG_HZ_100 is not set
173CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set
176CONFIG_HZ=250
177CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
183CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y
185CONFIG_SELECT_MEMORY_MODEL=y
186CONFIG_FLATMEM_MANUAL=y
187# CONFIG_DISCONTIGMEM_MANUAL is not set
188# CONFIG_SPARSEMEM_MANUAL is not set
189CONFIG_FLATMEM=y
190CONFIG_FLAT_NODE_MEM_MAP=y
191# CONFIG_SPARSEMEM_STATIC is not set
192# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
193CONFIG_SPLIT_PTLOCK_CPUS=4
194# CONFIG_RESOURCES_64BIT is not set
195CONFIG_ZONE_DMA_FLAG=1
196CONFIG_BOUNCE=y
197CONFIG_VIRT_TO_BUS=y
198CONFIG_PROC_DEVICETREE=y
199# CONFIG_CMDLINE_BOOL is not set
200# CONFIG_PM is not set
201CONFIG_SUSPEND_UP_POSSIBLE=y
202CONFIG_HIBERNATION_UP_POSSIBLE=y
203CONFIG_SECCOMP=y
204CONFIG_WANT_DEVICE_TREE=y
205CONFIG_DEVICE_TREE=""
206CONFIG_ISA_DMA_API=y
207
208#
209# Bus options
210#
211CONFIG_ZONE_DMA=y
212CONFIG_GENERIC_ISA_DMA=y
213CONFIG_PPC_INDIRECT_PCI=y
214CONFIG_FSL_SOC=y
215CONFIG_PCI=y
216CONFIG_PCI_DOMAINS=y
217CONFIG_PCI_SYSCALL=y
218# CONFIG_PCIEPORTBUS is not set
219CONFIG_ARCH_SUPPORTS_MSI=y
220# CONFIG_PCI_MSI is not set
221CONFIG_PCI_LEGACY=y
222# CONFIG_PCI_DEBUG is not set
223# CONFIG_PCCARD is not set
224# CONFIG_HOTPLUG_PCI is not set
225
226#
227# Advanced setup
228#
229# CONFIG_ADVANCED_OPTIONS is not set
230
231#
232# Default settings for advanced configuration options are used
233#
234CONFIG_HIGHMEM_START=0xfe000000
235CONFIG_LOWMEM_SIZE=0x30000000
236CONFIG_KERNEL_START=0xc0000000
237CONFIG_TASK_SIZE=0xc0000000
238CONFIG_BOOT_LOAD=0x00800000
239
240#
241# Networking
242#
243CONFIG_NET=y
244
245#
246# Networking options
247#
248CONFIG_PACKET=y
249# CONFIG_PACKET_MMAP is not set
250CONFIG_UNIX=y
251CONFIG_XFRM=y
252# CONFIG_XFRM_USER is not set
253# CONFIG_XFRM_SUB_POLICY is not set
254# CONFIG_XFRM_MIGRATE is not set
255# CONFIG_NET_KEY is not set
256CONFIG_INET=y
257CONFIG_IP_MULTICAST=y
258# CONFIG_IP_ADVANCED_ROUTER is not set
259CONFIG_IP_FIB_HASH=y
260CONFIG_IP_PNP=y
261CONFIG_IP_PNP_DHCP=y
262CONFIG_IP_PNP_BOOTP=y
263# CONFIG_IP_PNP_RARP is not set
264# CONFIG_NET_IPIP is not set
265# CONFIG_NET_IPGRE is not set
266# CONFIG_IP_MROUTE is not set
267# CONFIG_ARPD is not set
268CONFIG_SYN_COOKIES=y
269# CONFIG_INET_AH is not set
270# CONFIG_INET_ESP is not set
271# CONFIG_INET_IPCOMP is not set
272# CONFIG_INET_XFRM_TUNNEL is not set
273# CONFIG_INET_TUNNEL is not set
274CONFIG_INET_XFRM_MODE_TRANSPORT=y
275CONFIG_INET_XFRM_MODE_TUNNEL=y
276CONFIG_INET_XFRM_MODE_BEET=y
277# CONFIG_INET_LRO is not set
278CONFIG_INET_DIAG=y
279CONFIG_INET_TCP_DIAG=y
280# CONFIG_TCP_CONG_ADVANCED is not set
281CONFIG_TCP_CONG_CUBIC=y
282CONFIG_DEFAULT_TCP_CONG="cubic"
283# CONFIG_TCP_MD5SIG is not set
284# CONFIG_IPV6 is not set
285# CONFIG_INET6_XFRM_TUNNEL is not set
286# CONFIG_INET6_TUNNEL is not set
287# CONFIG_NETWORK_SECMARK is not set
288# CONFIG_NETFILTER is not set
289# CONFIG_IP_DCCP is not set
290# CONFIG_IP_SCTP is not set
291# CONFIG_TIPC is not set
292# CONFIG_ATM is not set
293# CONFIG_BRIDGE is not set
294# CONFIG_VLAN_8021Q is not set
295# CONFIG_DECNET is not set
296# CONFIG_LLC2 is not set
297# CONFIG_IPX is not set
298# CONFIG_ATALK is not set
299# CONFIG_X25 is not set
300# CONFIG_LAPB is not set
301# CONFIG_ECONET is not set
302# CONFIG_WAN_ROUTER is not set
303# CONFIG_NET_SCHED is not set
304
305#
306# Network testing
307#
308# CONFIG_NET_PKTGEN is not set
309# CONFIG_HAMRADIO is not set
310# CONFIG_IRDA is not set
311# CONFIG_BT is not set
312# CONFIG_AF_RXRPC is not set
313
314#
315# Wireless
316#
317# CONFIG_CFG80211 is not set
318# CONFIG_WIRELESS_EXT is not set
319# CONFIG_MAC80211 is not set
320# CONFIG_IEEE80211 is not set
321# CONFIG_RFKILL is not set
322# CONFIG_NET_9P is not set
323
324#
325# Device Drivers
326#
327
328#
329# Generic Driver Options
330#
331CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
332CONFIG_STANDALONE=y
333CONFIG_PREVENT_FIRMWARE_BUILD=y
334# CONFIG_FW_LOADER is not set
335# CONFIG_DEBUG_DRIVER is not set
336# CONFIG_DEBUG_DEVRES is not set
337# CONFIG_SYS_HYPERVISOR is not set
338# CONFIG_CONNECTOR is not set
339CONFIG_MTD=y
340# CONFIG_MTD_DEBUG is not set
341# CONFIG_MTD_CONCAT is not set
342CONFIG_MTD_PARTITIONS=y
343# CONFIG_MTD_REDBOOT_PARTS is not set
344# CONFIG_MTD_CMDLINE_PARTS is not set
345
346#
347# User Modules And Translation Layers
348#
349CONFIG_MTD_CHAR=y
350CONFIG_MTD_BLKDEVS=y
351CONFIG_MTD_BLOCK=y
352# CONFIG_FTL is not set
353# CONFIG_NFTL is not set
354# CONFIG_INFTL is not set
355# CONFIG_RFD_FTL is not set
356# CONFIG_SSFDC is not set
357# CONFIG_MTD_OOPS is not set
358
359#
360# RAM/ROM/Flash chip drivers
361#
362CONFIG_MTD_CFI=y
363# CONFIG_MTD_JEDECPROBE is not set
364CONFIG_MTD_GEN_PROBE=y
365# CONFIG_MTD_CFI_ADV_OPTIONS is not set
366CONFIG_MTD_MAP_BANK_WIDTH_1=y
367CONFIG_MTD_MAP_BANK_WIDTH_2=y
368CONFIG_MTD_MAP_BANK_WIDTH_4=y
369# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
370# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
371# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
372CONFIG_MTD_CFI_I1=y
373CONFIG_MTD_CFI_I2=y
374# CONFIG_MTD_CFI_I4 is not set
375# CONFIG_MTD_CFI_I8 is not set
376# CONFIG_MTD_CFI_INTELEXT is not set
377CONFIG_MTD_CFI_AMDSTD=y
378# CONFIG_MTD_CFI_STAA is not set
379CONFIG_MTD_CFI_UTIL=y
380# CONFIG_MTD_RAM is not set
381# CONFIG_MTD_ROM is not set
382# CONFIG_MTD_ABSENT is not set
383
384#
385# Mapping drivers for chip access
386#
387# CONFIG_MTD_COMPLEX_MAPPINGS is not set
388# CONFIG_MTD_PHYSMAP is not set
389CONFIG_MTD_PHYSMAP_OF=y
390# CONFIG_MTD_INTEL_VR_NOR is not set
391# CONFIG_MTD_PLATRAM is not set
392
393#
394# Self-contained MTD device drivers
395#
396# CONFIG_MTD_PMC551 is not set
397# CONFIG_MTD_DATAFLASH is not set
398# CONFIG_MTD_M25P80 is not set
399# CONFIG_MTD_SLRAM is not set
400# CONFIG_MTD_PHRAM is not set
401# CONFIG_MTD_MTDRAM is not set
402# CONFIG_MTD_BLOCK2MTD is not set
403
404#
405# Disk-On-Chip Device Drivers
406#
407# CONFIG_MTD_DOC2000 is not set
408# CONFIG_MTD_DOC2001 is not set
409# CONFIG_MTD_DOC2001PLUS is not set
410CONFIG_MTD_NAND=y
411CONFIG_MTD_NAND_VERIFY_WRITE=y
412# CONFIG_MTD_NAND_ECC_SMC is not set
413# CONFIG_MTD_NAND_MUSEUM_IDS is not set
414CONFIG_MTD_NAND_IDS=y
415# CONFIG_MTD_NAND_DISKONCHIP is not set
416# CONFIG_MTD_NAND_CAFE is not set
417# CONFIG_MTD_NAND_NANDSIM is not set
418# CONFIG_MTD_NAND_PLATFORM is not set
419# CONFIG_MTD_ALAUDA is not set
420# CONFIG_MTD_ONENAND is not set
421
422#
423# UBI - Unsorted block images
424#
425# CONFIG_MTD_UBI is not set
426CONFIG_OF_DEVICE=y
427# CONFIG_PARPORT is not set
428CONFIG_BLK_DEV=y
429# CONFIG_BLK_DEV_FD is not set
430# CONFIG_BLK_CPQ_DA is not set
431# CONFIG_BLK_CPQ_CISS_DA is not set
432# CONFIG_BLK_DEV_DAC960 is not set
433# CONFIG_BLK_DEV_UMEM is not set
434# CONFIG_BLK_DEV_COW_COMMON is not set
435CONFIG_BLK_DEV_LOOP=y
436# CONFIG_BLK_DEV_CRYPTOLOOP is not set
437# CONFIG_BLK_DEV_NBD is not set
438# CONFIG_BLK_DEV_SX8 is not set
439# CONFIG_BLK_DEV_UB is not set
440CONFIG_BLK_DEV_RAM=y
441CONFIG_BLK_DEV_RAM_COUNT=16
442CONFIG_BLK_DEV_RAM_SIZE=32768
443CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
444# CONFIG_CDROM_PKTCDVD is not set
445# CONFIG_ATA_OVER_ETH is not set
446CONFIG_MISC_DEVICES=y
447# CONFIG_PHANTOM is not set
448# CONFIG_EEPROM_93CX6 is not set
449# CONFIG_SGI_IOC4 is not set
450# CONFIG_TIFM_CORE is not set
451# CONFIG_IDE is not set
452
453#
454# SCSI device support
455#
456# CONFIG_RAID_ATTRS is not set
457CONFIG_SCSI=y
458CONFIG_SCSI_DMA=y
459# CONFIG_SCSI_TGT is not set
460# CONFIG_SCSI_NETLINK is not set
461CONFIG_SCSI_PROC_FS=y
462
463#
464# SCSI support type (disk, tape, CD-ROM)
465#
466# CONFIG_BLK_DEV_SD is not set
467# CONFIG_CHR_DEV_ST is not set
468# CONFIG_CHR_DEV_OSST is not set
469# CONFIG_BLK_DEV_SR is not set
470CONFIG_CHR_DEV_SG=y
471# CONFIG_CHR_DEV_SCH is not set
472
473#
474# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
475#
476# CONFIG_SCSI_MULTI_LUN is not set
477# CONFIG_SCSI_CONSTANTS is not set
478# CONFIG_SCSI_LOGGING is not set
479# CONFIG_SCSI_SCAN_ASYNC is not set
480CONFIG_SCSI_WAIT_SCAN=m
481
482#
483# SCSI Transports
484#
485CONFIG_SCSI_SPI_ATTRS=y
486# CONFIG_SCSI_FC_ATTRS is not set
487# CONFIG_SCSI_ISCSI_ATTRS is not set
488# CONFIG_SCSI_SAS_LIBSAS is not set
489# CONFIG_SCSI_SRP_ATTRS is not set
490CONFIG_SCSI_LOWLEVEL=y
491# CONFIG_ISCSI_TCP is not set
492# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
493# CONFIG_SCSI_3W_9XXX is not set
494# CONFIG_SCSI_ACARD is not set
495# CONFIG_SCSI_AACRAID is not set
496# CONFIG_SCSI_AIC7XXX is not set
497# CONFIG_SCSI_AIC7XXX_OLD is not set
498# CONFIG_SCSI_AIC79XX is not set
499# CONFIG_SCSI_AIC94XX is not set
500# CONFIG_SCSI_DPT_I2O is not set
501# CONFIG_SCSI_ADVANSYS is not set
502# CONFIG_SCSI_ARCMSR is not set
503# CONFIG_MEGARAID_NEWGEN is not set
504# CONFIG_MEGARAID_LEGACY is not set
505# CONFIG_MEGARAID_SAS is not set
506# CONFIG_SCSI_HPTIOP is not set
507# CONFIG_SCSI_BUSLOGIC is not set
508# CONFIG_SCSI_DMX3191D is not set
509# CONFIG_SCSI_EATA is not set
510# CONFIG_SCSI_FUTURE_DOMAIN is not set
511# CONFIG_SCSI_GDTH is not set
512# CONFIG_SCSI_IPS is not set
513# CONFIG_SCSI_INITIO is not set
514# CONFIG_SCSI_INIA100 is not set
515# CONFIG_SCSI_STEX is not set
516# CONFIG_SCSI_SYM53C8XX_2 is not set
517# CONFIG_SCSI_IPR is not set
518# CONFIG_SCSI_QLOGIC_1280 is not set
519# CONFIG_SCSI_QLA_FC is not set
520# CONFIG_SCSI_QLA_ISCSI is not set
521# CONFIG_SCSI_LPFC is not set
522# CONFIG_SCSI_DC395x is not set
523# CONFIG_SCSI_DC390T is not set
524# CONFIG_SCSI_NSP32 is not set
525# CONFIG_SCSI_DEBUG is not set
526# CONFIG_SCSI_SRP is not set
527CONFIG_ATA=y
528# CONFIG_ATA_NONSTANDARD is not set
529# CONFIG_SATA_AHCI is not set
530# CONFIG_SATA_SVW is not set
531# CONFIG_ATA_PIIX is not set
532# CONFIG_SATA_MV is not set
533# CONFIG_SATA_NV is not set
534# CONFIG_PDC_ADMA is not set
535# CONFIG_SATA_QSTOR is not set
536# CONFIG_SATA_PROMISE is not set
537# CONFIG_SATA_SX4 is not set
538# CONFIG_SATA_SIL is not set
539# CONFIG_SATA_SIL24 is not set
540# CONFIG_SATA_SIS is not set
541# CONFIG_SATA_ULI is not set
542# CONFIG_SATA_VIA is not set
543# CONFIG_SATA_VITESSE is not set
544# CONFIG_SATA_INIC162X is not set
545CONFIG_SATA_FSL=y
546# CONFIG_PATA_ALI is not set
547# CONFIG_PATA_AMD is not set
548# CONFIG_PATA_ARTOP is not set
549# CONFIG_PATA_ATIIXP is not set
550# CONFIG_PATA_CMD640_PCI is not set
551# CONFIG_PATA_CMD64X is not set
552# CONFIG_PATA_CS5520 is not set
553# CONFIG_PATA_CS5530 is not set
554# CONFIG_PATA_CYPRESS is not set
555# CONFIG_PATA_EFAR is not set
556# CONFIG_ATA_GENERIC is not set
557# CONFIG_PATA_HPT366 is not set
558# CONFIG_PATA_HPT37X is not set
559# CONFIG_PATA_HPT3X2N is not set
560# CONFIG_PATA_HPT3X3 is not set
561# CONFIG_PATA_IT821X is not set
562# CONFIG_PATA_IT8213 is not set
563# CONFIG_PATA_JMICRON is not set
564# CONFIG_PATA_TRIFLEX is not set
565# CONFIG_PATA_MARVELL is not set
566# CONFIG_PATA_MPIIX is not set
567# CONFIG_PATA_OLDPIIX is not set
568# CONFIG_PATA_NETCELL is not set
569# CONFIG_PATA_NS87410 is not set
570# CONFIG_PATA_NS87415 is not set
571# CONFIG_PATA_OPTI is not set
572# CONFIG_PATA_OPTIDMA is not set
573# CONFIG_PATA_PDC_OLD is not set
574# CONFIG_PATA_RADISYS is not set
575# CONFIG_PATA_RZ1000 is not set
576# CONFIG_PATA_SC1200 is not set
577# CONFIG_PATA_SERVERWORKS is not set
578# CONFIG_PATA_PDC2027X is not set
579# CONFIG_PATA_SIL680 is not set
580# CONFIG_PATA_SIS is not set
581# CONFIG_PATA_VIA is not set
582# CONFIG_PATA_WINBOND is not set
583# CONFIG_PATA_PLATFORM is not set
584CONFIG_MD=y
585CONFIG_BLK_DEV_MD=y
586CONFIG_MD_LINEAR=y
587CONFIG_MD_RAID0=y
588CONFIG_MD_RAID1=y
589# CONFIG_MD_RAID10 is not set
590# CONFIG_MD_RAID456 is not set
591# CONFIG_MD_MULTIPATH is not set
592# CONFIG_MD_FAULTY is not set
593# CONFIG_BLK_DEV_DM is not set
594# CONFIG_FUSION is not set
595
596#
597# IEEE 1394 (FireWire) support
598#
599# CONFIG_FIREWIRE is not set
600# CONFIG_IEEE1394 is not set
601# CONFIG_I2O is not set
602# CONFIG_MACINTOSH_DRIVERS is not set
603CONFIG_NETDEVICES=y
604# CONFIG_NETDEVICES_MULTIQUEUE is not set
605# CONFIG_DUMMY is not set
606# CONFIG_BONDING is not set
607# CONFIG_MACVLAN is not set
608# CONFIG_EQUALIZER is not set
609# CONFIG_TUN is not set
610# CONFIG_VETH is not set
611# CONFIG_ARCNET is not set
612CONFIG_PHYLIB=y
613
614#
615# MII PHY device drivers
616#
617# CONFIG_MARVELL_PHY is not set
618# CONFIG_DAVICOM_PHY is not set
619# CONFIG_QSEMI_PHY is not set
620# CONFIG_LXT_PHY is not set
621# CONFIG_CICADA_PHY is not set
622# CONFIG_VITESSE_PHY is not set
623# CONFIG_SMSC_PHY is not set
624# CONFIG_BROADCOM_PHY is not set
625# CONFIG_ICPLUS_PHY is not set
626# CONFIG_FIXED_PHY is not set
627# CONFIG_MDIO_BITBANG is not set
628CONFIG_NET_ETHERNET=y
629CONFIG_MII=y
630# CONFIG_HAPPYMEAL is not set
631# CONFIG_SUNGEM is not set
632# CONFIG_CASSINI is not set
633# CONFIG_NET_VENDOR_3COM is not set
634# CONFIG_NET_TULIP is not set
635# CONFIG_HP100 is not set
636# CONFIG_IBM_NEW_EMAC_ZMII is not set
637# CONFIG_IBM_NEW_EMAC_RGMII is not set
638# CONFIG_IBM_NEW_EMAC_TAH is not set
639# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
640CONFIG_NET_PCI=y
641# CONFIG_PCNET32 is not set
642# CONFIG_AMD8111_ETH is not set
643# CONFIG_ADAPTEC_STARFIRE is not set
644# CONFIG_B44 is not set
645# CONFIG_FORCEDETH is not set
646# CONFIG_EEPRO100 is not set
647CONFIG_E100=y
648# CONFIG_FEALNX is not set
649# CONFIG_NATSEMI is not set
650# CONFIG_NE2K_PCI is not set
651# CONFIG_8139CP is not set
652# CONFIG_8139TOO is not set
653# CONFIG_SIS900 is not set
654# CONFIG_EPIC100 is not set
655# CONFIG_SUNDANCE is not set
656# CONFIG_TLAN is not set
657# CONFIG_VIA_RHINE is not set
658# CONFIG_SC92031 is not set
659CONFIG_NETDEV_1000=y
660# CONFIG_ACENIC is not set
661# CONFIG_DL2K is not set
662# CONFIG_E1000 is not set
663# CONFIG_E1000E is not set
664# CONFIG_IP1000 is not set
665# CONFIG_NS83820 is not set
666# CONFIG_HAMACHI is not set
667# CONFIG_YELLOWFIN is not set
668# CONFIG_R8169 is not set
669# CONFIG_SIS190 is not set
670# CONFIG_SKGE is not set
671# CONFIG_SKY2 is not set
672# CONFIG_SK98LIN is not set
673# CONFIG_VIA_VELOCITY is not set
674# CONFIG_TIGON3 is not set
675# CONFIG_BNX2 is not set
676CONFIG_GIANFAR=y
677CONFIG_GFAR_NAPI=y
678# CONFIG_QLA3XXX is not set
679# CONFIG_ATL1 is not set
680CONFIG_NETDEV_10000=y
681# CONFIG_CHELSIO_T1 is not set
682# CONFIG_CHELSIO_T3 is not set
683# CONFIG_IXGBE is not set
684# CONFIG_IXGB is not set
685# CONFIG_S2IO is not set
686# CONFIG_MYRI10GE is not set
687# CONFIG_NETXEN_NIC is not set
688# CONFIG_NIU is not set
689# CONFIG_MLX4_CORE is not set
690# CONFIG_TEHUTI is not set
691# CONFIG_TR is not set
692
693#
694# Wireless LAN
695#
696# CONFIG_WLAN_PRE80211 is not set
697# CONFIG_WLAN_80211 is not set
698
699#
700# USB Network Adapters
701#
702# CONFIG_USB_CATC is not set
703# CONFIG_USB_KAWETH is not set
704# CONFIG_USB_PEGASUS is not set
705# CONFIG_USB_RTL8150 is not set
706# CONFIG_USB_USBNET is not set
707# CONFIG_WAN is not set
708# CONFIG_FDDI is not set
709# CONFIG_HIPPI is not set
710# CONFIG_PPP is not set
711# CONFIG_SLIP is not set
712# CONFIG_NET_FC is not set
713# CONFIG_SHAPER is not set
714# CONFIG_NETCONSOLE is not set
715# CONFIG_NETPOLL is not set
716# CONFIG_NET_POLL_CONTROLLER is not set
717# CONFIG_ISDN is not set
718# CONFIG_PHONE is not set
719
720#
721# Input device support
722#
723CONFIG_INPUT=y
724# CONFIG_INPUT_FF_MEMLESS is not set
725# CONFIG_INPUT_POLLDEV is not set
726
727#
728# Userland interfaces
729#
730# CONFIG_INPUT_MOUSEDEV is not set
731# CONFIG_INPUT_JOYDEV is not set
732# CONFIG_INPUT_EVDEV is not set
733# CONFIG_INPUT_EVBUG is not set
734
735#
736# Input Device Drivers
737#
738# CONFIG_INPUT_KEYBOARD is not set
739# CONFIG_INPUT_MOUSE is not set
740# CONFIG_INPUT_JOYSTICK is not set
741# CONFIG_INPUT_TABLET is not set
742# CONFIG_INPUT_TOUCHSCREEN is not set
743# CONFIG_INPUT_MISC is not set
744
745#
746# Hardware I/O ports
747#
748# CONFIG_SERIO is not set
749# CONFIG_GAMEPORT is not set
750
751#
752# Character devices
753#
754# CONFIG_VT is not set
755# CONFIG_SERIAL_NONSTANDARD is not set
756
757#
758# Serial drivers
759#
760CONFIG_SERIAL_8250=y
761CONFIG_SERIAL_8250_CONSOLE=y
762CONFIG_SERIAL_8250_PCI=y
763CONFIG_SERIAL_8250_NR_UARTS=4
764CONFIG_SERIAL_8250_RUNTIME_UARTS=4
765# CONFIG_SERIAL_8250_EXTENDED is not set
766
767#
768# Non-8250 serial port support
769#
770# CONFIG_SERIAL_UARTLITE is not set
771CONFIG_SERIAL_CORE=y
772CONFIG_SERIAL_CORE_CONSOLE=y
773# CONFIG_SERIAL_JSM is not set
774# CONFIG_SERIAL_OF_PLATFORM is not set
775CONFIG_UNIX98_PTYS=y
776CONFIG_LEGACY_PTYS=y
777CONFIG_LEGACY_PTY_COUNT=256
778# CONFIG_IPMI_HANDLER is not set
779CONFIG_HW_RANDOM=y
780# CONFIG_NVRAM is not set
781# CONFIG_GEN_RTC is not set
782# CONFIG_R3964 is not set
783# CONFIG_APPLICOM is not set
784# CONFIG_RAW_DRIVER is not set
785# CONFIG_TCG_TPM is not set
786CONFIG_DEVPORT=y
787CONFIG_I2C=y
788CONFIG_I2C_BOARDINFO=y
789CONFIG_I2C_CHARDEV=y
790
791#
792# I2C Algorithms
793#
794# CONFIG_I2C_ALGOBIT is not set
795# CONFIG_I2C_ALGOPCF is not set
796# CONFIG_I2C_ALGOPCA is not set
797
798#
799# I2C Hardware Bus support
800#
801# CONFIG_I2C_ALI1535 is not set
802# CONFIG_I2C_ALI1563 is not set
803# CONFIG_I2C_ALI15X3 is not set
804# CONFIG_I2C_AMD756 is not set
805# CONFIG_I2C_AMD8111 is not set
806# CONFIG_I2C_I801 is not set
807# CONFIG_I2C_I810 is not set
808# CONFIG_I2C_PIIX4 is not set
809CONFIG_I2C_MPC=y
810# CONFIG_I2C_NFORCE2 is not set
811# CONFIG_I2C_OCORES is not set
812# CONFIG_I2C_PARPORT_LIGHT is not set
813# CONFIG_I2C_PROSAVAGE is not set
814# CONFIG_I2C_SAVAGE4 is not set
815# CONFIG_I2C_SIMTEC is not set
816# CONFIG_I2C_SIS5595 is not set
817# CONFIG_I2C_SIS630 is not set
818# CONFIG_I2C_SIS96X is not set
819# CONFIG_I2C_TAOS_EVM is not set
820# CONFIG_I2C_STUB is not set
821# CONFIG_I2C_TINY_USB is not set
822# CONFIG_I2C_VIA is not set
823# CONFIG_I2C_VIAPRO is not set
824# CONFIG_I2C_VOODOO3 is not set
825
826#
827# Miscellaneous I2C Chip support
828#
829# CONFIG_SENSORS_DS1337 is not set
830# CONFIG_SENSORS_DS1374 is not set
831# CONFIG_DS1682 is not set
832# CONFIG_SENSORS_EEPROM is not set
833# CONFIG_SENSORS_PCF8574 is not set
834# CONFIG_SENSORS_PCA9539 is not set
835# CONFIG_SENSORS_PCF8591 is not set
836# CONFIG_SENSORS_M41T00 is not set
837# CONFIG_SENSORS_MAX6875 is not set
838# CONFIG_SENSORS_TSL2550 is not set
839# CONFIG_I2C_DEBUG_CORE is not set
840# CONFIG_I2C_DEBUG_ALGO is not set
841# CONFIG_I2C_DEBUG_BUS is not set
842# CONFIG_I2C_DEBUG_CHIP is not set
843
844#
845# SPI support
846#
847CONFIG_SPI=y
848# CONFIG_SPI_DEBUG is not set
849CONFIG_SPI_MASTER=y
850
851#
852# SPI Master Controller Drivers
853#
854CONFIG_SPI_BITBANG=y
855CONFIG_SPI_MPC83xx=y
856
857#
858# SPI Protocol Masters
859#
860# CONFIG_SPI_AT25 is not set
861# CONFIG_SPI_SPIDEV is not set
862# CONFIG_SPI_TLE62X0 is not set
863# CONFIG_W1 is not set
864# CONFIG_POWER_SUPPLY is not set
865CONFIG_HWMON=y
866# CONFIG_HWMON_VID is not set
867# CONFIG_SENSORS_AD7418 is not set
868# CONFIG_SENSORS_ADM1021 is not set
869# CONFIG_SENSORS_ADM1025 is not set
870# CONFIG_SENSORS_ADM1026 is not set
871# CONFIG_SENSORS_ADM1029 is not set
872# CONFIG_SENSORS_ADM1031 is not set
873# CONFIG_SENSORS_ADM9240 is not set
874# CONFIG_SENSORS_ADT7470 is not set
875# CONFIG_SENSORS_ATXP1 is not set
876# CONFIG_SENSORS_DS1621 is not set
877# CONFIG_SENSORS_I5K_AMB is not set
878# CONFIG_SENSORS_F71805F is not set
879# CONFIG_SENSORS_F71882FG is not set
880# CONFIG_SENSORS_F75375S is not set
881# CONFIG_SENSORS_GL518SM is not set
882# CONFIG_SENSORS_GL520SM is not set
883# CONFIG_SENSORS_IT87 is not set
884# CONFIG_SENSORS_LM63 is not set
885# CONFIG_SENSORS_LM70 is not set
886# CONFIG_SENSORS_LM75 is not set
887# CONFIG_SENSORS_LM77 is not set
888# CONFIG_SENSORS_LM78 is not set
889# CONFIG_SENSORS_LM80 is not set
890# CONFIG_SENSORS_LM83 is not set
891# CONFIG_SENSORS_LM85 is not set
892# CONFIG_SENSORS_LM87 is not set
893# CONFIG_SENSORS_LM90 is not set
894# CONFIG_SENSORS_LM92 is not set
895# CONFIG_SENSORS_LM93 is not set
896# CONFIG_SENSORS_MAX1619 is not set
897# CONFIG_SENSORS_MAX6650 is not set
898# CONFIG_SENSORS_PC87360 is not set
899# CONFIG_SENSORS_PC87427 is not set
900# CONFIG_SENSORS_SIS5595 is not set
901# CONFIG_SENSORS_DME1737 is not set
902# CONFIG_SENSORS_SMSC47M1 is not set
903# CONFIG_SENSORS_SMSC47M192 is not set
904# CONFIG_SENSORS_SMSC47B397 is not set
905# CONFIG_SENSORS_THMC50 is not set
906# CONFIG_SENSORS_VIA686A is not set
907# CONFIG_SENSORS_VT1211 is not set
908# CONFIG_SENSORS_VT8231 is not set
909# CONFIG_SENSORS_W83781D is not set
910# CONFIG_SENSORS_W83791D is not set
911# CONFIG_SENSORS_W83792D is not set
912# CONFIG_SENSORS_W83793 is not set
913# CONFIG_SENSORS_W83L785TS is not set
914# CONFIG_SENSORS_W83627HF is not set
915# CONFIG_SENSORS_W83627EHF is not set
916# CONFIG_HWMON_DEBUG_CHIP is not set
917CONFIG_WATCHDOG=y
918# CONFIG_WATCHDOG_NOWAYOUT is not set
919
920#
921# Watchdog Device Drivers
922#
923# CONFIG_SOFT_WATCHDOG is not set
924CONFIG_83xx_WDT=y
925
926#
927# PCI-based Watchdog Cards
928#
929# CONFIG_PCIPCWATCHDOG is not set
930# CONFIG_WDTPCI is not set
931
932#
933# USB-based Watchdog Cards
934#
935# CONFIG_USBPCWATCHDOG is not set
936
937#
938# Sonics Silicon Backplane
939#
940CONFIG_SSB_POSSIBLE=y
941# CONFIG_SSB is not set
942
943#
944# Multifunction device drivers
945#
946# CONFIG_MFD_SM501 is not set
947
948#
949# Multimedia devices
950#
951# CONFIG_VIDEO_DEV is not set
952# CONFIG_DVB_CORE is not set
953CONFIG_DAB=y
954# CONFIG_USB_DABUSB is not set
955
956#
957# Graphics support
958#
959# CONFIG_AGP is not set
960# CONFIG_DRM is not set
961# CONFIG_VGASTATE is not set
962CONFIG_VIDEO_OUTPUT_CONTROL=m
963# CONFIG_FB is not set
964# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
965
966#
967# Display device support
968#
969# CONFIG_DISPLAY_SUPPORT is not set
970
971#
972# Sound
973#
974# CONFIG_SOUND is not set
975CONFIG_HID_SUPPORT=y
976CONFIG_HID=y
977# CONFIG_HID_DEBUG is not set
978# CONFIG_HIDRAW is not set
979
980#
981# USB Input Devices
982#
983# CONFIG_USB_HID is not set
984
985#
986# USB HID Boot Protocol drivers
987#
988# CONFIG_USB_KBD is not set
989# CONFIG_USB_MOUSE is not set
990CONFIG_USB_SUPPORT=y
991CONFIG_USB_ARCH_HAS_HCD=y
992CONFIG_USB_ARCH_HAS_OHCI=y
993CONFIG_USB_ARCH_HAS_EHCI=y
994CONFIG_USB=y
995# CONFIG_USB_DEBUG is not set
996
997#
998# Miscellaneous USB options
999#
1000CONFIG_USB_DEVICEFS=y
1001CONFIG_USB_DEVICE_CLASS=y
1002# CONFIG_USB_DYNAMIC_MINORS is not set
1003# CONFIG_USB_OTG is not set
1004
1005#
1006# USB Host Controller Drivers
1007#
1008CONFIG_USB_EHCI_HCD=y
1009# CONFIG_USB_EHCI_SPLIT_ISO is not set
1010CONFIG_USB_EHCI_ROOT_HUB_TT=y
1011# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1012CONFIG_USB_EHCI_FSL=y
1013# CONFIG_USB_ISP116X_HCD is not set
1014CONFIG_USB_OHCI_HCD=y
1015CONFIG_USB_OHCI_HCD_PPC_OF=y
1016CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1017# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
1018CONFIG_USB_OHCI_HCD_PCI=y
1019CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1020CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1021CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1022CONFIG_USB_UHCI_HCD=y
1023# CONFIG_USB_SL811_HCD is not set
1024# CONFIG_USB_R8A66597_HCD is not set
1025
1026#
1027# USB Device Class drivers
1028#
1029# CONFIG_USB_ACM is not set
1030# CONFIG_USB_PRINTER is not set
1031
1032#
1033# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1034#
1035
1036#
1037# may also be needed; see USB_STORAGE Help for more information
1038#
1039CONFIG_USB_STORAGE=y
1040# CONFIG_USB_STORAGE_DEBUG is not set
1041# CONFIG_USB_STORAGE_DATAFAB is not set
1042# CONFIG_USB_STORAGE_FREECOM is not set
1043# CONFIG_USB_STORAGE_ISD200 is not set
1044# CONFIG_USB_STORAGE_DPCM is not set
1045# CONFIG_USB_STORAGE_USBAT is not set
1046# CONFIG_USB_STORAGE_SDDR09 is not set
1047# CONFIG_USB_STORAGE_SDDR55 is not set
1048# CONFIG_USB_STORAGE_JUMPSHOT is not set
1049# CONFIG_USB_STORAGE_ALAUDA is not set
1050# CONFIG_USB_STORAGE_KARMA is not set
1051# CONFIG_USB_LIBUSUAL is not set
1052
1053#
1054# USB Imaging devices
1055#
1056# CONFIG_USB_MDC800 is not set
1057# CONFIG_USB_MICROTEK is not set
1058CONFIG_USB_MON=y
1059
1060#
1061# USB port drivers
1062#
1063
1064#
1065# USB Serial Converter support
1066#
1067# CONFIG_USB_SERIAL is not set
1068
1069#
1070# USB Miscellaneous drivers
1071#
1072# CONFIG_USB_EMI62 is not set
1073# CONFIG_USB_EMI26 is not set
1074# CONFIG_USB_ADUTUX is not set
1075# CONFIG_USB_AUERSWALD is not set
1076# CONFIG_USB_RIO500 is not set
1077# CONFIG_USB_LEGOTOWER is not set
1078# CONFIG_USB_LCD is not set
1079# CONFIG_USB_BERRY_CHARGE is not set
1080# CONFIG_USB_LED is not set
1081# CONFIG_USB_CYPRESS_CY7C63 is not set
1082# CONFIG_USB_CYTHERM is not set
1083# CONFIG_USB_PHIDGET is not set
1084# CONFIG_USB_IDMOUSE is not set
1085# CONFIG_USB_FTDI_ELAN is not set
1086# CONFIG_USB_APPLEDISPLAY is not set
1087# CONFIG_USB_SISUSBVGA is not set
1088# CONFIG_USB_LD is not set
1089# CONFIG_USB_TRANCEVIBRATOR is not set
1090# CONFIG_USB_IOWARRIOR is not set
1091# CONFIG_USB_TEST is not set
1092
1093#
1094# USB DSL modem support
1095#
1096
1097#
1098# USB Gadget Support
1099#
1100CONFIG_USB_GADGET=y
1101# CONFIG_USB_GADGET_DEBUG is not set
1102# CONFIG_USB_GADGET_DEBUG_FILES is not set
1103CONFIG_USB_GADGET_SELECTED=y
1104# CONFIG_USB_GADGET_AMD5536UDC is not set
1105# CONFIG_USB_GADGET_ATMEL_USBA is not set
1106# CONFIG_USB_GADGET_FSL_USB2 is not set
1107CONFIG_USB_GADGET_NET2280=y
1108CONFIG_USB_NET2280=y
1109# CONFIG_USB_GADGET_PXA2XX is not set
1110# CONFIG_USB_GADGET_M66592 is not set
1111# CONFIG_USB_GADGET_GOKU is not set
1112# CONFIG_USB_GADGET_LH7A40X is not set
1113# CONFIG_USB_GADGET_OMAP is not set
1114# CONFIG_USB_GADGET_S3C2410 is not set
1115# CONFIG_USB_GADGET_AT91 is not set
1116# CONFIG_USB_GADGET_DUMMY_HCD is not set
1117CONFIG_USB_GADGET_DUALSPEED=y
1118# CONFIG_USB_ZERO is not set
1119CONFIG_USB_ETH=y
1120CONFIG_USB_ETH_RNDIS=y
1121# CONFIG_USB_GADGETFS is not set
1122# CONFIG_USB_FILE_STORAGE is not set
1123# CONFIG_USB_G_SERIAL is not set
1124# CONFIG_USB_MIDI_GADGET is not set
1125# CONFIG_MMC is not set
1126# CONFIG_NEW_LEDS is not set
1127# CONFIG_INFINIBAND is not set
1128# CONFIG_EDAC is not set
1129CONFIG_RTC_LIB=y
1130CONFIG_RTC_CLASS=y
1131CONFIG_RTC_HCTOSYS=y
1132CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1133# CONFIG_RTC_DEBUG is not set
1134
1135#
1136# RTC interfaces
1137#
1138CONFIG_RTC_INTF_SYSFS=y
1139CONFIG_RTC_INTF_PROC=y
1140CONFIG_RTC_INTF_DEV=y
1141CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1142# CONFIG_RTC_DRV_TEST is not set
1143
1144#
1145# I2C RTC drivers
1146#
1147CONFIG_RTC_DRV_DS1307=y
1148# CONFIG_RTC_DRV_DS1374 is not set
1149# CONFIG_RTC_DRV_DS1672 is not set
1150# CONFIG_RTC_DRV_MAX6900 is not set
1151# CONFIG_RTC_DRV_RS5C372 is not set
1152# CONFIG_RTC_DRV_ISL1208 is not set
1153# CONFIG_RTC_DRV_X1205 is not set
1154# CONFIG_RTC_DRV_PCF8563 is not set
1155# CONFIG_RTC_DRV_PCF8583 is not set
1156# CONFIG_RTC_DRV_M41T80 is not set
1157
1158#
1159# SPI RTC drivers
1160#
1161# CONFIG_RTC_DRV_RS5C348 is not set
1162# CONFIG_RTC_DRV_MAX6902 is not set
1163
1164#
1165# Platform RTC drivers
1166#
1167# CONFIG_RTC_DRV_CMOS is not set
1168# CONFIG_RTC_DRV_DS1553 is not set
1169# CONFIG_RTC_DRV_STK17TA8 is not set
1170# CONFIG_RTC_DRV_DS1742 is not set
1171# CONFIG_RTC_DRV_M48T86 is not set
1172# CONFIG_RTC_DRV_M48T59 is not set
1173# CONFIG_RTC_DRV_V3020 is not set
1174
1175#
1176# on-CPU RTC drivers
1177#
1178
1179#
1180# Userspace I/O
1181#
1182# CONFIG_UIO is not set
1183
1184#
1185# File systems
1186#
1187CONFIG_EXT2_FS=y
1188# CONFIG_EXT2_FS_XATTR is not set
1189# CONFIG_EXT2_FS_XIP is not set
1190CONFIG_EXT3_FS=y
1191CONFIG_EXT3_FS_XATTR=y
1192# CONFIG_EXT3_FS_POSIX_ACL is not set
1193# CONFIG_EXT3_FS_SECURITY is not set
1194# CONFIG_EXT4DEV_FS is not set
1195CONFIG_JBD=y
1196CONFIG_FS_MBCACHE=y
1197# CONFIG_REISERFS_FS is not set
1198# CONFIG_JFS_FS is not set
1199# CONFIG_FS_POSIX_ACL is not set
1200# CONFIG_XFS_FS is not set
1201# CONFIG_GFS2_FS is not set
1202# CONFIG_OCFS2_FS is not set
1203# CONFIG_MINIX_FS is not set
1204# CONFIG_ROMFS_FS is not set
1205CONFIG_INOTIFY=y
1206CONFIG_INOTIFY_USER=y
1207# CONFIG_QUOTA is not set
1208CONFIG_DNOTIFY=y
1209# CONFIG_AUTOFS_FS is not set
1210# CONFIG_AUTOFS4_FS is not set
1211# CONFIG_FUSE_FS is not set
1212
1213#
1214# CD-ROM/DVD Filesystems
1215#
1216# CONFIG_ISO9660_FS is not set
1217# CONFIG_UDF_FS is not set
1218
1219#
1220# DOS/FAT/NT Filesystems
1221#
1222# CONFIG_MSDOS_FS is not set
1223# CONFIG_VFAT_FS is not set
1224# CONFIG_NTFS_FS is not set
1225
1226#
1227# Pseudo filesystems
1228#
1229CONFIG_PROC_FS=y
1230CONFIG_PROC_KCORE=y
1231CONFIG_PROC_SYSCTL=y
1232CONFIG_SYSFS=y
1233CONFIG_TMPFS=y
1234# CONFIG_TMPFS_POSIX_ACL is not set
1235# CONFIG_HUGETLB_PAGE is not set
1236# CONFIG_CONFIGFS_FS is not set
1237
1238#
1239# Miscellaneous filesystems
1240#
1241# CONFIG_ADFS_FS is not set
1242# CONFIG_AFFS_FS is not set
1243# CONFIG_HFS_FS is not set
1244# CONFIG_HFSPLUS_FS is not set
1245# CONFIG_BEFS_FS is not set
1246# CONFIG_BFS_FS is not set
1247# CONFIG_EFS_FS is not set
1248CONFIG_JFFS2_FS=y
1249CONFIG_JFFS2_FS_DEBUG=0
1250CONFIG_JFFS2_FS_WRITEBUFFER=y
1251# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
1252# CONFIG_JFFS2_SUMMARY is not set
1253# CONFIG_JFFS2_FS_XATTR is not set
1254# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1255CONFIG_JFFS2_ZLIB=y
1256# CONFIG_JFFS2_LZO is not set
1257CONFIG_JFFS2_RTIME=y
1258# CONFIG_JFFS2_RUBIN is not set
1259# CONFIG_CRAMFS is not set
1260# CONFIG_VXFS_FS is not set
1261# CONFIG_HPFS_FS is not set
1262# CONFIG_QNX4FS_FS is not set
1263# CONFIG_SYSV_FS is not set
1264# CONFIG_UFS_FS is not set
1265CONFIG_NETWORK_FILESYSTEMS=y
1266CONFIG_NFS_FS=y
1267CONFIG_NFS_V3=y
1268# CONFIG_NFS_V3_ACL is not set
1269CONFIG_NFS_V4=y
1270# CONFIG_NFS_DIRECTIO is not set
1271# CONFIG_NFSD is not set
1272CONFIG_ROOT_NFS=y
1273CONFIG_LOCKD=y
1274CONFIG_LOCKD_V4=y
1275CONFIG_NFS_COMMON=y
1276CONFIG_SUNRPC=y
1277CONFIG_SUNRPC_GSS=y
1278# CONFIG_SUNRPC_BIND34 is not set
1279CONFIG_RPCSEC_GSS_KRB5=y
1280# CONFIG_RPCSEC_GSS_SPKM3 is not set
1281# CONFIG_SMB_FS is not set
1282# CONFIG_CIFS is not set
1283# CONFIG_NCP_FS is not set
1284# CONFIG_CODA_FS is not set
1285# CONFIG_AFS_FS is not set
1286
1287#
1288# Partition Types
1289#
1290CONFIG_PARTITION_ADVANCED=y
1291# CONFIG_ACORN_PARTITION is not set
1292# CONFIG_OSF_PARTITION is not set
1293# CONFIG_AMIGA_PARTITION is not set
1294# CONFIG_ATARI_PARTITION is not set
1295# CONFIG_MAC_PARTITION is not set
1296CONFIG_MSDOS_PARTITION=y
1297# CONFIG_BSD_DISKLABEL is not set
1298# CONFIG_MINIX_SUBPARTITION is not set
1299# CONFIG_SOLARIS_X86_PARTITION is not set
1300# CONFIG_UNIXWARE_DISKLABEL is not set
1301# CONFIG_LDM_PARTITION is not set
1302# CONFIG_SGI_PARTITION is not set
1303# CONFIG_ULTRIX_PARTITION is not set
1304# CONFIG_SUN_PARTITION is not set
1305# CONFIG_KARMA_PARTITION is not set
1306# CONFIG_EFI_PARTITION is not set
1307# CONFIG_SYSV68_PARTITION is not set
1308# CONFIG_NLS is not set
1309# CONFIG_DLM is not set
1310
1311#
1312# Library routines
1313#
1314CONFIG_BITREVERSE=y
1315# CONFIG_CRC_CCITT is not set
1316# CONFIG_CRC16 is not set
1317# CONFIG_CRC_ITU_T is not set
1318CONFIG_CRC32=y
1319# CONFIG_CRC7 is not set
1320# CONFIG_LIBCRC32C is not set
1321CONFIG_ZLIB_INFLATE=y
1322CONFIG_ZLIB_DEFLATE=y
1323CONFIG_PLIST=y
1324CONFIG_HAS_IOMEM=y
1325CONFIG_HAS_IOPORT=y
1326CONFIG_HAS_DMA=y
1327# CONFIG_INSTRUMENTATION is not set
1328
1329#
1330# Kernel hacking
1331#
1332# CONFIG_PRINTK_TIME is not set
1333CONFIG_ENABLE_WARN_DEPRECATED=y
1334CONFIG_ENABLE_MUST_CHECK=y
1335# CONFIG_MAGIC_SYSRQ is not set
1336# CONFIG_UNUSED_SYMBOLS is not set
1337# CONFIG_DEBUG_FS is not set
1338# CONFIG_HEADERS_CHECK is not set
1339CONFIG_DEBUG_KERNEL=y
1340# CONFIG_DEBUG_SHIRQ is not set
1341CONFIG_DETECT_SOFTLOCKUP=y
1342CONFIG_SCHED_DEBUG=y
1343# CONFIG_SCHEDSTATS is not set
1344# CONFIG_TIMER_STATS is not set
1345# CONFIG_SLUB_DEBUG_ON is not set
1346# CONFIG_DEBUG_RT_MUTEXES is not set
1347# CONFIG_RT_MUTEX_TESTER is not set
1348# CONFIG_DEBUG_SPINLOCK is not set
1349# CONFIG_DEBUG_MUTEXES is not set
1350# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1351# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1352# CONFIG_DEBUG_KOBJECT is not set
1353# CONFIG_DEBUG_BUGVERBOSE is not set
1354# CONFIG_DEBUG_INFO is not set
1355# CONFIG_DEBUG_VM is not set
1356# CONFIG_DEBUG_LIST is not set
1357# CONFIG_DEBUG_SG is not set
1358CONFIG_FORCED_INLINING=y
1359# CONFIG_BOOT_PRINTK_DELAY is not set
1360# CONFIG_RCU_TORTURE_TEST is not set
1361# CONFIG_FAULT_INJECTION is not set
1362# CONFIG_SAMPLES is not set
1363# CONFIG_DEBUG_STACKOVERFLOW is not set
1364# CONFIG_DEBUG_STACK_USAGE is not set
1365# CONFIG_DEBUG_PAGEALLOC is not set
1366# CONFIG_DEBUGGER is not set
1367# CONFIG_BDI_SWITCH is not set
1368# CONFIG_PPC_EARLY_DEBUG is not set
1369
1370#
1371# Security options
1372#
1373# CONFIG_KEYS is not set
1374# CONFIG_SECURITY is not set
1375# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1376CONFIG_CRYPTO=y
1377CONFIG_CRYPTO_ALGAPI=y
1378CONFIG_CRYPTO_BLKCIPHER=y
1379CONFIG_CRYPTO_MANAGER=y
1380# CONFIG_CRYPTO_HMAC is not set
1381# CONFIG_CRYPTO_XCBC is not set
1382# CONFIG_CRYPTO_NULL is not set
1383# CONFIG_CRYPTO_MD4 is not set
1384CONFIG_CRYPTO_MD5=y
1385# CONFIG_CRYPTO_SHA1 is not set
1386# CONFIG_CRYPTO_SHA256 is not set
1387# CONFIG_CRYPTO_SHA512 is not set
1388# CONFIG_CRYPTO_WP512 is not set
1389# CONFIG_CRYPTO_TGR192 is not set
1390# CONFIG_CRYPTO_GF128MUL is not set
1391# CONFIG_CRYPTO_ECB is not set
1392CONFIG_CRYPTO_CBC=y
1393CONFIG_CRYPTO_PCBC=m
1394# CONFIG_CRYPTO_LRW is not set
1395# CONFIG_CRYPTO_XTS is not set
1396# CONFIG_CRYPTO_CRYPTD is not set
1397CONFIG_CRYPTO_DES=y
1398# CONFIG_CRYPTO_FCRYPT is not set
1399# CONFIG_CRYPTO_BLOWFISH is not set
1400# CONFIG_CRYPTO_TWOFISH is not set
1401# CONFIG_CRYPTO_SERPENT is not set
1402# CONFIG_CRYPTO_AES is not set
1403# CONFIG_CRYPTO_CAST5 is not set
1404# CONFIG_CRYPTO_CAST6 is not set
1405# CONFIG_CRYPTO_TEA is not set
1406# CONFIG_CRYPTO_ARC4 is not set
1407# CONFIG_CRYPTO_KHAZAD is not set
1408# CONFIG_CRYPTO_ANUBIS is not set
1409# CONFIG_CRYPTO_SEED is not set
1410# CONFIG_CRYPTO_DEFLATE is not set
1411# CONFIG_CRYPTO_MICHAEL_MIC is not set
1412# CONFIG_CRYPTO_CRC32C is not set
1413# CONFIG_CRYPTO_CAMELLIA is not set
1414# CONFIG_CRYPTO_TEST is not set
1415# CONFIG_CRYPTO_AUTHENC is not set
1416CONFIG_CRYPTO_HW=y
1417# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc837x_rdb_defconfig b/arch/powerpc/configs/mpc837x_rdb_defconfig
new file mode 100644
index 000000000000..91d291e3ee3a
--- /dev/null
+++ b/arch/powerpc/configs/mpc837x_rdb_defconfig
@@ -0,0 +1,887 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc8
4# Thu Jan 24 20:04:39 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y
19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set
23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y
26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y
32CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y
35CONFIG_GENERIC_HWEIGHT=y
36CONFIG_GENERIC_CALIBRATE_DELAY=y
37CONFIG_GENERIC_FIND_NEXT_BIT=y
38# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
39CONFIG_PPC=y
40CONFIG_EARLY_PRINTK=y
41CONFIG_GENERIC_NVRAM=y
42CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
43CONFIG_ARCH_MAY_HAVE_PC_FDC=y
44CONFIG_PPC_OF=y
45CONFIG_OF=y
46CONFIG_PPC_UDBG_16550=y
47# CONFIG_GENERIC_TBSYNC is not set
48CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y
50CONFIG_DEFAULT_UIMAGE=y
51# CONFIG_PPC_DCR_NATIVE is not set
52# CONFIG_PPC_DCR_MMIO is not set
53CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
54
55#
56# General setup
57#
58CONFIG_EXPERIMENTAL=y
59CONFIG_BROKEN_ON_SMP=y
60CONFIG_INIT_ENV_ARG_LIMIT=32
61CONFIG_LOCALVERSION=""
62CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y
64CONFIG_SYSVIPC=y
65CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y
77# CONFIG_FAIR_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y
79# CONFIG_RELAY is not set
80CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
83CONFIG_SYSCTL=y
84CONFIG_EMBEDDED=y
85CONFIG_SYSCTL_SYSCALL=y
86CONFIG_KALLSYMS=y
87# CONFIG_KALLSYMS_EXTRA_PASS is not set
88CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y
90CONFIG_BUG=y
91CONFIG_ELF_CORE=y
92CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y
95# CONFIG_EPOLL is not set
96CONFIG_SIGNALFD=y
97CONFIG_EVENTFD=y
98CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y
100CONFIG_SLAB=y
101# CONFIG_SLUB is not set
102# CONFIG_SLOB is not set
103CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set
106CONFIG_BASE_SMALL=0
107CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set
113CONFIG_BLOCK=y
114# CONFIG_LBD is not set
115# CONFIG_BLK_DEV_IO_TRACE is not set
116# CONFIG_LSF is not set
117# CONFIG_BLK_DEV_BSG is not set
118
119#
120# IO Schedulers
121#
122CONFIG_IOSCHED_NOOP=y
123CONFIG_IOSCHED_AS=y
124CONFIG_IOSCHED_DEADLINE=y
125CONFIG_IOSCHED_CFQ=y
126CONFIG_DEFAULT_AS=y
127# CONFIG_DEFAULT_DEADLINE is not set
128# CONFIG_DEFAULT_CFQ is not set
129# CONFIG_DEFAULT_NOOP is not set
130CONFIG_DEFAULT_IOSCHED="anticipatory"
131
132#
133# Platform support
134#
135# CONFIG_PPC_MULTIPLATFORM is not set
136# CONFIG_PPC_82xx is not set
137CONFIG_PPC_83xx=y
138# CONFIG_PPC_86xx is not set
139# CONFIG_PPC_MPC52xx is not set
140# CONFIG_PPC_MPC5200 is not set
141# CONFIG_PPC_CELL is not set
142# CONFIG_PPC_CELL_NATIVE is not set
143# CONFIG_PQ2ADS is not set
144# CONFIG_MPC831x_RDB is not set
145# CONFIG_MPC832x_MDS is not set
146# CONFIG_MPC832x_RDB is not set
147# CONFIG_MPC834x_MDS is not set
148# CONFIG_MPC834x_ITX is not set
149# CONFIG_MPC836x_MDS is not set
150# CONFIG_MPC837x_MDS is not set
151CONFIG_MPC837x_RDB=y
152CONFIG_PPC_MPC837x=y
153CONFIG_IPIC=y
154# CONFIG_MPIC is not set
155# CONFIG_MPIC_WEIRD is not set
156# CONFIG_PPC_I8259 is not set
157# CONFIG_PPC_RTAS is not set
158# CONFIG_MMIO_NVRAM is not set
159# CONFIG_PPC_MPC106 is not set
160# CONFIG_PPC_970_NAP is not set
161# CONFIG_PPC_INDIRECT_IO is not set
162# CONFIG_GENERIC_IOMAP is not set
163# CONFIG_CPU_FREQ is not set
164# CONFIG_CPM2 is not set
165# CONFIG_FSL_ULI1575 is not set
166
167#
168# Kernel options
169#
170# CONFIG_HIGHMEM is not set
171# CONFIG_TICK_ONESHOT is not set
172# CONFIG_NO_HZ is not set
173# CONFIG_HIGH_RES_TIMERS is not set
174CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
175# CONFIG_HZ_100 is not set
176CONFIG_HZ_250=y
177# CONFIG_HZ_300 is not set
178# CONFIG_HZ_1000 is not set
179CONFIG_HZ=250
180CONFIG_PREEMPT_NONE=y
181# CONFIG_PREEMPT_VOLUNTARY is not set
182# CONFIG_PREEMPT is not set
183CONFIG_BINFMT_ELF=y
184# CONFIG_BINFMT_MISC is not set
185CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
186CONFIG_ARCH_FLATMEM_ENABLE=y
187CONFIG_ARCH_POPULATES_NODE_MAP=y
188CONFIG_SELECT_MEMORY_MODEL=y
189CONFIG_FLATMEM_MANUAL=y
190# CONFIG_DISCONTIGMEM_MANUAL is not set
191# CONFIG_SPARSEMEM_MANUAL is not set
192CONFIG_FLATMEM=y
193CONFIG_FLAT_NODE_MEM_MAP=y
194# CONFIG_SPARSEMEM_STATIC is not set
195# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
196CONFIG_SPLIT_PTLOCK_CPUS=4
197# CONFIG_RESOURCES_64BIT is not set
198CONFIG_ZONE_DMA_FLAG=1
199CONFIG_BOUNCE=y
200CONFIG_VIRT_TO_BUS=y
201CONFIG_PROC_DEVICETREE=y
202# CONFIG_CMDLINE_BOOL is not set
203# CONFIG_PM is not set
204CONFIG_SUSPEND_UP_POSSIBLE=y
205CONFIG_HIBERNATION_UP_POSSIBLE=y
206CONFIG_SECCOMP=y
207CONFIG_WANT_DEVICE_TREE=y
208CONFIG_DEVICE_TREE=""
209CONFIG_ISA_DMA_API=y
210
211#
212# Bus options
213#
214CONFIG_ZONE_DMA=y
215CONFIG_GENERIC_ISA_DMA=y
216CONFIG_PPC_INDIRECT_PCI=y
217CONFIG_FSL_SOC=y
218# CONFIG_PCI is not set
219# CONFIG_PCI_DOMAINS is not set
220# CONFIG_PCI_SYSCALL is not set
221# CONFIG_ARCH_SUPPORTS_MSI is not set
222# CONFIG_PCCARD is not set
223
224#
225# Advanced setup
226#
227# CONFIG_ADVANCED_OPTIONS is not set
228
229#
230# Default settings for advanced configuration options are used
231#
232CONFIG_HIGHMEM_START=0xfe000000
233CONFIG_LOWMEM_SIZE=0x30000000
234CONFIG_KERNEL_START=0xc0000000
235CONFIG_TASK_SIZE=0xc0000000
236CONFIG_BOOT_LOAD=0x00800000
237
238#
239# Networking
240#
241CONFIG_NET=y
242
243#
244# Networking options
245#
246CONFIG_PACKET=y
247# CONFIG_PACKET_MMAP is not set
248CONFIG_UNIX=y
249# CONFIG_NET_KEY is not set
250CONFIG_INET=y
251CONFIG_IP_MULTICAST=y
252# CONFIG_IP_ADVANCED_ROUTER is not set
253CONFIG_IP_FIB_HASH=y
254CONFIG_IP_PNP=y
255CONFIG_IP_PNP_DHCP=y
256CONFIG_IP_PNP_BOOTP=y
257# CONFIG_IP_PNP_RARP is not set
258# CONFIG_NET_IPIP is not set
259# CONFIG_NET_IPGRE is not set
260# CONFIG_IP_MROUTE is not set
261# CONFIG_ARPD is not set
262CONFIG_SYN_COOKIES=y
263# CONFIG_INET_AH is not set
264# CONFIG_INET_ESP is not set
265# CONFIG_INET_IPCOMP is not set
266# CONFIG_INET_XFRM_TUNNEL is not set
267# CONFIG_INET_TUNNEL is not set
268# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
269# CONFIG_INET_XFRM_MODE_TUNNEL is not set
270# CONFIG_INET_XFRM_MODE_BEET is not set
271# CONFIG_INET_LRO is not set
272CONFIG_INET_DIAG=y
273CONFIG_INET_TCP_DIAG=y
274# CONFIG_TCP_CONG_ADVANCED is not set
275CONFIG_TCP_CONG_CUBIC=y
276CONFIG_DEFAULT_TCP_CONG="cubic"
277# CONFIG_TCP_MD5SIG is not set
278# CONFIG_IPV6 is not set
279# CONFIG_INET6_XFRM_TUNNEL is not set
280# CONFIG_INET6_TUNNEL is not set
281# CONFIG_NETWORK_SECMARK is not set
282# CONFIG_NETFILTER is not set
283# CONFIG_IP_DCCP is not set
284# CONFIG_IP_SCTP is not set
285# CONFIG_TIPC is not set
286# CONFIG_ATM is not set
287# CONFIG_BRIDGE is not set
288# CONFIG_VLAN_8021Q is not set
289# CONFIG_DECNET is not set
290# CONFIG_LLC2 is not set
291# CONFIG_IPX is not set
292# CONFIG_ATALK is not set
293# CONFIG_X25 is not set
294# CONFIG_LAPB is not set
295# CONFIG_ECONET is not set
296# CONFIG_WAN_ROUTER is not set
297# CONFIG_NET_SCHED is not set
298
299#
300# Network testing
301#
302# CONFIG_NET_PKTGEN is not set
303# CONFIG_HAMRADIO is not set
304# CONFIG_IRDA is not set
305# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set
307
308#
309# Wireless
310#
311# CONFIG_CFG80211 is not set
312# CONFIG_WIRELESS_EXT is not set
313# CONFIG_MAC80211 is not set
314# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set
316# CONFIG_NET_9P is not set
317
318#
319# Device Drivers
320#
321
322#
323# Generic Driver Options
324#
325CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
326CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set
329# CONFIG_SYS_HYPERVISOR is not set
330# CONFIG_CONNECTOR is not set
331# CONFIG_MTD is not set
332CONFIG_OF_DEVICE=y
333# CONFIG_PARPORT is not set
334CONFIG_BLK_DEV=y
335# CONFIG_BLK_DEV_FD is not set
336# CONFIG_BLK_DEV_COW_COMMON is not set
337CONFIG_BLK_DEV_LOOP=y
338# CONFIG_BLK_DEV_CRYPTOLOOP is not set
339# CONFIG_BLK_DEV_NBD is not set
340CONFIG_BLK_DEV_RAM=y
341CONFIG_BLK_DEV_RAM_COUNT=16
342CONFIG_BLK_DEV_RAM_SIZE=32768
343CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
344# CONFIG_CDROM_PKTCDVD is not set
345# CONFIG_ATA_OVER_ETH is not set
346CONFIG_MISC_DEVICES=y
347# CONFIG_EEPROM_93CX6 is not set
348# CONFIG_IDE is not set
349
350#
351# SCSI device support
352#
353# CONFIG_RAID_ATTRS is not set
354CONFIG_SCSI=y
355CONFIG_SCSI_DMA=y
356# CONFIG_SCSI_TGT is not set
357# CONFIG_SCSI_NETLINK is not set
358CONFIG_SCSI_PROC_FS=y
359
360#
361# SCSI support type (disk, tape, CD-ROM)
362#
363CONFIG_BLK_DEV_SD=y
364# CONFIG_CHR_DEV_ST is not set
365# CONFIG_CHR_DEV_OSST is not set
366# CONFIG_BLK_DEV_SR is not set
367CONFIG_CHR_DEV_SG=y
368# CONFIG_CHR_DEV_SCH is not set
369
370#
371# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
372#
373# CONFIG_SCSI_MULTI_LUN is not set
374# CONFIG_SCSI_CONSTANTS is not set
375# CONFIG_SCSI_LOGGING is not set
376# CONFIG_SCSI_SCAN_ASYNC is not set
377CONFIG_SCSI_WAIT_SCAN=m
378
379#
380# SCSI Transports
381#
382# CONFIG_SCSI_SPI_ATTRS is not set
383# CONFIG_SCSI_FC_ATTRS is not set
384# CONFIG_SCSI_ISCSI_ATTRS is not set
385# CONFIG_SCSI_SAS_LIBSAS is not set
386# CONFIG_SCSI_SRP_ATTRS is not set
387CONFIG_SCSI_LOWLEVEL=y
388# CONFIG_ISCSI_TCP is not set
389# CONFIG_SCSI_DEBUG is not set
390CONFIG_ATA=y
391# CONFIG_ATA_NONSTANDARD is not set
392CONFIG_SATA_FSL=y
393# CONFIG_PATA_PLATFORM is not set
394CONFIG_MD=y
395CONFIG_BLK_DEV_MD=y
396# CONFIG_MD_LINEAR is not set
397# CONFIG_MD_RAID0 is not set
398CONFIG_MD_RAID1=y
399# CONFIG_MD_RAID10 is not set
400CONFIG_MD_RAID456=y
401CONFIG_MD_RAID5_RESHAPE=y
402# CONFIG_MD_MULTIPATH is not set
403# CONFIG_MD_FAULTY is not set
404# CONFIG_BLK_DEV_DM is not set
405# CONFIG_MACINTOSH_DRIVERS is not set
406CONFIG_NETDEVICES=y
407# CONFIG_NETDEVICES_MULTIQUEUE is not set
408# CONFIG_DUMMY is not set
409# CONFIG_BONDING is not set
410# CONFIG_MACVLAN is not set
411# CONFIG_EQUALIZER is not set
412# CONFIG_TUN is not set
413# CONFIG_VETH is not set
414CONFIG_PHYLIB=y
415
416#
417# MII PHY device drivers
418#
419CONFIG_MARVELL_PHY=y
420# CONFIG_DAVICOM_PHY is not set
421# CONFIG_QSEMI_PHY is not set
422# CONFIG_LXT_PHY is not set
423# CONFIG_CICADA_PHY is not set
424# CONFIG_VITESSE_PHY is not set
425# CONFIG_SMSC_PHY is not set
426# CONFIG_BROADCOM_PHY is not set
427# CONFIG_ICPLUS_PHY is not set
428# CONFIG_FIXED_PHY is not set
429# CONFIG_MDIO_BITBANG is not set
430CONFIG_NET_ETHERNET=y
431CONFIG_MII=y
432# CONFIG_IBM_NEW_EMAC_ZMII is not set
433# CONFIG_IBM_NEW_EMAC_RGMII is not set
434# CONFIG_IBM_NEW_EMAC_TAH is not set
435# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
436# CONFIG_B44 is not set
437CONFIG_NETDEV_1000=y
438CONFIG_GIANFAR=y
439CONFIG_GFAR_NAPI=y
440# CONFIG_NETDEV_10000 is not set
441
442#
443# Wireless LAN
444#
445# CONFIG_WLAN_PRE80211 is not set
446# CONFIG_WLAN_80211 is not set
447# CONFIG_WAN is not set
448# CONFIG_PPP is not set
449# CONFIG_SLIP is not set
450# CONFIG_SHAPER is not set
451# CONFIG_NETCONSOLE is not set
452# CONFIG_NETPOLL is not set
453# CONFIG_NET_POLL_CONTROLLER is not set
454# CONFIG_ISDN is not set
455# CONFIG_PHONE is not set
456
457#
458# Input device support
459#
460CONFIG_INPUT=y
461# CONFIG_INPUT_FF_MEMLESS is not set
462# CONFIG_INPUT_POLLDEV is not set
463
464#
465# Userland interfaces
466#
467# CONFIG_INPUT_MOUSEDEV is not set
468# CONFIG_INPUT_JOYDEV is not set
469# CONFIG_INPUT_EVDEV is not set
470# CONFIG_INPUT_EVBUG is not set
471
472#
473# Input Device Drivers
474#
475# CONFIG_INPUT_KEYBOARD is not set
476# CONFIG_INPUT_MOUSE is not set
477# CONFIG_INPUT_JOYSTICK is not set
478# CONFIG_INPUT_TABLET is not set
479# CONFIG_INPUT_TOUCHSCREEN is not set
480# CONFIG_INPUT_MISC is not set
481
482#
483# Hardware I/O ports
484#
485# CONFIG_SERIO is not set
486# CONFIG_GAMEPORT is not set
487
488#
489# Character devices
490#
491# CONFIG_VT is not set
492# CONFIG_SERIAL_NONSTANDARD is not set
493
494#
495# Serial drivers
496#
497CONFIG_SERIAL_8250=y
498CONFIG_SERIAL_8250_CONSOLE=y
499CONFIG_SERIAL_8250_NR_UARTS=4
500CONFIG_SERIAL_8250_RUNTIME_UARTS=4
501# CONFIG_SERIAL_8250_EXTENDED is not set
502
503#
504# Non-8250 serial port support
505#
506# CONFIG_SERIAL_UARTLITE is not set
507CONFIG_SERIAL_CORE=y
508CONFIG_SERIAL_CORE_CONSOLE=y
509# CONFIG_SERIAL_OF_PLATFORM is not set
510CONFIG_UNIX98_PTYS=y
511CONFIG_LEGACY_PTYS=y
512CONFIG_LEGACY_PTY_COUNT=256
513# CONFIG_IPMI_HANDLER is not set
514# CONFIG_HW_RANDOM is not set
515# CONFIG_NVRAM is not set
516CONFIG_GEN_RTC=y
517# CONFIG_GEN_RTC_X is not set
518# CONFIG_R3964 is not set
519# CONFIG_RAW_DRIVER is not set
520# CONFIG_TCG_TPM is not set
521CONFIG_I2C=y
522CONFIG_I2C_BOARDINFO=y
523CONFIG_I2C_CHARDEV=y
524
525#
526# I2C Algorithms
527#
528# CONFIG_I2C_ALGOBIT is not set
529# CONFIG_I2C_ALGOPCF is not set
530# CONFIG_I2C_ALGOPCA is not set
531
532#
533# I2C Hardware Bus support
534#
535CONFIG_I2C_MPC=y
536# CONFIG_I2C_OCORES is not set
537# CONFIG_I2C_PARPORT_LIGHT is not set
538# CONFIG_I2C_SIMTEC is not set
539# CONFIG_I2C_TAOS_EVM is not set
540# CONFIG_I2C_STUB is not set
541
542#
543# Miscellaneous I2C Chip support
544#
545# CONFIG_SENSORS_DS1337 is not set
546# CONFIG_SENSORS_DS1374 is not set
547# CONFIG_DS1682 is not set
548# CONFIG_SENSORS_EEPROM is not set
549# CONFIG_SENSORS_PCF8574 is not set
550# CONFIG_SENSORS_PCA9539 is not set
551# CONFIG_SENSORS_PCF8591 is not set
552# CONFIG_SENSORS_M41T00 is not set
553# CONFIG_SENSORS_MAX6875 is not set
554# CONFIG_SENSORS_TSL2550 is not set
555# CONFIG_I2C_DEBUG_CORE is not set
556# CONFIG_I2C_DEBUG_ALGO is not set
557# CONFIG_I2C_DEBUG_BUS is not set
558# CONFIG_I2C_DEBUG_CHIP is not set
559
560#
561# SPI support
562#
563# CONFIG_SPI is not set
564# CONFIG_SPI_MASTER is not set
565# CONFIG_W1 is not set
566# CONFIG_POWER_SUPPLY is not set
567CONFIG_HWMON=y
568# CONFIG_HWMON_VID is not set
569# CONFIG_SENSORS_AD7418 is not set
570# CONFIG_SENSORS_ADM1021 is not set
571# CONFIG_SENSORS_ADM1025 is not set
572# CONFIG_SENSORS_ADM1026 is not set
573# CONFIG_SENSORS_ADM1029 is not set
574# CONFIG_SENSORS_ADM1031 is not set
575# CONFIG_SENSORS_ADM9240 is not set
576# CONFIG_SENSORS_ADT7470 is not set
577# CONFIG_SENSORS_ATXP1 is not set
578# CONFIG_SENSORS_DS1621 is not set
579# CONFIG_SENSORS_F71805F is not set
580# CONFIG_SENSORS_F71882FG is not set
581# CONFIG_SENSORS_F75375S is not set
582# CONFIG_SENSORS_GL518SM is not set
583# CONFIG_SENSORS_GL520SM is not set
584# CONFIG_SENSORS_IT87 is not set
585# CONFIG_SENSORS_LM63 is not set
586# CONFIG_SENSORS_LM75 is not set
587# CONFIG_SENSORS_LM77 is not set
588# CONFIG_SENSORS_LM78 is not set
589# CONFIG_SENSORS_LM80 is not set
590# CONFIG_SENSORS_LM83 is not set
591# CONFIG_SENSORS_LM85 is not set
592# CONFIG_SENSORS_LM87 is not set
593# CONFIG_SENSORS_LM90 is not set
594# CONFIG_SENSORS_LM92 is not set
595# CONFIG_SENSORS_LM93 is not set
596# CONFIG_SENSORS_MAX1619 is not set
597# CONFIG_SENSORS_MAX6650 is not set
598# CONFIG_SENSORS_PC87360 is not set
599# CONFIG_SENSORS_PC87427 is not set
600# CONFIG_SENSORS_DME1737 is not set
601# CONFIG_SENSORS_SMSC47M1 is not set
602# CONFIG_SENSORS_SMSC47M192 is not set
603# CONFIG_SENSORS_SMSC47B397 is not set
604# CONFIG_SENSORS_THMC50 is not set
605# CONFIG_SENSORS_VT1211 is not set
606# CONFIG_SENSORS_W83781D is not set
607# CONFIG_SENSORS_W83791D is not set
608# CONFIG_SENSORS_W83792D is not set
609# CONFIG_SENSORS_W83793 is not set
610# CONFIG_SENSORS_W83L785TS is not set
611# CONFIG_SENSORS_W83627HF is not set
612# CONFIG_SENSORS_W83627EHF is not set
613# CONFIG_HWMON_DEBUG_CHIP is not set
614CONFIG_WATCHDOG=y
615# CONFIG_WATCHDOG_NOWAYOUT is not set
616
617#
618# Watchdog Device Drivers
619#
620# CONFIG_SOFT_WATCHDOG is not set
621CONFIG_83xx_WDT=y
622
623#
624# Sonics Silicon Backplane
625#
626CONFIG_SSB_POSSIBLE=y
627# CONFIG_SSB is not set
628
629#
630# Multifunction device drivers
631#
632# CONFIG_MFD_SM501 is not set
633
634#
635# Multimedia devices
636#
637# CONFIG_VIDEO_DEV is not set
638# CONFIG_DVB_CORE is not set
639CONFIG_DAB=y
640
641#
642# Graphics support
643#
644# CONFIG_VGASTATE is not set
645CONFIG_VIDEO_OUTPUT_CONTROL=m
646# CONFIG_FB is not set
647# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
648
649#
650# Display device support
651#
652# CONFIG_DISPLAY_SUPPORT is not set
653
654#
655# Sound
656#
657# CONFIG_SOUND is not set
658CONFIG_HID_SUPPORT=y
659CONFIG_HID=y
660# CONFIG_HID_DEBUG is not set
661# CONFIG_HIDRAW is not set
662CONFIG_USB_SUPPORT=y
663CONFIG_USB_ARCH_HAS_HCD=y
664# CONFIG_USB_ARCH_HAS_OHCI is not set
665CONFIG_USB_ARCH_HAS_EHCI=y
666# CONFIG_USB is not set
667
668#
669# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
670#
671
672#
673# USB Gadget Support
674#
675# CONFIG_USB_GADGET is not set
676# CONFIG_MMC is not set
677# CONFIG_NEW_LEDS is not set
678# CONFIG_EDAC is not set
679# CONFIG_RTC_CLASS is not set
680
681#
682# Userspace I/O
683#
684# CONFIG_UIO is not set
685
686#
687# File systems
688#
689CONFIG_EXT2_FS=y
690# CONFIG_EXT2_FS_XATTR is not set
691# CONFIG_EXT2_FS_XIP is not set
692CONFIG_EXT3_FS=y
693CONFIG_EXT3_FS_XATTR=y
694# CONFIG_EXT3_FS_POSIX_ACL is not set
695# CONFIG_EXT3_FS_SECURITY is not set
696# CONFIG_EXT4DEV_FS is not set
697CONFIG_JBD=y
698CONFIG_FS_MBCACHE=y
699# CONFIG_REISERFS_FS is not set
700# CONFIG_JFS_FS is not set
701# CONFIG_FS_POSIX_ACL is not set
702# CONFIG_XFS_FS is not set
703# CONFIG_GFS2_FS is not set
704# CONFIG_OCFS2_FS is not set
705# CONFIG_MINIX_FS is not set
706# CONFIG_ROMFS_FS is not set
707CONFIG_INOTIFY=y
708CONFIG_INOTIFY_USER=y
709# CONFIG_QUOTA is not set
710CONFIG_DNOTIFY=y
711# CONFIG_AUTOFS_FS is not set
712# CONFIG_AUTOFS4_FS is not set
713# CONFIG_FUSE_FS is not set
714
715#
716# CD-ROM/DVD Filesystems
717#
718# CONFIG_ISO9660_FS is not set
719# CONFIG_UDF_FS is not set
720
721#
722# DOS/FAT/NT Filesystems
723#
724# CONFIG_MSDOS_FS is not set
725# CONFIG_VFAT_FS is not set
726# CONFIG_NTFS_FS is not set
727
728#
729# Pseudo filesystems
730#
731CONFIG_PROC_FS=y
732CONFIG_PROC_KCORE=y
733CONFIG_PROC_SYSCTL=y
734CONFIG_SYSFS=y
735CONFIG_TMPFS=y
736# CONFIG_TMPFS_POSIX_ACL is not set
737# CONFIG_HUGETLB_PAGE is not set
738# CONFIG_CONFIGFS_FS is not set
739
740#
741# Miscellaneous filesystems
742#
743# CONFIG_ADFS_FS is not set
744# CONFIG_AFFS_FS is not set
745# CONFIG_HFS_FS is not set
746# CONFIG_HFSPLUS_FS is not set
747# CONFIG_BEFS_FS is not set
748# CONFIG_BFS_FS is not set
749# CONFIG_EFS_FS is not set
750# CONFIG_CRAMFS is not set
751# CONFIG_VXFS_FS is not set
752# CONFIG_HPFS_FS is not set
753# CONFIG_QNX4FS_FS is not set
754# CONFIG_SYSV_FS is not set
755# CONFIG_UFS_FS is not set
756CONFIG_NETWORK_FILESYSTEMS=y
757CONFIG_NFS_FS=y
758CONFIG_NFS_V3=y
759# CONFIG_NFS_V3_ACL is not set
760CONFIG_NFS_V4=y
761# CONFIG_NFS_DIRECTIO is not set
762# CONFIG_NFSD is not set
763CONFIG_ROOT_NFS=y
764CONFIG_LOCKD=y
765CONFIG_LOCKD_V4=y
766CONFIG_NFS_COMMON=y
767CONFIG_SUNRPC=y
768CONFIG_SUNRPC_GSS=y
769# CONFIG_SUNRPC_BIND34 is not set
770CONFIG_RPCSEC_GSS_KRB5=y
771# CONFIG_RPCSEC_GSS_SPKM3 is not set
772# CONFIG_SMB_FS is not set
773# CONFIG_CIFS is not set
774# CONFIG_NCP_FS is not set
775# CONFIG_CODA_FS is not set
776# CONFIG_AFS_FS is not set
777
778#
779# Partition Types
780#
781CONFIG_PARTITION_ADVANCED=y
782# CONFIG_ACORN_PARTITION is not set
783# CONFIG_OSF_PARTITION is not set
784# CONFIG_AMIGA_PARTITION is not set
785# CONFIG_ATARI_PARTITION is not set
786# CONFIG_MAC_PARTITION is not set
787CONFIG_MSDOS_PARTITION=y
788# CONFIG_BSD_DISKLABEL is not set
789# CONFIG_MINIX_SUBPARTITION is not set
790# CONFIG_SOLARIS_X86_PARTITION is not set
791# CONFIG_UNIXWARE_DISKLABEL is not set
792# CONFIG_LDM_PARTITION is not set
793# CONFIG_SGI_PARTITION is not set
794# CONFIG_ULTRIX_PARTITION is not set
795# CONFIG_SUN_PARTITION is not set
796# CONFIG_KARMA_PARTITION is not set
797# CONFIG_EFI_PARTITION is not set
798# CONFIG_SYSV68_PARTITION is not set
799# CONFIG_NLS is not set
800# CONFIG_DLM is not set
801
802#
803# Library routines
804#
805CONFIG_BITREVERSE=y
806# CONFIG_CRC_CCITT is not set
807# CONFIG_CRC16 is not set
808# CONFIG_CRC_ITU_T is not set
809CONFIG_CRC32=y
810# CONFIG_CRC7 is not set
811# CONFIG_LIBCRC32C is not set
812CONFIG_PLIST=y
813CONFIG_HAS_IOMEM=y
814CONFIG_HAS_IOPORT=y
815CONFIG_HAS_DMA=y
816CONFIG_INSTRUMENTATION=y
817# CONFIG_PROFILING is not set
818# CONFIG_KPROBES is not set
819# CONFIG_MARKERS is not set
820
821#
822# Kernel hacking
823#
824# CONFIG_PRINTK_TIME is not set
825CONFIG_ENABLE_WARN_DEPRECATED=y
826# CONFIG_ENABLE_MUST_CHECK is not set
827# CONFIG_MAGIC_SYSRQ is not set
828# CONFIG_UNUSED_SYMBOLS is not set
829# CONFIG_DEBUG_FS is not set
830# CONFIG_HEADERS_CHECK is not set
831# CONFIG_DEBUG_KERNEL is not set
832# CONFIG_DEBUG_BUGVERBOSE is not set
833# CONFIG_SAMPLES is not set
834# CONFIG_PPC_EARLY_DEBUG is not set
835
836#
837# Security options
838#
839# CONFIG_KEYS is not set
840# CONFIG_SECURITY is not set
841# CONFIG_SECURITY_FILE_CAPABILITIES is not set
842CONFIG_XOR_BLOCKS=y
843CONFIG_ASYNC_CORE=y
844CONFIG_ASYNC_MEMCPY=y
845CONFIG_ASYNC_XOR=y
846CONFIG_CRYPTO=y
847CONFIG_CRYPTO_ALGAPI=y
848CONFIG_CRYPTO_BLKCIPHER=y
849CONFIG_CRYPTO_MANAGER=y
850# CONFIG_CRYPTO_HMAC is not set
851# CONFIG_CRYPTO_XCBC is not set
852# CONFIG_CRYPTO_NULL is not set
853# CONFIG_CRYPTO_MD4 is not set
854CONFIG_CRYPTO_MD5=y
855# CONFIG_CRYPTO_SHA1 is not set
856# CONFIG_CRYPTO_SHA256 is not set
857# CONFIG_CRYPTO_SHA512 is not set
858# CONFIG_CRYPTO_WP512 is not set
859# CONFIG_CRYPTO_TGR192 is not set
860# CONFIG_CRYPTO_GF128MUL is not set
861CONFIG_CRYPTO_ECB=m
862CONFIG_CRYPTO_CBC=y
863CONFIG_CRYPTO_PCBC=m
864# CONFIG_CRYPTO_LRW is not set
865# CONFIG_CRYPTO_XTS is not set
866# CONFIG_CRYPTO_CRYPTD is not set
867CONFIG_CRYPTO_DES=y
868# CONFIG_CRYPTO_FCRYPT is not set
869# CONFIG_CRYPTO_BLOWFISH is not set
870# CONFIG_CRYPTO_TWOFISH is not set
871# CONFIG_CRYPTO_SERPENT is not set
872# CONFIG_CRYPTO_AES is not set
873# CONFIG_CRYPTO_CAST5 is not set
874# CONFIG_CRYPTO_CAST6 is not set
875# CONFIG_CRYPTO_TEA is not set
876# CONFIG_CRYPTO_ARC4 is not set
877# CONFIG_CRYPTO_KHAZAD is not set
878# CONFIG_CRYPTO_ANUBIS is not set
879# CONFIG_CRYPTO_SEED is not set
880# CONFIG_CRYPTO_DEFLATE is not set
881# CONFIG_CRYPTO_MICHAEL_MIC is not set
882# CONFIG_CRYPTO_CRC32C is not set
883# CONFIG_CRYPTO_CAMELLIA is not set
884# CONFIG_CRYPTO_TEST is not set
885# CONFIG_CRYPTO_AUTHENC is not set
886CONFIG_CRYPTO_HW=y
887# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
new file mode 100644
index 000000000000..31bdbf3f7566
--- /dev/null
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -0,0 +1,887 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc8
4# Mon Jan 28 13:14:19 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y
18CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set
22CONFIG_PPC32=y
23CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y
25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y
34CONFIG_GENERIC_HWEIGHT=y
35CONFIG_GENERIC_CALIBRATE_DELAY=y
36CONFIG_GENERIC_FIND_NEXT_BIT=y
37# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
38CONFIG_PPC=y
39CONFIG_EARLY_PRINTK=y
40CONFIG_GENERIC_NVRAM=y
41CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
42CONFIG_ARCH_MAY_HAVE_PC_FDC=y
43CONFIG_PPC_OF=y
44CONFIG_OF=y
45CONFIG_PPC_UDBG_16550=y
46# CONFIG_GENERIC_TBSYNC is not set
47CONFIG_AUDIT_ARCH=y
48CONFIG_GENERIC_BUG=y
49CONFIG_DEFAULT_UIMAGE=y
50# CONFIG_PPC_DCR_NATIVE is not set
51# CONFIG_PPC_DCR_MMIO is not set
52CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
53
54#
55# General setup
56#
57CONFIG_EXPERIMENTAL=y
58CONFIG_BROKEN_ON_SMP=y
59CONFIG_INIT_ENV_ARG_LIMIT=32
60CONFIG_LOCALVERSION=""
61CONFIG_LOCALVERSION_AUTO=y
62CONFIG_SWAP=y
63CONFIG_SYSVIPC=y
64CONFIG_SYSVIPC_SYSCTL=y
65# CONFIG_POSIX_MQUEUE is not set
66# CONFIG_BSD_PROCESS_ACCT is not set
67# CONFIG_TASKSTATS is not set
68# CONFIG_USER_NS is not set
69# CONFIG_PID_NS is not set
70# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_CGROUPS is not set
74CONFIG_FAIR_GROUP_SCHED=y
75CONFIG_FAIR_USER_SCHED=y
76# CONFIG_FAIR_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y
78# CONFIG_RELAY is not set
79CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
82CONFIG_SYSCTL=y
83CONFIG_EMBEDDED=y
84CONFIG_SYSCTL_SYSCALL=y
85CONFIG_KALLSYMS=y
86# CONFIG_KALLSYMS_EXTRA_PASS is not set
87CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y
89CONFIG_BUG=y
90CONFIG_ELF_CORE=y
91CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y
94# CONFIG_EPOLL is not set
95CONFIG_SIGNALFD=y
96CONFIG_EVENTFD=y
97CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
102CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0
106CONFIG_MODULES=y
107CONFIG_MODULE_UNLOAD=y
108# CONFIG_MODULE_FORCE_UNLOAD is not set
109# CONFIG_MODVERSIONS is not set
110# CONFIG_MODULE_SRCVERSION_ALL is not set
111# CONFIG_KMOD is not set
112CONFIG_BLOCK=y
113# CONFIG_LBD is not set
114# CONFIG_BLK_DEV_IO_TRACE is not set
115# CONFIG_LSF is not set
116# CONFIG_BLK_DEV_BSG is not set
117
118#
119# IO Schedulers
120#
121CONFIG_IOSCHED_NOOP=y
122CONFIG_IOSCHED_AS=y
123CONFIG_IOSCHED_DEADLINE=y
124CONFIG_IOSCHED_CFQ=y
125CONFIG_DEFAULT_AS=y
126# CONFIG_DEFAULT_DEADLINE is not set
127# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory"
130
131#
132# Platform support
133#
134# CONFIG_PPC_MULTIPLATFORM is not set
135# CONFIG_PPC_82xx is not set
136CONFIG_PPC_83xx=y
137# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
143CONFIG_MPC83xx=y
144CONFIG_MPC831x_RDB=y
145CONFIG_MPC832x_MDS=y
146CONFIG_MPC832x_RDB=y
147CONFIG_MPC834x_MDS=y
148CONFIG_MPC834x_ITX=y
149CONFIG_MPC836x_MDS=y
150CONFIG_MPC837x_MDS=y
151CONFIG_MPC837x_RDB=y
152CONFIG_SBC834x=y
153CONFIG_PPC_MPC831x=y
154CONFIG_PPC_MPC832x=y
155CONFIG_PPC_MPC834x=y
156CONFIG_PPC_MPC837x=y
157CONFIG_IPIC=y
158# CONFIG_MPIC is not set
159# CONFIG_MPIC_WEIRD is not set
160# CONFIG_PPC_I8259 is not set
161# CONFIG_PPC_RTAS is not set
162# CONFIG_MMIO_NVRAM is not set
163# CONFIG_PPC_MPC106 is not set
164# CONFIG_PPC_970_NAP is not set
165# CONFIG_PPC_INDIRECT_IO is not set
166# CONFIG_GENERIC_IOMAP is not set
167# CONFIG_CPU_FREQ is not set
168CONFIG_QUICC_ENGINE=y
169# CONFIG_FSL_ULI1575 is not set
170
171#
172# Kernel options
173#
174# CONFIG_HIGHMEM is not set
175# CONFIG_TICK_ONESHOT is not set
176# CONFIG_NO_HZ is not set
177# CONFIG_HIGH_RES_TIMERS is not set
178CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
179# CONFIG_HZ_100 is not set
180CONFIG_HZ_250=y
181# CONFIG_HZ_300 is not set
182# CONFIG_HZ_1000 is not set
183CONFIG_HZ=250
184CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set
187CONFIG_BINFMT_ELF=y
188# CONFIG_BINFMT_MISC is not set
189# CONFIG_MATH_EMULATION is not set
190CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
191CONFIG_ARCH_FLATMEM_ENABLE=y
192CONFIG_ARCH_POPULATES_NODE_MAP=y
193CONFIG_SELECT_MEMORY_MODEL=y
194CONFIG_FLATMEM_MANUAL=y
195# CONFIG_DISCONTIGMEM_MANUAL is not set
196# CONFIG_SPARSEMEM_MANUAL is not set
197CONFIG_FLATMEM=y
198CONFIG_FLAT_NODE_MEM_MAP=y
199# CONFIG_SPARSEMEM_STATIC is not set
200# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
202# CONFIG_RESOURCES_64BIT is not set
203CONFIG_ZONE_DMA_FLAG=1
204CONFIG_BOUNCE=y
205CONFIG_VIRT_TO_BUS=y
206CONFIG_PROC_DEVICETREE=y
207# CONFIG_CMDLINE_BOOL is not set
208# CONFIG_PM is not set
209CONFIG_SUSPEND_UP_POSSIBLE=y
210CONFIG_HIBERNATION_UP_POSSIBLE=y
211CONFIG_SECCOMP=y
212CONFIG_WANT_DEVICE_TREE=y
213CONFIG_DEVICE_TREE=""
214CONFIG_ISA_DMA_API=y
215
216#
217# Bus options
218#
219CONFIG_ZONE_DMA=y
220CONFIG_GENERIC_ISA_DMA=y
221CONFIG_PPC_INDIRECT_PCI=y
222CONFIG_FSL_SOC=y
223# CONFIG_PCI is not set
224# CONFIG_PCI_DOMAINS is not set
225# CONFIG_PCI_SYSCALL is not set
226# CONFIG_ARCH_SUPPORTS_MSI is not set
227# CONFIG_PCCARD is not set
228
229#
230# Advanced setup
231#
232# CONFIG_ADVANCED_OPTIONS is not set
233
234#
235# Default settings for advanced configuration options are used
236#
237CONFIG_HIGHMEM_START=0xfe000000
238CONFIG_LOWMEM_SIZE=0x30000000
239CONFIG_KERNEL_START=0xc0000000
240CONFIG_TASK_SIZE=0xc0000000
241CONFIG_BOOT_LOAD=0x00800000
242
243#
244# Networking
245#
246CONFIG_NET=y
247
248#
249# Networking options
250#
251CONFIG_PACKET=y
252# CONFIG_PACKET_MMAP is not set
253CONFIG_UNIX=y
254CONFIG_XFRM=y
255CONFIG_XFRM_USER=m
256# CONFIG_XFRM_SUB_POLICY is not set
257# CONFIG_XFRM_MIGRATE is not set
258# CONFIG_NET_KEY is not set
259CONFIG_INET=y
260CONFIG_IP_MULTICAST=y
261# CONFIG_IP_ADVANCED_ROUTER is not set
262CONFIG_IP_FIB_HASH=y
263CONFIG_IP_PNP=y
264CONFIG_IP_PNP_DHCP=y
265CONFIG_IP_PNP_BOOTP=y
266# CONFIG_IP_PNP_RARP is not set
267# CONFIG_NET_IPIP is not set
268# CONFIG_NET_IPGRE is not set
269# CONFIG_IP_MROUTE is not set
270# CONFIG_ARPD is not set
271CONFIG_SYN_COOKIES=y
272# CONFIG_INET_AH is not set
273# CONFIG_INET_ESP is not set
274# CONFIG_INET_IPCOMP is not set
275# CONFIG_INET_XFRM_TUNNEL is not set
276# CONFIG_INET_TUNNEL is not set
277CONFIG_INET_XFRM_MODE_TRANSPORT=y
278CONFIG_INET_XFRM_MODE_TUNNEL=y
279CONFIG_INET_XFRM_MODE_BEET=y
280# CONFIG_INET_LRO is not set
281CONFIG_INET_DIAG=y
282CONFIG_INET_TCP_DIAG=y
283# CONFIG_TCP_CONG_ADVANCED is not set
284CONFIG_TCP_CONG_CUBIC=y
285CONFIG_DEFAULT_TCP_CONG="cubic"
286# CONFIG_TCP_MD5SIG is not set
287# CONFIG_IPV6 is not set
288# CONFIG_INET6_XFRM_TUNNEL is not set
289# CONFIG_INET6_TUNNEL is not set
290# CONFIG_NETWORK_SECMARK is not set
291# CONFIG_NETFILTER is not set
292# CONFIG_IP_DCCP is not set
293# CONFIG_IP_SCTP is not set
294# CONFIG_TIPC is not set
295# CONFIG_ATM is not set
296# CONFIG_BRIDGE is not set
297# CONFIG_VLAN_8021Q is not set
298# CONFIG_DECNET is not set
299# CONFIG_LLC2 is not set
300# CONFIG_IPX is not set
301# CONFIG_ATALK is not set
302# CONFIG_X25 is not set
303# CONFIG_LAPB is not set
304# CONFIG_ECONET is not set
305# CONFIG_WAN_ROUTER is not set
306# CONFIG_NET_SCHED is not set
307
308#
309# Network testing
310#
311# CONFIG_NET_PKTGEN is not set
312# CONFIG_HAMRADIO is not set
313# CONFIG_IRDA is not set
314# CONFIG_BT is not set
315# CONFIG_AF_RXRPC is not set
316
317#
318# Wireless
319#
320# CONFIG_CFG80211 is not set
321# CONFIG_WIRELESS_EXT is not set
322# CONFIG_MAC80211 is not set
323# CONFIG_IEEE80211 is not set
324# CONFIG_RFKILL is not set
325# CONFIG_NET_9P is not set
326
327#
328# Device Drivers
329#
330
331#
332# Generic Driver Options
333#
334CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
335CONFIG_STANDALONE=y
336CONFIG_PREVENT_FIRMWARE_BUILD=y
337# CONFIG_FW_LOADER is not set
338# CONFIG_SYS_HYPERVISOR is not set
339# CONFIG_CONNECTOR is not set
340# CONFIG_MTD is not set
341CONFIG_OF_DEVICE=y
342# CONFIG_PARPORT is not set
343CONFIG_BLK_DEV=y
344# CONFIG_BLK_DEV_FD is not set
345# CONFIG_BLK_DEV_COW_COMMON is not set
346CONFIG_BLK_DEV_LOOP=y
347# CONFIG_BLK_DEV_CRYPTOLOOP is not set
348# CONFIG_BLK_DEV_NBD is not set
349CONFIG_BLK_DEV_RAM=y
350CONFIG_BLK_DEV_RAM_COUNT=16
351CONFIG_BLK_DEV_RAM_SIZE=32768
352CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
353# CONFIG_CDROM_PKTCDVD is not set
354# CONFIG_ATA_OVER_ETH is not set
355CONFIG_MISC_DEVICES=y
356# CONFIG_EEPROM_93CX6 is not set
357# CONFIG_IDE is not set
358
359#
360# SCSI device support
361#
362# CONFIG_RAID_ATTRS is not set
363CONFIG_SCSI=y
364CONFIG_SCSI_DMA=y
365# CONFIG_SCSI_TGT is not set
366# CONFIG_SCSI_NETLINK is not set
367CONFIG_SCSI_PROC_FS=y
368
369#
370# SCSI support type (disk, tape, CD-ROM)
371#
372CONFIG_BLK_DEV_SD=y
373# CONFIG_CHR_DEV_ST is not set
374# CONFIG_CHR_DEV_OSST is not set
375# CONFIG_BLK_DEV_SR is not set
376CONFIG_CHR_DEV_SG=y
377# CONFIG_CHR_DEV_SCH is not set
378
379#
380# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
381#
382# CONFIG_SCSI_MULTI_LUN is not set
383# CONFIG_SCSI_CONSTANTS is not set
384# CONFIG_SCSI_LOGGING is not set
385# CONFIG_SCSI_SCAN_ASYNC is not set
386CONFIG_SCSI_WAIT_SCAN=m
387
388#
389# SCSI Transports
390#
391# CONFIG_SCSI_SPI_ATTRS is not set
392# CONFIG_SCSI_FC_ATTRS is not set
393# CONFIG_SCSI_ISCSI_ATTRS is not set
394# CONFIG_SCSI_SAS_LIBSAS is not set
395# CONFIG_SCSI_SRP_ATTRS is not set
396CONFIG_SCSI_LOWLEVEL=y
397# CONFIG_ISCSI_TCP is not set
398# CONFIG_SCSI_DEBUG is not set
399CONFIG_ATA=y
400# CONFIG_ATA_NONSTANDARD is not set
401CONFIG_SATA_FSL=y
402# CONFIG_PATA_PLATFORM is not set
403# CONFIG_MD is not set
404# CONFIG_MACINTOSH_DRIVERS is not set
405CONFIG_NETDEVICES=y
406# CONFIG_NETDEVICES_MULTIQUEUE is not set
407# CONFIG_DUMMY is not set
408# CONFIG_BONDING is not set
409# CONFIG_MACVLAN is not set
410# CONFIG_EQUALIZER is not set
411# CONFIG_TUN is not set
412# CONFIG_VETH is not set
413CONFIG_PHYLIB=y
414
415#
416# MII PHY device drivers
417#
418CONFIG_MARVELL_PHY=y
419# CONFIG_DAVICOM_PHY is not set
420# CONFIG_QSEMI_PHY is not set
421# CONFIG_LXT_PHY is not set
422# CONFIG_CICADA_PHY is not set
423# CONFIG_VITESSE_PHY is not set
424# CONFIG_SMSC_PHY is not set
425# CONFIG_BROADCOM_PHY is not set
426# CONFIG_ICPLUS_PHY is not set
427# CONFIG_FIXED_PHY is not set
428# CONFIG_MDIO_BITBANG is not set
429CONFIG_NET_ETHERNET=y
430CONFIG_MII=y
431# CONFIG_IBM_NEW_EMAC_ZMII is not set
432# CONFIG_IBM_NEW_EMAC_RGMII is not set
433# CONFIG_IBM_NEW_EMAC_TAH is not set
434# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
435# CONFIG_B44 is not set
436CONFIG_NETDEV_1000=y
437CONFIG_GIANFAR=y
438# CONFIG_GFAR_NAPI is not set
439# CONFIG_UCC_GETH is not set
440CONFIG_NETDEV_10000=y
441
442#
443# Wireless LAN
444#
445# CONFIG_WLAN_PRE80211 is not set
446# CONFIG_WLAN_80211 is not set
447# CONFIG_WAN is not set
448# CONFIG_PPP is not set
449# CONFIG_SLIP is not set
450# CONFIG_SHAPER is not set
451# CONFIG_NETCONSOLE is not set
452# CONFIG_NETPOLL is not set
453# CONFIG_NET_POLL_CONTROLLER is not set
454# CONFIG_ISDN is not set
455# CONFIG_PHONE is not set
456
457#
458# Input device support
459#
460CONFIG_INPUT=y
461# CONFIG_INPUT_FF_MEMLESS is not set
462# CONFIG_INPUT_POLLDEV is not set
463
464#
465# Userland interfaces
466#
467# CONFIG_INPUT_MOUSEDEV is not set
468# CONFIG_INPUT_JOYDEV is not set
469# CONFIG_INPUT_EVDEV is not set
470# CONFIG_INPUT_EVBUG is not set
471
472#
473# Input Device Drivers
474#
475# CONFIG_INPUT_KEYBOARD is not set
476# CONFIG_INPUT_MOUSE is not set
477# CONFIG_INPUT_JOYSTICK is not set
478# CONFIG_INPUT_TABLET is not set
479# CONFIG_INPUT_TOUCHSCREEN is not set
480# CONFIG_INPUT_MISC is not set
481
482#
483# Hardware I/O ports
484#
485# CONFIG_SERIO is not set
486# CONFIG_GAMEPORT is not set
487
488#
489# Character devices
490#
491# CONFIG_VT is not set
492# CONFIG_SERIAL_NONSTANDARD is not set
493
494#
495# Serial drivers
496#
497CONFIG_SERIAL_8250=y
498CONFIG_SERIAL_8250_CONSOLE=y
499CONFIG_SERIAL_8250_NR_UARTS=4
500CONFIG_SERIAL_8250_RUNTIME_UARTS=4
501# CONFIG_SERIAL_8250_EXTENDED is not set
502
503#
504# Non-8250 serial port support
505#
506# CONFIG_SERIAL_UARTLITE is not set
507CONFIG_SERIAL_CORE=y
508CONFIG_SERIAL_CORE_CONSOLE=y
509# CONFIG_SERIAL_OF_PLATFORM is not set
510# CONFIG_SERIAL_QE is not set
511CONFIG_UNIX98_PTYS=y
512CONFIG_LEGACY_PTYS=y
513CONFIG_LEGACY_PTY_COUNT=256
514# CONFIG_IPMI_HANDLER is not set
515# CONFIG_HW_RANDOM is not set
516# CONFIG_NVRAM is not set
517CONFIG_GEN_RTC=y
518# CONFIG_GEN_RTC_X is not set
519# CONFIG_R3964 is not set
520# CONFIG_RAW_DRIVER is not set
521# CONFIG_TCG_TPM is not set
522CONFIG_I2C=y
523CONFIG_I2C_BOARDINFO=y
524CONFIG_I2C_CHARDEV=y
525
526#
527# I2C Algorithms
528#
529# CONFIG_I2C_ALGOBIT is not set
530# CONFIG_I2C_ALGOPCF is not set
531# CONFIG_I2C_ALGOPCA is not set
532
533#
534# I2C Hardware Bus support
535#
536CONFIG_I2C_MPC=y
537# CONFIG_I2C_OCORES is not set
538# CONFIG_I2C_PARPORT_LIGHT is not set
539# CONFIG_I2C_SIMTEC is not set
540# CONFIG_I2C_TAOS_EVM is not set
541# CONFIG_I2C_STUB is not set
542
543#
544# Miscellaneous I2C Chip support
545#
546# CONFIG_SENSORS_DS1337 is not set
547# CONFIG_SENSORS_DS1374 is not set
548# CONFIG_DS1682 is not set
549# CONFIG_SENSORS_EEPROM is not set
550# CONFIG_SENSORS_PCF8574 is not set
551# CONFIG_SENSORS_PCA9539 is not set
552# CONFIG_SENSORS_PCF8591 is not set
553# CONFIG_SENSORS_M41T00 is not set
554# CONFIG_SENSORS_MAX6875 is not set
555# CONFIG_SENSORS_TSL2550 is not set
556# CONFIG_I2C_DEBUG_CORE is not set
557# CONFIG_I2C_DEBUG_ALGO is not set
558# CONFIG_I2C_DEBUG_BUS is not set
559# CONFIG_I2C_DEBUG_CHIP is not set
560
561#
562# SPI support
563#
564# CONFIG_SPI is not set
565# CONFIG_SPI_MASTER is not set
566# CONFIG_W1 is not set
567# CONFIG_POWER_SUPPLY is not set
568CONFIG_HWMON=y
569# CONFIG_HWMON_VID is not set
570# CONFIG_SENSORS_AD7418 is not set
571# CONFIG_SENSORS_ADM1021 is not set
572# CONFIG_SENSORS_ADM1025 is not set
573# CONFIG_SENSORS_ADM1026 is not set
574# CONFIG_SENSORS_ADM1029 is not set
575# CONFIG_SENSORS_ADM1031 is not set
576# CONFIG_SENSORS_ADM9240 is not set
577# CONFIG_SENSORS_ADT7470 is not set
578# CONFIG_SENSORS_ATXP1 is not set
579# CONFIG_SENSORS_DS1621 is not set
580# CONFIG_SENSORS_F71805F is not set
581# CONFIG_SENSORS_F71882FG is not set
582# CONFIG_SENSORS_F75375S is not set
583# CONFIG_SENSORS_GL518SM is not set
584# CONFIG_SENSORS_GL520SM is not set
585# CONFIG_SENSORS_IT87 is not set
586# CONFIG_SENSORS_LM63 is not set
587# CONFIG_SENSORS_LM75 is not set
588# CONFIG_SENSORS_LM77 is not set
589# CONFIG_SENSORS_LM78 is not set
590# CONFIG_SENSORS_LM80 is not set
591# CONFIG_SENSORS_LM83 is not set
592# CONFIG_SENSORS_LM85 is not set
593# CONFIG_SENSORS_LM87 is not set
594# CONFIG_SENSORS_LM90 is not set
595# CONFIG_SENSORS_LM92 is not set
596# CONFIG_SENSORS_LM93 is not set
597# CONFIG_SENSORS_MAX1619 is not set
598# CONFIG_SENSORS_MAX6650 is not set
599# CONFIG_SENSORS_PC87360 is not set
600# CONFIG_SENSORS_PC87427 is not set
601# CONFIG_SENSORS_DME1737 is not set
602# CONFIG_SENSORS_SMSC47M1 is not set
603# CONFIG_SENSORS_SMSC47M192 is not set
604# CONFIG_SENSORS_SMSC47B397 is not set
605# CONFIG_SENSORS_THMC50 is not set
606# CONFIG_SENSORS_VT1211 is not set
607# CONFIG_SENSORS_W83781D is not set
608# CONFIG_SENSORS_W83791D is not set
609# CONFIG_SENSORS_W83792D is not set
610# CONFIG_SENSORS_W83793 is not set
611# CONFIG_SENSORS_W83L785TS is not set
612# CONFIG_SENSORS_W83627HF is not set
613# CONFIG_SENSORS_W83627EHF is not set
614# CONFIG_HWMON_DEBUG_CHIP is not set
615CONFIG_WATCHDOG=y
616# CONFIG_WATCHDOG_NOWAYOUT is not set
617
618#
619# Watchdog Device Drivers
620#
621# CONFIG_SOFT_WATCHDOG is not set
622CONFIG_83xx_WDT=y
623
624#
625# Sonics Silicon Backplane
626#
627CONFIG_SSB_POSSIBLE=y
628# CONFIG_SSB is not set
629
630#
631# Multifunction device drivers
632#
633# CONFIG_MFD_SM501 is not set
634
635#
636# Multimedia devices
637#
638# CONFIG_VIDEO_DEV is not set
639# CONFIG_DVB_CORE is not set
640CONFIG_DAB=y
641
642#
643# Graphics support
644#
645# CONFIG_VGASTATE is not set
646CONFIG_VIDEO_OUTPUT_CONTROL=m
647# CONFIG_FB is not set
648# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
649
650#
651# Display device support
652#
653# CONFIG_DISPLAY_SUPPORT is not set
654
655#
656# Sound
657#
658# CONFIG_SOUND is not set
659CONFIG_HID_SUPPORT=y
660CONFIG_HID=y
661# CONFIG_HID_DEBUG is not set
662# CONFIG_HIDRAW is not set
663CONFIG_USB_SUPPORT=y
664CONFIG_USB_ARCH_HAS_HCD=y
665# CONFIG_USB_ARCH_HAS_OHCI is not set
666CONFIG_USB_ARCH_HAS_EHCI=y
667# CONFIG_USB is not set
668CONFIG_USB_EHCI_ROOT_HUB_TT=y
669CONFIG_USB_EHCI_FSL=y
670
671#
672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
673#
674
675#
676# USB Gadget Support
677#
678# CONFIG_USB_GADGET is not set
679# CONFIG_MMC is not set
680# CONFIG_NEW_LEDS is not set
681# CONFIG_EDAC is not set
682# CONFIG_RTC_CLASS is not set
683
684#
685# Userspace I/O
686#
687# CONFIG_UIO is not set
688
689#
690# File systems
691#
692CONFIG_EXT2_FS=y
693# CONFIG_EXT2_FS_XATTR is not set
694# CONFIG_EXT2_FS_XIP is not set
695CONFIG_EXT3_FS=y
696CONFIG_EXT3_FS_XATTR=y
697# CONFIG_EXT3_FS_POSIX_ACL is not set
698# CONFIG_EXT3_FS_SECURITY is not set
699# CONFIG_EXT4DEV_FS is not set
700CONFIG_JBD=y
701CONFIG_FS_MBCACHE=y
702# CONFIG_REISERFS_FS is not set
703# CONFIG_JFS_FS is not set
704# CONFIG_FS_POSIX_ACL is not set
705# CONFIG_XFS_FS is not set
706# CONFIG_GFS2_FS is not set
707# CONFIG_OCFS2_FS is not set
708# CONFIG_MINIX_FS is not set
709# CONFIG_ROMFS_FS is not set
710CONFIG_INOTIFY=y
711CONFIG_INOTIFY_USER=y
712# CONFIG_QUOTA is not set
713CONFIG_DNOTIFY=y
714# CONFIG_AUTOFS_FS is not set
715# CONFIG_AUTOFS4_FS is not set
716# CONFIG_FUSE_FS is not set
717
718#
719# CD-ROM/DVD Filesystems
720#
721# CONFIG_ISO9660_FS is not set
722# CONFIG_UDF_FS is not set
723
724#
725# DOS/FAT/NT Filesystems
726#
727# CONFIG_MSDOS_FS is not set
728# CONFIG_VFAT_FS is not set
729# CONFIG_NTFS_FS is not set
730
731#
732# Pseudo filesystems
733#
734CONFIG_PROC_FS=y
735CONFIG_PROC_KCORE=y
736CONFIG_PROC_SYSCTL=y
737CONFIG_SYSFS=y
738CONFIG_TMPFS=y
739# CONFIG_TMPFS_POSIX_ACL is not set
740# CONFIG_HUGETLB_PAGE is not set
741# CONFIG_CONFIGFS_FS is not set
742
743#
744# Miscellaneous filesystems
745#
746# CONFIG_ADFS_FS is not set
747# CONFIG_AFFS_FS is not set
748# CONFIG_HFS_FS is not set
749# CONFIG_HFSPLUS_FS is not set
750# CONFIG_BEFS_FS is not set
751# CONFIG_BFS_FS is not set
752# CONFIG_EFS_FS is not set
753# CONFIG_CRAMFS is not set
754# CONFIG_VXFS_FS is not set
755# CONFIG_HPFS_FS is not set
756# CONFIG_QNX4FS_FS is not set
757# CONFIG_SYSV_FS is not set
758# CONFIG_UFS_FS is not set
759CONFIG_NETWORK_FILESYSTEMS=y
760CONFIG_NFS_FS=y
761CONFIG_NFS_V3=y
762# CONFIG_NFS_V3_ACL is not set
763CONFIG_NFS_V4=y
764# CONFIG_NFS_DIRECTIO is not set
765# CONFIG_NFSD is not set
766CONFIG_ROOT_NFS=y
767CONFIG_LOCKD=y
768CONFIG_LOCKD_V4=y
769CONFIG_NFS_COMMON=y
770CONFIG_SUNRPC=y
771CONFIG_SUNRPC_GSS=y
772# CONFIG_SUNRPC_BIND34 is not set
773CONFIG_RPCSEC_GSS_KRB5=y
774# CONFIG_RPCSEC_GSS_SPKM3 is not set
775# CONFIG_SMB_FS is not set
776# CONFIG_CIFS is not set
777# CONFIG_NCP_FS is not set
778# CONFIG_CODA_FS is not set
779# CONFIG_AFS_FS is not set
780
781#
782# Partition Types
783#
784CONFIG_PARTITION_ADVANCED=y
785# CONFIG_ACORN_PARTITION is not set
786# CONFIG_OSF_PARTITION is not set
787# CONFIG_AMIGA_PARTITION is not set
788# CONFIG_ATARI_PARTITION is not set
789# CONFIG_MAC_PARTITION is not set
790CONFIG_MSDOS_PARTITION=y
791# CONFIG_BSD_DISKLABEL is not set
792# CONFIG_MINIX_SUBPARTITION is not set
793# CONFIG_SOLARIS_X86_PARTITION is not set
794# CONFIG_UNIXWARE_DISKLABEL is not set
795# CONFIG_LDM_PARTITION is not set
796# CONFIG_SGI_PARTITION is not set
797# CONFIG_ULTRIX_PARTITION is not set
798# CONFIG_SUN_PARTITION is not set
799# CONFIG_KARMA_PARTITION is not set
800# CONFIG_EFI_PARTITION is not set
801# CONFIG_SYSV68_PARTITION is not set
802# CONFIG_NLS is not set
803# CONFIG_DLM is not set
804
805#
806# Library routines
807#
808CONFIG_BITREVERSE=y
809# CONFIG_CRC_CCITT is not set
810# CONFIG_CRC16 is not set
811# CONFIG_CRC_ITU_T is not set
812CONFIG_CRC32=y
813# CONFIG_CRC7 is not set
814# CONFIG_LIBCRC32C is not set
815CONFIG_PLIST=y
816CONFIG_HAS_IOMEM=y
817CONFIG_HAS_IOPORT=y
818CONFIG_HAS_DMA=y
819CONFIG_INSTRUMENTATION=y
820# CONFIG_PROFILING is not set
821# CONFIG_KPROBES is not set
822# CONFIG_MARKERS is not set
823
824#
825# Kernel hacking
826#
827# CONFIG_PRINTK_TIME is not set
828CONFIG_ENABLE_WARN_DEPRECATED=y
829CONFIG_ENABLE_MUST_CHECK=y
830# CONFIG_MAGIC_SYSRQ is not set
831# CONFIG_UNUSED_SYMBOLS is not set
832# CONFIG_DEBUG_FS is not set
833# CONFIG_HEADERS_CHECK is not set
834# CONFIG_DEBUG_KERNEL is not set
835# CONFIG_DEBUG_BUGVERBOSE is not set
836# CONFIG_SAMPLES is not set
837# CONFIG_PPC_EARLY_DEBUG is not set
838
839#
840# Security options
841#
842# CONFIG_KEYS is not set
843# CONFIG_SECURITY is not set
844# CONFIG_SECURITY_FILE_CAPABILITIES is not set
845CONFIG_CRYPTO=y
846CONFIG_CRYPTO_ALGAPI=y
847CONFIG_CRYPTO_BLKCIPHER=y
848CONFIG_CRYPTO_MANAGER=y
849# CONFIG_CRYPTO_HMAC is not set
850# CONFIG_CRYPTO_XCBC is not set
851# CONFIG_CRYPTO_NULL is not set
852# CONFIG_CRYPTO_MD4 is not set
853CONFIG_CRYPTO_MD5=y
854# CONFIG_CRYPTO_SHA1 is not set
855# CONFIG_CRYPTO_SHA256 is not set
856# CONFIG_CRYPTO_SHA512 is not set
857# CONFIG_CRYPTO_WP512 is not set
858# CONFIG_CRYPTO_TGR192 is not set
859# CONFIG_CRYPTO_GF128MUL is not set
860CONFIG_CRYPTO_ECB=m
861CONFIG_CRYPTO_CBC=y
862CONFIG_CRYPTO_PCBC=m
863# CONFIG_CRYPTO_LRW is not set
864# CONFIG_CRYPTO_XTS is not set
865# CONFIG_CRYPTO_CRYPTD is not set
866CONFIG_CRYPTO_DES=y
867# CONFIG_CRYPTO_FCRYPT is not set
868# CONFIG_CRYPTO_BLOWFISH is not set
869# CONFIG_CRYPTO_TWOFISH is not set
870# CONFIG_CRYPTO_SERPENT is not set
871# CONFIG_CRYPTO_AES is not set
872# CONFIG_CRYPTO_CAST5 is not set
873# CONFIG_CRYPTO_CAST6 is not set
874# CONFIG_CRYPTO_TEA is not set
875# CONFIG_CRYPTO_ARC4 is not set
876# CONFIG_CRYPTO_KHAZAD is not set
877# CONFIG_CRYPTO_ANUBIS is not set
878# CONFIG_CRYPTO_SEED is not set
879# CONFIG_CRYPTO_DEFLATE is not set
880# CONFIG_CRYPTO_MICHAEL_MIC is not set
881# CONFIG_CRYPTO_CRC32C is not set
882# CONFIG_CRYPTO_CAMELLIA is not set
883# CONFIG_CRYPTO_TEST is not set
884# CONFIG_CRYPTO_AUTHENC is not set
885CONFIG_CRYPTO_HW=y
886# CONFIG_PPC_CLOCK is not set
887CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
new file mode 100644
index 000000000000..90e38ba3832b
--- /dev/null
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -0,0 +1,1523 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc8
4# Mon Jan 28 13:12:07 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_E500=y
18CONFIG_BOOKE=y
19CONFIG_FSL_BOOKE=y
20# CONFIG_PHYS_64BIT is not set
21CONFIG_SPE=y
22# CONFIG_PPC_MM_SLICES is not set
23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y
26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y
32CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y
35CONFIG_GENERIC_HWEIGHT=y
36CONFIG_GENERIC_CALIBRATE_DELAY=y
37CONFIG_GENERIC_FIND_NEXT_BIT=y
38# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
39CONFIG_PPC=y
40CONFIG_EARLY_PRINTK=y
41CONFIG_GENERIC_NVRAM=y
42CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
43CONFIG_ARCH_MAY_HAVE_PC_FDC=y
44CONFIG_PPC_OF=y
45CONFIG_OF=y
46CONFIG_PPC_UDBG_16550=y
47# CONFIG_GENERIC_TBSYNC is not set
48CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y
50CONFIG_DEFAULT_UIMAGE=y
51# CONFIG_PPC_DCR_NATIVE is not set
52# CONFIG_PPC_DCR_MMIO is not set
53CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
54
55#
56# General setup
57#
58CONFIG_EXPERIMENTAL=y
59CONFIG_BROKEN_ON_SMP=y
60CONFIG_INIT_ENV_ARG_LIMIT=32
61CONFIG_LOCALVERSION=""
62CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y
64CONFIG_SYSVIPC=y
65CONFIG_SYSVIPC_SYSCTL=y
66CONFIG_POSIX_MQUEUE=y
67CONFIG_BSD_PROCESS_ACCT=y
68# CONFIG_BSD_PROCESS_ACCT_V3 is not set
69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
72CONFIG_AUDIT=y
73# CONFIG_AUDITSYSCALL is not set
74CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78# CONFIG_FAIR_GROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
87CONFIG_KALLSYMS=y
88CONFIG_KALLSYMS_ALL=y
89CONFIG_KALLSYMS_EXTRA_PASS=y
90CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y
92CONFIG_BUG=y
93CONFIG_ELF_CORE=y
94CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y
99CONFIG_EVENTFD=y
100CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLUB_DEBUG=y
103# CONFIG_SLAB is not set
104CONFIG_SLUB=y
105# CONFIG_SLOB is not set
106CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0
110CONFIG_MODULES=y
111CONFIG_MODULE_UNLOAD=y
112CONFIG_MODULE_FORCE_UNLOAD=y
113CONFIG_MODVERSIONS=y
114# CONFIG_MODULE_SRCVERSION_ALL is not set
115CONFIG_KMOD=y
116CONFIG_BLOCK=y
117CONFIG_LBD=y
118# CONFIG_BLK_DEV_IO_TRACE is not set
119# CONFIG_LSF is not set
120# CONFIG_BLK_DEV_BSG is not set
121
122#
123# IO Schedulers
124#
125CONFIG_IOSCHED_NOOP=y
126CONFIG_IOSCHED_AS=y
127CONFIG_IOSCHED_DEADLINE=y
128CONFIG_IOSCHED_CFQ=y
129# CONFIG_DEFAULT_AS is not set
130# CONFIG_DEFAULT_DEADLINE is not set
131CONFIG_DEFAULT_CFQ=y
132# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="cfq"
134
135#
136# Platform support
137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
143CONFIG_MPC85xx=y
144CONFIG_MPC8540_ADS=y
145CONFIG_MPC8560_ADS=y
146CONFIG_MPC85xx_CDS=y
147CONFIG_MPC85xx_MDS=y
148CONFIG_MPC85xx_DS=y
149# CONFIG_STX_GP3 is not set
150CONFIG_TQM8540=y
151CONFIG_TQM8541=y
152CONFIG_TQM8555=y
153CONFIG_TQM8560=y
154CONFIG_SBC8548=y
155# CONFIG_SBC8560 is not set
156CONFIG_TQM85xx=y
157# CONFIG_IPIC is not set
158CONFIG_MPIC=y
159# CONFIG_MPIC_WEIRD is not set
160CONFIG_PPC_I8259=y
161# CONFIG_PPC_RTAS is not set
162# CONFIG_MMIO_NVRAM is not set
163# CONFIG_PPC_MPC106 is not set
164# CONFIG_PPC_970_NAP is not set
165# CONFIG_PPC_INDIRECT_IO is not set
166# CONFIG_GENERIC_IOMAP is not set
167# CONFIG_CPU_FREQ is not set
168CONFIG_QUICC_ENGINE=y
169CONFIG_CPM2=y
170CONFIG_PPC_CPM_NEW_BINDING=y
171CONFIG_FSL_ULI1575=y
172CONFIG_CPM=y
173
174#
175# Kernel options
176#
177CONFIG_HIGHMEM=y
178CONFIG_TICK_ONESHOT=y
179CONFIG_NO_HZ=y
180CONFIG_HIGH_RES_TIMERS=y
181CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
182# CONFIG_HZ_100 is not set
183CONFIG_HZ_250=y
184# CONFIG_HZ_300 is not set
185# CONFIG_HZ_1000 is not set
186CONFIG_HZ=250
187CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set
190CONFIG_BINFMT_ELF=y
191CONFIG_BINFMT_MISC=m
192CONFIG_MATH_EMULATION=y
193CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
194CONFIG_ARCH_FLATMEM_ENABLE=y
195CONFIG_ARCH_POPULATES_NODE_MAP=y
196CONFIG_SELECT_MEMORY_MODEL=y
197CONFIG_FLATMEM_MANUAL=y
198# CONFIG_DISCONTIGMEM_MANUAL is not set
199# CONFIG_SPARSEMEM_MANUAL is not set
200CONFIG_FLATMEM=y
201CONFIG_FLAT_NODE_MEM_MAP=y
202# CONFIG_SPARSEMEM_STATIC is not set
203# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
204CONFIG_SPLIT_PTLOCK_CPUS=4
205# CONFIG_RESOURCES_64BIT is not set
206CONFIG_ZONE_DMA_FLAG=1
207CONFIG_BOUNCE=y
208CONFIG_VIRT_TO_BUS=y
209CONFIG_PROC_DEVICETREE=y
210# CONFIG_CMDLINE_BOOL is not set
211# CONFIG_PM is not set
212CONFIG_SUSPEND_UP_POSSIBLE=y
213CONFIG_HIBERNATION_UP_POSSIBLE=y
214CONFIG_SECCOMP=y
215CONFIG_WANT_DEVICE_TREE=y
216CONFIG_DEVICE_TREE=""
217CONFIG_ISA_DMA_API=y
218
219#
220# Bus options
221#
222CONFIG_ZONE_DMA=y
223CONFIG_GENERIC_ISA_DMA=y
224CONFIG_PPC_INDIRECT_PCI=y
225CONFIG_FSL_SOC=y
226CONFIG_FSL_PCI=y
227CONFIG_PCI=y
228CONFIG_PCI_DOMAINS=y
229CONFIG_PCI_SYSCALL=y
230# CONFIG_PCIEPORTBUS is not set
231CONFIG_ARCH_SUPPORTS_MSI=y
232# CONFIG_PCI_MSI is not set
233CONFIG_PCI_LEGACY=y
234# CONFIG_PCI_DEBUG is not set
235# CONFIG_PCCARD is not set
236# CONFIG_HOTPLUG_PCI is not set
237
238#
239# Advanced setup
240#
241# CONFIG_ADVANCED_OPTIONS is not set
242
243#
244# Default settings for advanced configuration options are used
245#
246CONFIG_HIGHMEM_START=0xfe000000
247CONFIG_LOWMEM_SIZE=0x30000000
248CONFIG_KERNEL_START=0xc0000000
249CONFIG_TASK_SIZE=0xc0000000
250CONFIG_BOOT_LOAD=0x00800000
251
252#
253# Networking
254#
255CONFIG_NET=y
256
257#
258# Networking options
259#
260CONFIG_PACKET=y
261# CONFIG_PACKET_MMAP is not set
262CONFIG_UNIX=y
263CONFIG_XFRM=y
264CONFIG_XFRM_USER=y
265# CONFIG_XFRM_SUB_POLICY is not set
266# CONFIG_XFRM_MIGRATE is not set
267CONFIG_NET_KEY=m
268# CONFIG_NET_KEY_MIGRATE is not set
269CONFIG_INET=y
270CONFIG_IP_MULTICAST=y
271CONFIG_IP_ADVANCED_ROUTER=y
272CONFIG_ASK_IP_FIB_HASH=y
273# CONFIG_IP_FIB_TRIE is not set
274CONFIG_IP_FIB_HASH=y
275CONFIG_IP_MULTIPLE_TABLES=y
276CONFIG_IP_ROUTE_MULTIPATH=y
277CONFIG_IP_ROUTE_VERBOSE=y
278CONFIG_IP_PNP=y
279CONFIG_IP_PNP_DHCP=y
280CONFIG_IP_PNP_BOOTP=y
281CONFIG_IP_PNP_RARP=y
282CONFIG_NET_IPIP=y
283CONFIG_NET_IPGRE=y
284CONFIG_NET_IPGRE_BROADCAST=y
285CONFIG_IP_MROUTE=y
286CONFIG_IP_PIMSM_V1=y
287CONFIG_IP_PIMSM_V2=y
288CONFIG_ARPD=y
289# CONFIG_SYN_COOKIES is not set
290# CONFIG_INET_AH is not set
291# CONFIG_INET_ESP is not set
292# CONFIG_INET_IPCOMP is not set
293# CONFIG_INET_XFRM_TUNNEL is not set
294CONFIG_INET_TUNNEL=y
295# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
296# CONFIG_INET_XFRM_MODE_TUNNEL is not set
297# CONFIG_INET_XFRM_MODE_BEET is not set
298# CONFIG_INET_LRO is not set
299CONFIG_INET_DIAG=y
300CONFIG_INET_TCP_DIAG=y
301# CONFIG_TCP_CONG_ADVANCED is not set
302CONFIG_TCP_CONG_CUBIC=y
303CONFIG_DEFAULT_TCP_CONG="cubic"
304# CONFIG_TCP_MD5SIG is not set
305CONFIG_IPV6=y
306# CONFIG_IPV6_PRIVACY is not set
307# CONFIG_IPV6_ROUTER_PREF is not set
308# CONFIG_IPV6_OPTIMISTIC_DAD is not set
309# CONFIG_INET6_AH is not set
310# CONFIG_INET6_ESP is not set
311# CONFIG_INET6_IPCOMP is not set
312# CONFIG_IPV6_MIP6 is not set
313# CONFIG_INET6_XFRM_TUNNEL is not set
314# CONFIG_INET6_TUNNEL is not set
315CONFIG_INET6_XFRM_MODE_TRANSPORT=y
316CONFIG_INET6_XFRM_MODE_TUNNEL=y
317CONFIG_INET6_XFRM_MODE_BEET=y
318# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
319CONFIG_IPV6_SIT=y
320# CONFIG_IPV6_TUNNEL is not set
321# CONFIG_IPV6_MULTIPLE_TABLES is not set
322# CONFIG_NETWORK_SECMARK is not set
323# CONFIG_NETFILTER is not set
324# CONFIG_IP_DCCP is not set
325CONFIG_IP_SCTP=m
326# CONFIG_SCTP_DBG_MSG is not set
327# CONFIG_SCTP_DBG_OBJCNT is not set
328# CONFIG_SCTP_HMAC_NONE is not set
329# CONFIG_SCTP_HMAC_SHA1 is not set
330CONFIG_SCTP_HMAC_MD5=y
331# CONFIG_TIPC is not set
332# CONFIG_ATM is not set
333# CONFIG_BRIDGE is not set
334# CONFIG_VLAN_8021Q is not set
335# CONFIG_DECNET is not set
336# CONFIG_LLC2 is not set
337# CONFIG_IPX is not set
338# CONFIG_ATALK is not set
339# CONFIG_X25 is not set
340# CONFIG_LAPB is not set
341# CONFIG_ECONET is not set
342# CONFIG_WAN_ROUTER is not set
343# CONFIG_NET_SCHED is not set
344
345#
346# Network testing
347#
348# CONFIG_NET_PKTGEN is not set
349# CONFIG_HAMRADIO is not set
350# CONFIG_IRDA is not set
351# CONFIG_BT is not set
352# CONFIG_AF_RXRPC is not set
353CONFIG_FIB_RULES=y
354
355#
356# Wireless
357#
358# CONFIG_CFG80211 is not set
359# CONFIG_WIRELESS_EXT is not set
360# CONFIG_MAC80211 is not set
361# CONFIG_IEEE80211 is not set
362# CONFIG_RFKILL is not set
363# CONFIG_NET_9P is not set
364
365#
366# Device Drivers
367#
368
369#
370# Generic Driver Options
371#
372CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
373CONFIG_STANDALONE=y
374CONFIG_PREVENT_FIRMWARE_BUILD=y
375CONFIG_FW_LOADER=y
376# CONFIG_DEBUG_DRIVER is not set
377# CONFIG_DEBUG_DEVRES is not set
378# CONFIG_SYS_HYPERVISOR is not set
379# CONFIG_CONNECTOR is not set
380# CONFIG_MTD is not set
381CONFIG_OF_DEVICE=y
382# CONFIG_PARPORT is not set
383CONFIG_BLK_DEV=y
384# CONFIG_BLK_DEV_FD is not set
385# CONFIG_BLK_CPQ_DA is not set
386# CONFIG_BLK_CPQ_CISS_DA is not set
387# CONFIG_BLK_DEV_DAC960 is not set
388# CONFIG_BLK_DEV_UMEM is not set
389# CONFIG_BLK_DEV_COW_COMMON is not set
390CONFIG_BLK_DEV_LOOP=y
391# CONFIG_BLK_DEV_CRYPTOLOOP is not set
392CONFIG_BLK_DEV_NBD=y
393# CONFIG_BLK_DEV_SX8 is not set
394# CONFIG_BLK_DEV_UB is not set
395CONFIG_BLK_DEV_RAM=y
396CONFIG_BLK_DEV_RAM_COUNT=16
397CONFIG_BLK_DEV_RAM_SIZE=131072
398CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
399# CONFIG_CDROM_PKTCDVD is not set
400# CONFIG_ATA_OVER_ETH is not set
401CONFIG_MISC_DEVICES=y
402# CONFIG_PHANTOM is not set
403# CONFIG_EEPROM_93CX6 is not set
404# CONFIG_SGI_IOC4 is not set
405# CONFIG_TIFM_CORE is not set
406# CONFIG_IDE is not set
407
408#
409# SCSI device support
410#
411# CONFIG_RAID_ATTRS is not set
412CONFIG_SCSI=y
413CONFIG_SCSI_DMA=y
414# CONFIG_SCSI_TGT is not set
415# CONFIG_SCSI_NETLINK is not set
416CONFIG_SCSI_PROC_FS=y
417
418#
419# SCSI support type (disk, tape, CD-ROM)
420#
421CONFIG_BLK_DEV_SD=y
422CONFIG_CHR_DEV_ST=y
423# CONFIG_CHR_DEV_OSST is not set
424CONFIG_BLK_DEV_SR=y
425# CONFIG_BLK_DEV_SR_VENDOR is not set
426CONFIG_CHR_DEV_SG=y
427# CONFIG_CHR_DEV_SCH is not set
428
429#
430# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
431#
432CONFIG_SCSI_MULTI_LUN=y
433# CONFIG_SCSI_CONSTANTS is not set
434CONFIG_SCSI_LOGGING=y
435# CONFIG_SCSI_SCAN_ASYNC is not set
436CONFIG_SCSI_WAIT_SCAN=m
437
438#
439# SCSI Transports
440#
441# CONFIG_SCSI_SPI_ATTRS is not set
442# CONFIG_SCSI_FC_ATTRS is not set
443# CONFIG_SCSI_ISCSI_ATTRS is not set
444# CONFIG_SCSI_SAS_LIBSAS is not set
445# CONFIG_SCSI_SRP_ATTRS is not set
446CONFIG_SCSI_LOWLEVEL=y
447# CONFIG_ISCSI_TCP is not set
448# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
449# CONFIG_SCSI_3W_9XXX is not set
450# CONFIG_SCSI_ACARD is not set
451# CONFIG_SCSI_AACRAID is not set
452# CONFIG_SCSI_AIC7XXX is not set
453# CONFIG_SCSI_AIC7XXX_OLD is not set
454# CONFIG_SCSI_AIC79XX is not set
455# CONFIG_SCSI_AIC94XX is not set
456# CONFIG_SCSI_DPT_I2O is not set
457# CONFIG_SCSI_ADVANSYS is not set
458# CONFIG_SCSI_ARCMSR is not set
459# CONFIG_MEGARAID_NEWGEN is not set
460# CONFIG_MEGARAID_LEGACY is not set
461# CONFIG_MEGARAID_SAS is not set
462# CONFIG_SCSI_HPTIOP is not set
463# CONFIG_SCSI_BUSLOGIC is not set
464# CONFIG_SCSI_DMX3191D is not set
465# CONFIG_SCSI_EATA is not set
466# CONFIG_SCSI_FUTURE_DOMAIN is not set
467# CONFIG_SCSI_GDTH is not set
468# CONFIG_SCSI_IPS is not set
469# CONFIG_SCSI_INITIO is not set
470# CONFIG_SCSI_INIA100 is not set
471# CONFIG_SCSI_STEX is not set
472# CONFIG_SCSI_SYM53C8XX_2 is not set
473# CONFIG_SCSI_IPR is not set
474# CONFIG_SCSI_QLOGIC_1280 is not set
475# CONFIG_SCSI_QLA_FC is not set
476# CONFIG_SCSI_QLA_ISCSI is not set
477# CONFIG_SCSI_LPFC is not set
478# CONFIG_SCSI_DC395x is not set
479# CONFIG_SCSI_DC390T is not set
480# CONFIG_SCSI_NSP32 is not set
481# CONFIG_SCSI_DEBUG is not set
482# CONFIG_SCSI_SRP is not set
483CONFIG_ATA=y
484# CONFIG_ATA_NONSTANDARD is not set
485CONFIG_SATA_AHCI=y
486# CONFIG_SATA_SVW is not set
487# CONFIG_ATA_PIIX is not set
488# CONFIG_SATA_MV is not set
489# CONFIG_SATA_NV is not set
490# CONFIG_PDC_ADMA is not set
491# CONFIG_SATA_QSTOR is not set
492# CONFIG_SATA_PROMISE is not set
493# CONFIG_SATA_SX4 is not set
494# CONFIG_SATA_SIL is not set
495# CONFIG_SATA_SIL24 is not set
496# CONFIG_SATA_SIS is not set
497# CONFIG_SATA_ULI is not set
498# CONFIG_SATA_VIA is not set
499# CONFIG_SATA_VITESSE is not set
500# CONFIG_SATA_INIC162X is not set
501# CONFIG_SATA_FSL is not set
502CONFIG_PATA_ALI=y
503# CONFIG_PATA_AMD is not set
504# CONFIG_PATA_ARTOP is not set
505# CONFIG_PATA_ATIIXP is not set
506# CONFIG_PATA_CMD640_PCI is not set
507# CONFIG_PATA_CMD64X is not set
508# CONFIG_PATA_CS5520 is not set
509# CONFIG_PATA_CS5530 is not set
510# CONFIG_PATA_CYPRESS is not set
511# CONFIG_PATA_EFAR is not set
512# CONFIG_ATA_GENERIC is not set
513# CONFIG_PATA_HPT366 is not set
514# CONFIG_PATA_HPT37X is not set
515# CONFIG_PATA_HPT3X2N is not set
516# CONFIG_PATA_HPT3X3 is not set
517# CONFIG_PATA_IT821X is not set
518# CONFIG_PATA_IT8213 is not set
519# CONFIG_PATA_JMICRON is not set
520# CONFIG_PATA_TRIFLEX is not set
521# CONFIG_PATA_MARVELL is not set
522# CONFIG_PATA_MPIIX is not set
523# CONFIG_PATA_OLDPIIX is not set
524# CONFIG_PATA_NETCELL is not set
525# CONFIG_PATA_NS87410 is not set
526# CONFIG_PATA_NS87415 is not set
527# CONFIG_PATA_OPTI is not set
528# CONFIG_PATA_OPTIDMA is not set
529# CONFIG_PATA_PDC_OLD is not set
530# CONFIG_PATA_RADISYS is not set
531# CONFIG_PATA_RZ1000 is not set
532# CONFIG_PATA_SC1200 is not set
533# CONFIG_PATA_SERVERWORKS is not set
534# CONFIG_PATA_PDC2027X is not set
535# CONFIG_PATA_SIL680 is not set
536# CONFIG_PATA_SIS is not set
537# CONFIG_PATA_VIA is not set
538# CONFIG_PATA_WINBOND is not set
539# CONFIG_PATA_PLATFORM is not set
540# CONFIG_MD is not set
541# CONFIG_FUSION is not set
542
543#
544# IEEE 1394 (FireWire) support
545#
546# CONFIG_FIREWIRE is not set
547# CONFIG_IEEE1394 is not set
548# CONFIG_I2O is not set
549# CONFIG_MACINTOSH_DRIVERS is not set
550CONFIG_NETDEVICES=y
551# CONFIG_NETDEVICES_MULTIQUEUE is not set
552CONFIG_DUMMY=y
553# CONFIG_BONDING is not set
554# CONFIG_MACVLAN is not set
555# CONFIG_EQUALIZER is not set
556# CONFIG_TUN is not set
557# CONFIG_VETH is not set
558# CONFIG_ARCNET is not set
559CONFIG_PHYLIB=y
560
561#
562# MII PHY device drivers
563#
564# CONFIG_MARVELL_PHY is not set
565# CONFIG_DAVICOM_PHY is not set
566# CONFIG_QSEMI_PHY is not set
567# CONFIG_LXT_PHY is not set
568# CONFIG_CICADA_PHY is not set
569CONFIG_VITESSE_PHY=y
570# CONFIG_SMSC_PHY is not set
571# CONFIG_BROADCOM_PHY is not set
572# CONFIG_ICPLUS_PHY is not set
573# CONFIG_FIXED_PHY is not set
574# CONFIG_MDIO_BITBANG is not set
575CONFIG_NET_ETHERNET=y
576CONFIG_MII=y
577# CONFIG_HAPPYMEAL is not set
578# CONFIG_SUNGEM is not set
579# CONFIG_CASSINI is not set
580# CONFIG_NET_VENDOR_3COM is not set
581# CONFIG_NET_TULIP is not set
582# CONFIG_HP100 is not set
583# CONFIG_IBM_NEW_EMAC_ZMII is not set
584# CONFIG_IBM_NEW_EMAC_RGMII is not set
585# CONFIG_IBM_NEW_EMAC_TAH is not set
586# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
587# CONFIG_NET_PCI is not set
588# CONFIG_B44 is not set
589# CONFIG_FS_ENET is not set
590CONFIG_NETDEV_1000=y
591# CONFIG_ACENIC is not set
592# CONFIG_DL2K is not set
593# CONFIG_E1000 is not set
594# CONFIG_E1000E is not set
595# CONFIG_IP1000 is not set
596# CONFIG_NS83820 is not set
597# CONFIG_HAMACHI is not set
598# CONFIG_YELLOWFIN is not set
599# CONFIG_R8169 is not set
600# CONFIG_SIS190 is not set
601# CONFIG_SKGE is not set
602# CONFIG_SKY2 is not set
603# CONFIG_SK98LIN is not set
604# CONFIG_VIA_VELOCITY is not set
605# CONFIG_TIGON3 is not set
606# CONFIG_BNX2 is not set
607CONFIG_GIANFAR=y
608CONFIG_GFAR_NAPI=y
609# CONFIG_UCC_GETH is not set
610# CONFIG_QLA3XXX is not set
611# CONFIG_ATL1 is not set
612CONFIG_NETDEV_10000=y
613# CONFIG_CHELSIO_T1 is not set
614# CONFIG_CHELSIO_T3 is not set
615# CONFIG_IXGBE is not set
616# CONFIG_IXGB is not set
617# CONFIG_S2IO is not set
618# CONFIG_MYRI10GE is not set
619# CONFIG_NETXEN_NIC is not set
620# CONFIG_NIU is not set
621# CONFIG_MLX4_CORE is not set
622# CONFIG_TEHUTI is not set
623# CONFIG_TR is not set
624
625#
626# Wireless LAN
627#
628# CONFIG_WLAN_PRE80211 is not set
629# CONFIG_WLAN_80211 is not set
630
631#
632# USB Network Adapters
633#
634# CONFIG_USB_CATC is not set
635# CONFIG_USB_KAWETH is not set
636# CONFIG_USB_PEGASUS is not set
637# CONFIG_USB_RTL8150 is not set
638# CONFIG_USB_USBNET is not set
639# CONFIG_WAN is not set
640# CONFIG_FDDI is not set
641# CONFIG_HIPPI is not set
642# CONFIG_PPP is not set
643# CONFIG_SLIP is not set
644# CONFIG_NET_FC is not set
645# CONFIG_SHAPER is not set
646# CONFIG_NETCONSOLE is not set
647# CONFIG_NETPOLL is not set
648# CONFIG_NET_POLL_CONTROLLER is not set
649# CONFIG_ISDN is not set
650# CONFIG_PHONE is not set
651
652#
653# Input device support
654#
655CONFIG_INPUT=y
656# CONFIG_INPUT_FF_MEMLESS is not set
657# CONFIG_INPUT_POLLDEV is not set
658
659#
660# Userland interfaces
661#
662# CONFIG_INPUT_MOUSEDEV is not set
663# CONFIG_INPUT_JOYDEV is not set
664# CONFIG_INPUT_EVDEV is not set
665# CONFIG_INPUT_EVBUG is not set
666
667#
668# Input Device Drivers
669#
670# CONFIG_INPUT_KEYBOARD is not set
671# CONFIG_INPUT_MOUSE is not set
672# CONFIG_INPUT_JOYSTICK is not set
673# CONFIG_INPUT_TABLET is not set
674# CONFIG_INPUT_TOUCHSCREEN is not set
675# CONFIG_INPUT_MISC is not set
676
677#
678# Hardware I/O ports
679#
680CONFIG_SERIO=y
681CONFIG_SERIO_I8042=y
682CONFIG_SERIO_SERPORT=y
683# CONFIG_SERIO_PCIPS2 is not set
684CONFIG_SERIO_LIBPS2=y
685# CONFIG_SERIO_RAW is not set
686# CONFIG_GAMEPORT is not set
687
688#
689# Character devices
690#
691CONFIG_VT=y
692CONFIG_VT_CONSOLE=y
693CONFIG_HW_CONSOLE=y
694# CONFIG_VT_HW_CONSOLE_BINDING is not set
695# CONFIG_SERIAL_NONSTANDARD is not set
696
697#
698# Serial drivers
699#
700CONFIG_SERIAL_8250=y
701CONFIG_SERIAL_8250_CONSOLE=y
702CONFIG_SERIAL_8250_PCI=y
703CONFIG_SERIAL_8250_NR_UARTS=2
704CONFIG_SERIAL_8250_RUNTIME_UARTS=2
705CONFIG_SERIAL_8250_EXTENDED=y
706CONFIG_SERIAL_8250_MANY_PORTS=y
707CONFIG_SERIAL_8250_SHARE_IRQ=y
708CONFIG_SERIAL_8250_DETECT_IRQ=y
709CONFIG_SERIAL_8250_RSA=y
710
711#
712# Non-8250 serial port support
713#
714# CONFIG_SERIAL_UARTLITE is not set
715CONFIG_SERIAL_CORE=y
716CONFIG_SERIAL_CORE_CONSOLE=y
717# CONFIG_SERIAL_CPM is not set
718# CONFIG_SERIAL_JSM is not set
719# CONFIG_SERIAL_OF_PLATFORM is not set
720# CONFIG_SERIAL_QE is not set
721CONFIG_UNIX98_PTYS=y
722CONFIG_LEGACY_PTYS=y
723CONFIG_LEGACY_PTY_COUNT=256
724# CONFIG_IPMI_HANDLER is not set
725# CONFIG_HW_RANDOM is not set
726CONFIG_NVRAM=y
727CONFIG_GEN_RTC=y
728CONFIG_GEN_RTC_X=y
729# CONFIG_R3964 is not set
730# CONFIG_APPLICOM is not set
731# CONFIG_RAW_DRIVER is not set
732# CONFIG_TCG_TPM is not set
733CONFIG_DEVPORT=y
734CONFIG_I2C=y
735CONFIG_I2C_BOARDINFO=y
736# CONFIG_I2C_CHARDEV is not set
737
738#
739# I2C Algorithms
740#
741# CONFIG_I2C_ALGOBIT is not set
742# CONFIG_I2C_ALGOPCF is not set
743# CONFIG_I2C_ALGOPCA is not set
744
745#
746# I2C Hardware Bus support
747#
748# CONFIG_I2C_ALI1535 is not set
749# CONFIG_I2C_ALI1563 is not set
750# CONFIG_I2C_ALI15X3 is not set
751# CONFIG_I2C_AMD756 is not set
752# CONFIG_I2C_AMD8111 is not set
753# CONFIG_I2C_I801 is not set
754# CONFIG_I2C_I810 is not set
755# CONFIG_I2C_PIIX4 is not set
756CONFIG_I2C_MPC=y
757# CONFIG_I2C_NFORCE2 is not set
758# CONFIG_I2C_OCORES is not set
759# CONFIG_I2C_PARPORT_LIGHT is not set
760# CONFIG_I2C_PROSAVAGE is not set
761# CONFIG_I2C_SAVAGE4 is not set
762# CONFIG_I2C_SIMTEC is not set
763# CONFIG_I2C_SIS5595 is not set
764# CONFIG_I2C_SIS630 is not set
765# CONFIG_I2C_SIS96X is not set
766# CONFIG_I2C_TAOS_EVM is not set
767# CONFIG_I2C_STUB is not set
768# CONFIG_I2C_TINY_USB is not set
769# CONFIG_I2C_VIA is not set
770# CONFIG_I2C_VIAPRO is not set
771# CONFIG_I2C_VOODOO3 is not set
772
773#
774# Miscellaneous I2C Chip support
775#
776# CONFIG_SENSORS_DS1337 is not set
777# CONFIG_SENSORS_DS1374 is not set
778# CONFIG_DS1682 is not set
779CONFIG_SENSORS_EEPROM=y
780# CONFIG_SENSORS_PCF8574 is not set
781# CONFIG_SENSORS_PCA9539 is not set
782# CONFIG_SENSORS_PCF8591 is not set
783# CONFIG_SENSORS_M41T00 is not set
784# CONFIG_SENSORS_MAX6875 is not set
785# CONFIG_SENSORS_TSL2550 is not set
786# CONFIG_I2C_DEBUG_CORE is not set
787# CONFIG_I2C_DEBUG_ALGO is not set
788# CONFIG_I2C_DEBUG_BUS is not set
789# CONFIG_I2C_DEBUG_CHIP is not set
790
791#
792# SPI support
793#
794# CONFIG_SPI is not set
795# CONFIG_SPI_MASTER is not set
796# CONFIG_W1 is not set
797# CONFIG_POWER_SUPPLY is not set
798# CONFIG_HWMON is not set
799# CONFIG_WATCHDOG is not set
800
801#
802# Sonics Silicon Backplane
803#
804CONFIG_SSB_POSSIBLE=y
805# CONFIG_SSB is not set
806
807#
808# Multifunction device drivers
809#
810# CONFIG_MFD_SM501 is not set
811
812#
813# Multimedia devices
814#
815# CONFIG_VIDEO_DEV is not set
816CONFIG_DVB_CORE=m
817# CONFIG_DVB_CORE_ATTACH is not set
818CONFIG_DVB_CAPTURE_DRIVERS=y
819
820#
821# Supported SAA7146 based PCI Adapters
822#
823
824#
825# Supported USB Adapters
826#
827# CONFIG_DVB_USB is not set
828# CONFIG_DVB_TTUSB_BUDGET is not set
829# CONFIG_DVB_TTUSB_DEC is not set
830# CONFIG_DVB_CINERGYT2 is not set
831
832#
833# Supported FlexCopII (B2C2) Adapters
834#
835# CONFIG_DVB_B2C2_FLEXCOP is not set
836
837#
838# Supported BT878 Adapters
839#
840
841#
842# Supported Pluto2 Adapters
843#
844# CONFIG_DVB_PLUTO2 is not set
845
846#
847# Supported DVB Frontends
848#
849
850#
851# Customise DVB Frontends
852#
853# CONFIG_DVB_FE_CUSTOMISE is not set
854
855#
856# DVB-S (satellite) frontends
857#
858# CONFIG_DVB_STV0299 is not set
859# CONFIG_DVB_CX24110 is not set
860# CONFIG_DVB_CX24123 is not set
861# CONFIG_DVB_TDA8083 is not set
862# CONFIG_DVB_MT312 is not set
863# CONFIG_DVB_VES1X93 is not set
864# CONFIG_DVB_S5H1420 is not set
865# CONFIG_DVB_TDA10086 is not set
866
867#
868# DVB-T (terrestrial) frontends
869#
870# CONFIG_DVB_SP8870 is not set
871# CONFIG_DVB_SP887X is not set
872# CONFIG_DVB_CX22700 is not set
873# CONFIG_DVB_CX22702 is not set
874# CONFIG_DVB_L64781 is not set
875# CONFIG_DVB_TDA1004X is not set
876# CONFIG_DVB_NXT6000 is not set
877# CONFIG_DVB_MT352 is not set
878# CONFIG_DVB_ZL10353 is not set
879# CONFIG_DVB_DIB3000MB is not set
880# CONFIG_DVB_DIB3000MC is not set
881# CONFIG_DVB_DIB7000M is not set
882# CONFIG_DVB_DIB7000P is not set
883
884#
885# DVB-C (cable) frontends
886#
887# CONFIG_DVB_VES1820 is not set
888# CONFIG_DVB_TDA10021 is not set
889# CONFIG_DVB_TDA10023 is not set
890# CONFIG_DVB_STV0297 is not set
891
892#
893# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
894#
895# CONFIG_DVB_NXT200X is not set
896# CONFIG_DVB_OR51211 is not set
897# CONFIG_DVB_OR51132 is not set
898# CONFIG_DVB_BCM3510 is not set
899# CONFIG_DVB_LGDT330X is not set
900# CONFIG_DVB_S5H1409 is not set
901
902#
903# Tuners/PLL support
904#
905# CONFIG_DVB_PLL is not set
906# CONFIG_DVB_TDA826X is not set
907# CONFIG_DVB_TDA827X is not set
908# CONFIG_DVB_TUNER_QT1010 is not set
909# CONFIG_DVB_TUNER_MT2060 is not set
910# CONFIG_DVB_TUNER_MT2266 is not set
911# CONFIG_DVB_TUNER_MT2131 is not set
912# CONFIG_DVB_TUNER_DIB0070 is not set
913
914#
915# Miscellaneous devices
916#
917# CONFIG_DVB_LNBP21 is not set
918# CONFIG_DVB_ISL6421 is not set
919# CONFIG_DVB_TUA6100 is not set
920CONFIG_DAB=y
921# CONFIG_USB_DABUSB is not set
922
923#
924# Graphics support
925#
926# CONFIG_AGP is not set
927# CONFIG_DRM is not set
928# CONFIG_VGASTATE is not set
929CONFIG_VIDEO_OUTPUT_CONTROL=y
930# CONFIG_FB is not set
931# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
932
933#
934# Display device support
935#
936# CONFIG_DISPLAY_SUPPORT is not set
937
938#
939# Console display driver support
940#
941CONFIG_VGA_CONSOLE=y
942# CONFIG_VGACON_SOFT_SCROLLBACK is not set
943CONFIG_DUMMY_CONSOLE=y
944
945#
946# Sound
947#
948CONFIG_SOUND=y
949
950#
951# Advanced Linux Sound Architecture
952#
953CONFIG_SND=y
954CONFIG_SND_TIMER=y
955CONFIG_SND_PCM=y
956# CONFIG_SND_SEQUENCER is not set
957# CONFIG_SND_MIXER_OSS is not set
958# CONFIG_SND_PCM_OSS is not set
959# CONFIG_SND_DYNAMIC_MINORS is not set
960CONFIG_SND_SUPPORT_OLD_API=y
961CONFIG_SND_VERBOSE_PROCFS=y
962# CONFIG_SND_VERBOSE_PRINTK is not set
963# CONFIG_SND_DEBUG is not set
964
965#
966# Generic devices
967#
968CONFIG_SND_AC97_CODEC=y
969# CONFIG_SND_DUMMY is not set
970# CONFIG_SND_MTPAV is not set
971# CONFIG_SND_SERIAL_U16550 is not set
972# CONFIG_SND_MPU401 is not set
973
974#
975# PCI devices
976#
977# CONFIG_SND_AD1889 is not set
978# CONFIG_SND_ALS300 is not set
979# CONFIG_SND_ALS4000 is not set
980# CONFIG_SND_ALI5451 is not set
981# CONFIG_SND_ATIIXP is not set
982# CONFIG_SND_ATIIXP_MODEM is not set
983# CONFIG_SND_AU8810 is not set
984# CONFIG_SND_AU8820 is not set
985# CONFIG_SND_AU8830 is not set
986# CONFIG_SND_AZT3328 is not set
987# CONFIG_SND_BT87X is not set
988# CONFIG_SND_CA0106 is not set
989# CONFIG_SND_CMIPCI is not set
990# CONFIG_SND_CS4281 is not set
991# CONFIG_SND_CS46XX is not set
992# CONFIG_SND_CS5530 is not set
993# CONFIG_SND_DARLA20 is not set
994# CONFIG_SND_GINA20 is not set
995# CONFIG_SND_LAYLA20 is not set
996# CONFIG_SND_DARLA24 is not set
997# CONFIG_SND_GINA24 is not set
998# CONFIG_SND_LAYLA24 is not set
999# CONFIG_SND_MONA is not set
1000# CONFIG_SND_MIA is not set
1001# CONFIG_SND_ECHO3G is not set
1002# CONFIG_SND_INDIGO is not set
1003# CONFIG_SND_INDIGOIO is not set
1004# CONFIG_SND_INDIGODJ is not set
1005# CONFIG_SND_EMU10K1 is not set
1006# CONFIG_SND_EMU10K1X is not set
1007# CONFIG_SND_ENS1370 is not set
1008# CONFIG_SND_ENS1371 is not set
1009# CONFIG_SND_ES1938 is not set
1010# CONFIG_SND_ES1968 is not set
1011# CONFIG_SND_FM801 is not set
1012# CONFIG_SND_HDA_INTEL is not set
1013# CONFIG_SND_HDSP is not set
1014# CONFIG_SND_HDSPM is not set
1015# CONFIG_SND_ICE1712 is not set
1016# CONFIG_SND_ICE1724 is not set
1017CONFIG_SND_INTEL8X0=y
1018# CONFIG_SND_INTEL8X0M is not set
1019# CONFIG_SND_KORG1212 is not set
1020# CONFIG_SND_MAESTRO3 is not set
1021# CONFIG_SND_MIXART is not set
1022# CONFIG_SND_NM256 is not set
1023# CONFIG_SND_PCXHR is not set
1024# CONFIG_SND_RIPTIDE is not set
1025# CONFIG_SND_RME32 is not set
1026# CONFIG_SND_RME96 is not set
1027# CONFIG_SND_RME9652 is not set
1028# CONFIG_SND_SONICVIBES is not set
1029# CONFIG_SND_TRIDENT is not set
1030# CONFIG_SND_VIA82XX is not set
1031# CONFIG_SND_VIA82XX_MODEM is not set
1032# CONFIG_SND_VX222 is not set
1033# CONFIG_SND_YMFPCI is not set
1034# CONFIG_SND_AC97_POWER_SAVE is not set
1035
1036#
1037# ALSA PowerMac devices
1038#
1039
1040#
1041# ALSA PowerPC devices
1042#
1043
1044#
1045# USB devices
1046#
1047# CONFIG_SND_USB_AUDIO is not set
1048# CONFIG_SND_USB_USX2Y is not set
1049# CONFIG_SND_USB_CAIAQ is not set
1050
1051#
1052# System on Chip audio support
1053#
1054# CONFIG_SND_SOC is not set
1055
1056#
1057# SoC Audio support for SuperH
1058#
1059
1060#
1061# Open Sound System
1062#
1063# CONFIG_SOUND_PRIME is not set
1064CONFIG_AC97_BUS=y
1065CONFIG_HID_SUPPORT=y
1066CONFIG_HID=y
1067# CONFIG_HID_DEBUG is not set
1068# CONFIG_HIDRAW is not set
1069
1070#
1071# USB Input Devices
1072#
1073CONFIG_USB_HID=y
1074# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1075# CONFIG_HID_FF is not set
1076# CONFIG_USB_HIDDEV is not set
1077CONFIG_USB_SUPPORT=y
1078CONFIG_USB_ARCH_HAS_HCD=y
1079CONFIG_USB_ARCH_HAS_OHCI=y
1080CONFIG_USB_ARCH_HAS_EHCI=y
1081CONFIG_USB=y
1082# CONFIG_USB_DEBUG is not set
1083
1084#
1085# Miscellaneous USB options
1086#
1087CONFIG_USB_DEVICEFS=y
1088CONFIG_USB_DEVICE_CLASS=y
1089# CONFIG_USB_DYNAMIC_MINORS is not set
1090# CONFIG_USB_OTG is not set
1091
1092#
1093# USB Host Controller Drivers
1094#
1095CONFIG_USB_EHCI_HCD=y
1096# CONFIG_USB_EHCI_SPLIT_ISO is not set
1097# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1098# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1099# CONFIG_USB_ISP116X_HCD is not set
1100CONFIG_USB_OHCI_HCD=y
1101CONFIG_USB_OHCI_HCD_PPC_OF=y
1102CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1103CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
1104CONFIG_USB_OHCI_HCD_PCI=y
1105CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1106CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1107CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1108# CONFIG_USB_UHCI_HCD is not set
1109# CONFIG_USB_SL811_HCD is not set
1110# CONFIG_USB_R8A66597_HCD is not set
1111
1112#
1113# USB Device Class drivers
1114#
1115# CONFIG_USB_ACM is not set
1116# CONFIG_USB_PRINTER is not set
1117
1118#
1119# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1120#
1121
1122#
1123# may also be needed; see USB_STORAGE Help for more information
1124#
1125CONFIG_USB_STORAGE=y
1126# CONFIG_USB_STORAGE_DEBUG is not set
1127# CONFIG_USB_STORAGE_DATAFAB is not set
1128# CONFIG_USB_STORAGE_FREECOM is not set
1129# CONFIG_USB_STORAGE_ISD200 is not set
1130# CONFIG_USB_STORAGE_DPCM is not set
1131# CONFIG_USB_STORAGE_USBAT is not set
1132# CONFIG_USB_STORAGE_SDDR09 is not set
1133# CONFIG_USB_STORAGE_SDDR55 is not set
1134# CONFIG_USB_STORAGE_JUMPSHOT is not set
1135# CONFIG_USB_STORAGE_ALAUDA is not set
1136# CONFIG_USB_STORAGE_KARMA is not set
1137# CONFIG_USB_LIBUSUAL is not set
1138
1139#
1140# USB Imaging devices
1141#
1142# CONFIG_USB_MDC800 is not set
1143# CONFIG_USB_MICROTEK is not set
1144CONFIG_USB_MON=y
1145
1146#
1147# USB port drivers
1148#
1149
1150#
1151# USB Serial Converter support
1152#
1153# CONFIG_USB_SERIAL is not set
1154
1155#
1156# USB Miscellaneous drivers
1157#
1158# CONFIG_USB_EMI62 is not set
1159# CONFIG_USB_EMI26 is not set
1160# CONFIG_USB_ADUTUX is not set
1161# CONFIG_USB_AUERSWALD is not set
1162# CONFIG_USB_RIO500 is not set
1163# CONFIG_USB_LEGOTOWER is not set
1164# CONFIG_USB_LCD is not set
1165# CONFIG_USB_BERRY_CHARGE is not set
1166# CONFIG_USB_LED is not set
1167# CONFIG_USB_CYPRESS_CY7C63 is not set
1168# CONFIG_USB_CYTHERM is not set
1169# CONFIG_USB_PHIDGET is not set
1170# CONFIG_USB_IDMOUSE is not set
1171# CONFIG_USB_FTDI_ELAN is not set
1172# CONFIG_USB_APPLEDISPLAY is not set
1173# CONFIG_USB_SISUSBVGA is not set
1174# CONFIG_USB_LD is not set
1175# CONFIG_USB_TRANCEVIBRATOR is not set
1176# CONFIG_USB_IOWARRIOR is not set
1177# CONFIG_USB_TEST is not set
1178
1179#
1180# USB DSL modem support
1181#
1182
1183#
1184# USB Gadget Support
1185#
1186# CONFIG_USB_GADGET is not set
1187# CONFIG_MMC is not set
1188# CONFIG_NEW_LEDS is not set
1189# CONFIG_INFINIBAND is not set
1190# CONFIG_EDAC is not set
1191CONFIG_RTC_LIB=y
1192CONFIG_RTC_CLASS=y
1193CONFIG_RTC_HCTOSYS=y
1194CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1195# CONFIG_RTC_DEBUG is not set
1196
1197#
1198# RTC interfaces
1199#
1200CONFIG_RTC_INTF_SYSFS=y
1201CONFIG_RTC_INTF_PROC=y
1202CONFIG_RTC_INTF_DEV=y
1203# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1204# CONFIG_RTC_DRV_TEST is not set
1205
1206#
1207# I2C RTC drivers
1208#
1209# CONFIG_RTC_DRV_DS1307 is not set
1210# CONFIG_RTC_DRV_DS1374 is not set
1211# CONFIG_RTC_DRV_DS1672 is not set
1212# CONFIG_RTC_DRV_MAX6900 is not set
1213# CONFIG_RTC_DRV_RS5C372 is not set
1214# CONFIG_RTC_DRV_ISL1208 is not set
1215# CONFIG_RTC_DRV_X1205 is not set
1216# CONFIG_RTC_DRV_PCF8563 is not set
1217# CONFIG_RTC_DRV_PCF8583 is not set
1218# CONFIG_RTC_DRV_M41T80 is not set
1219
1220#
1221# SPI RTC drivers
1222#
1223
1224#
1225# Platform RTC drivers
1226#
1227CONFIG_RTC_DRV_CMOS=y
1228# CONFIG_RTC_DRV_DS1553 is not set
1229# CONFIG_RTC_DRV_STK17TA8 is not set
1230# CONFIG_RTC_DRV_DS1742 is not set
1231# CONFIG_RTC_DRV_M48T86 is not set
1232# CONFIG_RTC_DRV_M48T59 is not set
1233# CONFIG_RTC_DRV_V3020 is not set
1234
1235#
1236# on-CPU RTC drivers
1237#
1238
1239#
1240# Userspace I/O
1241#
1242# CONFIG_UIO is not set
1243
1244#
1245# File systems
1246#
1247CONFIG_EXT2_FS=y
1248# CONFIG_EXT2_FS_XATTR is not set
1249# CONFIG_EXT2_FS_XIP is not set
1250CONFIG_EXT3_FS=y
1251CONFIG_EXT3_FS_XATTR=y
1252# CONFIG_EXT3_FS_POSIX_ACL is not set
1253# CONFIG_EXT3_FS_SECURITY is not set
1254# CONFIG_EXT4DEV_FS is not set
1255CONFIG_JBD=y
1256CONFIG_FS_MBCACHE=y
1257# CONFIG_REISERFS_FS is not set
1258# CONFIG_JFS_FS is not set
1259# CONFIG_FS_POSIX_ACL is not set
1260# CONFIG_XFS_FS is not set
1261# CONFIG_GFS2_FS is not set
1262# CONFIG_OCFS2_FS is not set
1263# CONFIG_MINIX_FS is not set
1264# CONFIG_ROMFS_FS is not set
1265CONFIG_INOTIFY=y
1266CONFIG_INOTIFY_USER=y
1267# CONFIG_QUOTA is not set
1268CONFIG_DNOTIFY=y
1269# CONFIG_AUTOFS_FS is not set
1270# CONFIG_AUTOFS4_FS is not set
1271# CONFIG_FUSE_FS is not set
1272
1273#
1274# CD-ROM/DVD Filesystems
1275#
1276CONFIG_ISO9660_FS=m
1277CONFIG_JOLIET=y
1278CONFIG_ZISOFS=y
1279CONFIG_UDF_FS=m
1280CONFIG_UDF_NLS=y
1281
1282#
1283# DOS/FAT/NT Filesystems
1284#
1285CONFIG_FAT_FS=y
1286CONFIG_MSDOS_FS=m
1287CONFIG_VFAT_FS=y
1288CONFIG_FAT_DEFAULT_CODEPAGE=437
1289CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1290CONFIG_NTFS_FS=y
1291# CONFIG_NTFS_DEBUG is not set
1292# CONFIG_NTFS_RW is not set
1293
1294#
1295# Pseudo filesystems
1296#
1297CONFIG_PROC_FS=y
1298CONFIG_PROC_KCORE=y
1299CONFIG_PROC_SYSCTL=y
1300CONFIG_SYSFS=y
1301CONFIG_TMPFS=y
1302# CONFIG_TMPFS_POSIX_ACL is not set
1303# CONFIG_HUGETLB_PAGE is not set
1304# CONFIG_CONFIGFS_FS is not set
1305
1306#
1307# Miscellaneous filesystems
1308#
1309CONFIG_ADFS_FS=m
1310# CONFIG_ADFS_FS_RW is not set
1311CONFIG_AFFS_FS=m
1312CONFIG_HFS_FS=m
1313CONFIG_HFSPLUS_FS=m
1314CONFIG_BEFS_FS=m
1315# CONFIG_BEFS_DEBUG is not set
1316CONFIG_BFS_FS=m
1317CONFIG_EFS_FS=m
1318CONFIG_CRAMFS=y
1319CONFIG_VXFS_FS=m
1320CONFIG_HPFS_FS=m
1321CONFIG_QNX4FS_FS=m
1322CONFIG_SYSV_FS=m
1323CONFIG_UFS_FS=m
1324# CONFIG_UFS_FS_WRITE is not set
1325# CONFIG_UFS_DEBUG is not set
1326CONFIG_NETWORK_FILESYSTEMS=y
1327CONFIG_NFS_FS=y
1328CONFIG_NFS_V3=y
1329# CONFIG_NFS_V3_ACL is not set
1330CONFIG_NFS_V4=y
1331# CONFIG_NFS_DIRECTIO is not set
1332CONFIG_NFSD=y
1333# CONFIG_NFSD_V3 is not set
1334CONFIG_NFSD_TCP=y
1335CONFIG_ROOT_NFS=y
1336CONFIG_LOCKD=y
1337CONFIG_LOCKD_V4=y
1338CONFIG_EXPORTFS=y
1339CONFIG_NFS_COMMON=y
1340CONFIG_SUNRPC=y
1341CONFIG_SUNRPC_GSS=y
1342# CONFIG_SUNRPC_BIND34 is not set
1343CONFIG_RPCSEC_GSS_KRB5=y
1344# CONFIG_RPCSEC_GSS_SPKM3 is not set
1345# CONFIG_SMB_FS is not set
1346# CONFIG_CIFS is not set
1347# CONFIG_NCP_FS is not set
1348# CONFIG_CODA_FS is not set
1349# CONFIG_AFS_FS is not set
1350
1351#
1352# Partition Types
1353#
1354CONFIG_PARTITION_ADVANCED=y
1355# CONFIG_ACORN_PARTITION is not set
1356# CONFIG_OSF_PARTITION is not set
1357# CONFIG_AMIGA_PARTITION is not set
1358# CONFIG_ATARI_PARTITION is not set
1359CONFIG_MAC_PARTITION=y
1360CONFIG_MSDOS_PARTITION=y
1361# CONFIG_BSD_DISKLABEL is not set
1362# CONFIG_MINIX_SUBPARTITION is not set
1363# CONFIG_SOLARIS_X86_PARTITION is not set
1364# CONFIG_UNIXWARE_DISKLABEL is not set
1365# CONFIG_LDM_PARTITION is not set
1366# CONFIG_SGI_PARTITION is not set
1367# CONFIG_ULTRIX_PARTITION is not set
1368# CONFIG_SUN_PARTITION is not set
1369# CONFIG_KARMA_PARTITION is not set
1370# CONFIG_EFI_PARTITION is not set
1371# CONFIG_SYSV68_PARTITION is not set
1372CONFIG_NLS=y
1373CONFIG_NLS_DEFAULT="iso8859-1"
1374# CONFIG_NLS_CODEPAGE_437 is not set
1375# CONFIG_NLS_CODEPAGE_737 is not set
1376# CONFIG_NLS_CODEPAGE_775 is not set
1377# CONFIG_NLS_CODEPAGE_850 is not set
1378# CONFIG_NLS_CODEPAGE_852 is not set
1379# CONFIG_NLS_CODEPAGE_855 is not set
1380# CONFIG_NLS_CODEPAGE_857 is not set
1381# CONFIG_NLS_CODEPAGE_860 is not set
1382# CONFIG_NLS_CODEPAGE_861 is not set
1383# CONFIG_NLS_CODEPAGE_862 is not set
1384# CONFIG_NLS_CODEPAGE_863 is not set
1385# CONFIG_NLS_CODEPAGE_864 is not set
1386# CONFIG_NLS_CODEPAGE_865 is not set
1387# CONFIG_NLS_CODEPAGE_866 is not set
1388# CONFIG_NLS_CODEPAGE_869 is not set
1389# CONFIG_NLS_CODEPAGE_936 is not set
1390# CONFIG_NLS_CODEPAGE_950 is not set
1391# CONFIG_NLS_CODEPAGE_932 is not set
1392# CONFIG_NLS_CODEPAGE_949 is not set
1393# CONFIG_NLS_CODEPAGE_874 is not set
1394# CONFIG_NLS_ISO8859_8 is not set
1395# CONFIG_NLS_CODEPAGE_1250 is not set
1396# CONFIG_NLS_CODEPAGE_1251 is not set
1397# CONFIG_NLS_ASCII is not set
1398# CONFIG_NLS_ISO8859_1 is not set
1399# CONFIG_NLS_ISO8859_2 is not set
1400# CONFIG_NLS_ISO8859_3 is not set
1401# CONFIG_NLS_ISO8859_4 is not set
1402# CONFIG_NLS_ISO8859_5 is not set
1403# CONFIG_NLS_ISO8859_6 is not set
1404# CONFIG_NLS_ISO8859_7 is not set
1405# CONFIG_NLS_ISO8859_9 is not set
1406# CONFIG_NLS_ISO8859_13 is not set
1407# CONFIG_NLS_ISO8859_14 is not set
1408# CONFIG_NLS_ISO8859_15 is not set
1409# CONFIG_NLS_KOI8_R is not set
1410# CONFIG_NLS_KOI8_U is not set
1411CONFIG_NLS_UTF8=m
1412# CONFIG_DLM is not set
1413
1414#
1415# Library routines
1416#
1417CONFIG_BITREVERSE=y
1418# CONFIG_CRC_CCITT is not set
1419# CONFIG_CRC16 is not set
1420# CONFIG_CRC_ITU_T is not set
1421CONFIG_CRC32=y
1422# CONFIG_CRC7 is not set
1423CONFIG_LIBCRC32C=m
1424CONFIG_ZLIB_INFLATE=y
1425CONFIG_PLIST=y
1426CONFIG_HAS_IOMEM=y
1427CONFIG_HAS_IOPORT=y
1428CONFIG_HAS_DMA=y
1429# CONFIG_INSTRUMENTATION is not set
1430
1431#
1432# Kernel hacking
1433#
1434# CONFIG_PRINTK_TIME is not set
1435CONFIG_ENABLE_WARN_DEPRECATED=y
1436CONFIG_ENABLE_MUST_CHECK=y
1437# CONFIG_MAGIC_SYSRQ is not set
1438# CONFIG_UNUSED_SYMBOLS is not set
1439# CONFIG_DEBUG_FS is not set
1440# CONFIG_HEADERS_CHECK is not set
1441CONFIG_DEBUG_KERNEL=y
1442# CONFIG_DEBUG_SHIRQ is not set
1443CONFIG_DETECT_SOFTLOCKUP=y
1444CONFIG_SCHED_DEBUG=y
1445# CONFIG_SCHEDSTATS is not set
1446# CONFIG_TIMER_STATS is not set
1447# CONFIG_SLUB_DEBUG_ON is not set
1448# CONFIG_DEBUG_RT_MUTEXES is not set
1449# CONFIG_RT_MUTEX_TESTER is not set
1450# CONFIG_DEBUG_SPINLOCK is not set
1451# CONFIG_DEBUG_MUTEXES is not set
1452# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1453# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1454# CONFIG_DEBUG_KOBJECT is not set
1455# CONFIG_DEBUG_HIGHMEM is not set
1456# CONFIG_DEBUG_BUGVERBOSE is not set
1457CONFIG_DEBUG_INFO=y
1458# CONFIG_DEBUG_VM is not set
1459# CONFIG_DEBUG_LIST is not set
1460# CONFIG_DEBUG_SG is not set
1461CONFIG_FORCED_INLINING=y
1462# CONFIG_BOOT_PRINTK_DELAY is not set
1463# CONFIG_RCU_TORTURE_TEST is not set
1464# CONFIG_FAULT_INJECTION is not set
1465# CONFIG_SAMPLES is not set
1466# CONFIG_DEBUG_STACKOVERFLOW is not set
1467# CONFIG_DEBUG_STACK_USAGE is not set
1468# CONFIG_DEBUG_PAGEALLOC is not set
1469# CONFIG_DEBUGGER is not set
1470# CONFIG_KGDB_CONSOLE is not set
1471# CONFIG_BDI_SWITCH is not set
1472# CONFIG_PPC_EARLY_DEBUG is not set
1473
1474#
1475# Security options
1476#
1477# CONFIG_KEYS is not set
1478# CONFIG_SECURITY is not set
1479# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1480CONFIG_CRYPTO=y
1481CONFIG_CRYPTO_ALGAPI=y
1482CONFIG_CRYPTO_BLKCIPHER=y
1483CONFIG_CRYPTO_HASH=y
1484CONFIG_CRYPTO_MANAGER=y
1485CONFIG_CRYPTO_HMAC=y
1486# CONFIG_CRYPTO_XCBC is not set
1487# CONFIG_CRYPTO_NULL is not set
1488# CONFIG_CRYPTO_MD4 is not set
1489CONFIG_CRYPTO_MD5=y
1490CONFIG_CRYPTO_SHA1=m
1491# CONFIG_CRYPTO_SHA256 is not set
1492# CONFIG_CRYPTO_SHA512 is not set
1493# CONFIG_CRYPTO_WP512 is not set
1494# CONFIG_CRYPTO_TGR192 is not set
1495# CONFIG_CRYPTO_GF128MUL is not set
1496# CONFIG_CRYPTO_ECB is not set
1497CONFIG_CRYPTO_CBC=y
1498CONFIG_CRYPTO_PCBC=m
1499# CONFIG_CRYPTO_LRW is not set
1500# CONFIG_CRYPTO_XTS is not set
1501# CONFIG_CRYPTO_CRYPTD is not set
1502CONFIG_CRYPTO_DES=y
1503# CONFIG_CRYPTO_FCRYPT is not set
1504# CONFIG_CRYPTO_BLOWFISH is not set
1505# CONFIG_CRYPTO_TWOFISH is not set
1506# CONFIG_CRYPTO_SERPENT is not set
1507# CONFIG_CRYPTO_AES is not set
1508# CONFIG_CRYPTO_CAST5 is not set
1509# CONFIG_CRYPTO_CAST6 is not set
1510# CONFIG_CRYPTO_TEA is not set
1511# CONFIG_CRYPTO_ARC4 is not set
1512# CONFIG_CRYPTO_KHAZAD is not set
1513# CONFIG_CRYPTO_ANUBIS is not set
1514# CONFIG_CRYPTO_SEED is not set
1515# CONFIG_CRYPTO_DEFLATE is not set
1516# CONFIG_CRYPTO_MICHAEL_MIC is not set
1517# CONFIG_CRYPTO_CRC32C is not set
1518# CONFIG_CRYPTO_CAMELLIA is not set
1519# CONFIG_CRYPTO_TEST is not set
1520# CONFIG_CRYPTO_AUTHENC is not set
1521CONFIG_CRYPTO_HW=y
1522# CONFIG_PPC_CLOCK is not set
1523CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/sbc834x_defconfig b/arch/powerpc/configs/sbc834x_defconfig
new file mode 100644
index 000000000000..9245bcc24724
--- /dev/null
+++ b/arch/powerpc/configs/sbc834x_defconfig
@@ -0,0 +1,800 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc8
4# Thu Jan 24 15:54:27 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y
19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set
23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y
26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y
32CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y
35CONFIG_GENERIC_HWEIGHT=y
36CONFIG_GENERIC_CALIBRATE_DELAY=y
37CONFIG_GENERIC_FIND_NEXT_BIT=y
38# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
39CONFIG_PPC=y
40CONFIG_EARLY_PRINTK=y
41CONFIG_GENERIC_NVRAM=y
42CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
43CONFIG_ARCH_MAY_HAVE_PC_FDC=y
44CONFIG_PPC_OF=y
45CONFIG_OF=y
46CONFIG_PPC_UDBG_16550=y
47# CONFIG_GENERIC_TBSYNC is not set
48CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y
50CONFIG_DEFAULT_UIMAGE=y
51# CONFIG_PPC_DCR_NATIVE is not set
52# CONFIG_PPC_DCR_MMIO is not set
53CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
54
55#
56# General setup
57#
58CONFIG_EXPERIMENTAL=y
59CONFIG_BROKEN_ON_SMP=y
60CONFIG_INIT_ENV_ARG_LIMIT=32
61CONFIG_LOCALVERSION=""
62CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y
64CONFIG_SYSVIPC=y
65CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y
77# CONFIG_FAIR_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y
79# CONFIG_RELAY is not set
80CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
83CONFIG_SYSCTL=y
84CONFIG_EMBEDDED=y
85CONFIG_SYSCTL_SYSCALL=y
86# CONFIG_KALLSYMS is not set
87CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y
89CONFIG_BUG=y
90CONFIG_ELF_CORE=y
91CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y
94# CONFIG_EPOLL is not set
95CONFIG_SIGNALFD=y
96CONFIG_EVENTFD=y
97CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
102CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0
106CONFIG_MODULES=y
107CONFIG_MODULE_UNLOAD=y
108# CONFIG_MODULE_FORCE_UNLOAD is not set
109# CONFIG_MODVERSIONS is not set
110# CONFIG_MODULE_SRCVERSION_ALL is not set
111# CONFIG_KMOD is not set
112CONFIG_BLOCK=y
113# CONFIG_LBD is not set
114# CONFIG_BLK_DEV_IO_TRACE is not set
115# CONFIG_LSF is not set
116# CONFIG_BLK_DEV_BSG is not set
117
118#
119# IO Schedulers
120#
121CONFIG_IOSCHED_NOOP=y
122CONFIG_IOSCHED_AS=y
123CONFIG_IOSCHED_DEADLINE=y
124CONFIG_IOSCHED_CFQ=y
125CONFIG_DEFAULT_AS=y
126# CONFIG_DEFAULT_DEADLINE is not set
127# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory"
130
131#
132# Platform support
133#
134# CONFIG_PPC_MULTIPLATFORM is not set
135# CONFIG_PPC_82xx is not set
136CONFIG_PPC_83xx=y
137# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
143# CONFIG_MPC8313_RDB is not set
144# CONFIG_MPC832x_MDS is not set
145# CONFIG_MPC832x_RDB is not set
146# CONFIG_MPC834x_MDS is not set
147# CONFIG_MPC834x_ITX is not set
148# CONFIG_MPC836x_MDS is not set
149# CONFIG_MPC837x_MDS is not set
150CONFIG_SBC834x=y
151CONFIG_MPC834x=y
152CONFIG_IPIC=y
153# CONFIG_MPIC is not set
154# CONFIG_MPIC_WEIRD is not set
155# CONFIG_PPC_I8259 is not set
156# CONFIG_PPC_RTAS is not set
157# CONFIG_MMIO_NVRAM is not set
158# CONFIG_PPC_MPC106 is not set
159# CONFIG_PPC_970_NAP is not set
160# CONFIG_PPC_INDIRECT_IO is not set
161# CONFIG_GENERIC_IOMAP is not set
162# CONFIG_CPU_FREQ is not set
163# CONFIG_FSL_ULI1575 is not set
164
165#
166# Kernel options
167#
168# CONFIG_HIGHMEM is not set
169# CONFIG_TICK_ONESHOT is not set
170# CONFIG_NO_HZ is not set
171# CONFIG_HIGH_RES_TIMERS is not set
172CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
173# CONFIG_HZ_100 is not set
174CONFIG_HZ_250=y
175# CONFIG_HZ_300 is not set
176# CONFIG_HZ_1000 is not set
177CONFIG_HZ=250
178CONFIG_PREEMPT_NONE=y
179# CONFIG_PREEMPT_VOLUNTARY is not set
180# CONFIG_PREEMPT is not set
181CONFIG_BINFMT_ELF=y
182# CONFIG_BINFMT_MISC is not set
183CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
184CONFIG_ARCH_FLATMEM_ENABLE=y
185CONFIG_ARCH_POPULATES_NODE_MAP=y
186CONFIG_SELECT_MEMORY_MODEL=y
187CONFIG_FLATMEM_MANUAL=y
188# CONFIG_DISCONTIGMEM_MANUAL is not set
189# CONFIG_SPARSEMEM_MANUAL is not set
190CONFIG_FLATMEM=y
191CONFIG_FLAT_NODE_MEM_MAP=y
192# CONFIG_SPARSEMEM_STATIC is not set
193# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
195# CONFIG_RESOURCES_64BIT is not set
196CONFIG_ZONE_DMA_FLAG=1
197CONFIG_BOUNCE=y
198CONFIG_VIRT_TO_BUS=y
199CONFIG_PROC_DEVICETREE=y
200# CONFIG_CMDLINE_BOOL is not set
201# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
204CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE=""
207CONFIG_ISA_DMA_API=y
208
209#
210# Bus options
211#
212CONFIG_ZONE_DMA=y
213CONFIG_GENERIC_ISA_DMA=y
214CONFIG_PPC_INDIRECT_PCI=y
215CONFIG_FSL_SOC=y
216# CONFIG_PCI is not set
217# CONFIG_PCI_DOMAINS is not set
218# CONFIG_PCI_SYSCALL is not set
219# CONFIG_ARCH_SUPPORTS_MSI is not set
220# CONFIG_PCCARD is not set
221
222#
223# Advanced setup
224#
225# CONFIG_ADVANCED_OPTIONS is not set
226
227#
228# Default settings for advanced configuration options are used
229#
230CONFIG_HIGHMEM_START=0xfe000000
231CONFIG_LOWMEM_SIZE=0x30000000
232CONFIG_KERNEL_START=0xc0000000
233CONFIG_TASK_SIZE=0xc0000000
234CONFIG_BOOT_LOAD=0x00800000
235
236#
237# Networking
238#
239CONFIG_NET=y
240
241#
242# Networking options
243#
244CONFIG_PACKET=y
245# CONFIG_PACKET_MMAP is not set
246CONFIG_UNIX=y
247CONFIG_XFRM=y
248CONFIG_XFRM_USER=m
249# CONFIG_XFRM_SUB_POLICY is not set
250# CONFIG_XFRM_MIGRATE is not set
251# CONFIG_NET_KEY is not set
252CONFIG_INET=y
253CONFIG_IP_MULTICAST=y
254# CONFIG_IP_ADVANCED_ROUTER is not set
255CONFIG_IP_FIB_HASH=y
256CONFIG_IP_PNP=y
257CONFIG_IP_PNP_DHCP=y
258CONFIG_IP_PNP_BOOTP=y
259# CONFIG_IP_PNP_RARP is not set
260# CONFIG_NET_IPIP is not set
261# CONFIG_NET_IPGRE is not set
262# CONFIG_IP_MROUTE is not set
263# CONFIG_ARPD is not set
264CONFIG_SYN_COOKIES=y
265# CONFIG_INET_AH is not set
266# CONFIG_INET_ESP is not set
267# CONFIG_INET_IPCOMP is not set
268# CONFIG_INET_XFRM_TUNNEL is not set
269# CONFIG_INET_TUNNEL is not set
270CONFIG_INET_XFRM_MODE_TRANSPORT=y
271CONFIG_INET_XFRM_MODE_TUNNEL=y
272CONFIG_INET_XFRM_MODE_BEET=y
273# CONFIG_INET_LRO is not set
274CONFIG_INET_DIAG=y
275CONFIG_INET_TCP_DIAG=y
276# CONFIG_TCP_CONG_ADVANCED is not set
277CONFIG_TCP_CONG_CUBIC=y
278CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_TCP_MD5SIG is not set
280# CONFIG_IPV6 is not set
281# CONFIG_INET6_XFRM_TUNNEL is not set
282# CONFIG_INET6_TUNNEL is not set
283# CONFIG_NETWORK_SECMARK is not set
284# CONFIG_NETFILTER is not set
285# CONFIG_IP_DCCP is not set
286# CONFIG_IP_SCTP is not set
287# CONFIG_TIPC is not set
288# CONFIG_ATM is not set
289# CONFIG_BRIDGE is not set
290# CONFIG_VLAN_8021Q is not set
291# CONFIG_DECNET is not set
292# CONFIG_LLC2 is not set
293# CONFIG_IPX is not set
294# CONFIG_ATALK is not set
295# CONFIG_X25 is not set
296# CONFIG_LAPB is not set
297# CONFIG_ECONET is not set
298# CONFIG_WAN_ROUTER is not set
299# CONFIG_NET_SCHED is not set
300
301#
302# Network testing
303#
304# CONFIG_NET_PKTGEN is not set
305# CONFIG_HAMRADIO is not set
306# CONFIG_IRDA is not set
307# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set
309
310#
311# Wireless
312#
313# CONFIG_CFG80211 is not set
314# CONFIG_WIRELESS_EXT is not set
315# CONFIG_MAC80211 is not set
316# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set
318# CONFIG_NET_9P is not set
319
320#
321# Device Drivers
322#
323
324#
325# Generic Driver Options
326#
327CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
328CONFIG_STANDALONE=y
329CONFIG_PREVENT_FIRMWARE_BUILD=y
330# CONFIG_FW_LOADER is not set
331# CONFIG_SYS_HYPERVISOR is not set
332# CONFIG_CONNECTOR is not set
333# CONFIG_MTD is not set
334CONFIG_OF_DEVICE=y
335# CONFIG_PARPORT is not set
336CONFIG_BLK_DEV=y
337# CONFIG_BLK_DEV_FD is not set
338# CONFIG_BLK_DEV_COW_COMMON is not set
339CONFIG_BLK_DEV_LOOP=y
340# CONFIG_BLK_DEV_CRYPTOLOOP is not set
341# CONFIG_BLK_DEV_NBD is not set
342CONFIG_BLK_DEV_RAM=y
343CONFIG_BLK_DEV_RAM_COUNT=16
344CONFIG_BLK_DEV_RAM_SIZE=32768
345CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
346# CONFIG_CDROM_PKTCDVD is not set
347# CONFIG_ATA_OVER_ETH is not set
348CONFIG_MISC_DEVICES=y
349# CONFIG_EEPROM_93CX6 is not set
350# CONFIG_IDE is not set
351
352#
353# SCSI device support
354#
355# CONFIG_RAID_ATTRS is not set
356# CONFIG_SCSI is not set
357# CONFIG_SCSI_DMA is not set
358# CONFIG_SCSI_NETLINK is not set
359# CONFIG_ATA is not set
360# CONFIG_MD is not set
361# CONFIG_MACINTOSH_DRIVERS is not set
362CONFIG_NETDEVICES=y
363# CONFIG_NETDEVICES_MULTIQUEUE is not set
364# CONFIG_DUMMY is not set
365# CONFIG_BONDING is not set
366# CONFIG_MACVLAN is not set
367# CONFIG_EQUALIZER is not set
368# CONFIG_TUN is not set
369# CONFIG_VETH is not set
370CONFIG_PHYLIB=y
371
372#
373# MII PHY device drivers
374#
375# CONFIG_MARVELL_PHY is not set
376# CONFIG_DAVICOM_PHY is not set
377# CONFIG_QSEMI_PHY is not set
378# CONFIG_LXT_PHY is not set
379# CONFIG_CICADA_PHY is not set
380# CONFIG_VITESSE_PHY is not set
381# CONFIG_SMSC_PHY is not set
382CONFIG_BROADCOM_PHY=y
383# CONFIG_ICPLUS_PHY is not set
384# CONFIG_FIXED_PHY is not set
385# CONFIG_MDIO_BITBANG is not set
386CONFIG_NET_ETHERNET=y
387CONFIG_MII=y
388# CONFIG_IBM_NEW_EMAC_ZMII is not set
389# CONFIG_IBM_NEW_EMAC_RGMII is not set
390# CONFIG_IBM_NEW_EMAC_TAH is not set
391# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
392# CONFIG_B44 is not set
393CONFIG_NETDEV_1000=y
394CONFIG_GIANFAR=y
395# CONFIG_GFAR_NAPI is not set
396# CONFIG_NETDEV_10000 is not set
397
398#
399# Wireless LAN
400#
401# CONFIG_WLAN_PRE80211 is not set
402# CONFIG_WLAN_80211 is not set
403# CONFIG_WAN is not set
404# CONFIG_PPP is not set
405# CONFIG_SLIP is not set
406# CONFIG_SHAPER is not set
407# CONFIG_NETCONSOLE is not set
408# CONFIG_NETPOLL is not set
409# CONFIG_NET_POLL_CONTROLLER is not set
410# CONFIG_ISDN is not set
411# CONFIG_PHONE is not set
412
413#
414# Input device support
415#
416CONFIG_INPUT=y
417# CONFIG_INPUT_FF_MEMLESS is not set
418# CONFIG_INPUT_POLLDEV is not set
419
420#
421# Userland interfaces
422#
423# CONFIG_INPUT_MOUSEDEV is not set
424# CONFIG_INPUT_JOYDEV is not set
425# CONFIG_INPUT_EVDEV is not set
426# CONFIG_INPUT_EVBUG is not set
427
428#
429# Input Device Drivers
430#
431# CONFIG_INPUT_KEYBOARD is not set
432# CONFIG_INPUT_MOUSE is not set
433# CONFIG_INPUT_JOYSTICK is not set
434# CONFIG_INPUT_TABLET is not set
435# CONFIG_INPUT_TOUCHSCREEN is not set
436# CONFIG_INPUT_MISC is not set
437
438#
439# Hardware I/O ports
440#
441# CONFIG_SERIO is not set
442# CONFIG_GAMEPORT is not set
443
444#
445# Character devices
446#
447# CONFIG_VT is not set
448# CONFIG_SERIAL_NONSTANDARD is not set
449
450#
451# Serial drivers
452#
453CONFIG_SERIAL_8250=y
454CONFIG_SERIAL_8250_CONSOLE=y
455CONFIG_SERIAL_8250_NR_UARTS=4
456CONFIG_SERIAL_8250_RUNTIME_UARTS=4
457# CONFIG_SERIAL_8250_EXTENDED is not set
458
459#
460# Non-8250 serial port support
461#
462# CONFIG_SERIAL_UARTLITE is not set
463CONFIG_SERIAL_CORE=y
464CONFIG_SERIAL_CORE_CONSOLE=y
465# CONFIG_SERIAL_OF_PLATFORM is not set
466CONFIG_UNIX98_PTYS=y
467CONFIG_LEGACY_PTYS=y
468CONFIG_LEGACY_PTY_COUNT=256
469# CONFIG_IPMI_HANDLER is not set
470# CONFIG_HW_RANDOM is not set
471# CONFIG_NVRAM is not set
472CONFIG_GEN_RTC=y
473# CONFIG_GEN_RTC_X is not set
474# CONFIG_R3964 is not set
475# CONFIG_RAW_DRIVER is not set
476# CONFIG_TCG_TPM is not set
477CONFIG_I2C=y
478CONFIG_I2C_BOARDINFO=y
479CONFIG_I2C_CHARDEV=y
480
481#
482# I2C Algorithms
483#
484# CONFIG_I2C_ALGOBIT is not set
485# CONFIG_I2C_ALGOPCF is not set
486# CONFIG_I2C_ALGOPCA is not set
487
488#
489# I2C Hardware Bus support
490#
491CONFIG_I2C_MPC=y
492# CONFIG_I2C_OCORES is not set
493# CONFIG_I2C_PARPORT_LIGHT is not set
494# CONFIG_I2C_SIMTEC is not set
495# CONFIG_I2C_TAOS_EVM is not set
496# CONFIG_I2C_STUB is not set
497
498#
499# Miscellaneous I2C Chip support
500#
501# CONFIG_SENSORS_DS1337 is not set
502# CONFIG_SENSORS_DS1374 is not set
503# CONFIG_DS1682 is not set
504# CONFIG_SENSORS_EEPROM is not set
505# CONFIG_SENSORS_PCF8574 is not set
506# CONFIG_SENSORS_PCA9539 is not set
507# CONFIG_SENSORS_PCF8591 is not set
508# CONFIG_SENSORS_M41T00 is not set
509# CONFIG_SENSORS_MAX6875 is not set
510# CONFIG_SENSORS_TSL2550 is not set
511# CONFIG_I2C_DEBUG_CORE is not set
512# CONFIG_I2C_DEBUG_ALGO is not set
513# CONFIG_I2C_DEBUG_BUS is not set
514# CONFIG_I2C_DEBUG_CHIP is not set
515
516#
517# SPI support
518#
519# CONFIG_SPI is not set
520# CONFIG_SPI_MASTER is not set
521# CONFIG_W1 is not set
522# CONFIG_POWER_SUPPLY is not set
523CONFIG_HWMON=y
524# CONFIG_HWMON_VID is not set
525# CONFIG_SENSORS_AD7418 is not set
526# CONFIG_SENSORS_ADM1021 is not set
527# CONFIG_SENSORS_ADM1025 is not set
528# CONFIG_SENSORS_ADM1026 is not set
529# CONFIG_SENSORS_ADM1029 is not set
530# CONFIG_SENSORS_ADM1031 is not set
531# CONFIG_SENSORS_ADM9240 is not set
532# CONFIG_SENSORS_ADT7470 is not set
533# CONFIG_SENSORS_ATXP1 is not set
534# CONFIG_SENSORS_DS1621 is not set
535# CONFIG_SENSORS_F71805F is not set
536# CONFIG_SENSORS_F71882FG is not set
537# CONFIG_SENSORS_F75375S is not set
538# CONFIG_SENSORS_GL518SM is not set
539# CONFIG_SENSORS_GL520SM is not set
540# CONFIG_SENSORS_IT87 is not set
541# CONFIG_SENSORS_LM63 is not set
542# CONFIG_SENSORS_LM75 is not set
543# CONFIG_SENSORS_LM77 is not set
544# CONFIG_SENSORS_LM78 is not set
545# CONFIG_SENSORS_LM80 is not set
546# CONFIG_SENSORS_LM83 is not set
547# CONFIG_SENSORS_LM85 is not set
548# CONFIG_SENSORS_LM87 is not set
549# CONFIG_SENSORS_LM90 is not set
550# CONFIG_SENSORS_LM92 is not set
551# CONFIG_SENSORS_LM93 is not set
552# CONFIG_SENSORS_MAX1619 is not set
553# CONFIG_SENSORS_MAX6650 is not set
554# CONFIG_SENSORS_PC87360 is not set
555# CONFIG_SENSORS_PC87427 is not set
556# CONFIG_SENSORS_DME1737 is not set
557# CONFIG_SENSORS_SMSC47M1 is not set
558# CONFIG_SENSORS_SMSC47M192 is not set
559# CONFIG_SENSORS_SMSC47B397 is not set
560# CONFIG_SENSORS_THMC50 is not set
561# CONFIG_SENSORS_VT1211 is not set
562# CONFIG_SENSORS_W83781D is not set
563# CONFIG_SENSORS_W83791D is not set
564# CONFIG_SENSORS_W83792D is not set
565# CONFIG_SENSORS_W83793 is not set
566# CONFIG_SENSORS_W83L785TS is not set
567# CONFIG_SENSORS_W83627HF is not set
568# CONFIG_SENSORS_W83627EHF is not set
569# CONFIG_HWMON_DEBUG_CHIP is not set
570CONFIG_WATCHDOG=y
571# CONFIG_WATCHDOG_NOWAYOUT is not set
572
573#
574# Watchdog Device Drivers
575#
576# CONFIG_SOFT_WATCHDOG is not set
577CONFIG_83xx_WDT=y
578
579#
580# Sonics Silicon Backplane
581#
582CONFIG_SSB_POSSIBLE=y
583# CONFIG_SSB is not set
584
585#
586# Multifunction device drivers
587#
588# CONFIG_MFD_SM501 is not set
589
590#
591# Multimedia devices
592#
593# CONFIG_VIDEO_DEV is not set
594# CONFIG_DVB_CORE is not set
595# CONFIG_DAB is not set
596
597#
598# Graphics support
599#
600# CONFIG_VGASTATE is not set
601# CONFIG_VIDEO_OUTPUT_CONTROL is not set
602# CONFIG_FB is not set
603# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
604
605#
606# Display device support
607#
608# CONFIG_DISPLAY_SUPPORT is not set
609
610#
611# Sound
612#
613# CONFIG_SOUND is not set
614CONFIG_HID_SUPPORT=y
615CONFIG_HID=y
616# CONFIG_HID_DEBUG is not set
617# CONFIG_HIDRAW is not set
618# CONFIG_USB_SUPPORT is not set
619# CONFIG_MMC is not set
620# CONFIG_NEW_LEDS is not set
621# CONFIG_EDAC is not set
622# CONFIG_RTC_CLASS is not set
623
624#
625# Userspace I/O
626#
627# CONFIG_UIO is not set
628
629#
630# File systems
631#
632# CONFIG_EXT2_FS is not set
633# CONFIG_EXT3_FS is not set
634# CONFIG_EXT4DEV_FS is not set
635# CONFIG_REISERFS_FS is not set
636# CONFIG_JFS_FS is not set
637# CONFIG_FS_POSIX_ACL is not set
638# CONFIG_XFS_FS is not set
639# CONFIG_GFS2_FS is not set
640# CONFIG_OCFS2_FS is not set
641# CONFIG_MINIX_FS is not set
642# CONFIG_ROMFS_FS is not set
643CONFIG_INOTIFY=y
644CONFIG_INOTIFY_USER=y
645# CONFIG_QUOTA is not set
646CONFIG_DNOTIFY=y
647# CONFIG_AUTOFS_FS is not set
648# CONFIG_AUTOFS4_FS is not set
649# CONFIG_FUSE_FS is not set
650
651#
652# CD-ROM/DVD Filesystems
653#
654# CONFIG_ISO9660_FS is not set
655# CONFIG_UDF_FS is not set
656
657#
658# DOS/FAT/NT Filesystems
659#
660# CONFIG_MSDOS_FS is not set
661# CONFIG_VFAT_FS is not set
662# CONFIG_NTFS_FS is not set
663
664#
665# Pseudo filesystems
666#
667CONFIG_PROC_FS=y
668CONFIG_PROC_KCORE=y
669CONFIG_PROC_SYSCTL=y
670CONFIG_SYSFS=y
671CONFIG_TMPFS=y
672# CONFIG_TMPFS_POSIX_ACL is not set
673# CONFIG_HUGETLB_PAGE is not set
674# CONFIG_CONFIGFS_FS is not set
675
676#
677# Miscellaneous filesystems
678#
679# CONFIG_ADFS_FS is not set
680# CONFIG_AFFS_FS is not set
681# CONFIG_HFS_FS is not set
682# CONFIG_HFSPLUS_FS is not set
683# CONFIG_BEFS_FS is not set
684# CONFIG_BFS_FS is not set
685# CONFIG_EFS_FS is not set
686# CONFIG_CRAMFS is not set
687# CONFIG_VXFS_FS is not set
688# CONFIG_HPFS_FS is not set
689# CONFIG_QNX4FS_FS is not set
690# CONFIG_SYSV_FS is not set
691# CONFIG_UFS_FS is not set
692CONFIG_NETWORK_FILESYSTEMS=y
693CONFIG_NFS_FS=y
694CONFIG_NFS_V3=y
695# CONFIG_NFS_V3_ACL is not set
696CONFIG_NFS_V4=y
697# CONFIG_NFS_DIRECTIO is not set
698# CONFIG_NFSD is not set
699CONFIG_ROOT_NFS=y
700CONFIG_LOCKD=y
701CONFIG_LOCKD_V4=y
702CONFIG_NFS_COMMON=y
703CONFIG_SUNRPC=y
704CONFIG_SUNRPC_GSS=y
705# CONFIG_SUNRPC_BIND34 is not set
706CONFIG_RPCSEC_GSS_KRB5=y
707# CONFIG_RPCSEC_GSS_SPKM3 is not set
708# CONFIG_SMB_FS is not set
709# CONFIG_CIFS is not set
710# CONFIG_NCP_FS is not set
711# CONFIG_CODA_FS is not set
712# CONFIG_AFS_FS is not set
713
714#
715# Partition Types
716#
717# CONFIG_PARTITION_ADVANCED is not set
718CONFIG_MSDOS_PARTITION=y
719# CONFIG_NLS is not set
720# CONFIG_DLM is not set
721
722#
723# Library routines
724#
725CONFIG_BITREVERSE=y
726# CONFIG_CRC_CCITT is not set
727# CONFIG_CRC16 is not set
728# CONFIG_CRC_ITU_T is not set
729CONFIG_CRC32=y
730# CONFIG_CRC7 is not set
731# CONFIG_LIBCRC32C is not set
732CONFIG_PLIST=y
733CONFIG_HAS_IOMEM=y
734CONFIG_HAS_IOPORT=y
735CONFIG_HAS_DMA=y
736# CONFIG_INSTRUMENTATION is not set
737
738#
739# Kernel hacking
740#
741# CONFIG_PRINTK_TIME is not set
742CONFIG_ENABLE_WARN_DEPRECATED=y
743CONFIG_ENABLE_MUST_CHECK=y
744# CONFIG_MAGIC_SYSRQ is not set
745# CONFIG_UNUSED_SYMBOLS is not set
746# CONFIG_DEBUG_FS is not set
747# CONFIG_HEADERS_CHECK is not set
748# CONFIG_DEBUG_KERNEL is not set
749# CONFIG_DEBUG_BUGVERBOSE is not set
750# CONFIG_SAMPLES is not set
751# CONFIG_PPC_EARLY_DEBUG is not set
752
753#
754# Security options
755#
756# CONFIG_KEYS is not set
757# CONFIG_SECURITY is not set
758# CONFIG_SECURITY_FILE_CAPABILITIES is not set
759CONFIG_CRYPTO=y
760CONFIG_CRYPTO_ALGAPI=y
761CONFIG_CRYPTO_BLKCIPHER=y
762CONFIG_CRYPTO_MANAGER=y
763# CONFIG_CRYPTO_HMAC is not set
764# CONFIG_CRYPTO_XCBC is not set
765# CONFIG_CRYPTO_NULL is not set
766# CONFIG_CRYPTO_MD4 is not set
767CONFIG_CRYPTO_MD5=y
768# CONFIG_CRYPTO_SHA1 is not set
769# CONFIG_CRYPTO_SHA256 is not set
770# CONFIG_CRYPTO_SHA512 is not set
771# CONFIG_CRYPTO_WP512 is not set
772# CONFIG_CRYPTO_TGR192 is not set
773# CONFIG_CRYPTO_GF128MUL is not set
774CONFIG_CRYPTO_ECB=m
775CONFIG_CRYPTO_CBC=y
776CONFIG_CRYPTO_PCBC=m
777# CONFIG_CRYPTO_LRW is not set
778# CONFIG_CRYPTO_XTS is not set
779# CONFIG_CRYPTO_CRYPTD is not set
780CONFIG_CRYPTO_DES=y
781# CONFIG_CRYPTO_FCRYPT is not set
782# CONFIG_CRYPTO_BLOWFISH is not set
783# CONFIG_CRYPTO_TWOFISH is not set
784# CONFIG_CRYPTO_SERPENT is not set
785# CONFIG_CRYPTO_AES is not set
786# CONFIG_CRYPTO_CAST5 is not set
787# CONFIG_CRYPTO_CAST6 is not set
788# CONFIG_CRYPTO_TEA is not set
789# CONFIG_CRYPTO_ARC4 is not set
790# CONFIG_CRYPTO_KHAZAD is not set
791# CONFIG_CRYPTO_ANUBIS is not set
792# CONFIG_CRYPTO_SEED is not set
793# CONFIG_CRYPTO_DEFLATE is not set
794# CONFIG_CRYPTO_MICHAEL_MIC is not set
795# CONFIG_CRYPTO_CRC32C is not set
796# CONFIG_CRYPTO_CAMELLIA is not set
797# CONFIG_CRYPTO_TEST is not set
798# CONFIG_CRYPTO_AUTHENC is not set
799# CONFIG_CRYPTO_HW is not set
800# CONFIG_PPC_CLOCK is not set
diff --git a/arch/ppc/configs/mpc834x_sys_defconfig b/arch/powerpc/configs/sbc8548_defconfig
index d90c8a7e060c..3b7fa53a2475 100644
--- a/arch/ppc/configs/mpc834x_sys_defconfig
+++ b/arch/powerpc/configs/sbc8548_defconfig
@@ -1,123 +1,182 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14 3# Linux kernel version: 2.6.24-rc8
4# Mon Nov 7 15:38:29 2005 4# Thu Jan 24 15:19:12 2008
5# 5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
6CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
10CONFIG_PPC=y 40CONFIG_PPC=y
11CONFIG_PPC32=y 41CONFIG_EARLY_PRINTK=y
12CONFIG_GENERIC_NVRAM=y 42CONFIG_GENERIC_NVRAM=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y 44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 55
16# 56#
17# Code maturity level options 57# General setup
18# 58#
19CONFIG_EXPERIMENTAL=y 59CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 60CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 61CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION="" 62CONFIG_LOCALVERSION=""
28CONFIG_LOCALVERSION_AUTO=y 63CONFIG_LOCALVERSION_AUTO=y
29CONFIG_SWAP=y 64CONFIG_SWAP=y
30CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
31# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
32# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
34# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
35# CONFIG_HOTPLUG is not set
36CONFIG_KOBJECT_UEVENT=y
37# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
38CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
39CONFIG_EMBEDDED=y 85CONFIG_EMBEDDED=y
40# CONFIG_KALLSYMS is not set 86CONFIG_SYSCTL_SYSCALL=y
87CONFIG_KALLSYMS=y
88# CONFIG_KALLSYMS_EXTRA_PASS is not set
89CONFIG_HOTPLUG=y
41CONFIG_PRINTK=y 90CONFIG_PRINTK=y
42CONFIG_BUG=y 91CONFIG_BUG=y
92CONFIG_ELF_CORE=y
43CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 94CONFIG_FUTEX=y
45# CONFIG_EPOLL is not set 95CONFIG_ANON_INODES=y
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 96CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y
98CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 99CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 100CONFIG_VM_EVENT_COUNTERS=y
49CONFIG_CC_ALIGN_LABELS=0 101CONFIG_SLAB=y
50CONFIG_CC_ALIGN_LOOPS=0 102# CONFIG_SLUB is not set
51CONFIG_CC_ALIGN_JUMPS=0 103# CONFIG_SLOB is not set
104CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
108# CONFIG_MODULES is not set
109CONFIG_BLOCK=y
110# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_LSF is not set
113# CONFIG_BLK_DEV_BSG is not set
54 114
55# 115#
56# Loadable module support 116# IO Schedulers
57# 117#
58# CONFIG_MODULES is not set 118CONFIG_IOSCHED_NOOP=y
119CONFIG_IOSCHED_AS=y
120CONFIG_IOSCHED_DEADLINE=y
121CONFIG_IOSCHED_CFQ=y
122CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_DEADLINE is not set
124# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory"
59 127
60# 128#
61# Processor 129# Platform support
62# 130#
63CONFIG_6xx=y 131# CONFIG_PPC_MPC52xx is not set
64# CONFIG_40x is not set 132# CONFIG_PPC_MPC5200 is not set
65# CONFIG_44x is not set 133# CONFIG_PPC_CELL is not set
66# CONFIG_POWER3 is not set 134# CONFIG_PPC_CELL_NATIVE is not set
67# CONFIG_POWER4 is not set 135# CONFIG_PQ2ADS is not set
68# CONFIG_8xx is not set 136# CONFIG_MPC8540_ADS is not set
69# CONFIG_E200 is not set 137# CONFIG_MPC8560_ADS is not set
70# CONFIG_E500 is not set 138# CONFIG_MPC85xx_CDS is not set
71CONFIG_PPC_FPU=y 139# CONFIG_MPC85xx_MDS is not set
72# CONFIG_KEXEC is not set 140# CONFIG_MPC85xx_DS is not set
141CONFIG_SBC8548=y
142# CONFIG_SBC8560 is not set
143CONFIG_MPC8540=y
144CONFIG_MPC85xx=y
145# CONFIG_IPIC is not set
146CONFIG_MPIC=y
147# CONFIG_MPIC_WEIRD is not set
148# CONFIG_PPC_I8259 is not set
149# CONFIG_PPC_RTAS is not set
150# CONFIG_MMIO_NVRAM is not set
151# CONFIG_PPC_MPC106 is not set
152# CONFIG_PPC_970_NAP is not set
153# CONFIG_PPC_INDIRECT_IO is not set
154# CONFIG_GENERIC_IOMAP is not set
73# CONFIG_CPU_FREQ is not set 155# CONFIG_CPU_FREQ is not set
74# CONFIG_WANT_EARLY_SERIAL is not set 156# CONFIG_FSL_ULI1575 is not set
75CONFIG_PPC_GEN550=y 157
76CONFIG_PPC_STD_MMU=y 158#
77 159# Kernel options
78# 160#
79# Platform options
80#
81# CONFIG_PPC_MULTIPLATFORM is not set
82# CONFIG_APUS is not set
83# CONFIG_KATANA is not set
84# CONFIG_WILLOW is not set
85# CONFIG_CPCI690 is not set
86# CONFIG_POWERPMC250 is not set
87# CONFIG_CHESTNUT is not set
88# CONFIG_SPRUCE is not set
89# CONFIG_HDPU is not set
90# CONFIG_EV64260 is not set
91# CONFIG_LOPEC is not set
92# CONFIG_MVME5100 is not set
93# CONFIG_PPLUS is not set
94# CONFIG_PRPMC750 is not set
95# CONFIG_PRPMC800 is not set
96# CONFIG_SANDPOINT is not set
97# CONFIG_RADSTONE_PPC7D is not set
98# CONFIG_PAL4 is not set
99# CONFIG_GEMINI is not set
100# CONFIG_EST8260 is not set
101# CONFIG_SBC82xx is not set
102# CONFIG_SBS8260 is not set
103# CONFIG_RPX8260 is not set
104# CONFIG_TQM8260 is not set
105# CONFIG_ADS8272 is not set
106# CONFIG_PQ2FADS is not set
107# CONFIG_LITE5200 is not set
108CONFIG_MPC834x_SYS=y
109# CONFIG_EV64360 is not set
110CONFIG_83xx=y
111CONFIG_MPC834x=y
112# CONFIG_SMP is not set
113# CONFIG_HIGHMEM is not set 161# CONFIG_HIGHMEM is not set
162# CONFIG_TICK_ONESHOT is not set
163# CONFIG_NO_HZ is not set
164# CONFIG_HIGH_RES_TIMERS is not set
165CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
114# CONFIG_HZ_100 is not set 166# CONFIG_HZ_100 is not set
115CONFIG_HZ_250=y 167CONFIG_HZ_250=y
168# CONFIG_HZ_300 is not set
116# CONFIG_HZ_1000 is not set 169# CONFIG_HZ_1000 is not set
117CONFIG_HZ=250 170CONFIG_HZ=250
118CONFIG_PREEMPT_NONE=y 171CONFIG_PREEMPT_NONE=y
119# CONFIG_PREEMPT_VOLUNTARY is not set 172# CONFIG_PREEMPT_VOLUNTARY is not set
120# CONFIG_PREEMPT is not set 173# CONFIG_PREEMPT is not set
174CONFIG_BINFMT_ELF=y
175CONFIG_BINFMT_MISC=y
176CONFIG_MATH_EMULATION=y
177CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
178CONFIG_ARCH_FLATMEM_ENABLE=y
179CONFIG_ARCH_POPULATES_NODE_MAP=y
121CONFIG_SELECT_MEMORY_MODEL=y 180CONFIG_SELECT_MEMORY_MODEL=y
122CONFIG_FLATMEM_MANUAL=y 181CONFIG_FLATMEM_MANUAL=y
123# CONFIG_DISCONTIGMEM_MANUAL is not set 182# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -125,30 +184,38 @@ CONFIG_FLATMEM_MANUAL=y
125CONFIG_FLATMEM=y 184CONFIG_FLATMEM=y
126CONFIG_FLAT_NODE_MEM_MAP=y 185CONFIG_FLAT_NODE_MEM_MAP=y
127# CONFIG_SPARSEMEM_STATIC is not set 186# CONFIG_SPARSEMEM_STATIC is not set
187# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
128CONFIG_SPLIT_PTLOCK_CPUS=4 188CONFIG_SPLIT_PTLOCK_CPUS=4
129CONFIG_BINFMT_ELF=y 189# CONFIG_RESOURCES_64BIT is not set
130# CONFIG_BINFMT_MISC is not set 190CONFIG_ZONE_DMA_FLAG=1
191CONFIG_BOUNCE=y
192CONFIG_VIRT_TO_BUS=y
193CONFIG_PROC_DEVICETREE=y
131# CONFIG_CMDLINE_BOOL is not set 194# CONFIG_CMDLINE_BOOL is not set
132# CONFIG_PM is not set 195# CONFIG_PM is not set
133# CONFIG_HIBERNATION is not set 196CONFIG_SUSPEND_UP_POSSIBLE=y
134CONFIG_SECCOMP=y 197CONFIG_HIBERNATION_UP_POSSIBLE=y
198# CONFIG_SECCOMP is not set
199CONFIG_WANT_DEVICE_TREE=y
200CONFIG_DEVICE_TREE=""
135CONFIG_ISA_DMA_API=y 201CONFIG_ISA_DMA_API=y
136 202
137# 203#
138# Bus options 204# Bus options
139# 205#
140CONFIG_GENERIC_ISA_DMA=y 206CONFIG_ZONE_DMA=y
141# CONFIG_PPC_I8259 is not set
142CONFIG_PPC_INDIRECT_PCI=y 207CONFIG_PPC_INDIRECT_PCI=y
208CONFIG_FSL_SOC=y
209CONFIG_FSL_PCI=y
143CONFIG_PCI=y 210CONFIG_PCI=y
144CONFIG_PCI_DOMAINS=y 211CONFIG_PCI_DOMAINS=y
145# CONFIG_MPC83xx_PCI2 is not set 212CONFIG_PCI_SYSCALL=y
146CONFIG_PCI_LEGACY_PROC=y 213# CONFIG_PCIEPORTBUS is not set
147 214CONFIG_ARCH_SUPPORTS_MSI=y
148# 215# CONFIG_PCI_MSI is not set
149# PCCARD (PCMCIA/CardBus) support 216CONFIG_PCI_LEGACY=y
150#
151# CONFIG_PCCARD is not set 217# CONFIG_PCCARD is not set
218# CONFIG_HOTPLUG_PCI is not set
152 219
153# 220#
154# Advanced setup 221# Advanced setup
@@ -161,7 +228,7 @@ CONFIG_PCI_LEGACY_PROC=y
161CONFIG_HIGHMEM_START=0xfe000000 228CONFIG_HIGHMEM_START=0xfe000000
162CONFIG_LOWMEM_SIZE=0x30000000 229CONFIG_LOWMEM_SIZE=0x30000000
163CONFIG_KERNEL_START=0xc0000000 230CONFIG_KERNEL_START=0xc0000000
164CONFIG_TASK_SIZE=0x80000000 231CONFIG_TASK_SIZE=0xc0000000
165CONFIG_BOOT_LOAD=0x00800000 232CONFIG_BOOT_LOAD=0x00800000
166 233
167# 234#
@@ -175,6 +242,10 @@ CONFIG_NET=y
175CONFIG_PACKET=y 242CONFIG_PACKET=y
176# CONFIG_PACKET_MMAP is not set 243# CONFIG_PACKET_MMAP is not set
177CONFIG_UNIX=y 244CONFIG_UNIX=y
245CONFIG_XFRM=y
246CONFIG_XFRM_USER=y
247# CONFIG_XFRM_SUB_POLICY is not set
248# CONFIG_XFRM_MIGRATE is not set
178# CONFIG_NET_KEY is not set 249# CONFIG_NET_KEY is not set
179CONFIG_INET=y 250CONFIG_INET=y
180CONFIG_IP_MULTICAST=y 251CONFIG_IP_MULTICAST=y
@@ -192,23 +263,26 @@ CONFIG_SYN_COOKIES=y
192# CONFIG_INET_AH is not set 263# CONFIG_INET_AH is not set
193# CONFIG_INET_ESP is not set 264# CONFIG_INET_ESP is not set
194# CONFIG_INET_IPCOMP is not set 265# CONFIG_INET_IPCOMP is not set
266# CONFIG_INET_XFRM_TUNNEL is not set
195# CONFIG_INET_TUNNEL is not set 267# CONFIG_INET_TUNNEL is not set
268CONFIG_INET_XFRM_MODE_TRANSPORT=y
269CONFIG_INET_XFRM_MODE_TUNNEL=y
270CONFIG_INET_XFRM_MODE_BEET=y
271# CONFIG_INET_LRO is not set
196CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
197CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
198# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
199CONFIG_TCP_CONG_BIC=y 275CONFIG_TCP_CONG_CUBIC=y
276CONFIG_DEFAULT_TCP_CONG="cubic"
277# CONFIG_TCP_MD5SIG is not set
200# CONFIG_IPV6 is not set 278# CONFIG_IPV6 is not set
279# CONFIG_INET6_XFRM_TUNNEL is not set
280# CONFIG_INET6_TUNNEL is not set
281# CONFIG_NETWORK_SECMARK is not set
201# CONFIG_NETFILTER is not set 282# CONFIG_NETFILTER is not set
202
203#
204# DCCP Configuration (EXPERIMENTAL)
205#
206# CONFIG_IP_DCCP is not set 283# CONFIG_IP_DCCP is not set
207
208#
209# SCTP Configuration (EXPERIMENTAL)
210#
211# CONFIG_IP_SCTP is not set 284# CONFIG_IP_SCTP is not set
285# CONFIG_TIPC is not set
212# CONFIG_ATM is not set 286# CONFIG_ATM is not set
213# CONFIG_BRIDGE is not set 287# CONFIG_BRIDGE is not set
214# CONFIG_VLAN_8021Q is not set 288# CONFIG_VLAN_8021Q is not set
@@ -218,11 +292,9 @@ CONFIG_TCP_CONG_BIC=y
218# CONFIG_ATALK is not set 292# CONFIG_ATALK is not set
219# CONFIG_X25 is not set 293# CONFIG_X25 is not set
220# CONFIG_LAPB is not set 294# CONFIG_LAPB is not set
221# CONFIG_NET_DIVERT is not set
222# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
223# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
224# CONFIG_NET_SCHED is not set 297# CONFIG_NET_SCHED is not set
225# CONFIG_NET_CLS_ROUTE is not set
226 298
227# 299#
228# Network testing 300# Network testing
@@ -231,7 +303,17 @@ CONFIG_TCP_CONG_BIC=y
231# CONFIG_HAMRADIO is not set 303# CONFIG_HAMRADIO is not set
232# CONFIG_IRDA is not set 304# CONFIG_IRDA is not set
233# CONFIG_BT is not set 305# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set
307
308#
309# Wireless
310#
311# CONFIG_CFG80211 is not set
312# CONFIG_WIRELESS_EXT is not set
313# CONFIG_MAC80211 is not set
234# CONFIG_IEEE80211 is not set 314# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set
316# CONFIG_NET_9P is not set
235 317
236# 318#
237# Device Drivers 319# Device Drivers
@@ -240,32 +322,16 @@ CONFIG_TCP_CONG_BIC=y
240# 322#
241# Generic Driver Options 323# Generic Driver Options
242# 324#
325CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
243CONFIG_STANDALONE=y 326CONFIG_STANDALONE=y
244CONFIG_PREVENT_FIRMWARE_BUILD=y 327CONFIG_PREVENT_FIRMWARE_BUILD=y
245# CONFIG_FW_LOADER is not set 328# CONFIG_FW_LOADER is not set
246 329# CONFIG_SYS_HYPERVISOR is not set
247#
248# Connector - unified userspace <-> kernelspace linker
249#
250# CONFIG_CONNECTOR is not set 330# CONFIG_CONNECTOR is not set
251
252#
253# Memory Technology Devices (MTD)
254#
255# CONFIG_MTD is not set 331# CONFIG_MTD is not set
256 332CONFIG_OF_DEVICE=y
257#
258# Parallel port support
259#
260# CONFIG_PARPORT is not set 333# CONFIG_PARPORT is not set
261 334CONFIG_BLK_DEV=y
262#
263# Plug and Play support
264#
265
266#
267# Block devices
268#
269# CONFIG_BLK_DEV_FD is not set 335# CONFIG_BLK_DEV_FD is not set
270# CONFIG_BLK_CPQ_DA is not set 336# CONFIG_BLK_CPQ_DA is not set
271# CONFIG_BLK_CPQ_CISS_DA is not set 337# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -278,28 +344,15 @@ CONFIG_BLK_DEV_LOOP=y
278# CONFIG_BLK_DEV_SX8 is not set 344# CONFIG_BLK_DEV_SX8 is not set
279CONFIG_BLK_DEV_RAM=y 345CONFIG_BLK_DEV_RAM=y
280CONFIG_BLK_DEV_RAM_COUNT=16 346CONFIG_BLK_DEV_RAM_COUNT=16
281CONFIG_BLK_DEV_RAM_SIZE=32768 347CONFIG_BLK_DEV_RAM_SIZE=4096
282CONFIG_BLK_DEV_INITRD=y 348CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
283# CONFIG_LBD is not set
284# CONFIG_CDROM_PKTCDVD is not set 349# CONFIG_CDROM_PKTCDVD is not set
285
286#
287# IO Schedulers
288#
289CONFIG_IOSCHED_NOOP=y
290CONFIG_IOSCHED_AS=y
291CONFIG_IOSCHED_DEADLINE=y
292CONFIG_IOSCHED_CFQ=y
293CONFIG_DEFAULT_AS=y
294# CONFIG_DEFAULT_DEADLINE is not set
295# CONFIG_DEFAULT_CFQ is not set
296# CONFIG_DEFAULT_NOOP is not set
297CONFIG_DEFAULT_IOSCHED="anticipatory"
298# CONFIG_ATA_OVER_ETH is not set 350# CONFIG_ATA_OVER_ETH is not set
299 351CONFIG_MISC_DEVICES=y
300# 352# CONFIG_PHANTOM is not set
301# ATA/ATAPI/MFM/RLL support 353# CONFIG_EEPROM_93CX6 is not set
302# 354# CONFIG_SGI_IOC4 is not set
355# CONFIG_TIFM_CORE is not set
303# CONFIG_IDE is not set 356# CONFIG_IDE is not set
304 357
305# 358#
@@ -307,135 +360,97 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
307# 360#
308# CONFIG_RAID_ATTRS is not set 361# CONFIG_RAID_ATTRS is not set
309# CONFIG_SCSI is not set 362# CONFIG_SCSI is not set
310 363# CONFIG_SCSI_DMA is not set
311# 364# CONFIG_SCSI_NETLINK is not set
312# Multi-device support (RAID and LVM) 365# CONFIG_ATA is not set
313#
314# CONFIG_MD is not set 366# CONFIG_MD is not set
315
316#
317# Fusion MPT device support
318#
319# CONFIG_FUSION is not set 367# CONFIG_FUSION is not set
320 368
321# 369#
322# IEEE 1394 (FireWire) support 370# IEEE 1394 (FireWire) support
323# 371#
372# CONFIG_FIREWIRE is not set
324# CONFIG_IEEE1394 is not set 373# CONFIG_IEEE1394 is not set
325
326#
327# I2O device support
328#
329# CONFIG_I2O is not set 374# CONFIG_I2O is not set
330 375# CONFIG_MACINTOSH_DRIVERS is not set
331#
332# Macintosh device drivers
333#
334
335#
336# Network device support
337#
338CONFIG_NETDEVICES=y 376CONFIG_NETDEVICES=y
377# CONFIG_NETDEVICES_MULTIQUEUE is not set
339# CONFIG_DUMMY is not set 378# CONFIG_DUMMY is not set
340# CONFIG_BONDING is not set 379# CONFIG_BONDING is not set
380# CONFIG_MACVLAN is not set
341# CONFIG_EQUALIZER is not set 381# CONFIG_EQUALIZER is not set
342# CONFIG_TUN is not set 382# CONFIG_TUN is not set
343 383# CONFIG_VETH is not set
344#
345# ARCnet devices
346#
347# CONFIG_ARCNET is not set 384# CONFIG_ARCNET is not set
348
349#
350# PHY device support
351#
352CONFIG_PHYLIB=y 385CONFIG_PHYLIB=y
353 386
354# 387#
355# MII PHY device drivers 388# MII PHY device drivers
356# 389#
357CONFIG_MARVELL_PHY=y 390# CONFIG_MARVELL_PHY is not set
358# CONFIG_DAVICOM_PHY is not set 391# CONFIG_DAVICOM_PHY is not set
359# CONFIG_QSEMI_PHY is not set 392# CONFIG_QSEMI_PHY is not set
360# CONFIG_LXT_PHY is not set 393# CONFIG_LXT_PHY is not set
361# CONFIG_CICADA_PHY is not set 394# CONFIG_CICADA_PHY is not set
362 395# CONFIG_VITESSE_PHY is not set
363# 396# CONFIG_SMSC_PHY is not set
364# Ethernet (10 or 100Mbit) 397CONFIG_BROADCOM_PHY=y
365# 398# CONFIG_ICPLUS_PHY is not set
399# CONFIG_FIXED_PHY is not set
400# CONFIG_MDIO_BITBANG is not set
366CONFIG_NET_ETHERNET=y 401CONFIG_NET_ETHERNET=y
367CONFIG_MII=y 402CONFIG_MII=y
368# CONFIG_HAPPYMEAL is not set 403# CONFIG_HAPPYMEAL is not set
369# CONFIG_SUNGEM is not set 404# CONFIG_SUNGEM is not set
370# CONFIG_CASSINI is not set 405# CONFIG_CASSINI is not set
371# CONFIG_NET_VENDOR_3COM is not set 406# CONFIG_NET_VENDOR_3COM is not set
372
373#
374# Tulip family network device support
375#
376# CONFIG_NET_TULIP is not set 407# CONFIG_NET_TULIP is not set
377# CONFIG_HP100 is not set 408# CONFIG_HP100 is not set
378CONFIG_NET_PCI=y 409# CONFIG_IBM_NEW_EMAC_ZMII is not set
379# CONFIG_PCNET32 is not set 410# CONFIG_IBM_NEW_EMAC_RGMII is not set
380# CONFIG_AMD8111_ETH is not set 411# CONFIG_IBM_NEW_EMAC_TAH is not set
381# CONFIG_ADAPTEC_STARFIRE is not set 412# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
413# CONFIG_NET_PCI is not set
382# CONFIG_B44 is not set 414# CONFIG_B44 is not set
383# CONFIG_FORCEDETH is not set 415CONFIG_NETDEV_1000=y
384# CONFIG_DGRS is not set
385# CONFIG_EEPRO100 is not set
386CONFIG_E100=y
387# CONFIG_FEALNX is not set
388# CONFIG_NATSEMI is not set
389# CONFIG_NE2K_PCI is not set
390# CONFIG_8139CP is not set
391# CONFIG_8139TOO is not set
392# CONFIG_SIS900 is not set
393# CONFIG_EPIC100 is not set
394# CONFIG_SUNDANCE is not set
395# CONFIG_TLAN is not set
396# CONFIG_VIA_RHINE is not set
397
398#
399# Ethernet (1000 Mbit)
400#
401# CONFIG_ACENIC is not set 416# CONFIG_ACENIC is not set
402# CONFIG_DL2K is not set 417# CONFIG_DL2K is not set
403CONFIG_E1000=y 418# CONFIG_E1000 is not set
404# CONFIG_E1000_NAPI is not set 419# CONFIG_E1000E is not set
405# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 420# CONFIG_IP1000 is not set
406# CONFIG_NS83820 is not set 421# CONFIG_NS83820 is not set
407# CONFIG_HAMACHI is not set 422# CONFIG_HAMACHI is not set
408# CONFIG_YELLOWFIN is not set 423# CONFIG_YELLOWFIN is not set
409# CONFIG_R8169 is not set 424# CONFIG_R8169 is not set
410# CONFIG_SIS190 is not set 425# CONFIG_SIS190 is not set
411# CONFIG_SKGE is not set 426# CONFIG_SKGE is not set
427# CONFIG_SKY2 is not set
412# CONFIG_SK98LIN is not set 428# CONFIG_SK98LIN is not set
413# CONFIG_VIA_VELOCITY is not set 429# CONFIG_VIA_VELOCITY is not set
414# CONFIG_TIGON3 is not set 430# CONFIG_TIGON3 is not set
415# CONFIG_BNX2 is not set 431# CONFIG_BNX2 is not set
416CONFIG_GIANFAR=y 432CONFIG_GIANFAR=y
417# CONFIG_GFAR_NAPI is not set 433CONFIG_GFAR_NAPI=y
418 434# CONFIG_QLA3XXX is not set
419# 435# CONFIG_ATL1 is not set
420# Ethernet (10000 Mbit) 436CONFIG_NETDEV_10000=y
421#
422# CONFIG_CHELSIO_T1 is not set 437# CONFIG_CHELSIO_T1 is not set
438# CONFIG_CHELSIO_T3 is not set
439# CONFIG_IXGBE is not set
423# CONFIG_IXGB is not set 440# CONFIG_IXGB is not set
424# CONFIG_S2IO is not set 441# CONFIG_S2IO is not set
425 442# CONFIG_MYRI10GE is not set
426# 443# CONFIG_NETXEN_NIC is not set
427# Token Ring devices 444# CONFIG_NIU is not set
428# 445# CONFIG_MLX4_CORE is not set
446# CONFIG_TEHUTI is not set
429# CONFIG_TR is not set 447# CONFIG_TR is not set
430 448
431# 449#
432# Wireless LAN (non-hamradio) 450# Wireless LAN
433#
434# CONFIG_NET_RADIO is not set
435
436#
437# Wan interfaces
438# 451#
452# CONFIG_WLAN_PRE80211 is not set
453# CONFIG_WLAN_80211 is not set
439# CONFIG_WAN is not set 454# CONFIG_WAN is not set
440# CONFIG_FDDI is not set 455# CONFIG_FDDI is not set
441# CONFIG_HIPPI is not set 456# CONFIG_HIPPI is not set
@@ -445,28 +460,21 @@ CONFIG_GIANFAR=y
445# CONFIG_NETCONSOLE is not set 460# CONFIG_NETCONSOLE is not set
446# CONFIG_NETPOLL is not set 461# CONFIG_NETPOLL is not set
447# CONFIG_NET_POLL_CONTROLLER is not set 462# CONFIG_NET_POLL_CONTROLLER is not set
448
449#
450# ISDN subsystem
451#
452# CONFIG_ISDN is not set 463# CONFIG_ISDN is not set
453
454#
455# Telephony Support
456#
457# CONFIG_PHONE is not set 464# CONFIG_PHONE is not set
458 465
459# 466#
460# Input device support 467# Input device support
461# 468#
462CONFIG_INPUT=y 469CONFIG_INPUT=y
470# CONFIG_INPUT_FF_MEMLESS is not set
471# CONFIG_INPUT_POLLDEV is not set
463 472
464# 473#
465# Userland interfaces 474# Userland interfaces
466# 475#
467# CONFIG_INPUT_MOUSEDEV is not set 476# CONFIG_INPUT_MOUSEDEV is not set
468# CONFIG_INPUT_JOYDEV is not set 477# CONFIG_INPUT_JOYDEV is not set
469# CONFIG_INPUT_TSDEV is not set
470# CONFIG_INPUT_EVDEV is not set 478# CONFIG_INPUT_EVDEV is not set
471# CONFIG_INPUT_EVBUG is not set 479# CONFIG_INPUT_EVBUG is not set
472 480
@@ -476,6 +484,7 @@ CONFIG_INPUT=y
476# CONFIG_INPUT_KEYBOARD is not set 484# CONFIG_INPUT_KEYBOARD is not set
477# CONFIG_INPUT_MOUSE is not set 485# CONFIG_INPUT_MOUSE is not set
478# CONFIG_INPUT_JOYSTICK is not set 486# CONFIG_INPUT_JOYSTICK is not set
487# CONFIG_INPUT_TABLET is not set
479# CONFIG_INPUT_TOUCHSCREEN is not set 488# CONFIG_INPUT_TOUCHSCREEN is not set
480# CONFIG_INPUT_MISC is not set 489# CONFIG_INPUT_MISC is not set
481 490
@@ -496,228 +505,127 @@ CONFIG_INPUT=y
496# 505#
497CONFIG_SERIAL_8250=y 506CONFIG_SERIAL_8250=y
498CONFIG_SERIAL_8250_CONSOLE=y 507CONFIG_SERIAL_8250_CONSOLE=y
508CONFIG_SERIAL_8250_PCI=y
499CONFIG_SERIAL_8250_NR_UARTS=4 509CONFIG_SERIAL_8250_NR_UARTS=4
510CONFIG_SERIAL_8250_RUNTIME_UARTS=4
500# CONFIG_SERIAL_8250_EXTENDED is not set 511# CONFIG_SERIAL_8250_EXTENDED is not set
512CONFIG_SERIAL_8250_SHARE_IRQ=y
501 513
502# 514#
503# Non-8250 serial port support 515# Non-8250 serial port support
504# 516#
517# CONFIG_SERIAL_UARTLITE is not set
505CONFIG_SERIAL_CORE=y 518CONFIG_SERIAL_CORE=y
506CONFIG_SERIAL_CORE_CONSOLE=y 519CONFIG_SERIAL_CORE_CONSOLE=y
507# CONFIG_SERIAL_JSM is not set 520# CONFIG_SERIAL_JSM is not set
521# CONFIG_SERIAL_OF_PLATFORM is not set
508CONFIG_UNIX98_PTYS=y 522CONFIG_UNIX98_PTYS=y
509CONFIG_LEGACY_PTYS=y 523CONFIG_LEGACY_PTYS=y
510CONFIG_LEGACY_PTY_COUNT=256 524CONFIG_LEGACY_PTY_COUNT=256
511
512#
513# IPMI
514#
515# CONFIG_IPMI_HANDLER is not set 525# CONFIG_IPMI_HANDLER is not set
516 526# CONFIG_HW_RANDOM is not set
517#
518# Watchdog Cards
519#
520# CONFIG_WATCHDOG is not set
521# CONFIG_NVRAM is not set 527# CONFIG_NVRAM is not set
522CONFIG_GEN_RTC=y 528CONFIG_GEN_RTC=y
523# CONFIG_GEN_RTC_X is not set 529# CONFIG_GEN_RTC_X is not set
524# CONFIG_DTLK is not set
525# CONFIG_R3964 is not set 530# CONFIG_R3964 is not set
526# CONFIG_APPLICOM is not set 531# CONFIG_APPLICOM is not set
527
528#
529# Ftape, the floppy tape device driver
530#
531# CONFIG_AGP is not set
532# CONFIG_DRM is not set
533# CONFIG_RAW_DRIVER is not set 532# CONFIG_RAW_DRIVER is not set
534
535#
536# TPM devices
537#
538# CONFIG_TCG_TPM is not set 533# CONFIG_TCG_TPM is not set
539# CONFIG_TELCLOCK is not set 534CONFIG_DEVPORT=y
540 535# CONFIG_I2C is not set
541#
542# I2C support
543#
544CONFIG_I2C=y
545CONFIG_I2C_CHARDEV=y
546 536
547# 537#
548# I2C Algorithms 538# SPI support
549#
550# CONFIG_I2C_ALGOBIT is not set
551# CONFIG_I2C_ALGOPCF is not set
552# CONFIG_I2C_ALGOPCA is not set
553
554#
555# I2C Hardware Bus support
556#
557# CONFIG_I2C_ALI1535 is not set
558# CONFIG_I2C_ALI1563 is not set
559# CONFIG_I2C_ALI15X3 is not set
560# CONFIG_I2C_AMD756 is not set
561# CONFIG_I2C_AMD8111 is not set
562# CONFIG_I2C_I801 is not set
563# CONFIG_I2C_I810 is not set
564# CONFIG_I2C_PIIX4 is not set
565CONFIG_I2C_MPC=y
566# CONFIG_I2C_NFORCE2 is not set
567# CONFIG_I2C_PARPORT_LIGHT is not set
568# CONFIG_I2C_PROSAVAGE is not set
569# CONFIG_I2C_SAVAGE4 is not set
570# CONFIG_SCx200_ACB is not set
571# CONFIG_I2C_SIS5595 is not set
572# CONFIG_I2C_SIS630 is not set
573# CONFIG_I2C_SIS96X is not set
574# CONFIG_I2C_VIA is not set
575# CONFIG_I2C_VIAPRO is not set
576# CONFIG_I2C_VOODOO3 is not set
577# CONFIG_I2C_PCA_ISA is not set
578
579#
580# Miscellaneous I2C Chip support
581#
582# CONFIG_SENSORS_DS1337 is not set
583# CONFIG_SENSORS_DS1374 is not set
584# CONFIG_SENSORS_EEPROM is not set
585# CONFIG_SENSORS_PCF8574 is not set
586# CONFIG_SENSORS_PCA9539 is not set
587# CONFIG_SENSORS_PCF8591 is not set
588# CONFIG_SENSORS_RTC8564 is not set
589# CONFIG_SENSORS_M41T00 is not set
590# CONFIG_SENSORS_MAX6875 is not set
591# CONFIG_RTC_X1205_I2C is not set
592# CONFIG_I2C_DEBUG_CORE is not set
593# CONFIG_I2C_DEBUG_ALGO is not set
594# CONFIG_I2C_DEBUG_BUS is not set
595# CONFIG_I2C_DEBUG_CHIP is not set
596
597#
598# Dallas's 1-wire bus
599# 539#
540# CONFIG_SPI is not set
541# CONFIG_SPI_MASTER is not set
600# CONFIG_W1 is not set 542# CONFIG_W1 is not set
601 543# CONFIG_POWER_SUPPLY is not set
602#
603# Hardware Monitoring support
604#
605CONFIG_HWMON=y 544CONFIG_HWMON=y
606# CONFIG_HWMON_VID is not set 545# CONFIG_HWMON_VID is not set
607# CONFIG_SENSORS_ADM1021 is not set 546# CONFIG_SENSORS_I5K_AMB is not set
608# CONFIG_SENSORS_ADM1025 is not set 547# CONFIG_SENSORS_F71805F is not set
609# CONFIG_SENSORS_ADM1026 is not set 548# CONFIG_SENSORS_F71882FG is not set
610# CONFIG_SENSORS_ADM1031 is not set
611# CONFIG_SENSORS_ADM9240 is not set
612# CONFIG_SENSORS_ASB100 is not set
613# CONFIG_SENSORS_ATXP1 is not set
614# CONFIG_SENSORS_DS1621 is not set
615# CONFIG_SENSORS_FSCHER is not set
616# CONFIG_SENSORS_FSCPOS is not set
617# CONFIG_SENSORS_GL518SM is not set
618# CONFIG_SENSORS_GL520SM is not set
619# CONFIG_SENSORS_IT87 is not set 549# CONFIG_SENSORS_IT87 is not set
620# CONFIG_SENSORS_LM63 is not set
621# CONFIG_SENSORS_LM75 is not set
622# CONFIG_SENSORS_LM77 is not set
623# CONFIG_SENSORS_LM78 is not set
624# CONFIG_SENSORS_LM80 is not set
625# CONFIG_SENSORS_LM83 is not set
626# CONFIG_SENSORS_LM85 is not set
627# CONFIG_SENSORS_LM87 is not set
628# CONFIG_SENSORS_LM90 is not set
629# CONFIG_SENSORS_LM92 is not set
630# CONFIG_SENSORS_MAX1619 is not set
631# CONFIG_SENSORS_PC87360 is not set 550# CONFIG_SENSORS_PC87360 is not set
551# CONFIG_SENSORS_PC87427 is not set
632# CONFIG_SENSORS_SIS5595 is not set 552# CONFIG_SENSORS_SIS5595 is not set
633# CONFIG_SENSORS_SMSC47M1 is not set 553# CONFIG_SENSORS_SMSC47M1 is not set
634# CONFIG_SENSORS_SMSC47B397 is not set 554# CONFIG_SENSORS_SMSC47B397 is not set
635# CONFIG_SENSORS_VIA686A is not set 555# CONFIG_SENSORS_VIA686A is not set
636# CONFIG_SENSORS_W83781D is not set 556# CONFIG_SENSORS_VT1211 is not set
637# CONFIG_SENSORS_W83792D is not set 557# CONFIG_SENSORS_VT8231 is not set
638# CONFIG_SENSORS_W83L785TS is not set
639# CONFIG_SENSORS_W83627HF is not set 558# CONFIG_SENSORS_W83627HF is not set
640# CONFIG_SENSORS_W83627EHF is not set 559# CONFIG_SENSORS_W83627EHF is not set
641# CONFIG_HWMON_DEBUG_CHIP is not set 560# CONFIG_HWMON_DEBUG_CHIP is not set
561# CONFIG_WATCHDOG is not set
642 562
643# 563#
644# Misc devices 564# Sonics Silicon Backplane
645# 565#
566CONFIG_SSB_POSSIBLE=y
567# CONFIG_SSB is not set
646 568
647# 569#
648# Multimedia Capabilities Port drivers 570# Multifunction device drivers
649# 571#
572# CONFIG_MFD_SM501 is not set
650 573
651# 574#
652# Multimedia devices 575# Multimedia devices
653# 576#
654# CONFIG_VIDEO_DEV is not set 577# CONFIG_VIDEO_DEV is not set
655 578# CONFIG_DVB_CORE is not set
656# 579CONFIG_DAB=y
657# Digital Video Broadcasting Devices
658#
659# CONFIG_DVB is not set
660 580
661# 581#
662# Graphics support 582# Graphics support
663# 583#
584# CONFIG_AGP is not set
585# CONFIG_DRM is not set
586# CONFIG_VGASTATE is not set
587CONFIG_VIDEO_OUTPUT_CONTROL=y
664# CONFIG_FB is not set 588# CONFIG_FB is not set
589# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
665 590
666# 591#
667# Sound 592# Display device support
668#
669# CONFIG_SOUND is not set
670
671#
672# USB support
673#
674CONFIG_USB_ARCH_HAS_HCD=y
675CONFIG_USB_ARCH_HAS_OHCI=y
676# CONFIG_USB is not set
677
678#
679# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
680# 593#
594# CONFIG_DISPLAY_SUPPORT is not set
681 595
682# 596#
683# USB Gadget Support 597# Sound
684#
685# CONFIG_USB_GADGET is not set
686
687#
688# MMC/SD Card support
689# 598#
599# CONFIG_SOUND is not set
600# CONFIG_HID_SUPPORT is not set
601# CONFIG_USB_SUPPORT is not set
690# CONFIG_MMC is not set 602# CONFIG_MMC is not set
691 603# CONFIG_NEW_LEDS is not set
692#
693# InfiniBand support
694#
695# CONFIG_INFINIBAND is not set 604# CONFIG_INFINIBAND is not set
605# CONFIG_EDAC is not set
606# CONFIG_RTC_CLASS is not set
696 607
697# 608#
698# SN Devices 609# Userspace I/O
699# 610#
611# CONFIG_UIO is not set
700 612
701# 613#
702# File systems 614# File systems
703# 615#
704CONFIG_EXT2_FS=y 616# CONFIG_EXT2_FS is not set
705# CONFIG_EXT2_FS_XATTR is not set 617# CONFIG_EXT3_FS is not set
706# CONFIG_EXT2_FS_XIP is not set 618# CONFIG_EXT4DEV_FS is not set
707CONFIG_EXT3_FS=y
708CONFIG_EXT3_FS_XATTR=y
709# CONFIG_EXT3_FS_POSIX_ACL is not set
710# CONFIG_EXT3_FS_SECURITY is not set
711CONFIG_JBD=y
712# CONFIG_JBD_DEBUG is not set
713CONFIG_FS_MBCACHE=y
714# CONFIG_REISERFS_FS is not set 619# CONFIG_REISERFS_FS is not set
715# CONFIG_JFS_FS is not set 620# CONFIG_JFS_FS is not set
716# CONFIG_FS_POSIX_ACL is not set 621# CONFIG_FS_POSIX_ACL is not set
717# CONFIG_XFS_FS is not set 622# CONFIG_XFS_FS is not set
623# CONFIG_GFS2_FS is not set
624# CONFIG_OCFS2_FS is not set
718# CONFIG_MINIX_FS is not set 625# CONFIG_MINIX_FS is not set
719# CONFIG_ROMFS_FS is not set 626# CONFIG_ROMFS_FS is not set
720CONFIG_INOTIFY=y 627CONFIG_INOTIFY=y
628CONFIG_INOTIFY_USER=y
721# CONFIG_QUOTA is not set 629# CONFIG_QUOTA is not set
722CONFIG_DNOTIFY=y 630CONFIG_DNOTIFY=y
723# CONFIG_AUTOFS_FS is not set 631# CONFIG_AUTOFS_FS is not set
@@ -742,11 +650,12 @@ CONFIG_DNOTIFY=y
742# 650#
743CONFIG_PROC_FS=y 651CONFIG_PROC_FS=y
744CONFIG_PROC_KCORE=y 652CONFIG_PROC_KCORE=y
653CONFIG_PROC_SYSCTL=y
745CONFIG_SYSFS=y 654CONFIG_SYSFS=y
746CONFIG_TMPFS=y 655CONFIG_TMPFS=y
656# CONFIG_TMPFS_POSIX_ACL is not set
747# CONFIG_HUGETLB_PAGE is not set 657# CONFIG_HUGETLB_PAGE is not set
748CONFIG_RAMFS=y 658# CONFIG_CONFIGFS_FS is not set
749# CONFIG_RELAYFS_FS is not set
750 659
751# 660#
752# Miscellaneous filesystems 661# Miscellaneous filesystems
@@ -764,10 +673,7 @@ CONFIG_RAMFS=y
764# CONFIG_QNX4FS_FS is not set 673# CONFIG_QNX4FS_FS is not set
765# CONFIG_SYSV_FS is not set 674# CONFIG_SYSV_FS is not set
766# CONFIG_UFS_FS is not set 675# CONFIG_UFS_FS is not set
767 676CONFIG_NETWORK_FILESYSTEMS=y
768#
769# Network File Systems
770#
771CONFIG_NFS_FS=y 677CONFIG_NFS_FS=y
772# CONFIG_NFS_V3 is not set 678# CONFIG_NFS_V3 is not set
773# CONFIG_NFS_V4 is not set 679# CONFIG_NFS_V4 is not set
@@ -777,6 +683,7 @@ CONFIG_ROOT_NFS=y
777CONFIG_LOCKD=y 683CONFIG_LOCKD=y
778CONFIG_NFS_COMMON=y 684CONFIG_NFS_COMMON=y
779CONFIG_SUNRPC=y 685CONFIG_SUNRPC=y
686# CONFIG_SUNRPC_BIND34 is not set
780# CONFIG_RPCSEC_GSS_KRB5 is not set 687# CONFIG_RPCSEC_GSS_KRB5 is not set
781# CONFIG_RPCSEC_GSS_SPKM3 is not set 688# CONFIG_RPCSEC_GSS_SPKM3 is not set
782# CONFIG_SMB_FS is not set 689# CONFIG_SMB_FS is not set
@@ -784,61 +691,51 @@ CONFIG_SUNRPC=y
784# CONFIG_NCP_FS is not set 691# CONFIG_NCP_FS is not set
785# CONFIG_CODA_FS is not set 692# CONFIG_CODA_FS is not set
786# CONFIG_AFS_FS is not set 693# CONFIG_AFS_FS is not set
787# CONFIG_9P_FS is not set
788 694
789# 695#
790# Partition Types 696# Partition Types
791# 697#
792CONFIG_PARTITION_ADVANCED=y 698# CONFIG_PARTITION_ADVANCED is not set
793# CONFIG_ACORN_PARTITION is not set 699CONFIG_MSDOS_PARTITION=y
794# CONFIG_OSF_PARTITION is not set
795# CONFIG_AMIGA_PARTITION is not set
796# CONFIG_ATARI_PARTITION is not set
797# CONFIG_MAC_PARTITION is not set
798# CONFIG_MSDOS_PARTITION is not set
799# CONFIG_LDM_PARTITION is not set
800# CONFIG_SGI_PARTITION is not set
801# CONFIG_ULTRIX_PARTITION is not set
802# CONFIG_SUN_PARTITION is not set
803# CONFIG_EFI_PARTITION is not set
804
805#
806# Native Language Support
807#
808# CONFIG_NLS is not set 700# CONFIG_NLS is not set
701# CONFIG_DLM is not set
809 702
810# 703#
811# Library routines 704# Library routines
812# 705#
706CONFIG_BITREVERSE=y
813# CONFIG_CRC_CCITT is not set 707# CONFIG_CRC_CCITT is not set
814# CONFIG_CRC16 is not set 708# CONFIG_CRC16 is not set
709# CONFIG_CRC_ITU_T is not set
815CONFIG_CRC32=y 710CONFIG_CRC32=y
711# CONFIG_CRC7 is not set
816# CONFIG_LIBCRC32C is not set 712# CONFIG_LIBCRC32C is not set
817 713CONFIG_PLIST=y
818# 714CONFIG_HAS_IOMEM=y
819# Profiling support 715CONFIG_HAS_IOPORT=y
820# 716CONFIG_HAS_DMA=y
821# CONFIG_PROFILING is not set 717# CONFIG_INSTRUMENTATION is not set
822 718
823# 719#
824# Kernel hacking 720# Kernel hacking
825# 721#
826# CONFIG_PRINTK_TIME is not set 722# CONFIG_PRINTK_TIME is not set
723CONFIG_ENABLE_WARN_DEPRECATED=y
724CONFIG_ENABLE_MUST_CHECK=y
725# CONFIG_MAGIC_SYSRQ is not set
726# CONFIG_UNUSED_SYMBOLS is not set
727# CONFIG_DEBUG_FS is not set
728# CONFIG_HEADERS_CHECK is not set
827# CONFIG_DEBUG_KERNEL is not set 729# CONFIG_DEBUG_KERNEL is not set
828CONFIG_LOG_BUF_SHIFT=14 730# CONFIG_DEBUG_BUGVERBOSE is not set
829# CONFIG_SERIAL_TEXT_DEBUG is not set 731# CONFIG_SAMPLES is not set
732# CONFIG_PPC_EARLY_DEBUG is not set
830 733
831# 734#
832# Security options 735# Security options
833# 736#
834# CONFIG_KEYS is not set 737# CONFIG_KEYS is not set
835# CONFIG_SECURITY is not set 738# CONFIG_SECURITY is not set
836 739# CONFIG_SECURITY_FILE_CAPABILITIES is not set
837#
838# Cryptographic options
839#
840# CONFIG_CRYPTO is not set 740# CONFIG_CRYPTO is not set
841 741# CONFIG_PPC_CLOCK is not set
842#
843# Hardware crypto devices
844#
diff --git a/arch/powerpc/configs/sbc8560_defconfig b/arch/powerpc/configs/sbc8560_defconfig
new file mode 100644
index 000000000000..d89fce0d3ba1
--- /dev/null
+++ b/arch/powerpc/configs/sbc8560_defconfig
@@ -0,0 +1,764 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4
4# Wed Jan 23 14:59:20 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
40CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
55
56#
57# General setup
58#
59CONFIG_EXPERIMENTAL=y
60CONFIG_BROKEN_ON_SMP=y
61CONFIG_INIT_ENV_ARG_LIMIT=32
62CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y
65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set
68# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
72# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
87CONFIG_KALLSYMS=y
88# CONFIG_KALLSYMS_ALL is not set
89# CONFIG_KALLSYMS_EXTRA_PASS is not set
90CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y
92CONFIG_BUG=y
93CONFIG_ELF_CORE=y
94CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y
99CONFIG_EVENTFD=y
100CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y
103# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set
105CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0
108# CONFIG_MODULES is not set
109CONFIG_BLOCK=y
110# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_LSF is not set
113# CONFIG_BLK_DEV_BSG is not set
114
115#
116# IO Schedulers
117#
118CONFIG_IOSCHED_NOOP=y
119CONFIG_IOSCHED_AS=y
120CONFIG_IOSCHED_DEADLINE=y
121CONFIG_IOSCHED_CFQ=y
122CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_DEADLINE is not set
124# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory"
127
128#
129# Platform support
130#
131# CONFIG_PPC_MPC52xx is not set
132# CONFIG_PPC_MPC5200 is not set
133# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set
136# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set
141CONFIG_SBC8560=y
142CONFIG_MPC8560=y
143CONFIG_MPC85xx=y
144CONFIG_MPIC=y
145# CONFIG_MPIC_WEIRD is not set
146# CONFIG_PPC_I8259 is not set
147# CONFIG_PPC_RTAS is not set
148# CONFIG_MMIO_NVRAM is not set
149# CONFIG_PPC_MPC106 is not set
150# CONFIG_PPC_970_NAP is not set
151# CONFIG_PPC_INDIRECT_IO is not set
152# CONFIG_GENERIC_IOMAP is not set
153# CONFIG_CPU_FREQ is not set
154# CONFIG_CPM2 is not set
155# CONFIG_FSL_ULI1575 is not set
156
157#
158# Kernel options
159#
160# CONFIG_HIGHMEM is not set
161# CONFIG_TICK_ONESHOT is not set
162# CONFIG_NO_HZ is not set
163# CONFIG_HIGH_RES_TIMERS is not set
164CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
165# CONFIG_HZ_100 is not set
166CONFIG_HZ_250=y
167# CONFIG_HZ_300 is not set
168# CONFIG_HZ_1000 is not set
169CONFIG_HZ=250
170CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set
173CONFIG_BINFMT_ELF=y
174CONFIG_BINFMT_MISC=y
175# CONFIG_MATH_EMULATION is not set
176CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
177CONFIG_ARCH_FLATMEM_ENABLE=y
178CONFIG_ARCH_POPULATES_NODE_MAP=y
179CONFIG_SELECT_MEMORY_MODEL=y
180CONFIG_FLATMEM_MANUAL=y
181# CONFIG_DISCONTIGMEM_MANUAL is not set
182# CONFIG_SPARSEMEM_MANUAL is not set
183CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set
186# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
187CONFIG_SPLIT_PTLOCK_CPUS=4
188# CONFIG_RESOURCES_64BIT is not set
189CONFIG_ZONE_DMA_FLAG=1
190CONFIG_BOUNCE=y
191CONFIG_VIRT_TO_BUS=y
192CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set
195CONFIG_SUSPEND_UP_POSSIBLE=y
196CONFIG_HIBERNATION_UP_POSSIBLE=y
197# CONFIG_SECCOMP is not set
198CONFIG_WANT_DEVICE_TREE=y
199CONFIG_DEVICE_TREE=""
200CONFIG_ISA_DMA_API=y
201
202#
203# Bus options
204#
205CONFIG_ZONE_DMA=y
206CONFIG_FSL_SOC=y
207# CONFIG_PCI is not set
208# CONFIG_PCI_DOMAINS is not set
209# CONFIG_PCI_SYSCALL is not set
210# CONFIG_ARCH_SUPPORTS_MSI is not set
211# CONFIG_PCCARD is not set
212
213#
214# Advanced setup
215#
216# CONFIG_ADVANCED_OPTIONS is not set
217
218#
219# Default settings for advanced configuration options are used
220#
221CONFIG_HIGHMEM_START=0xfe000000
222CONFIG_LOWMEM_SIZE=0x30000000
223CONFIG_KERNEL_START=0xc0000000
224CONFIG_TASK_SIZE=0xc0000000
225CONFIG_BOOT_LOAD=0x00800000
226
227#
228# Networking
229#
230CONFIG_NET=y
231
232#
233# Networking options
234#
235CONFIG_PACKET=y
236# CONFIG_PACKET_MMAP is not set
237CONFIG_UNIX=y
238CONFIG_XFRM=y
239CONFIG_XFRM_USER=y
240# CONFIG_XFRM_SUB_POLICY is not set
241# CONFIG_XFRM_MIGRATE is not set
242# CONFIG_NET_KEY is not set
243CONFIG_INET=y
244CONFIG_IP_MULTICAST=y
245# CONFIG_IP_ADVANCED_ROUTER is not set
246CONFIG_IP_FIB_HASH=y
247CONFIG_IP_PNP=y
248CONFIG_IP_PNP_DHCP=y
249CONFIG_IP_PNP_BOOTP=y
250# CONFIG_IP_PNP_RARP is not set
251# CONFIG_NET_IPIP is not set
252# CONFIG_NET_IPGRE is not set
253# CONFIG_IP_MROUTE is not set
254# CONFIG_ARPD is not set
255CONFIG_SYN_COOKIES=y
256# CONFIG_INET_AH is not set
257# CONFIG_INET_ESP is not set
258# CONFIG_INET_IPCOMP is not set
259# CONFIG_INET_XFRM_TUNNEL is not set
260# CONFIG_INET_TUNNEL is not set
261CONFIG_INET_XFRM_MODE_TRANSPORT=y
262CONFIG_INET_XFRM_MODE_TUNNEL=y
263CONFIG_INET_XFRM_MODE_BEET=y
264# CONFIG_INET_LRO is not set
265CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set
268CONFIG_TCP_CONG_CUBIC=y
269CONFIG_DEFAULT_TCP_CONG="cubic"
270# CONFIG_TCP_MD5SIG is not set
271# CONFIG_IPV6 is not set
272# CONFIG_INET6_XFRM_TUNNEL is not set
273# CONFIG_INET6_TUNNEL is not set
274# CONFIG_NETWORK_SECMARK is not set
275# CONFIG_NETFILTER is not set
276# CONFIG_IP_DCCP is not set
277# CONFIG_IP_SCTP is not set
278# CONFIG_TIPC is not set
279# CONFIG_ATM is not set
280# CONFIG_BRIDGE is not set
281# CONFIG_VLAN_8021Q is not set
282# CONFIG_DECNET is not set
283# CONFIG_LLC2 is not set
284# CONFIG_IPX is not set
285# CONFIG_ATALK is not set
286# CONFIG_X25 is not set
287# CONFIG_LAPB is not set
288# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set
290# CONFIG_NET_SCHED is not set
291
292#
293# Network testing
294#
295# CONFIG_NET_PKTGEN is not set
296# CONFIG_HAMRADIO is not set
297# CONFIG_IRDA is not set
298# CONFIG_BT is not set
299# CONFIG_AF_RXRPC is not set
300
301#
302# Wireless
303#
304# CONFIG_CFG80211 is not set
305# CONFIG_WIRELESS_EXT is not set
306# CONFIG_MAC80211 is not set
307# CONFIG_IEEE80211 is not set
308# CONFIG_RFKILL is not set
309# CONFIG_NET_9P is not set
310
311#
312# Device Drivers
313#
314
315#
316# Generic Driver Options
317#
318CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
319CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set
322# CONFIG_DEBUG_DRIVER is not set
323# CONFIG_DEBUG_DEVRES is not set
324# CONFIG_SYS_HYPERVISOR is not set
325# CONFIG_CONNECTOR is not set
326# CONFIG_MTD is not set
327CONFIG_OF_DEVICE=y
328# CONFIG_PARPORT is not set
329CONFIG_BLK_DEV=y
330# CONFIG_BLK_DEV_FD is not set
331# CONFIG_BLK_DEV_COW_COMMON is not set
332CONFIG_BLK_DEV_LOOP=y
333# CONFIG_BLK_DEV_CRYPTOLOOP is not set
334# CONFIG_BLK_DEV_NBD is not set
335CONFIG_BLK_DEV_RAM=y
336CONFIG_BLK_DEV_RAM_COUNT=16
337CONFIG_BLK_DEV_RAM_SIZE=32768
338CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
339# CONFIG_CDROM_PKTCDVD is not set
340# CONFIG_ATA_OVER_ETH is not set
341CONFIG_MISC_DEVICES=y
342# CONFIG_EEPROM_93CX6 is not set
343# CONFIG_IDE is not set
344
345#
346# SCSI device support
347#
348# CONFIG_RAID_ATTRS is not set
349# CONFIG_SCSI is not set
350# CONFIG_SCSI_DMA is not set
351# CONFIG_SCSI_NETLINK is not set
352# CONFIG_ATA is not set
353# CONFIG_MD is not set
354# CONFIG_MACINTOSH_DRIVERS is not set
355CONFIG_NETDEVICES=y
356# CONFIG_NETDEVICES_MULTIQUEUE is not set
357# CONFIG_DUMMY is not set
358# CONFIG_BONDING is not set
359# CONFIG_MACVLAN is not set
360# CONFIG_EQUALIZER is not set
361# CONFIG_TUN is not set
362# CONFIG_VETH is not set
363CONFIG_PHYLIB=y
364
365#
366# MII PHY device drivers
367#
368# CONFIG_MARVELL_PHY is not set
369# CONFIG_DAVICOM_PHY is not set
370# CONFIG_QSEMI_PHY is not set
371# CONFIG_LXT_PHY is not set
372# CONFIG_CICADA_PHY is not set
373# CONFIG_VITESSE_PHY is not set
374# CONFIG_SMSC_PHY is not set
375CONFIG_BROADCOM_PHY=y
376# CONFIG_ICPLUS_PHY is not set
377# CONFIG_FIXED_PHY is not set
378# CONFIG_MDIO_BITBANG is not set
379CONFIG_NET_ETHERNET=y
380CONFIG_MII=y
381# CONFIG_IBM_NEW_EMAC_ZMII is not set
382# CONFIG_IBM_NEW_EMAC_RGMII is not set
383# CONFIG_IBM_NEW_EMAC_TAH is not set
384# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
385# CONFIG_B44 is not set
386CONFIG_NETDEV_1000=y
387CONFIG_GIANFAR=y
388CONFIG_GFAR_NAPI=y
389CONFIG_NETDEV_10000=y
390
391#
392# Wireless LAN
393#
394# CONFIG_WLAN_PRE80211 is not set
395# CONFIG_WLAN_80211 is not set
396# CONFIG_WAN is not set
397# CONFIG_PPP is not set
398# CONFIG_SLIP is not set
399# CONFIG_SHAPER is not set
400# CONFIG_NETCONSOLE is not set
401# CONFIG_NETPOLL is not set
402# CONFIG_NET_POLL_CONTROLLER is not set
403# CONFIG_ISDN is not set
404# CONFIG_PHONE is not set
405
406#
407# Input device support
408#
409CONFIG_INPUT=y
410# CONFIG_INPUT_FF_MEMLESS is not set
411# CONFIG_INPUT_POLLDEV is not set
412
413#
414# Userland interfaces
415#
416# CONFIG_INPUT_MOUSEDEV is not set
417# CONFIG_INPUT_JOYDEV is not set
418# CONFIG_INPUT_EVDEV is not set
419# CONFIG_INPUT_EVBUG is not set
420
421#
422# Input Device Drivers
423#
424# CONFIG_INPUT_KEYBOARD is not set
425# CONFIG_INPUT_MOUSE is not set
426# CONFIG_INPUT_JOYSTICK is not set
427# CONFIG_INPUT_TABLET is not set
428# CONFIG_INPUT_TOUCHSCREEN is not set
429# CONFIG_INPUT_MISC is not set
430
431#
432# Hardware I/O ports
433#
434# CONFIG_SERIO is not set
435# CONFIG_GAMEPORT is not set
436
437#
438# Character devices
439#
440# CONFIG_VT is not set
441# CONFIG_SERIAL_NONSTANDARD is not set
442
443#
444# Serial drivers
445#
446CONFIG_SERIAL_8250=y
447CONFIG_SERIAL_8250_CONSOLE=y
448CONFIG_SERIAL_8250_NR_UARTS=2
449CONFIG_SERIAL_8250_RUNTIME_UARTS=2
450# CONFIG_SERIAL_8250_EXTENDED is not set
451CONFIG_SERIAL_8250_SHARE_IRQ=y
452
453#
454# Non-8250 serial port support
455#
456# CONFIG_SERIAL_UARTLITE is not set
457CONFIG_SERIAL_CORE=y
458CONFIG_SERIAL_CORE_CONSOLE=y
459# CONFIG_SERIAL_OF_PLATFORM is not set
460CONFIG_UNIX98_PTYS=y
461CONFIG_LEGACY_PTYS=y
462CONFIG_LEGACY_PTY_COUNT=256
463# CONFIG_IPMI_HANDLER is not set
464# CONFIG_HW_RANDOM is not set
465# CONFIG_NVRAM is not set
466# CONFIG_GEN_RTC is not set
467# CONFIG_R3964 is not set
468# CONFIG_RAW_DRIVER is not set
469# CONFIG_TCG_TPM is not set
470# CONFIG_I2C is not set
471
472#
473# SPI support
474#
475# CONFIG_SPI is not set
476# CONFIG_SPI_MASTER is not set
477# CONFIG_W1 is not set
478# CONFIG_POWER_SUPPLY is not set
479CONFIG_HWMON=y
480# CONFIG_HWMON_VID is not set
481# CONFIG_SENSORS_F71805F is not set
482# CONFIG_SENSORS_F71882FG is not set
483# CONFIG_SENSORS_IT87 is not set
484# CONFIG_SENSORS_PC87360 is not set
485# CONFIG_SENSORS_PC87427 is not set
486# CONFIG_SENSORS_SMSC47M1 is not set
487# CONFIG_SENSORS_SMSC47B397 is not set
488# CONFIG_SENSORS_VT1211 is not set
489# CONFIG_SENSORS_W83627HF is not set
490# CONFIG_SENSORS_W83627EHF is not set
491# CONFIG_HWMON_DEBUG_CHIP is not set
492# CONFIG_WATCHDOG is not set
493
494#
495# Sonics Silicon Backplane
496#
497CONFIG_SSB_POSSIBLE=y
498# CONFIG_SSB is not set
499
500#
501# Multifunction device drivers
502#
503# CONFIG_MFD_SM501 is not set
504
505#
506# Multimedia devices
507#
508# CONFIG_VIDEO_DEV is not set
509# CONFIG_DVB_CORE is not set
510CONFIG_DAB=y
511
512#
513# Graphics support
514#
515# CONFIG_VGASTATE is not set
516CONFIG_VIDEO_OUTPUT_CONTROL=y
517# CONFIG_FB is not set
518# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
519
520#
521# Display device support
522#
523# CONFIG_DISPLAY_SUPPORT is not set
524
525#
526# Sound
527#
528# CONFIG_SOUND is not set
529CONFIG_HID_SUPPORT=y
530CONFIG_HID=y
531# CONFIG_HID_DEBUG is not set
532# CONFIG_HIDRAW is not set
533CONFIG_USB_SUPPORT=y
534# CONFIG_USB_ARCH_HAS_HCD is not set
535# CONFIG_USB_ARCH_HAS_OHCI is not set
536# CONFIG_USB_ARCH_HAS_EHCI is not set
537
538#
539# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
540#
541
542#
543# USB Gadget Support
544#
545# CONFIG_USB_GADGET is not set
546# CONFIG_MMC is not set
547# CONFIG_NEW_LEDS is not set
548# CONFIG_EDAC is not set
549CONFIG_RTC_LIB=y
550CONFIG_RTC_CLASS=y
551CONFIG_RTC_HCTOSYS=y
552CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
553# CONFIG_RTC_DEBUG is not set
554
555#
556# RTC interfaces
557#
558CONFIG_RTC_INTF_SYSFS=y
559CONFIG_RTC_INTF_PROC=y
560CONFIG_RTC_INTF_DEV=y
561# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
562# CONFIG_RTC_DRV_TEST is not set
563
564#
565# SPI RTC drivers
566#
567
568#
569# Platform RTC drivers
570#
571# CONFIG_RTC_DRV_CMOS is not set
572# CONFIG_RTC_DRV_DS1553 is not set
573# CONFIG_RTC_DRV_STK17TA8 is not set
574# CONFIG_RTC_DRV_DS1742 is not set
575# CONFIG_RTC_DRV_M48T86 is not set
576CONFIG_RTC_DRV_M48T59=y
577# CONFIG_RTC_DRV_V3020 is not set
578
579#
580# on-CPU RTC drivers
581#
582
583#
584# Userspace I/O
585#
586# CONFIG_UIO is not set
587
588#
589# File systems
590#
591# CONFIG_EXT2_FS is not set
592# CONFIG_EXT3_FS is not set
593# CONFIG_EXT4DEV_FS is not set
594# CONFIG_REISERFS_FS is not set
595# CONFIG_JFS_FS is not set
596# CONFIG_FS_POSIX_ACL is not set
597# CONFIG_XFS_FS is not set
598# CONFIG_GFS2_FS is not set
599# CONFIG_OCFS2_FS is not set
600# CONFIG_MINIX_FS is not set
601# CONFIG_ROMFS_FS is not set
602CONFIG_INOTIFY=y
603CONFIG_INOTIFY_USER=y
604# CONFIG_QUOTA is not set
605CONFIG_DNOTIFY=y
606# CONFIG_AUTOFS_FS is not set
607# CONFIG_AUTOFS4_FS is not set
608# CONFIG_FUSE_FS is not set
609
610#
611# CD-ROM/DVD Filesystems
612#
613# CONFIG_ISO9660_FS is not set
614# CONFIG_UDF_FS is not set
615
616#
617# DOS/FAT/NT Filesystems
618#
619# CONFIG_MSDOS_FS is not set
620# CONFIG_VFAT_FS is not set
621# CONFIG_NTFS_FS is not set
622
623#
624# Pseudo filesystems
625#
626CONFIG_PROC_FS=y
627CONFIG_PROC_KCORE=y
628CONFIG_PROC_SYSCTL=y
629CONFIG_SYSFS=y
630CONFIG_TMPFS=y
631# CONFIG_TMPFS_POSIX_ACL is not set
632# CONFIG_HUGETLB_PAGE is not set
633# CONFIG_CONFIGFS_FS is not set
634
635#
636# Miscellaneous filesystems
637#
638# CONFIG_ADFS_FS is not set
639# CONFIG_AFFS_FS is not set
640# CONFIG_HFS_FS is not set
641# CONFIG_HFSPLUS_FS is not set
642# CONFIG_BEFS_FS is not set
643# CONFIG_BFS_FS is not set
644# CONFIG_EFS_FS is not set
645# CONFIG_CRAMFS is not set
646# CONFIG_VXFS_FS is not set
647# CONFIG_HPFS_FS is not set
648# CONFIG_QNX4FS_FS is not set
649# CONFIG_SYSV_FS is not set
650# CONFIG_UFS_FS is not set
651CONFIG_NETWORK_FILESYSTEMS=y
652CONFIG_NFS_FS=y
653# CONFIG_NFS_V3 is not set
654# CONFIG_NFS_V4 is not set
655# CONFIG_NFS_DIRECTIO is not set
656# CONFIG_NFSD is not set
657CONFIG_ROOT_NFS=y
658CONFIG_LOCKD=y
659CONFIG_NFS_COMMON=y
660CONFIG_SUNRPC=y
661# CONFIG_SUNRPC_BIND34 is not set
662# CONFIG_RPCSEC_GSS_KRB5 is not set
663# CONFIG_RPCSEC_GSS_SPKM3 is not set
664# CONFIG_SMB_FS is not set
665# CONFIG_CIFS is not set
666# CONFIG_NCP_FS is not set
667# CONFIG_CODA_FS is not set
668# CONFIG_AFS_FS is not set
669
670#
671# Partition Types
672#
673CONFIG_PARTITION_ADVANCED=y
674# CONFIG_ACORN_PARTITION is not set
675# CONFIG_OSF_PARTITION is not set
676# CONFIG_AMIGA_PARTITION is not set
677# CONFIG_ATARI_PARTITION is not set
678# CONFIG_MAC_PARTITION is not set
679# CONFIG_MSDOS_PARTITION is not set
680# CONFIG_LDM_PARTITION is not set
681# CONFIG_SGI_PARTITION is not set
682# CONFIG_ULTRIX_PARTITION is not set
683# CONFIG_SUN_PARTITION is not set
684# CONFIG_KARMA_PARTITION is not set
685# CONFIG_EFI_PARTITION is not set
686# CONFIG_SYSV68_PARTITION is not set
687# CONFIG_NLS is not set
688# CONFIG_DLM is not set
689# CONFIG_UCC_SLOW is not set
690
691#
692# Library routines
693#
694CONFIG_BITREVERSE=y
695# CONFIG_CRC_CCITT is not set
696# CONFIG_CRC16 is not set
697# CONFIG_CRC_ITU_T is not set
698CONFIG_CRC32=y
699# CONFIG_CRC7 is not set
700# CONFIG_LIBCRC32C is not set
701CONFIG_PLIST=y
702CONFIG_HAS_IOMEM=y
703CONFIG_HAS_IOPORT=y
704CONFIG_HAS_DMA=y
705# CONFIG_INSTRUMENTATION is not set
706
707#
708# Kernel hacking
709#
710# CONFIG_PRINTK_TIME is not set
711CONFIG_ENABLE_WARN_DEPRECATED=y
712CONFIG_ENABLE_MUST_CHECK=y
713CONFIG_MAGIC_SYSRQ=y
714# CONFIG_UNUSED_SYMBOLS is not set
715# CONFIG_DEBUG_FS is not set
716# CONFIG_HEADERS_CHECK is not set
717CONFIG_DEBUG_KERNEL=y
718# CONFIG_DEBUG_SHIRQ is not set
719CONFIG_DETECT_SOFTLOCKUP=y
720CONFIG_SCHED_DEBUG=y
721# CONFIG_SCHEDSTATS is not set
722# CONFIG_TIMER_STATS is not set
723# CONFIG_DEBUG_SLAB is not set
724# CONFIG_DEBUG_RT_MUTEXES is not set
725# CONFIG_RT_MUTEX_TESTER is not set
726# CONFIG_DEBUG_SPINLOCK is not set
727CONFIG_DEBUG_MUTEXES=y
728# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
729# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
730# CONFIG_DEBUG_KOBJECT is not set
731# CONFIG_DEBUG_BUGVERBOSE is not set
732# CONFIG_DEBUG_INFO is not set
733# CONFIG_DEBUG_VM is not set
734# CONFIG_DEBUG_LIST is not set
735# CONFIG_DEBUG_SG is not set
736CONFIG_FORCED_INLINING=y
737# CONFIG_BOOT_PRINTK_DELAY is not set
738# CONFIG_FAULT_INJECTION is not set
739# CONFIG_SAMPLES is not set
740# CONFIG_DEBUG_STACKOVERFLOW is not set
741# CONFIG_DEBUG_STACK_USAGE is not set
742# CONFIG_DEBUG_PAGEALLOC is not set
743# CONFIG_DEBUGGER is not set
744# CONFIG_BDI_SWITCH is not set
745CONFIG_PPC_EARLY_DEBUG=y
746# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
747# CONFIG_PPC_EARLY_DEBUG_G5 is not set
748# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
749# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
750# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
751# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
752# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
753# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
754# CONFIG_PPC_EARLY_DEBUG_44x is not set
755# CONFIG_PPC_EARLY_DEBUG_CPM is not set
756
757#
758# Security options
759#
760# CONFIG_KEYS is not set
761# CONFIG_SECURITY is not set
762# CONFIG_SECURITY_FILE_CAPABILITIES is not set
763# CONFIG_CRYPTO is not set
764# CONFIG_PPC_CLOCK is not set
diff --git a/arch/ppc/configs/stx_gp3_defconfig b/arch/powerpc/configs/stx_gp3_defconfig
index 70d6f842aa9b..e8137a839bd4 100644
--- a/arch/ppc/configs/stx_gp3_defconfig
+++ b/arch/powerpc/configs/stx_gp3_defconfig
@@ -1,126 +1,230 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc4 3# Linux kernel version: 2.6.24-rc8
4# Tue May 24 18:11:04 2005 4# Thu Jan 24 02:02:30 2008
5# 5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
6CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_HAVE_DEC_LOCK=y 38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
11CONFIG_PPC=y 40CONFIG_PPC=y
12CONFIG_PPC32=y 41CONFIG_EARLY_PRINTK=y
13CONFIG_GENERIC_NVRAM=y 42CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 55
16# 56#
17# Code maturity level options 57# General setup
18# 58#
19CONFIG_EXPERIMENTAL=y 59CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 60CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 61CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION="" 62CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y
28CONFIG_SWAP=y 64CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
30# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
31# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
32CONFIG_SYSCTL=y 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
33# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
34CONFIG_HOTPLUG=y
35CONFIG_KOBJECT_UEVENT=y
36# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
37CONFIG_EMBEDDED=y 85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
38CONFIG_KALLSYMS=y 87CONFIG_KALLSYMS=y
39# CONFIG_KALLSYMS_ALL is not set 88# CONFIG_KALLSYMS_ALL is not set
40# CONFIG_KALLSYMS_EXTRA_PASS is not set 89# CONFIG_KALLSYMS_EXTRA_PASS is not set
90CONFIG_HOTPLUG=y
41CONFIG_PRINTK=y 91CONFIG_PRINTK=y
42CONFIG_BUG=y 92CONFIG_BUG=y
93CONFIG_ELF_CORE=y
43CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 95CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y
45CONFIG_EPOLL=y 97CONFIG_EPOLL=y
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 98CONFIG_SIGNALFD=y
99CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 100CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 101CONFIG_VM_EVENT_COUNTERS=y
49CONFIG_CC_ALIGN_LABELS=0 102CONFIG_SLUB_DEBUG=y
50CONFIG_CC_ALIGN_LOOPS=0 103# CONFIG_SLAB is not set
51CONFIG_CC_ALIGN_JUMPS=0 104CONFIG_SLUB=y
105# CONFIG_SLOB is not set
106CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 108# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 109CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58CONFIG_MODULES=y 110CONFIG_MODULES=y
59# CONFIG_MODULE_UNLOAD is not set 111# CONFIG_MODULE_UNLOAD is not set
60CONFIG_OBSOLETE_MODPARM=y
61CONFIG_MODVERSIONS=y 112CONFIG_MODVERSIONS=y
62# CONFIG_MODULE_SRCVERSION_ALL is not set 113# CONFIG_MODULE_SRCVERSION_ALL is not set
63CONFIG_KMOD=y 114CONFIG_KMOD=y
115CONFIG_BLOCK=y
116# CONFIG_LBD is not set
117# CONFIG_BLK_DEV_IO_TRACE is not set
118# CONFIG_LSF is not set
119# CONFIG_BLK_DEV_BSG is not set
64 120
65# 121#
66# Processor 122# IO Schedulers
67# 123#
68# CONFIG_6xx is not set 124CONFIG_IOSCHED_NOOP=y
69# CONFIG_40x is not set 125CONFIG_IOSCHED_AS=y
70# CONFIG_44x is not set 126CONFIG_IOSCHED_DEADLINE=y
71# CONFIG_POWER3 is not set 127CONFIG_IOSCHED_CFQ=y
72# CONFIG_POWER4 is not set 128# CONFIG_DEFAULT_AS is not set
73# CONFIG_8xx is not set 129# CONFIG_DEFAULT_DEADLINE is not set
74CONFIG_E500=y 130CONFIG_DEFAULT_CFQ=y
75CONFIG_BOOKE=y 131# CONFIG_DEFAULT_NOOP is not set
76CONFIG_FSL_BOOKE=y 132CONFIG_DEFAULT_IOSCHED="cfq"
77# CONFIG_PHYS_64BIT is not set
78# CONFIG_SPE is not set
79CONFIG_MATH_EMULATION=y
80# CONFIG_CPU_FREQ is not set
81# CONFIG_PM is not set
82CONFIG_85xx=y
83CONFIG_PPC_INDIRECT_PCI_BE=y
84 133
85# 134#
86# Freescale 85xx options 135# Platform support
87# 136#
137# CONFIG_PPC_MPC52xx is not set
138# CONFIG_PPC_MPC5200 is not set
139# CONFIG_PPC_CELL is not set
140# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PQ2ADS is not set
88# CONFIG_MPC8540_ADS is not set 142# CONFIG_MPC8540_ADS is not set
89# CONFIG_MPC8555_CDS is not set
90# CONFIG_MPC8560_ADS is not set 143# CONFIG_MPC8560_ADS is not set
91# CONFIG_SBC8560 is not set 144# CONFIG_MPC85xx_CDS is not set
145# CONFIG_MPC85xx_MDS is not set
146# CONFIG_MPC85xx_DS is not set
92CONFIG_STX_GP3=y 147CONFIG_STX_GP3=y
93CONFIG_MPC8560=y 148CONFIG_MPC8560=y
149CONFIG_MPC85xx=y
150# CONFIG_IPIC is not set
151CONFIG_MPIC=y
152# CONFIG_MPIC_WEIRD is not set
153# CONFIG_PPC_I8259 is not set
154# CONFIG_PPC_RTAS is not set
155# CONFIG_MMIO_NVRAM is not set
156# CONFIG_PPC_MPC106 is not set
157# CONFIG_PPC_970_NAP is not set
158# CONFIG_PPC_INDIRECT_IO is not set
159# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set
161CONFIG_CPM2=y
162CONFIG_PPC_CPM_NEW_BINDING=y
163# CONFIG_FSL_ULI1575 is not set
164CONFIG_CPM=y
94 165
95# 166#
96# Platform options 167# Kernel options
97# 168#
98CONFIG_CPM2=y
99# CONFIG_PC_KEYBOARD is not set
100# CONFIG_SMP is not set
101# CONFIG_PREEMPT is not set
102CONFIG_HIGHMEM=y 169CONFIG_HIGHMEM=y
170# CONFIG_TICK_ONESHOT is not set
171# CONFIG_NO_HZ is not set
172# CONFIG_HIGH_RES_TIMERS is not set
173CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
174# CONFIG_HZ_100 is not set
175CONFIG_HZ_250=y
176# CONFIG_HZ_300 is not set
177# CONFIG_HZ_1000 is not set
178CONFIG_HZ=250
179CONFIG_PREEMPT_NONE=y
180# CONFIG_PREEMPT_VOLUNTARY is not set
181# CONFIG_PREEMPT is not set
103CONFIG_BINFMT_ELF=y 182CONFIG_BINFMT_ELF=y
104CONFIG_BINFMT_MISC=m 183CONFIG_BINFMT_MISC=m
184CONFIG_MATH_EMULATION=y
185CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
186CONFIG_ARCH_FLATMEM_ENABLE=y
187CONFIG_ARCH_POPULATES_NODE_MAP=y
188CONFIG_SELECT_MEMORY_MODEL=y
189CONFIG_FLATMEM_MANUAL=y
190# CONFIG_DISCONTIGMEM_MANUAL is not set
191# CONFIG_SPARSEMEM_MANUAL is not set
192CONFIG_FLATMEM=y
193CONFIG_FLAT_NODE_MEM_MAP=y
194# CONFIG_SPARSEMEM_STATIC is not set
195# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
196CONFIG_SPLIT_PTLOCK_CPUS=4
197# CONFIG_RESOURCES_64BIT is not set
198CONFIG_ZONE_DMA_FLAG=1
199CONFIG_BOUNCE=y
200CONFIG_VIRT_TO_BUS=y
201CONFIG_PROC_DEVICETREE=y
105# CONFIG_CMDLINE_BOOL is not set 202# CONFIG_CMDLINE_BOOL is not set
203# CONFIG_PM is not set
204CONFIG_SUSPEND_UP_POSSIBLE=y
205CONFIG_HIBERNATION_UP_POSSIBLE=y
206CONFIG_SECCOMP=y
207CONFIG_WANT_DEVICE_TREE=y
208CONFIG_DEVICE_TREE="stx_gp3_8560.dts"
106CONFIG_ISA_DMA_API=y 209CONFIG_ISA_DMA_API=y
107 210
108# 211#
109# Bus options 212# Bus options
110# 213#
214CONFIG_ZONE_DMA=y
215CONFIG_PPC_INDIRECT_PCI=y
216CONFIG_FSL_SOC=y
217CONFIG_FSL_PCI=y
111CONFIG_PCI=y 218CONFIG_PCI=y
112CONFIG_PCI_DOMAINS=y 219CONFIG_PCI_DOMAINS=y
113# CONFIG_PCI_LEGACY_PROC is not set 220CONFIG_PCI_SYSCALL=y
114# CONFIG_PCI_NAMES is not set 221# CONFIG_PCIEPORTBUS is not set
222CONFIG_ARCH_SUPPORTS_MSI=y
223# CONFIG_PCI_MSI is not set
224CONFIG_PCI_LEGACY=y
115# CONFIG_PCI_DEBUG is not set 225# CONFIG_PCI_DEBUG is not set
116
117#
118# PCCARD (PCMCIA/CardBus) support
119#
120# CONFIG_PCCARD is not set 226# CONFIG_PCCARD is not set
121CONFIG_RAPIDIO=y 227# CONFIG_HOTPLUG_PCI is not set
122CONFIG_RAPIDIO_8_BIT_TRANSPORT=y
123CONFIG_RAPIDIO_DISC_TIMEOUT=30
124 228
125# 229#
126# Advanced setup 230# Advanced setup
@@ -133,43 +237,173 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
133CONFIG_HIGHMEM_START=0xfe000000 237CONFIG_HIGHMEM_START=0xfe000000
134CONFIG_LOWMEM_SIZE=0x30000000 238CONFIG_LOWMEM_SIZE=0x30000000
135CONFIG_KERNEL_START=0xc0000000 239CONFIG_KERNEL_START=0xc0000000
136CONFIG_TASK_SIZE=0x80000000 240CONFIG_TASK_SIZE=0xc0000000
137CONFIG_BOOT_LOAD=0x00800000 241CONFIG_BOOT_LOAD=0x00800000
138 242
139# 243#
244# Networking
245#
246CONFIG_NET=y
247
248#
249# Networking options
250#
251CONFIG_PACKET=y
252# CONFIG_PACKET_MMAP is not set
253CONFIG_UNIX=y
254CONFIG_XFRM=y
255# CONFIG_XFRM_USER is not set
256# CONFIG_XFRM_SUB_POLICY is not set
257# CONFIG_XFRM_MIGRATE is not set
258# CONFIG_NET_KEY is not set
259CONFIG_INET=y
260# CONFIG_IP_MULTICAST is not set
261# CONFIG_IP_ADVANCED_ROUTER is not set
262CONFIG_IP_FIB_HASH=y
263CONFIG_IP_PNP=y
264# CONFIG_IP_PNP_DHCP is not set
265CONFIG_IP_PNP_BOOTP=y
266# CONFIG_IP_PNP_RARP is not set
267# CONFIG_NET_IPIP is not set
268# CONFIG_NET_IPGRE is not set
269# CONFIG_ARPD is not set
270# CONFIG_SYN_COOKIES is not set
271# CONFIG_INET_AH is not set
272# CONFIG_INET_ESP is not set
273# CONFIG_INET_IPCOMP is not set
274# CONFIG_INET_XFRM_TUNNEL is not set
275# CONFIG_INET_TUNNEL is not set
276CONFIG_INET_XFRM_MODE_TRANSPORT=y
277CONFIG_INET_XFRM_MODE_TUNNEL=y
278CONFIG_INET_XFRM_MODE_BEET=y
279# CONFIG_INET_LRO is not set
280CONFIG_INET_DIAG=y
281CONFIG_INET_TCP_DIAG=y
282# CONFIG_TCP_CONG_ADVANCED is not set
283CONFIG_TCP_CONG_CUBIC=y
284CONFIG_DEFAULT_TCP_CONG="cubic"
285# CONFIG_TCP_MD5SIG is not set
286# CONFIG_IP_VS is not set
287# CONFIG_IPV6 is not set
288# CONFIG_INET6_XFRM_TUNNEL is not set
289# CONFIG_INET6_TUNNEL is not set
290# CONFIG_NETWORK_SECMARK is not set
291CONFIG_NETFILTER=y
292# CONFIG_NETFILTER_DEBUG is not set
293
294#
295# Core Netfilter Configuration
296#
297# CONFIG_NETFILTER_NETLINK is not set
298# CONFIG_NF_CONNTRACK_ENABLED is not set
299# CONFIG_NF_CONNTRACK is not set
300CONFIG_NETFILTER_XTABLES=m
301# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
302# CONFIG_NETFILTER_XT_TARGET_MARK is not set
303# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
304# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
305# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
306# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
307# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
308# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
309# CONFIG_NETFILTER_XT_MATCH_ESP is not set
310# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
311# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
312# CONFIG_NETFILTER_XT_MATCH_MAC is not set
313# CONFIG_NETFILTER_XT_MATCH_MARK is not set
314# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
315# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
316# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
317# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
318# CONFIG_NETFILTER_XT_MATCH_REALM is not set
319# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
320# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
321# CONFIG_NETFILTER_XT_MATCH_STRING is not set
322# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
323# CONFIG_NETFILTER_XT_MATCH_TIME is not set
324# CONFIG_NETFILTER_XT_MATCH_U32 is not set
325# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
326
327#
328# IP: Netfilter Configuration
329#
330# CONFIG_IP_NF_QUEUE is not set
331CONFIG_IP_NF_IPTABLES=m
332# CONFIG_IP_NF_MATCH_IPRANGE is not set
333# CONFIG_IP_NF_MATCH_TOS is not set
334# CONFIG_IP_NF_MATCH_RECENT is not set
335# CONFIG_IP_NF_MATCH_ECN is not set
336# CONFIG_IP_NF_MATCH_AH is not set
337# CONFIG_IP_NF_MATCH_TTL is not set
338# CONFIG_IP_NF_MATCH_OWNER is not set
339# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
340CONFIG_IP_NF_FILTER=m
341# CONFIG_IP_NF_TARGET_REJECT is not set
342# CONFIG_IP_NF_TARGET_LOG is not set
343# CONFIG_IP_NF_TARGET_ULOG is not set
344# CONFIG_IP_NF_MANGLE is not set
345# CONFIG_IP_NF_RAW is not set
346# CONFIG_IP_NF_ARPTABLES is not set
347# CONFIG_IP_DCCP is not set
348# CONFIG_IP_SCTP is not set
349# CONFIG_TIPC is not set
350# CONFIG_ATM is not set
351# CONFIG_BRIDGE is not set
352# CONFIG_VLAN_8021Q is not set
353# CONFIG_DECNET is not set
354# CONFIG_LLC2 is not set
355# CONFIG_IPX is not set
356# CONFIG_ATALK is not set
357# CONFIG_X25 is not set
358# CONFIG_LAPB is not set
359# CONFIG_ECONET is not set
360# CONFIG_WAN_ROUTER is not set
361# CONFIG_NET_SCHED is not set
362
363#
364# Network testing
365#
366CONFIG_NET_PKTGEN=y
367# CONFIG_HAMRADIO is not set
368# CONFIG_IRDA is not set
369# CONFIG_BT is not set
370# CONFIG_AF_RXRPC is not set
371
372#
373# Wireless
374#
375# CONFIG_CFG80211 is not set
376# CONFIG_WIRELESS_EXT is not set
377# CONFIG_MAC80211 is not set
378# CONFIG_IEEE80211 is not set
379# CONFIG_RFKILL is not set
380# CONFIG_NET_9P is not set
381
382#
140# Device Drivers 383# Device Drivers
141# 384#
142 385
143# 386#
144# Generic Driver Options 387# Generic Driver Options
145# 388#
389CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
146CONFIG_STANDALONE=y 390CONFIG_STANDALONE=y
147CONFIG_PREVENT_FIRMWARE_BUILD=y 391CONFIG_PREVENT_FIRMWARE_BUILD=y
148# CONFIG_FW_LOADER is not set 392# CONFIG_FW_LOADER is not set
149# CONFIG_DEBUG_DRIVER is not set 393# CONFIG_DEBUG_DRIVER is not set
150 394# CONFIG_DEBUG_DEVRES is not set
151# 395# CONFIG_SYS_HYPERVISOR is not set
152# Memory Technology Devices (MTD) 396# CONFIG_CONNECTOR is not set
153#
154# CONFIG_MTD is not set 397# CONFIG_MTD is not set
155 398CONFIG_OF_DEVICE=y
156#
157# Parallel port support
158#
159CONFIG_PARPORT=m 399CONFIG_PARPORT=m
160CONFIG_PARPORT_PC=m 400CONFIG_PARPORT_PC=m
161# CONFIG_PARPORT_PC_FIFO is not set 401# CONFIG_PARPORT_PC_FIFO is not set
162# CONFIG_PARPORT_PC_SUPERIO is not set 402# CONFIG_PARPORT_PC_SUPERIO is not set
163# CONFIG_PARPORT_GSC is not set 403# CONFIG_PARPORT_GSC is not set
404# CONFIG_PARPORT_AX88796 is not set
164# CONFIG_PARPORT_1284 is not set 405# CONFIG_PARPORT_1284 is not set
165 406CONFIG_BLK_DEV=y
166#
167# Plug and Play support
168#
169
170#
171# Block devices
172#
173# CONFIG_BLK_DEV_FD is not set 407# CONFIG_BLK_DEV_FD is not set
174# CONFIG_PARIDE is not set 408# CONFIG_PARIDE is not set
175# CONFIG_BLK_CPQ_DA is not set 409# CONFIG_BLK_CPQ_DA is not set
@@ -181,26 +415,19 @@ CONFIG_BLK_DEV_LOOP=m
181# CONFIG_BLK_DEV_CRYPTOLOOP is not set 415# CONFIG_BLK_DEV_CRYPTOLOOP is not set
182CONFIG_BLK_DEV_NBD=m 416CONFIG_BLK_DEV_NBD=m
183# CONFIG_BLK_DEV_SX8 is not set 417# CONFIG_BLK_DEV_SX8 is not set
184CONFIG_BLK_DEV_RAM=m 418CONFIG_BLK_DEV_RAM=y
185CONFIG_BLK_DEV_RAM_COUNT=16 419CONFIG_BLK_DEV_RAM_COUNT=16
186CONFIG_BLK_DEV_RAM_SIZE=4096 420CONFIG_BLK_DEV_RAM_SIZE=32768
187CONFIG_INITRAMFS_SOURCE="" 421CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
188# CONFIG_LBD is not set
189# CONFIG_CDROM_PKTCDVD is not set 422# CONFIG_CDROM_PKTCDVD is not set
190
191#
192# IO Schedulers
193#
194CONFIG_IOSCHED_NOOP=y
195CONFIG_IOSCHED_AS=y
196CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y
198# CONFIG_ATA_OVER_ETH is not set 423# CONFIG_ATA_OVER_ETH is not set
199 424CONFIG_MISC_DEVICES=y
200# 425# CONFIG_PHANTOM is not set
201# ATA/ATAPI/MFM/RLL support 426# CONFIG_EEPROM_93CX6 is not set
202# 427# CONFIG_SGI_IOC4 is not set
428# CONFIG_TIFM_CORE is not set
203CONFIG_IDE=y 429CONFIG_IDE=y
430CONFIG_IDE_MAX_HWIFS=4
204CONFIG_BLK_DEV_IDE=y 431CONFIG_BLK_DEV_IDE=y
205 432
206# 433#
@@ -214,21 +441,58 @@ CONFIG_BLK_DEV_IDECD=m
214# CONFIG_BLK_DEV_IDEFLOPPY is not set 441# CONFIG_BLK_DEV_IDEFLOPPY is not set
215# CONFIG_BLK_DEV_IDESCSI is not set 442# CONFIG_BLK_DEV_IDESCSI is not set
216# CONFIG_IDE_TASK_IOCTL is not set 443# CONFIG_IDE_TASK_IOCTL is not set
444CONFIG_IDE_PROC_FS=y
217 445
218# 446#
219# IDE chipset support/bugfixes 447# IDE chipset support/bugfixes
220# 448#
221CONFIG_IDE_GENERIC=y 449CONFIG_IDE_GENERIC=y
222# CONFIG_BLK_DEV_IDEPCI is not set 450# CONFIG_BLK_DEV_PLATFORM is not set
451
452#
453# PCI IDE chipsets support
454#
455# CONFIG_IDEPCI_PCIBUS_ORDER is not set
456# CONFIG_BLK_DEV_GENERIC is not set
457# CONFIG_BLK_DEV_OPTI621 is not set
458# CONFIG_BLK_DEV_AEC62XX is not set
459# CONFIG_BLK_DEV_ALI15X3 is not set
460# CONFIG_BLK_DEV_AMD74XX is not set
461# CONFIG_BLK_DEV_CMD64X is not set
462# CONFIG_BLK_DEV_TRIFLEX is not set
463# CONFIG_BLK_DEV_CY82C693 is not set
464# CONFIG_BLK_DEV_CS5520 is not set
465# CONFIG_BLK_DEV_CS5530 is not set
466# CONFIG_BLK_DEV_HPT34X is not set
467# CONFIG_BLK_DEV_HPT366 is not set
468# CONFIG_BLK_DEV_JMICRON is not set
469# CONFIG_BLK_DEV_SC1200 is not set
470# CONFIG_BLK_DEV_PIIX is not set
471# CONFIG_BLK_DEV_IT8213 is not set
472# CONFIG_BLK_DEV_IT821X is not set
473# CONFIG_BLK_DEV_NS87415 is not set
474# CONFIG_BLK_DEV_PDC202XX_OLD is not set
475# CONFIG_BLK_DEV_PDC202XX_NEW is not set
476# CONFIG_BLK_DEV_SVWKS is not set
477# CONFIG_BLK_DEV_SIIMAGE is not set
478# CONFIG_BLK_DEV_SL82C105 is not set
479# CONFIG_BLK_DEV_SLC90E66 is not set
480# CONFIG_BLK_DEV_TRM290 is not set
481# CONFIG_BLK_DEV_VIA82CXXX is not set
482# CONFIG_BLK_DEV_TC86C001 is not set
223# CONFIG_IDE_ARM is not set 483# CONFIG_IDE_ARM is not set
224# CONFIG_BLK_DEV_IDEDMA is not set 484# CONFIG_BLK_DEV_IDEDMA is not set
225# CONFIG_IDEDMA_AUTO is not set 485CONFIG_IDE_ARCH_OBSOLETE_INIT=y
226# CONFIG_BLK_DEV_HD is not set 486# CONFIG_BLK_DEV_HD is not set
227 487
228# 488#
229# SCSI device support 489# SCSI device support
230# 490#
491# CONFIG_RAID_ATTRS is not set
231CONFIG_SCSI=m 492CONFIG_SCSI=m
493CONFIG_SCSI_DMA=y
494# CONFIG_SCSI_TGT is not set
495# CONFIG_SCSI_NETLINK is not set
232CONFIG_SCSI_PROC_FS=y 496CONFIG_SCSI_PROC_FS=y
233 497
234# 498#
@@ -240,6 +504,7 @@ CONFIG_CHR_DEV_ST=m
240CONFIG_BLK_DEV_SR=m 504CONFIG_BLK_DEV_SR=m
241# CONFIG_BLK_DEV_SR_VENDOR is not set 505# CONFIG_BLK_DEV_SR_VENDOR is not set
242CONFIG_CHR_DEV_SG=m 506CONFIG_CHR_DEV_SG=m
507# CONFIG_CHR_DEV_SCH is not set
243 508
244# 509#
245# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 510# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -247,17 +512,19 @@ CONFIG_CHR_DEV_SG=m
247CONFIG_SCSI_MULTI_LUN=y 512CONFIG_SCSI_MULTI_LUN=y
248CONFIG_SCSI_CONSTANTS=y 513CONFIG_SCSI_CONSTANTS=y
249# CONFIG_SCSI_LOGGING is not set 514# CONFIG_SCSI_LOGGING is not set
515# CONFIG_SCSI_SCAN_ASYNC is not set
516CONFIG_SCSI_WAIT_SCAN=m
250 517
251# 518#
252# SCSI Transport Attributes 519# SCSI Transports
253# 520#
254# CONFIG_SCSI_SPI_ATTRS is not set 521# CONFIG_SCSI_SPI_ATTRS is not set
255# CONFIG_SCSI_FC_ATTRS is not set 522# CONFIG_SCSI_FC_ATTRS is not set
256# CONFIG_SCSI_ISCSI_ATTRS is not set 523# CONFIG_SCSI_ISCSI_ATTRS is not set
257 524# CONFIG_SCSI_SAS_LIBSAS is not set
258# 525# CONFIG_SCSI_SRP_ATTRS is not set
259# SCSI low-level drivers 526CONFIG_SCSI_LOWLEVEL=y
260# 527# CONFIG_ISCSI_TCP is not set
261# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 528# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
262# CONFIG_SCSI_3W_9XXX is not set 529# CONFIG_SCSI_3W_9XXX is not set
263# CONFIG_SCSI_ACARD is not set 530# CONFIG_SCSI_ACARD is not set
@@ -265,10 +532,14 @@ CONFIG_SCSI_CONSTANTS=y
265# CONFIG_SCSI_AIC7XXX is not set 532# CONFIG_SCSI_AIC7XXX is not set
266# CONFIG_SCSI_AIC7XXX_OLD is not set 533# CONFIG_SCSI_AIC7XXX_OLD is not set
267# CONFIG_SCSI_AIC79XX is not set 534# CONFIG_SCSI_AIC79XX is not set
535# CONFIG_SCSI_AIC94XX is not set
268# CONFIG_SCSI_DPT_I2O is not set 536# CONFIG_SCSI_DPT_I2O is not set
537# CONFIG_SCSI_ADVANSYS is not set
538# CONFIG_SCSI_ARCMSR is not set
269# CONFIG_MEGARAID_NEWGEN is not set 539# CONFIG_MEGARAID_NEWGEN is not set
270# CONFIG_MEGARAID_LEGACY is not set 540# CONFIG_MEGARAID_LEGACY is not set
271# CONFIG_SCSI_SATA is not set 541# CONFIG_MEGARAID_SAS is not set
542# CONFIG_SCSI_HPTIOP is not set
272# CONFIG_SCSI_BUSLOGIC is not set 543# CONFIG_SCSI_BUSLOGIC is not set
273# CONFIG_SCSI_DMX3191D is not set 544# CONFIG_SCSI_DMX3191D is not set
274# CONFIG_SCSI_EATA is not set 545# CONFIG_SCSI_EATA is not set
@@ -279,233 +550,109 @@ CONFIG_SCSI_CONSTANTS=y
279# CONFIG_SCSI_INIA100 is not set 550# CONFIG_SCSI_INIA100 is not set
280# CONFIG_SCSI_PPA is not set 551# CONFIG_SCSI_PPA is not set
281# CONFIG_SCSI_IMM is not set 552# CONFIG_SCSI_IMM is not set
553# CONFIG_SCSI_STEX is not set
282# CONFIG_SCSI_SYM53C8XX_2 is not set 554# CONFIG_SCSI_SYM53C8XX_2 is not set
283# CONFIG_SCSI_IPR is not set
284# CONFIG_SCSI_QLOGIC_FC is not set
285# CONFIG_SCSI_QLOGIC_1280 is not set 555# CONFIG_SCSI_QLOGIC_1280 is not set
286CONFIG_SCSI_QLA2XXX=m 556# CONFIG_SCSI_QLA_FC is not set
287# CONFIG_SCSI_QLA21XX is not set 557# CONFIG_SCSI_QLA_ISCSI is not set
288# CONFIG_SCSI_QLA22XX is not set
289# CONFIG_SCSI_QLA2300 is not set
290# CONFIG_SCSI_QLA2322 is not set
291# CONFIG_SCSI_QLA6312 is not set
292# CONFIG_SCSI_LPFC is not set 558# CONFIG_SCSI_LPFC is not set
293# CONFIG_SCSI_DC395x is not set 559# CONFIG_SCSI_DC395x is not set
294# CONFIG_SCSI_DC390T is not set 560# CONFIG_SCSI_DC390T is not set
295# CONFIG_SCSI_NSP32 is not set 561# CONFIG_SCSI_NSP32 is not set
296# CONFIG_SCSI_DEBUG is not set 562# CONFIG_SCSI_DEBUG is not set
297 563# CONFIG_SCSI_SRP is not set
298# 564# CONFIG_ATA is not set
299# Multi-device support (RAID and LVM)
300#
301# CONFIG_MD is not set 565# CONFIG_MD is not set
302
303#
304# Fusion MPT device support
305#
306# CONFIG_FUSION is not set 566# CONFIG_FUSION is not set
307 567
308# 568#
309# IEEE 1394 (FireWire) support 569# IEEE 1394 (FireWire) support
310# 570#
571# CONFIG_FIREWIRE is not set
311# CONFIG_IEEE1394 is not set 572# CONFIG_IEEE1394 is not set
312
313#
314# I2O device support
315#
316# CONFIG_I2O is not set 573# CONFIG_I2O is not set
317 574# CONFIG_MACINTOSH_DRIVERS is not set
318#
319# Macintosh device drivers
320#
321
322#
323# Networking support
324#
325CONFIG_NET=y
326
327#
328# Networking options
329#
330CONFIG_PACKET=y
331# CONFIG_PACKET_MMAP is not set
332CONFIG_UNIX=y
333# CONFIG_NET_KEY is not set
334CONFIG_INET=y
335# CONFIG_IP_MULTICAST is not set
336# CONFIG_IP_ADVANCED_ROUTER is not set
337CONFIG_IP_PNP=y
338# CONFIG_IP_PNP_DHCP is not set
339CONFIG_IP_PNP_BOOTP=y
340# CONFIG_IP_PNP_RARP is not set
341# CONFIG_NET_IPIP is not set
342# CONFIG_NET_IPGRE is not set
343# CONFIG_ARPD is not set
344# CONFIG_SYN_COOKIES is not set
345# CONFIG_INET_AH is not set
346# CONFIG_INET_ESP is not set
347# CONFIG_INET_IPCOMP is not set
348# CONFIG_INET_TUNNEL is not set
349CONFIG_IP_TCPDIAG=y
350# CONFIG_IP_TCPDIAG_IPV6 is not set
351
352#
353# IP: Virtual Server Configuration
354#
355# CONFIG_IP_VS is not set
356# CONFIG_IPV6 is not set
357CONFIG_NETFILTER=y
358# CONFIG_NETFILTER_DEBUG is not set
359
360#
361# IP: Netfilter Configuration
362#
363CONFIG_IP_NF_CONNTRACK=m
364# CONFIG_IP_NF_CT_ACCT is not set
365# CONFIG_IP_NF_CONNTRACK_MARK is not set
366# CONFIG_IP_NF_CT_PROTO_SCTP is not set
367CONFIG_IP_NF_FTP=m
368CONFIG_IP_NF_IRC=m
369# CONFIG_IP_NF_TFTP is not set
370# CONFIG_IP_NF_AMANDA is not set
371# CONFIG_IP_NF_QUEUE is not set
372CONFIG_IP_NF_IPTABLES=m
373# CONFIG_IP_NF_MATCH_LIMIT is not set
374# CONFIG_IP_NF_MATCH_IPRANGE is not set
375# CONFIG_IP_NF_MATCH_MAC is not set
376# CONFIG_IP_NF_MATCH_PKTTYPE is not set
377# CONFIG_IP_NF_MATCH_MARK is not set
378# CONFIG_IP_NF_MATCH_MULTIPORT is not set
379# CONFIG_IP_NF_MATCH_TOS is not set
380# CONFIG_IP_NF_MATCH_RECENT is not set
381# CONFIG_IP_NF_MATCH_ECN is not set
382# CONFIG_IP_NF_MATCH_DSCP is not set
383# CONFIG_IP_NF_MATCH_AH_ESP is not set
384# CONFIG_IP_NF_MATCH_LENGTH is not set
385# CONFIG_IP_NF_MATCH_TTL is not set
386# CONFIG_IP_NF_MATCH_TCPMSS is not set
387# CONFIG_IP_NF_MATCH_HELPER is not set
388# CONFIG_IP_NF_MATCH_STATE is not set
389# CONFIG_IP_NF_MATCH_CONNTRACK is not set
390# CONFIG_IP_NF_MATCH_OWNER is not set
391# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
392# CONFIG_IP_NF_MATCH_REALM is not set
393# CONFIG_IP_NF_MATCH_SCTP is not set
394# CONFIG_IP_NF_MATCH_COMMENT is not set
395# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
396CONFIG_IP_NF_FILTER=m
397# CONFIG_IP_NF_TARGET_REJECT is not set
398# CONFIG_IP_NF_TARGET_LOG is not set
399# CONFIG_IP_NF_TARGET_ULOG is not set
400# CONFIG_IP_NF_TARGET_TCPMSS is not set
401CONFIG_IP_NF_NAT=m
402CONFIG_IP_NF_NAT_NEEDED=y
403CONFIG_IP_NF_TARGET_MASQUERADE=m
404CONFIG_IP_NF_TARGET_REDIRECT=m
405# CONFIG_IP_NF_TARGET_NETMAP is not set
406# CONFIG_IP_NF_TARGET_SAME is not set
407CONFIG_IP_NF_NAT_SNMP_BASIC=m
408CONFIG_IP_NF_NAT_IRC=m
409CONFIG_IP_NF_NAT_FTP=m
410# CONFIG_IP_NF_MANGLE is not set
411# CONFIG_IP_NF_RAW is not set
412# CONFIG_IP_NF_ARPTABLES is not set
413
414#
415# SCTP Configuration (EXPERIMENTAL)
416#
417# CONFIG_IP_SCTP is not set
418# CONFIG_ATM is not set
419# CONFIG_BRIDGE is not set
420# CONFIG_VLAN_8021Q is not set
421# CONFIG_DECNET is not set
422# CONFIG_LLC2 is not set
423# CONFIG_IPX is not set
424# CONFIG_ATALK is not set
425# CONFIG_X25 is not set
426# CONFIG_LAPB is not set
427# CONFIG_NET_DIVERT is not set
428# CONFIG_ECONET is not set
429# CONFIG_WAN_ROUTER is not set
430
431#
432# QoS and/or fair queueing
433#
434# CONFIG_NET_SCHED is not set
435# CONFIG_NET_CLS_ROUTE is not set
436
437#
438# Network testing
439#
440CONFIG_NET_PKTGEN=y
441# CONFIG_NETPOLL is not set
442# CONFIG_NET_POLL_CONTROLLER is not set
443# CONFIG_HAMRADIO is not set
444# CONFIG_IRDA is not set
445# CONFIG_BT is not set
446CONFIG_NETDEVICES=y 575CONFIG_NETDEVICES=y
576# CONFIG_NETDEVICES_MULTIQUEUE is not set
447# CONFIG_DUMMY is not set 577# CONFIG_DUMMY is not set
448# CONFIG_BONDING is not set 578# CONFIG_BONDING is not set
579# CONFIG_MACVLAN is not set
449# CONFIG_EQUALIZER is not set 580# CONFIG_EQUALIZER is not set
450# CONFIG_TUN is not set 581# CONFIG_TUN is not set
451 582# CONFIG_VETH is not set
452#
453# ARCnet devices
454#
455# CONFIG_ARCNET is not set 583# CONFIG_ARCNET is not set
456 584CONFIG_PHYLIB=y
457# 585
458# Ethernet (10 or 100Mbit) 586#
459# 587# MII PHY device drivers
588#
589CONFIG_MARVELL_PHY=y
590# CONFIG_DAVICOM_PHY is not set
591# CONFIG_QSEMI_PHY is not set
592# CONFIG_LXT_PHY is not set
593# CONFIG_CICADA_PHY is not set
594# CONFIG_VITESSE_PHY is not set
595# CONFIG_SMSC_PHY is not set
596# CONFIG_BROADCOM_PHY is not set
597# CONFIG_ICPLUS_PHY is not set
598# CONFIG_FIXED_PHY is not set
599# CONFIG_MDIO_BITBANG is not set
460CONFIG_NET_ETHERNET=y 600CONFIG_NET_ETHERNET=y
461# CONFIG_MII is not set 601# CONFIG_MII is not set
462# CONFIG_HAPPYMEAL is not set 602# CONFIG_HAPPYMEAL is not set
463# CONFIG_SUNGEM is not set 603# CONFIG_SUNGEM is not set
604# CONFIG_CASSINI is not set
464# CONFIG_NET_VENDOR_3COM is not set 605# CONFIG_NET_VENDOR_3COM is not set
465
466#
467# Tulip family network device support
468#
469# CONFIG_NET_TULIP is not set 606# CONFIG_NET_TULIP is not set
470# CONFIG_HP100 is not set 607# CONFIG_HP100 is not set
608# CONFIG_IBM_NEW_EMAC_ZMII is not set
609# CONFIG_IBM_NEW_EMAC_RGMII is not set
610# CONFIG_IBM_NEW_EMAC_TAH is not set
611# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
471# CONFIG_NET_PCI is not set 612# CONFIG_NET_PCI is not set
472 613# CONFIG_B44 is not set
473# 614# CONFIG_NET_POCKET is not set
474# Ethernet (1000 Mbit) 615# CONFIG_FS_ENET is not set
475# 616CONFIG_NETDEV_1000=y
476# CONFIG_ACENIC is not set 617# CONFIG_ACENIC is not set
477# CONFIG_DL2K is not set 618# CONFIG_DL2K is not set
478# CONFIG_E1000 is not set 619# CONFIG_E1000 is not set
620# CONFIG_E1000E is not set
621# CONFIG_IP1000 is not set
479# CONFIG_NS83820 is not set 622# CONFIG_NS83820 is not set
480# CONFIG_HAMACHI is not set 623# CONFIG_HAMACHI is not set
481# CONFIG_YELLOWFIN is not set 624# CONFIG_YELLOWFIN is not set
482# CONFIG_R8169 is not set 625# CONFIG_R8169 is not set
626# CONFIG_SIS190 is not set
627# CONFIG_SKGE is not set
628# CONFIG_SKY2 is not set
483# CONFIG_SK98LIN is not set 629# CONFIG_SK98LIN is not set
630# CONFIG_VIA_VELOCITY is not set
484# CONFIG_TIGON3 is not set 631# CONFIG_TIGON3 is not set
632# CONFIG_BNX2 is not set
485CONFIG_GIANFAR=y 633CONFIG_GIANFAR=y
486CONFIG_GFAR_NAPI=y 634CONFIG_GFAR_NAPI=y
487 635# CONFIG_QLA3XXX is not set
488# 636# CONFIG_ATL1 is not set
489# Ethernet (10000 Mbit) 637CONFIG_NETDEV_10000=y
490# 638# CONFIG_CHELSIO_T1 is not set
639# CONFIG_CHELSIO_T3 is not set
640# CONFIG_IXGBE is not set
491# CONFIG_IXGB is not set 641# CONFIG_IXGB is not set
492# CONFIG_S2IO is not set 642# CONFIG_S2IO is not set
493 643# CONFIG_MYRI10GE is not set
494# 644# CONFIG_NETXEN_NIC is not set
495# Token Ring devices 645# CONFIG_NIU is not set
496# 646# CONFIG_MLX4_CORE is not set
647# CONFIG_TEHUTI is not set
497# CONFIG_TR is not set 648# CONFIG_TR is not set
498 649
499# 650#
500# Wireless LAN (non-hamradio) 651# Wireless LAN
501#
502# CONFIG_NET_RADIO is not set
503
504#
505# Wan interfaces
506# 652#
653# CONFIG_WLAN_PRE80211 is not set
654# CONFIG_WLAN_80211 is not set
507# CONFIG_WAN is not set 655# CONFIG_WAN is not set
508CONFIG_RIONET=y
509# CONFIG_FDDI is not set 656# CONFIG_FDDI is not set
510# CONFIG_HIPPI is not set 657# CONFIG_HIPPI is not set
511# CONFIG_PLIP is not set 658# CONFIG_PLIP is not set
@@ -514,21 +661,17 @@ CONFIG_RIONET=y
514# CONFIG_NET_FC is not set 661# CONFIG_NET_FC is not set
515# CONFIG_SHAPER is not set 662# CONFIG_SHAPER is not set
516# CONFIG_NETCONSOLE is not set 663# CONFIG_NETCONSOLE is not set
517 664# CONFIG_NETPOLL is not set
518# 665# CONFIG_NET_POLL_CONTROLLER is not set
519# ISDN subsystem
520#
521# CONFIG_ISDN is not set 666# CONFIG_ISDN is not set
522
523#
524# Telephony Support
525#
526# CONFIG_PHONE is not set 667# CONFIG_PHONE is not set
527 668
528# 669#
529# Input device support 670# Input device support
530# 671#
531CONFIG_INPUT=y 672CONFIG_INPUT=y
673# CONFIG_INPUT_FF_MEMLESS is not set
674# CONFIG_INPUT_POLLDEV is not set
532 675
533# 676#
534# Userland interfaces 677# Userland interfaces
@@ -538,7 +681,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
538CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280 681CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
539CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024 682CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
540CONFIG_INPUT_JOYDEV=m 683CONFIG_INPUT_JOYDEV=m
541# CONFIG_INPUT_TSDEV is not set
542CONFIG_INPUT_EVDEV=m 684CONFIG_INPUT_EVDEV=m
543# CONFIG_INPUT_EVBUG is not set 685# CONFIG_INPUT_EVBUG is not set
544 686
@@ -551,11 +693,20 @@ CONFIG_KEYBOARD_ATKBD=y
551# CONFIG_KEYBOARD_LKKBD is not set 693# CONFIG_KEYBOARD_LKKBD is not set
552# CONFIG_KEYBOARD_XTKBD is not set 694# CONFIG_KEYBOARD_XTKBD is not set
553# CONFIG_KEYBOARD_NEWTON is not set 695# CONFIG_KEYBOARD_NEWTON is not set
696# CONFIG_KEYBOARD_STOWAWAY is not set
554CONFIG_INPUT_MOUSE=y 697CONFIG_INPUT_MOUSE=y
555CONFIG_MOUSE_PS2=y 698CONFIG_MOUSE_PS2=y
699CONFIG_MOUSE_PS2_ALPS=y
700CONFIG_MOUSE_PS2_LOGIPS2PP=y
701CONFIG_MOUSE_PS2_SYNAPTICS=y
702CONFIG_MOUSE_PS2_LIFEBOOK=y
703CONFIG_MOUSE_PS2_TRACKPOINT=y
704# CONFIG_MOUSE_PS2_TOUCHKIT is not set
556# CONFIG_MOUSE_SERIAL is not set 705# CONFIG_MOUSE_SERIAL is not set
706# CONFIG_MOUSE_APPLETOUCH is not set
557# CONFIG_MOUSE_VSXXXAA is not set 707# CONFIG_MOUSE_VSXXXAA is not set
558# CONFIG_INPUT_JOYSTICK is not set 708# CONFIG_INPUT_JOYSTICK is not set
709# CONFIG_INPUT_TABLET is not set
559# CONFIG_INPUT_TOUCHSCREEN is not set 710# CONFIG_INPUT_TOUCHSCREEN is not set
560# CONFIG_INPUT_MISC is not set 711# CONFIG_INPUT_MISC is not set
561 712
@@ -570,7 +721,6 @@ CONFIG_SERIO_SERPORT=y
570CONFIG_SERIO_LIBPS2=y 721CONFIG_SERIO_LIBPS2=y
571# CONFIG_SERIO_RAW is not set 722# CONFIG_SERIO_RAW is not set
572# CONFIG_GAMEPORT is not set 723# CONFIG_GAMEPORT is not set
573CONFIG_SOUND_GAMEPORT=y
574 724
575# 725#
576# Character devices 726# Character devices
@@ -586,6 +736,7 @@ CONFIG_SOUND_GAMEPORT=y
586# 736#
587# Non-8250 serial port support 737# Non-8250 serial port support
588# 738#
739# CONFIG_SERIAL_UARTLITE is not set
589CONFIG_SERIAL_CORE=y 740CONFIG_SERIAL_CORE=y
590CONFIG_SERIAL_CORE_CONSOLE=y 741CONFIG_SERIAL_CORE_CONSOLE=y
591CONFIG_SERIAL_CPM=y 742CONFIG_SERIAL_CPM=y
@@ -603,44 +754,17 @@ CONFIG_LEGACY_PTY_COUNT=256
603CONFIG_PRINTER=m 754CONFIG_PRINTER=m
604# CONFIG_LP_CONSOLE is not set 755# CONFIG_LP_CONSOLE is not set
605# CONFIG_PPDEV is not set 756# CONFIG_PPDEV is not set
606# CONFIG_TIPAR is not set
607
608#
609# IPMI
610#
611# CONFIG_IPMI_HANDLER is not set 757# CONFIG_IPMI_HANDLER is not set
612 758CONFIG_HW_RANDOM=m
613#
614# Watchdog Cards
615#
616# CONFIG_WATCHDOG is not set
617# CONFIG_NVRAM is not set 759# CONFIG_NVRAM is not set
618# CONFIG_GEN_RTC is not set 760# CONFIG_GEN_RTC is not set
619# CONFIG_DTLK is not set
620# CONFIG_R3964 is not set 761# CONFIG_R3964 is not set
621# CONFIG_APPLICOM is not set 762# CONFIG_APPLICOM is not set
622
623#
624# Ftape, the floppy tape device driver
625#
626CONFIG_AGP=m
627CONFIG_DRM=m
628# CONFIG_DRM_TDFX is not set
629# CONFIG_DRM_R128 is not set
630# CONFIG_DRM_RADEON is not set
631# CONFIG_DRM_MGA is not set
632# CONFIG_DRM_SIS is not set
633# CONFIG_RAW_DRIVER is not set 763# CONFIG_RAW_DRIVER is not set
634
635#
636# TPM devices
637#
638# CONFIG_TCG_TPM is not set 764# CONFIG_TCG_TPM is not set
639 765CONFIG_DEVPORT=y
640#
641# I2C support
642#
643CONFIG_I2C=m 766CONFIG_I2C=m
767CONFIG_I2C_BOARDINFO=y
644CONFIG_I2C_CHARDEV=m 768CONFIG_I2C_CHARDEV=m
645 769
646# 770#
@@ -663,32 +787,62 @@ CONFIG_I2C_ALGOBIT=m
663# CONFIG_I2C_PIIX4 is not set 787# CONFIG_I2C_PIIX4 is not set
664# CONFIG_I2C_MPC is not set 788# CONFIG_I2C_MPC is not set
665# CONFIG_I2C_NFORCE2 is not set 789# CONFIG_I2C_NFORCE2 is not set
790# CONFIG_I2C_OCORES is not set
666# CONFIG_I2C_PARPORT is not set 791# CONFIG_I2C_PARPORT is not set
667# CONFIG_I2C_PARPORT_LIGHT is not set 792# CONFIG_I2C_PARPORT_LIGHT is not set
668# CONFIG_I2C_PROSAVAGE is not set 793# CONFIG_I2C_PROSAVAGE is not set
669# CONFIG_I2C_SAVAGE4 is not set 794# CONFIG_I2C_SAVAGE4 is not set
670# CONFIG_SCx200_ACB is not set 795# CONFIG_I2C_SIMTEC is not set
671# CONFIG_I2C_SIS5595 is not set 796# CONFIG_I2C_SIS5595 is not set
672# CONFIG_I2C_SIS630 is not set 797# CONFIG_I2C_SIS630 is not set
673# CONFIG_I2C_SIS96X is not set 798# CONFIG_I2C_SIS96X is not set
799# CONFIG_I2C_TAOS_EVM is not set
674# CONFIG_I2C_STUB is not set 800# CONFIG_I2C_STUB is not set
675# CONFIG_I2C_VIA is not set 801# CONFIG_I2C_VIA is not set
676# CONFIG_I2C_VIAPRO is not set 802# CONFIG_I2C_VIAPRO is not set
677# CONFIG_I2C_VOODOO3 is not set 803# CONFIG_I2C_VOODOO3 is not set
678# CONFIG_I2C_PCA_ISA is not set
679 804
680# 805#
681# Hardware Sensors Chip support 806# Miscellaneous I2C Chip support
807#
808# CONFIG_SENSORS_DS1337 is not set
809# CONFIG_SENSORS_DS1374 is not set
810# CONFIG_DS1682 is not set
811# CONFIG_SENSORS_EEPROM is not set
812# CONFIG_SENSORS_PCF8574 is not set
813# CONFIG_SENSORS_PCA9539 is not set
814# CONFIG_SENSORS_PCF8591 is not set
815# CONFIG_SENSORS_M41T00 is not set
816# CONFIG_SENSORS_MAX6875 is not set
817# CONFIG_SENSORS_TSL2550 is not set
818# CONFIG_I2C_DEBUG_CORE is not set
819# CONFIG_I2C_DEBUG_ALGO is not set
820# CONFIG_I2C_DEBUG_BUS is not set
821# CONFIG_I2C_DEBUG_CHIP is not set
822
823#
824# SPI support
682# 825#
683# CONFIG_I2C_SENSOR is not set 826# CONFIG_SPI is not set
827# CONFIG_SPI_MASTER is not set
828# CONFIG_W1 is not set
829# CONFIG_POWER_SUPPLY is not set
830CONFIG_HWMON=y
831# CONFIG_HWMON_VID is not set
832# CONFIG_SENSORS_AD7418 is not set
684# CONFIG_SENSORS_ADM1021 is not set 833# CONFIG_SENSORS_ADM1021 is not set
685# CONFIG_SENSORS_ADM1025 is not set 834# CONFIG_SENSORS_ADM1025 is not set
686# CONFIG_SENSORS_ADM1026 is not set 835# CONFIG_SENSORS_ADM1026 is not set
836# CONFIG_SENSORS_ADM1029 is not set
687# CONFIG_SENSORS_ADM1031 is not set 837# CONFIG_SENSORS_ADM1031 is not set
688# CONFIG_SENSORS_ASB100 is not set 838# CONFIG_SENSORS_ADM9240 is not set
839# CONFIG_SENSORS_ADT7470 is not set
840# CONFIG_SENSORS_ATXP1 is not set
689# CONFIG_SENSORS_DS1621 is not set 841# CONFIG_SENSORS_DS1621 is not set
690# CONFIG_SENSORS_FSCHER is not set 842# CONFIG_SENSORS_I5K_AMB is not set
691# CONFIG_SENSORS_FSCPOS is not set 843# CONFIG_SENSORS_F71805F is not set
844# CONFIG_SENSORS_F71882FG is not set
845# CONFIG_SENSORS_F75375S is not set
692# CONFIG_SENSORS_GL518SM is not set 846# CONFIG_SENSORS_GL518SM is not set
693# CONFIG_SENSORS_GL520SM is not set 847# CONFIG_SENSORS_GL520SM is not set
694# CONFIG_SENSORS_IT87 is not set 848# CONFIG_SENSORS_IT87 is not set
@@ -702,53 +856,69 @@ CONFIG_I2C_ALGOBIT=m
702# CONFIG_SENSORS_LM87 is not set 856# CONFIG_SENSORS_LM87 is not set
703# CONFIG_SENSORS_LM90 is not set 857# CONFIG_SENSORS_LM90 is not set
704# CONFIG_SENSORS_LM92 is not set 858# CONFIG_SENSORS_LM92 is not set
859# CONFIG_SENSORS_LM93 is not set
705# CONFIG_SENSORS_MAX1619 is not set 860# CONFIG_SENSORS_MAX1619 is not set
861# CONFIG_SENSORS_MAX6650 is not set
706# CONFIG_SENSORS_PC87360 is not set 862# CONFIG_SENSORS_PC87360 is not set
707# CONFIG_SENSORS_SMSC47B397 is not set 863# CONFIG_SENSORS_PC87427 is not set
708# CONFIG_SENSORS_SIS5595 is not set 864# CONFIG_SENSORS_SIS5595 is not set
865# CONFIG_SENSORS_DME1737 is not set
709# CONFIG_SENSORS_SMSC47M1 is not set 866# CONFIG_SENSORS_SMSC47M1 is not set
867# CONFIG_SENSORS_SMSC47M192 is not set
868# CONFIG_SENSORS_SMSC47B397 is not set
869# CONFIG_SENSORS_THMC50 is not set
710# CONFIG_SENSORS_VIA686A is not set 870# CONFIG_SENSORS_VIA686A is not set
871# CONFIG_SENSORS_VT1211 is not set
872# CONFIG_SENSORS_VT8231 is not set
711# CONFIG_SENSORS_W83781D is not set 873# CONFIG_SENSORS_W83781D is not set
874# CONFIG_SENSORS_W83791D is not set
875# CONFIG_SENSORS_W83792D is not set
876# CONFIG_SENSORS_W83793 is not set
712# CONFIG_SENSORS_W83L785TS is not set 877# CONFIG_SENSORS_W83L785TS is not set
713# CONFIG_SENSORS_W83627HF is not set 878# CONFIG_SENSORS_W83627HF is not set
879# CONFIG_SENSORS_W83627EHF is not set
880# CONFIG_HWMON_DEBUG_CHIP is not set
881# CONFIG_WATCHDOG is not set
714 882
715# 883#
716# Other I2C Chip support 884# Sonics Silicon Backplane
717# 885#
718# CONFIG_SENSORS_DS1337 is not set 886CONFIG_SSB_POSSIBLE=y
719# CONFIG_SENSORS_EEPROM is not set 887# CONFIG_SSB is not set
720# CONFIG_SENSORS_PCF8574 is not set
721# CONFIG_SENSORS_PCF8591 is not set
722# CONFIG_SENSORS_RTC8564 is not set
723# CONFIG_SENSORS_M41T00 is not set
724# CONFIG_I2C_DEBUG_CORE is not set
725# CONFIG_I2C_DEBUG_ALGO is not set
726# CONFIG_I2C_DEBUG_BUS is not set
727# CONFIG_I2C_DEBUG_CHIP is not set
728 888
729# 889#
730# Dallas's 1-wire bus 890# Multifunction device drivers
731#
732# CONFIG_W1 is not set
733
734#
735# Misc devices
736# 891#
892# CONFIG_MFD_SM501 is not set
737 893
738# 894#
739# Multimedia devices 895# Multimedia devices
740# 896#
741# CONFIG_VIDEO_DEV is not set 897# CONFIG_VIDEO_DEV is not set
898# CONFIG_DVB_CORE is not set
899CONFIG_DAB=y
742 900
743# 901#
744# Digital Video Broadcasting Devices 902# Graphics support
745# 903#
746# CONFIG_DVB is not set 904CONFIG_AGP=m
905CONFIG_DRM=m
906# CONFIG_DRM_TDFX is not set
907# CONFIG_DRM_R128 is not set
908# CONFIG_DRM_RADEON is not set
909# CONFIG_DRM_MGA is not set
910# CONFIG_DRM_SIS is not set
911# CONFIG_DRM_VIA is not set
912# CONFIG_DRM_SAVAGE is not set
913# CONFIG_VGASTATE is not set
914# CONFIG_VIDEO_OUTPUT_CONTROL is not set
915# CONFIG_FB is not set
916# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
747 917
748# 918#
749# Graphics support 919# Display device support
750# 920#
751# CONFIG_FB is not set 921# CONFIG_DISPLAY_SUPPORT is not set
752 922
753# 923#
754# Sound 924# Sound
@@ -764,54 +934,64 @@ CONFIG_SOUND=m
764# Open Sound System 934# Open Sound System
765# 935#
766# CONFIG_SOUND_PRIME is not set 936# CONFIG_SOUND_PRIME is not set
767 937CONFIG_HID_SUPPORT=y
768# 938CONFIG_HID=y
769# USB support 939# CONFIG_HID_DEBUG is not set
770# 940# CONFIG_HIDRAW is not set
941CONFIG_USB_SUPPORT=y
771CONFIG_USB_ARCH_HAS_HCD=y 942CONFIG_USB_ARCH_HAS_HCD=y
772CONFIG_USB_ARCH_HAS_OHCI=y 943CONFIG_USB_ARCH_HAS_OHCI=y
944CONFIG_USB_ARCH_HAS_EHCI=y
773# CONFIG_USB is not set 945# CONFIG_USB is not set
774 946
775# 947#
776# USB Gadget Support 948# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
777# 949#
778# CONFIG_USB_GADGET is not set
779 950
780# 951#
781# MMC/SD Card support 952# USB Gadget Support
782# 953#
954# CONFIG_USB_GADGET is not set
783# CONFIG_MMC is not set 955# CONFIG_MMC is not set
956# CONFIG_NEW_LEDS is not set
957# CONFIG_INFINIBAND is not set
958# CONFIG_EDAC is not set
959# CONFIG_RTC_CLASS is not set
960# CONFIG_AUXDISPLAY is not set
784 961
785# 962#
786# InfiniBand support 963# Userspace I/O
787# 964#
788# CONFIG_INFINIBAND is not set 965# CONFIG_UIO is not set
789 966
790# 967#
791# File systems 968# File systems
792# 969#
793CONFIG_EXT2_FS=y 970CONFIG_EXT2_FS=y
794# CONFIG_EXT2_FS_XATTR is not set 971# CONFIG_EXT2_FS_XATTR is not set
972# CONFIG_EXT2_FS_XIP is not set
795CONFIG_EXT3_FS=y 973CONFIG_EXT3_FS=y
796CONFIG_EXT3_FS_XATTR=y 974CONFIG_EXT3_FS_XATTR=y
797# CONFIG_EXT3_FS_POSIX_ACL is not set 975# CONFIG_EXT3_FS_POSIX_ACL is not set
798# CONFIG_EXT3_FS_SECURITY is not set 976# CONFIG_EXT3_FS_SECURITY is not set
977# CONFIG_EXT4DEV_FS is not set
799CONFIG_JBD=y 978CONFIG_JBD=y
800CONFIG_JBD_DEBUG=y
801CONFIG_FS_MBCACHE=y 979CONFIG_FS_MBCACHE=y
802# CONFIG_REISERFS_FS is not set 980# CONFIG_REISERFS_FS is not set
803# CONFIG_JFS_FS is not set 981# CONFIG_JFS_FS is not set
804 982# CONFIG_FS_POSIX_ACL is not set
805#
806# XFS support
807#
808# CONFIG_XFS_FS is not set 983# CONFIG_XFS_FS is not set
984# CONFIG_GFS2_FS is not set
985# CONFIG_OCFS2_FS is not set
809# CONFIG_MINIX_FS is not set 986# CONFIG_MINIX_FS is not set
810# CONFIG_ROMFS_FS is not set 987# CONFIG_ROMFS_FS is not set
988CONFIG_INOTIFY=y
989CONFIG_INOTIFY_USER=y
811# CONFIG_QUOTA is not set 990# CONFIG_QUOTA is not set
812CONFIG_DNOTIFY=y 991CONFIG_DNOTIFY=y
813CONFIG_AUTOFS_FS=m 992CONFIG_AUTOFS_FS=m
814CONFIG_AUTOFS4_FS=y 993CONFIG_AUTOFS4_FS=y
994# CONFIG_FUSE_FS is not set
815 995
816# 996#
817# CD-ROM/DVD Filesystems 997# CD-ROM/DVD Filesystems
@@ -837,15 +1017,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
837# 1017#
838CONFIG_PROC_FS=y 1018CONFIG_PROC_FS=y
839# CONFIG_PROC_KCORE is not set 1019# CONFIG_PROC_KCORE is not set
1020CONFIG_PROC_SYSCTL=y
840CONFIG_SYSFS=y 1021CONFIG_SYSFS=y
841CONFIG_DEVFS_FS=y
842# CONFIG_DEVFS_MOUNT is not set
843# CONFIG_DEVFS_DEBUG is not set
844# CONFIG_DEVPTS_FS_XATTR is not set
845CONFIG_TMPFS=y 1022CONFIG_TMPFS=y
846# CONFIG_TMPFS_XATTR is not set 1023# CONFIG_TMPFS_POSIX_ACL is not set
847# CONFIG_HUGETLB_PAGE is not set 1024# CONFIG_HUGETLB_PAGE is not set
848CONFIG_RAMFS=y 1025# CONFIG_CONFIGFS_FS is not set
849 1026
850# 1027#
851# Miscellaneous filesystems 1028# Miscellaneous filesystems
@@ -863,19 +1040,19 @@ CONFIG_CRAMFS=m
863# CONFIG_QNX4FS_FS is not set 1040# CONFIG_QNX4FS_FS is not set
864# CONFIG_SYSV_FS is not set 1041# CONFIG_SYSV_FS is not set
865# CONFIG_UFS_FS is not set 1042# CONFIG_UFS_FS is not set
866 1043CONFIG_NETWORK_FILESYSTEMS=y
867#
868# Network File Systems
869#
870CONFIG_NFS_FS=y 1044CONFIG_NFS_FS=y
871CONFIG_NFS_V3=y 1045CONFIG_NFS_V3=y
1046# CONFIG_NFS_V3_ACL is not set
872# CONFIG_NFS_V4 is not set 1047# CONFIG_NFS_V4 is not set
873# CONFIG_NFS_DIRECTIO is not set 1048# CONFIG_NFS_DIRECTIO is not set
874# CONFIG_NFSD is not set 1049# CONFIG_NFSD is not set
875CONFIG_ROOT_NFS=y 1050CONFIG_ROOT_NFS=y
876CONFIG_LOCKD=y 1051CONFIG_LOCKD=y
877CONFIG_LOCKD_V4=y 1052CONFIG_LOCKD_V4=y
1053CONFIG_NFS_COMMON=y
878CONFIG_SUNRPC=y 1054CONFIG_SUNRPC=y
1055# CONFIG_SUNRPC_BIND34 is not set
879# CONFIG_RPCSEC_GSS_KRB5 is not set 1056# CONFIG_RPCSEC_GSS_KRB5 is not set
880# CONFIG_RPCSEC_GSS_SPKM3 is not set 1057# CONFIG_RPCSEC_GSS_SPKM3 is not set
881CONFIG_SMB_FS=m 1058CONFIG_SMB_FS=m
@@ -890,10 +1067,6 @@ CONFIG_SMB_FS=m
890# 1067#
891# CONFIG_PARTITION_ADVANCED is not set 1068# CONFIG_PARTITION_ADVANCED is not set
892CONFIG_MSDOS_PARTITION=y 1069CONFIG_MSDOS_PARTITION=y
893
894#
895# Native Language Support
896#
897CONFIG_NLS=y 1070CONFIG_NLS=y
898CONFIG_NLS_DEFAULT="iso8859-1" 1071CONFIG_NLS_DEFAULT="iso8859-1"
899# CONFIG_NLS_CODEPAGE_437 is not set 1072# CONFIG_NLS_CODEPAGE_437 is not set
@@ -934,56 +1107,77 @@ CONFIG_NLS_DEFAULT="iso8859-1"
934# CONFIG_NLS_KOI8_R is not set 1107# CONFIG_NLS_KOI8_R is not set
935# CONFIG_NLS_KOI8_U is not set 1108# CONFIG_NLS_KOI8_U is not set
936# CONFIG_NLS_UTF8 is not set 1109# CONFIG_NLS_UTF8 is not set
937# CONFIG_SCC_ENET is not set 1110# CONFIG_DLM is not set
938# CONFIG_FEC_ENET is not set
939
940#
941# CPM2 Options
942#
943 1111
944# 1112#
945# Library routines 1113# Library routines
946# 1114#
1115CONFIG_BITREVERSE=y
947CONFIG_CRC_CCITT=y 1116CONFIG_CRC_CCITT=y
1117# CONFIG_CRC16 is not set
1118# CONFIG_CRC_ITU_T is not set
948CONFIG_CRC32=y 1119CONFIG_CRC32=y
1120# CONFIG_CRC7 is not set
949# CONFIG_LIBCRC32C is not set 1121# CONFIG_LIBCRC32C is not set
950CONFIG_ZLIB_INFLATE=m 1122CONFIG_ZLIB_INFLATE=m
951 1123CONFIG_PLIST=y
952# 1124CONFIG_HAS_IOMEM=y
953# Profiling support 1125CONFIG_HAS_IOPORT=y
954# 1126CONFIG_HAS_DMA=y
1127CONFIG_INSTRUMENTATION=y
955# CONFIG_PROFILING is not set 1128# CONFIG_PROFILING is not set
1129# CONFIG_KPROBES is not set
1130# CONFIG_MARKERS is not set
956 1131
957# 1132#
958# Kernel hacking 1133# Kernel hacking
959# 1134#
960# CONFIG_PRINTK_TIME is not set 1135# CONFIG_PRINTK_TIME is not set
961CONFIG_DEBUG_KERNEL=y 1136CONFIG_ENABLE_WARN_DEPRECATED=y
1137CONFIG_ENABLE_MUST_CHECK=y
962# CONFIG_MAGIC_SYSRQ is not set 1138# CONFIG_MAGIC_SYSRQ is not set
963CONFIG_LOG_BUF_SHIFT=14 1139# CONFIG_UNUSED_SYMBOLS is not set
1140# CONFIG_DEBUG_FS is not set
1141# CONFIG_HEADERS_CHECK is not set
1142CONFIG_DEBUG_KERNEL=y
1143# CONFIG_DEBUG_SHIRQ is not set
1144CONFIG_DETECT_SOFTLOCKUP=y
1145CONFIG_SCHED_DEBUG=y
964# CONFIG_SCHEDSTATS is not set 1146# CONFIG_SCHEDSTATS is not set
965# CONFIG_DEBUG_SLAB is not set 1147# CONFIG_TIMER_STATS is not set
1148# CONFIG_SLUB_DEBUG_ON is not set
1149# CONFIG_DEBUG_RT_MUTEXES is not set
1150# CONFIG_RT_MUTEX_TESTER is not set
966# CONFIG_DEBUG_SPINLOCK is not set 1151# CONFIG_DEBUG_SPINLOCK is not set
1152# CONFIG_DEBUG_MUTEXES is not set
967# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1153# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1154# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
968# CONFIG_DEBUG_KOBJECT is not set 1155# CONFIG_DEBUG_KOBJECT is not set
969# CONFIG_DEBUG_HIGHMEM is not set 1156# CONFIG_DEBUG_HIGHMEM is not set
1157# CONFIG_DEBUG_BUGVERBOSE is not set
970# CONFIG_DEBUG_INFO is not set 1158# CONFIG_DEBUG_INFO is not set
971# CONFIG_DEBUG_FS is not set 1159# CONFIG_DEBUG_VM is not set
1160# CONFIG_DEBUG_LIST is not set
1161# CONFIG_DEBUG_SG is not set
1162CONFIG_FORCED_INLINING=y
1163# CONFIG_BOOT_PRINTK_DELAY is not set
1164# CONFIG_RCU_TORTURE_TEST is not set
1165# CONFIG_FAULT_INJECTION is not set
1166# CONFIG_SAMPLES is not set
1167# CONFIG_DEBUG_STACKOVERFLOW is not set
1168# CONFIG_DEBUG_STACK_USAGE is not set
1169# CONFIG_DEBUG_PAGEALLOC is not set
1170# CONFIG_DEBUGGER is not set
972# CONFIG_KGDB_CONSOLE is not set 1171# CONFIG_KGDB_CONSOLE is not set
973# CONFIG_XMON is not set
974CONFIG_BDI_SWITCH=y 1172CONFIG_BDI_SWITCH=y
1173# CONFIG_PPC_EARLY_DEBUG is not set
975 1174
976# 1175#
977# Security options 1176# Security options
978# 1177#
979# CONFIG_KEYS is not set 1178# CONFIG_KEYS is not set
980# CONFIG_SECURITY is not set 1179# CONFIG_SECURITY is not set
981 1180# CONFIG_SECURITY_FILE_CAPABILITIES is not set
982#
983# Cryptographic options
984#
985# CONFIG_CRYPTO is not set 1181# CONFIG_CRYPTO is not set
986 1182# CONFIG_PPC_CLOCK is not set
987# 1183CONFIG_PPC_LIB_RHEAP=y
988# Hardware crypto devices
989#
diff --git a/arch/ppc/configs/TQM8540_defconfig b/arch/powerpc/configs/tqm8540_defconfig
index f33f0e772dcb..732de34cfc27 100644
--- a/arch/ppc/configs/TQM8540_defconfig
+++ b/arch/powerpc/configs/tqm8540_defconfig
@@ -1,66 +1,116 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.24-rc8
4# Fri Nov 25 17:26:50 2005 4# Fri Jan 25 01:32:05 2008
5# 5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
6CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
10CONFIG_PPC=y 40CONFIG_PPC=y
11CONFIG_PPC32=y 41CONFIG_EARLY_PRINTK=y
12CONFIG_GENERIC_NVRAM=y 42CONFIG_GENERIC_NVRAM=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y 44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 55
16# 56#
17# Code maturity level options 57# General setup
18# 58#
19CONFIG_EXPERIMENTAL=y 59CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 60CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 61CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION="" 62CONFIG_LOCALVERSION=""
28CONFIG_LOCALVERSION_AUTO=y 63CONFIG_LOCALVERSION_AUTO=y
29CONFIG_SWAP=y 64CONFIG_SWAP=y
30CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
31# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
32# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
34# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
35# CONFIG_HOTPLUG is not set
36CONFIG_KOBJECT_UEVENT=y
37# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
38CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
39CONFIG_EMBEDDED=y 85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
40# CONFIG_KALLSYMS is not set 87# CONFIG_KALLSYMS is not set
88# CONFIG_HOTPLUG is not set
41CONFIG_PRINTK=y 89CONFIG_PRINTK=y
42CONFIG_BUG=y 90CONFIG_BUG=y
91CONFIG_ELF_CORE=y
43CONFIG_BASE_FULL=y 92CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 93CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y
45# CONFIG_EPOLL is not set 95# CONFIG_EPOLL is not set
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 96CONFIG_SIGNALFD=y
97CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 98CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 99CONFIG_VM_EVENT_COUNTERS=y
49CONFIG_CC_ALIGN_LABELS=0 100CONFIG_SLUB_DEBUG=y
50CONFIG_CC_ALIGN_LOOPS=0 101# CONFIG_SLAB is not set
51CONFIG_CC_ALIGN_JUMPS=0 102CONFIG_SLUB=y
103# CONFIG_SLOB is not set
104CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58# CONFIG_MODULES is not set 108# CONFIG_MODULES is not set
59 109CONFIG_BLOCK=y
60#
61# Block layer
62#
63# CONFIG_LBD is not set 110# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_LSF is not set
113# CONFIG_BLK_DEV_BSG is not set
64 114
65# 115#
66# IO Schedulers 116# IO Schedulers
@@ -76,54 +126,62 @@ CONFIG_DEFAULT_AS=y
76CONFIG_DEFAULT_IOSCHED="anticipatory" 126CONFIG_DEFAULT_IOSCHED="anticipatory"
77 127
78# 128#
79# Processor 129# Platform support
80#
81# CONFIG_6xx is not set
82# CONFIG_40x is not set
83# CONFIG_44x is not set
84# CONFIG_POWER3 is not set
85# CONFIG_POWER4 is not set
86# CONFIG_8xx is not set
87# CONFIG_E200 is not set
88CONFIG_E500=y
89CONFIG_BOOKE=y
90CONFIG_FSL_BOOKE=y
91# CONFIG_PHYS_64BIT is not set
92CONFIG_SPE=y
93CONFIG_MATH_EMULATION=y
94# CONFIG_KEXEC is not set
95# CONFIG_CPU_FREQ is not set
96# CONFIG_WANT_EARLY_SERIAL is not set
97CONFIG_PPC_GEN550=y
98CONFIG_85xx=y
99CONFIG_PPC_INDIRECT_PCI_BE=y
100
101#
102# Freescale 85xx options
103# 130#
131# CONFIG_PPC_MPC52xx is not set
132# CONFIG_PPC_MPC5200 is not set
133# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set
104# CONFIG_MPC8540_ADS is not set 136# CONFIG_MPC8540_ADS is not set
105# CONFIG_MPC8548_CDS is not set
106# CONFIG_MPC8555_CDS is not set
107# CONFIG_MPC8560_ADS is not set 137# CONFIG_MPC8560_ADS is not set
108# CONFIG_SBC8560 is not set 138# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set
109# CONFIG_STX_GP3 is not set 141# CONFIG_STX_GP3 is not set
110CONFIG_TQM8540=y 142CONFIG_TQM8540=y
111# CONFIG_TQM8541 is not set 143# CONFIG_TQM8541 is not set
112# CONFIG_TQM8555 is not set 144# CONFIG_TQM8555 is not set
113# CONFIG_TQM8560 is not set 145# CONFIG_TQM8560 is not set
114CONFIG_MPC8540=y 146CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set
149CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set
152# CONFIG_PPC_RTAS is not set
153# CONFIG_MMIO_NVRAM is not set
154# CONFIG_PPC_MPC106 is not set
155# CONFIG_PPC_970_NAP is not set
156# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set
159# CONFIG_CPM2 is not set
160CONFIG_PPC_CPM_NEW_BINDING=y
161# CONFIG_FSL_ULI1575 is not set
115 162
116# 163#
117# Platform options 164# Kernel options
118# 165#
119# CONFIG_HIGHMEM is not set 166# CONFIG_HIGHMEM is not set
167# CONFIG_TICK_ONESHOT is not set
168# CONFIG_NO_HZ is not set
169# CONFIG_HIGH_RES_TIMERS is not set
170CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
120# CONFIG_HZ_100 is not set 171# CONFIG_HZ_100 is not set
121CONFIG_HZ_250=y 172CONFIG_HZ_250=y
173# CONFIG_HZ_300 is not set
122# CONFIG_HZ_1000 is not set 174# CONFIG_HZ_1000 is not set
123CONFIG_HZ=250 175CONFIG_HZ=250
124CONFIG_PREEMPT_NONE=y 176CONFIG_PREEMPT_NONE=y
125# CONFIG_PREEMPT_VOLUNTARY is not set 177# CONFIG_PREEMPT_VOLUNTARY is not set
126# CONFIG_PREEMPT is not set 178# CONFIG_PREEMPT is not set
179CONFIG_BINFMT_ELF=y
180# CONFIG_BINFMT_MISC is not set
181CONFIG_MATH_EMULATION=y
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
183CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y
127CONFIG_SELECT_MEMORY_MODEL=y 185CONFIG_SELECT_MEMORY_MODEL=y
128CONFIG_FLATMEM_MANUAL=y 186CONFIG_FLATMEM_MANUAL=y
129# CONFIG_DISCONTIGMEM_MANUAL is not set 187# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -131,29 +189,36 @@ CONFIG_FLATMEM_MANUAL=y
131CONFIG_FLATMEM=y 189CONFIG_FLATMEM=y
132CONFIG_FLAT_NODE_MEM_MAP=y 190CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 191# CONFIG_SPARSEMEM_STATIC is not set
192# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4 193CONFIG_SPLIT_PTLOCK_CPUS=4
135CONFIG_BINFMT_ELF=y 194# CONFIG_RESOURCES_64BIT is not set
136# CONFIG_BINFMT_MISC is not set 195CONFIG_ZONE_DMA_FLAG=1
196CONFIG_BOUNCE=y
197CONFIG_VIRT_TO_BUS=y
198# CONFIG_PROC_DEVICETREE is not set
137# CONFIG_CMDLINE_BOOL is not set 199# CONFIG_CMDLINE_BOOL is not set
138# CONFIG_PM is not set 200# CONFIG_PM is not set
139# CONFIG_HIBERNATION is not set 201CONFIG_SUSPEND_UP_POSSIBLE=y
202CONFIG_HIBERNATION_UP_POSSIBLE=y
140CONFIG_SECCOMP=y 203CONFIG_SECCOMP=y
204CONFIG_WANT_DEVICE_TREE=y
205CONFIG_DEVICE_TREE="tqm8540.dts"
141CONFIG_ISA_DMA_API=y 206CONFIG_ISA_DMA_API=y
142 207
143# 208#
144# Bus options 209# Bus options
145# 210#
146CONFIG_PPC_I8259=y 211CONFIG_ZONE_DMA=y
147CONFIG_PPC_INDIRECT_PCI=y 212CONFIG_PPC_INDIRECT_PCI=y
213CONFIG_FSL_SOC=y
214CONFIG_FSL_PCI=y
148CONFIG_PCI=y 215CONFIG_PCI=y
149CONFIG_PCI_DOMAINS=y 216CONFIG_PCI_DOMAINS=y
150# CONFIG_PCI_LEGACY_PROC is not set 217CONFIG_PCI_SYSCALL=y
151 218# CONFIG_PCIEPORTBUS is not set
152# 219CONFIG_ARCH_SUPPORTS_MSI=y
153# PCCARD (PCMCIA/CardBus) support 220# CONFIG_PCI_MSI is not set
154# 221CONFIG_PCI_LEGACY=y
155# CONFIG_PCCARD is not set
156# CONFIG_RAPIDIO is not set
157 222
158# 223#
159# Advanced setup 224# Advanced setup
@@ -166,7 +231,7 @@ CONFIG_PCI_DOMAINS=y
166CONFIG_HIGHMEM_START=0xfe000000 231CONFIG_HIGHMEM_START=0xfe000000
167CONFIG_LOWMEM_SIZE=0x30000000 232CONFIG_LOWMEM_SIZE=0x30000000
168CONFIG_KERNEL_START=0xc0000000 233CONFIG_KERNEL_START=0xc0000000
169CONFIG_TASK_SIZE=0x80000000 234CONFIG_TASK_SIZE=0xc0000000
170CONFIG_BOOT_LOAD=0x00800000 235CONFIG_BOOT_LOAD=0x00800000
171 236
172# 237#
@@ -180,6 +245,10 @@ CONFIG_NET=y
180CONFIG_PACKET=y 245CONFIG_PACKET=y
181# CONFIG_PACKET_MMAP is not set 246# CONFIG_PACKET_MMAP is not set
182CONFIG_UNIX=y 247CONFIG_UNIX=y
248CONFIG_XFRM=y
249# CONFIG_XFRM_USER is not set
250# CONFIG_XFRM_SUB_POLICY is not set
251# CONFIG_XFRM_MIGRATE is not set
183# CONFIG_NET_KEY is not set 252# CONFIG_NET_KEY is not set
184CONFIG_INET=y 253CONFIG_INET=y
185CONFIG_IP_MULTICAST=y 254CONFIG_IP_MULTICAST=y
@@ -197,23 +266,26 @@ CONFIG_SYN_COOKIES=y
197# CONFIG_INET_AH is not set 266# CONFIG_INET_AH is not set
198# CONFIG_INET_ESP is not set 267# CONFIG_INET_ESP is not set
199# CONFIG_INET_IPCOMP is not set 268# CONFIG_INET_IPCOMP is not set
269# CONFIG_INET_XFRM_TUNNEL is not set
200# CONFIG_INET_TUNNEL is not set 270# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_XFRM_MODE_TRANSPORT=y
272CONFIG_INET_XFRM_MODE_TUNNEL=y
273CONFIG_INET_XFRM_MODE_BEET=y
274# CONFIG_INET_LRO is not set
201CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
202CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
203# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
204CONFIG_TCP_CONG_BIC=y 278CONFIG_TCP_CONG_CUBIC=y
279CONFIG_DEFAULT_TCP_CONG="cubic"
280# CONFIG_TCP_MD5SIG is not set
205# CONFIG_IPV6 is not set 281# CONFIG_IPV6 is not set
282# CONFIG_INET6_XFRM_TUNNEL is not set
283# CONFIG_INET6_TUNNEL is not set
284# CONFIG_NETWORK_SECMARK is not set
206# CONFIG_NETFILTER is not set 285# CONFIG_NETFILTER is not set
207
208#
209# DCCP Configuration (EXPERIMENTAL)
210#
211# CONFIG_IP_DCCP is not set 286# CONFIG_IP_DCCP is not set
212
213#
214# SCTP Configuration (EXPERIMENTAL)
215#
216# CONFIG_IP_SCTP is not set 287# CONFIG_IP_SCTP is not set
288# CONFIG_TIPC is not set
217# CONFIG_ATM is not set 289# CONFIG_ATM is not set
218# CONFIG_BRIDGE is not set 290# CONFIG_BRIDGE is not set
219# CONFIG_VLAN_8021Q is not set 291# CONFIG_VLAN_8021Q is not set
@@ -223,13 +295,8 @@ CONFIG_TCP_CONG_BIC=y
223# CONFIG_ATALK is not set 295# CONFIG_ATALK is not set
224# CONFIG_X25 is not set 296# CONFIG_X25 is not set
225# CONFIG_LAPB is not set 297# CONFIG_LAPB is not set
226# CONFIG_NET_DIVERT is not set
227# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
228# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
229
230#
231# QoS and/or fair queueing
232#
233# CONFIG_NET_SCHED is not set 300# CONFIG_NET_SCHED is not set
234 301
235# 302#
@@ -239,7 +306,17 @@ CONFIG_TCP_CONG_BIC=y
239# CONFIG_HAMRADIO is not set 306# CONFIG_HAMRADIO is not set
240# CONFIG_IRDA is not set 307# CONFIG_IRDA is not set
241# CONFIG_BT is not set 308# CONFIG_BT is not set
309# CONFIG_AF_RXRPC is not set
310
311#
312# Wireless
313#
314# CONFIG_CFG80211 is not set
315# CONFIG_WIRELESS_EXT is not set
316# CONFIG_MAC80211 is not set
242# CONFIG_IEEE80211 is not set 317# CONFIG_IEEE80211 is not set
318# CONFIG_RFKILL is not set
319# CONFIG_NET_9P is not set
243 320
244# 321#
245# Device Drivers 322# Device Drivers
@@ -250,16 +327,8 @@ CONFIG_TCP_CONG_BIC=y
250# 327#
251CONFIG_STANDALONE=y 328CONFIG_STANDALONE=y
252CONFIG_PREVENT_FIRMWARE_BUILD=y 329CONFIG_PREVENT_FIRMWARE_BUILD=y
253# CONFIG_FW_LOADER is not set 330# CONFIG_SYS_HYPERVISOR is not set
254
255#
256# Connector - unified userspace <-> kernelspace linker
257#
258# CONFIG_CONNECTOR is not set 331# CONFIG_CONNECTOR is not set
259
260#
261# Memory Technology Devices (MTD)
262#
263CONFIG_MTD=y 332CONFIG_MTD=y
264# CONFIG_MTD_DEBUG is not set 333# CONFIG_MTD_DEBUG is not set
265CONFIG_MTD_CONCAT=y 334CONFIG_MTD_CONCAT=y
@@ -271,11 +340,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
271# User Modules And Translation Layers 340# User Modules And Translation Layers
272# 341#
273CONFIG_MTD_CHAR=y 342CONFIG_MTD_CHAR=y
343CONFIG_MTD_BLKDEVS=y
274CONFIG_MTD_BLOCK=y 344CONFIG_MTD_BLOCK=y
275# CONFIG_FTL is not set 345# CONFIG_FTL is not set
276# CONFIG_NFTL is not set 346# CONFIG_NFTL is not set
277# CONFIG_INFTL is not set 347# CONFIG_INFTL is not set
278# CONFIG_RFD_FTL is not set 348# CONFIG_RFD_FTL is not set
349# CONFIG_SSFDC is not set
350# CONFIG_MTD_OOPS is not set
279 351
280# 352#
281# RAM/ROM/Flash chip drivers 353# RAM/ROM/Flash chip drivers
@@ -296,7 +368,6 @@ CONFIG_MTD_CFI_I2=y
296# CONFIG_MTD_CFI_I8 is not set 368# CONFIG_MTD_CFI_I8 is not set
297# CONFIG_MTD_CFI_INTELEXT is not set 369# CONFIG_MTD_CFI_INTELEXT is not set
298CONFIG_MTD_CFI_AMDSTD=y 370CONFIG_MTD_CFI_AMDSTD=y
299CONFIG_MTD_CFI_AMDSTD_RETRY=0
300# CONFIG_MTD_CFI_STAA is not set 371# CONFIG_MTD_CFI_STAA is not set
301CONFIG_MTD_CFI_UTIL=y 372CONFIG_MTD_CFI_UTIL=y
302# CONFIG_MTD_RAM is not set 373# CONFIG_MTD_RAM is not set
@@ -308,7 +379,8 @@ CONFIG_MTD_CFI_UTIL=y
308# 379#
309# CONFIG_MTD_COMPLEX_MAPPINGS is not set 380# CONFIG_MTD_COMPLEX_MAPPINGS is not set
310# CONFIG_MTD_PHYSMAP is not set 381# CONFIG_MTD_PHYSMAP is not set
311CONFIG_MTD_TQM85xx=y 382# CONFIG_MTD_PHYSMAP_OF is not set
383# CONFIG_MTD_INTEL_VR_NOR is not set
312# CONFIG_MTD_PLATRAM is not set 384# CONFIG_MTD_PLATRAM is not set
313 385
314# 386#
@@ -318,7 +390,6 @@ CONFIG_MTD_TQM85xx=y
318# CONFIG_MTD_SLRAM is not set 390# CONFIG_MTD_SLRAM is not set
319# CONFIG_MTD_PHRAM is not set 391# CONFIG_MTD_PHRAM is not set
320# CONFIG_MTD_MTDRAM is not set 392# CONFIG_MTD_MTDRAM is not set
321# CONFIG_MTD_BLKMTD is not set
322# CONFIG_MTD_BLOCK2MTD is not set 393# CONFIG_MTD_BLOCK2MTD is not set
323 394
324# 395#
@@ -327,29 +398,16 @@ CONFIG_MTD_TQM85xx=y
327# CONFIG_MTD_DOC2000 is not set 398# CONFIG_MTD_DOC2000 is not set
328# CONFIG_MTD_DOC2001 is not set 399# CONFIG_MTD_DOC2001 is not set
329# CONFIG_MTD_DOC2001PLUS is not set 400# CONFIG_MTD_DOC2001PLUS is not set
330
331#
332# NAND Flash Device Drivers
333#
334# CONFIG_MTD_NAND is not set 401# CONFIG_MTD_NAND is not set
335
336#
337# OneNAND Flash Device Drivers
338#
339# CONFIG_MTD_ONENAND is not set 402# CONFIG_MTD_ONENAND is not set
340 403
341# 404#
342# Parallel port support 405# UBI - Unsorted block images
343# 406#
407# CONFIG_MTD_UBI is not set
408CONFIG_OF_DEVICE=y
344# CONFIG_PARPORT is not set 409# CONFIG_PARPORT is not set
345 410CONFIG_BLK_DEV=y
346#
347# Plug and Play support
348#
349
350#
351# Block devices
352#
353# CONFIG_BLK_DEV_FD is not set 411# CONFIG_BLK_DEV_FD is not set
354# CONFIG_BLK_CPQ_DA is not set 412# CONFIG_BLK_CPQ_DA is not set
355# CONFIG_BLK_CPQ_CISS_DA is not set 413# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -363,14 +421,16 @@ CONFIG_BLK_DEV_LOOP=y
363CONFIG_BLK_DEV_RAM=y 421CONFIG_BLK_DEV_RAM=y
364CONFIG_BLK_DEV_RAM_COUNT=16 422CONFIG_BLK_DEV_RAM_COUNT=16
365CONFIG_BLK_DEV_RAM_SIZE=32768 423CONFIG_BLK_DEV_RAM_SIZE=32768
366CONFIG_BLK_DEV_INITRD=y 424CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
367# CONFIG_CDROM_PKTCDVD is not set 425# CONFIG_CDROM_PKTCDVD is not set
368# CONFIG_ATA_OVER_ETH is not set 426# CONFIG_ATA_OVER_ETH is not set
369 427CONFIG_MISC_DEVICES=y
370# 428# CONFIG_PHANTOM is not set
371# ATA/ATAPI/MFM/RLL support 429# CONFIG_EEPROM_93CX6 is not set
372# 430# CONFIG_SGI_IOC4 is not set
431# CONFIG_TIFM_CORE is not set
373CONFIG_IDE=y 432CONFIG_IDE=y
433CONFIG_IDE_MAX_HWIFS=4
374CONFIG_BLK_DEV_IDE=y 434CONFIG_BLK_DEV_IDE=y
375 435
376# 436#
@@ -383,21 +443,24 @@ CONFIG_BLK_DEV_IDEDISK=y
383# CONFIG_BLK_DEV_IDETAPE is not set 443# CONFIG_BLK_DEV_IDETAPE is not set
384# CONFIG_BLK_DEV_IDEFLOPPY is not set 444# CONFIG_BLK_DEV_IDEFLOPPY is not set
385# CONFIG_IDE_TASK_IOCTL is not set 445# CONFIG_IDE_TASK_IOCTL is not set
446CONFIG_IDE_PROC_FS=y
386 447
387# 448#
388# IDE chipset support/bugfixes 449# IDE chipset support/bugfixes
389# 450#
390CONFIG_IDE_GENERIC=y 451CONFIG_IDE_GENERIC=y
452# CONFIG_BLK_DEV_PLATFORM is not set
453
454#
455# PCI IDE chipsets support
456#
391CONFIG_BLK_DEV_IDEPCI=y 457CONFIG_BLK_DEV_IDEPCI=y
392CONFIG_IDEPCI_SHARE_IRQ=y 458CONFIG_IDEPCI_SHARE_IRQ=y
459CONFIG_IDEPCI_PCIBUS_ORDER=y
393# CONFIG_BLK_DEV_OFFBOARD is not set 460# CONFIG_BLK_DEV_OFFBOARD is not set
394CONFIG_BLK_DEV_GENERIC=y 461CONFIG_BLK_DEV_GENERIC=y
395# CONFIG_BLK_DEV_OPTI621 is not set 462# CONFIG_BLK_DEV_OPTI621 is not set
396# CONFIG_BLK_DEV_SL82C105 is not set
397CONFIG_BLK_DEV_IDEDMA_PCI=y 463CONFIG_BLK_DEV_IDEDMA_PCI=y
398# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
399CONFIG_IDEDMA_PCI_AUTO=y
400# CONFIG_IDEDMA_ONLYDISK is not set
401# CONFIG_BLK_DEV_AEC62XX is not set 464# CONFIG_BLK_DEV_AEC62XX is not set
402# CONFIG_BLK_DEV_ALI15X3 is not set 465# CONFIG_BLK_DEV_ALI15X3 is not set
403# CONFIG_BLK_DEV_AMD74XX is not set 466# CONFIG_BLK_DEV_AMD74XX is not set
@@ -408,21 +471,24 @@ CONFIG_IDEDMA_PCI_AUTO=y
408# CONFIG_BLK_DEV_CS5530 is not set 471# CONFIG_BLK_DEV_CS5530 is not set
409# CONFIG_BLK_DEV_HPT34X is not set 472# CONFIG_BLK_DEV_HPT34X is not set
410# CONFIG_BLK_DEV_HPT366 is not set 473# CONFIG_BLK_DEV_HPT366 is not set
474# CONFIG_BLK_DEV_JMICRON is not set
411# CONFIG_BLK_DEV_SC1200 is not set 475# CONFIG_BLK_DEV_SC1200 is not set
412# CONFIG_BLK_DEV_PIIX is not set 476# CONFIG_BLK_DEV_PIIX is not set
477# CONFIG_BLK_DEV_IT8213 is not set
413# CONFIG_BLK_DEV_IT821X is not set 478# CONFIG_BLK_DEV_IT821X is not set
414# CONFIG_BLK_DEV_NS87415 is not set 479# CONFIG_BLK_DEV_NS87415 is not set
415# CONFIG_BLK_DEV_PDC202XX_OLD is not set 480# CONFIG_BLK_DEV_PDC202XX_OLD is not set
416# CONFIG_BLK_DEV_PDC202XX_NEW is not set 481# CONFIG_BLK_DEV_PDC202XX_NEW is not set
417# CONFIG_BLK_DEV_SVWKS is not set 482# CONFIG_BLK_DEV_SVWKS is not set
418# CONFIG_BLK_DEV_SIIMAGE is not set 483# CONFIG_BLK_DEV_SIIMAGE is not set
484# CONFIG_BLK_DEV_SL82C105 is not set
419# CONFIG_BLK_DEV_SLC90E66 is not set 485# CONFIG_BLK_DEV_SLC90E66 is not set
420# CONFIG_BLK_DEV_TRM290 is not set 486# CONFIG_BLK_DEV_TRM290 is not set
421CONFIG_BLK_DEV_VIA82CXXX=y 487CONFIG_BLK_DEV_VIA82CXXX=y
488# CONFIG_BLK_DEV_TC86C001 is not set
422# CONFIG_IDE_ARM is not set 489# CONFIG_IDE_ARM is not set
423CONFIG_BLK_DEV_IDEDMA=y 490CONFIG_BLK_DEV_IDEDMA=y
424# CONFIG_IDEDMA_IVB is not set 491CONFIG_IDE_ARCH_OBSOLETE_INIT=y
425CONFIG_IDEDMA_AUTO=y
426# CONFIG_BLK_DEV_HD is not set 492# CONFIG_BLK_DEV_HD is not set
427 493
428# 494#
@@ -430,49 +496,28 @@ CONFIG_IDEDMA_AUTO=y
430# 496#
431# CONFIG_RAID_ATTRS is not set 497# CONFIG_RAID_ATTRS is not set
432# CONFIG_SCSI is not set 498# CONFIG_SCSI is not set
433 499# CONFIG_SCSI_DMA is not set
434# 500# CONFIG_SCSI_NETLINK is not set
435# Multi-device support (RAID and LVM) 501# CONFIG_ATA is not set
436#
437# CONFIG_MD is not set 502# CONFIG_MD is not set
438
439#
440# Fusion MPT device support
441#
442# CONFIG_FUSION is not set 503# CONFIG_FUSION is not set
443 504
444# 505#
445# IEEE 1394 (FireWire) support 506# IEEE 1394 (FireWire) support
446# 507#
508# CONFIG_FIREWIRE is not set
447# CONFIG_IEEE1394 is not set 509# CONFIG_IEEE1394 is not set
448
449#
450# I2O device support
451#
452# CONFIG_I2O is not set 510# CONFIG_I2O is not set
453 511# CONFIG_MACINTOSH_DRIVERS is not set
454#
455# Macintosh device drivers
456#
457# CONFIG_WINDFARM is not set
458
459#
460# Network device support
461#
462CONFIG_NETDEVICES=y 512CONFIG_NETDEVICES=y
513# CONFIG_NETDEVICES_MULTIQUEUE is not set
463# CONFIG_DUMMY is not set 514# CONFIG_DUMMY is not set
464# CONFIG_BONDING is not set 515# CONFIG_BONDING is not set
516# CONFIG_MACVLAN is not set
465# CONFIG_EQUALIZER is not set 517# CONFIG_EQUALIZER is not set
466# CONFIG_TUN is not set 518# CONFIG_TUN is not set
467 519# CONFIG_VETH is not set
468#
469# ARCnet devices
470#
471# CONFIG_ARCNET is not set 520# CONFIG_ARCNET is not set
472
473#
474# PHY device support
475#
476CONFIG_PHYLIB=y 521CONFIG_PHYLIB=y
477 522
478# 523#
@@ -483,29 +528,30 @@ CONFIG_PHYLIB=y
483# CONFIG_QSEMI_PHY is not set 528# CONFIG_QSEMI_PHY is not set
484# CONFIG_LXT_PHY is not set 529# CONFIG_LXT_PHY is not set
485# CONFIG_CICADA_PHY is not set 530# CONFIG_CICADA_PHY is not set
486 531# CONFIG_VITESSE_PHY is not set
487# 532# CONFIG_SMSC_PHY is not set
488# Ethernet (10 or 100Mbit) 533# CONFIG_BROADCOM_PHY is not set
489# 534# CONFIG_ICPLUS_PHY is not set
535# CONFIG_FIXED_PHY is not set
536# CONFIG_MDIO_BITBANG is not set
490CONFIG_NET_ETHERNET=y 537CONFIG_NET_ETHERNET=y
491CONFIG_MII=y 538CONFIG_MII=y
492# CONFIG_HAPPYMEAL is not set 539# CONFIG_HAPPYMEAL is not set
493# CONFIG_SUNGEM is not set 540# CONFIG_SUNGEM is not set
494# CONFIG_CASSINI is not set 541# CONFIG_CASSINI is not set
495# CONFIG_NET_VENDOR_3COM is not set 542# CONFIG_NET_VENDOR_3COM is not set
496
497#
498# Tulip family network device support
499#
500# CONFIG_NET_TULIP is not set 543# CONFIG_NET_TULIP is not set
501# CONFIG_HP100 is not set 544# CONFIG_HP100 is not set
545# CONFIG_IBM_NEW_EMAC_ZMII is not set
546# CONFIG_IBM_NEW_EMAC_RGMII is not set
547# CONFIG_IBM_NEW_EMAC_TAH is not set
548# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
502CONFIG_NET_PCI=y 549CONFIG_NET_PCI=y
503# CONFIG_PCNET32 is not set 550# CONFIG_PCNET32 is not set
504# CONFIG_AMD8111_ETH is not set 551# CONFIG_AMD8111_ETH is not set
505# CONFIG_ADAPTEC_STARFIRE is not set 552# CONFIG_ADAPTEC_STARFIRE is not set
506# CONFIG_B44 is not set 553# CONFIG_B44 is not set
507# CONFIG_FORCEDETH is not set 554# CONFIG_FORCEDETH is not set
508# CONFIG_DGRS is not set
509# CONFIG_EEPRO100 is not set 555# CONFIG_EEPRO100 is not set
510CONFIG_E100=y 556CONFIG_E100=y
511# CONFIG_FEALNX is not set 557# CONFIG_FEALNX is not set
@@ -518,46 +564,46 @@ CONFIG_E100=y
518# CONFIG_SUNDANCE is not set 564# CONFIG_SUNDANCE is not set
519# CONFIG_TLAN is not set 565# CONFIG_TLAN is not set
520# CONFIG_VIA_RHINE is not set 566# CONFIG_VIA_RHINE is not set
521 567# CONFIG_SC92031 is not set
522# 568CONFIG_NETDEV_1000=y
523# Ethernet (1000 Mbit)
524#
525# CONFIG_ACENIC is not set 569# CONFIG_ACENIC is not set
526# CONFIG_DL2K is not set 570# CONFIG_DL2K is not set
527# CONFIG_E1000 is not set 571# CONFIG_E1000 is not set
572# CONFIG_E1000E is not set
573# CONFIG_IP1000 is not set
528# CONFIG_NS83820 is not set 574# CONFIG_NS83820 is not set
529# CONFIG_HAMACHI is not set 575# CONFIG_HAMACHI is not set
530# CONFIG_YELLOWFIN is not set 576# CONFIG_YELLOWFIN is not set
531# CONFIG_R8169 is not set 577# CONFIG_R8169 is not set
532# CONFIG_SIS190 is not set 578# CONFIG_SIS190 is not set
533# CONFIG_SKGE is not set 579# CONFIG_SKGE is not set
580# CONFIG_SKY2 is not set
534# CONFIG_SK98LIN is not set 581# CONFIG_SK98LIN is not set
535# CONFIG_VIA_VELOCITY is not set 582# CONFIG_VIA_VELOCITY is not set
536# CONFIG_TIGON3 is not set 583# CONFIG_TIGON3 is not set
537# CONFIG_BNX2 is not set 584# CONFIG_BNX2 is not set
538CONFIG_GIANFAR=y 585CONFIG_GIANFAR=y
539CONFIG_GFAR_NAPI=y 586CONFIG_GFAR_NAPI=y
540 587# CONFIG_QLA3XXX is not set
541# 588# CONFIG_ATL1 is not set
542# Ethernet (10000 Mbit) 589CONFIG_NETDEV_10000=y
543#
544# CONFIG_CHELSIO_T1 is not set 590# CONFIG_CHELSIO_T1 is not set
591# CONFIG_CHELSIO_T3 is not set
592# CONFIG_IXGBE is not set
545# CONFIG_IXGB is not set 593# CONFIG_IXGB is not set
546# CONFIG_S2IO is not set 594# CONFIG_S2IO is not set
547 595# CONFIG_MYRI10GE is not set
548# 596# CONFIG_NETXEN_NIC is not set
549# Token Ring devices 597# CONFIG_NIU is not set
550# 598# CONFIG_MLX4_CORE is not set
599# CONFIG_TEHUTI is not set
551# CONFIG_TR is not set 600# CONFIG_TR is not set
552 601
553# 602#
554# Wireless LAN (non-hamradio) 603# Wireless LAN
555#
556# CONFIG_NET_RADIO is not set
557
558#
559# Wan interfaces
560# 604#
605# CONFIG_WLAN_PRE80211 is not set
606# CONFIG_WLAN_80211 is not set
561# CONFIG_WAN is not set 607# CONFIG_WAN is not set
562# CONFIG_FDDI is not set 608# CONFIG_FDDI is not set
563# CONFIG_HIPPI is not set 609# CONFIG_HIPPI is not set
@@ -567,28 +613,21 @@ CONFIG_GFAR_NAPI=y
567# CONFIG_NETCONSOLE is not set 613# CONFIG_NETCONSOLE is not set
568# CONFIG_NETPOLL is not set 614# CONFIG_NETPOLL is not set
569# CONFIG_NET_POLL_CONTROLLER is not set 615# CONFIG_NET_POLL_CONTROLLER is not set
570
571#
572# ISDN subsystem
573#
574# CONFIG_ISDN is not set 616# CONFIG_ISDN is not set
575
576#
577# Telephony Support
578#
579# CONFIG_PHONE is not set 617# CONFIG_PHONE is not set
580 618
581# 619#
582# Input device support 620# Input device support
583# 621#
584CONFIG_INPUT=y 622CONFIG_INPUT=y
623# CONFIG_INPUT_FF_MEMLESS is not set
624# CONFIG_INPUT_POLLDEV is not set
585 625
586# 626#
587# Userland interfaces 627# Userland interfaces
588# 628#
589# CONFIG_INPUT_MOUSEDEV is not set 629# CONFIG_INPUT_MOUSEDEV is not set
590# CONFIG_INPUT_JOYDEV is not set 630# CONFIG_INPUT_JOYDEV is not set
591# CONFIG_INPUT_TSDEV is not set
592# CONFIG_INPUT_EVDEV is not set 631# CONFIG_INPUT_EVDEV is not set
593# CONFIG_INPUT_EVBUG is not set 632# CONFIG_INPUT_EVBUG is not set
594 633
@@ -598,6 +637,7 @@ CONFIG_INPUT=y
598# CONFIG_INPUT_KEYBOARD is not set 637# CONFIG_INPUT_KEYBOARD is not set
599# CONFIG_INPUT_MOUSE is not set 638# CONFIG_INPUT_MOUSE is not set
600# CONFIG_INPUT_JOYSTICK is not set 639# CONFIG_INPUT_JOYSTICK is not set
640# CONFIG_INPUT_TABLET is not set
601# CONFIG_INPUT_TOUCHSCREEN is not set 641# CONFIG_INPUT_TOUCHSCREEN is not set
602# CONFIG_INPUT_MISC is not set 642# CONFIG_INPUT_MISC is not set
603 643
@@ -618,52 +658,35 @@ CONFIG_INPUT=y
618# 658#
619CONFIG_SERIAL_8250=y 659CONFIG_SERIAL_8250=y
620CONFIG_SERIAL_8250_CONSOLE=y 660CONFIG_SERIAL_8250_CONSOLE=y
661CONFIG_SERIAL_8250_PCI=y
621CONFIG_SERIAL_8250_NR_UARTS=4 662CONFIG_SERIAL_8250_NR_UARTS=4
663CONFIG_SERIAL_8250_RUNTIME_UARTS=4
622# CONFIG_SERIAL_8250_EXTENDED is not set 664# CONFIG_SERIAL_8250_EXTENDED is not set
665CONFIG_SERIAL_8250_SHARE_IRQ=y
623 666
624# 667#
625# Non-8250 serial port support 668# Non-8250 serial port support
626# 669#
670# CONFIG_SERIAL_UARTLITE is not set
627CONFIG_SERIAL_CORE=y 671CONFIG_SERIAL_CORE=y
628CONFIG_SERIAL_CORE_CONSOLE=y 672CONFIG_SERIAL_CORE_CONSOLE=y
629# CONFIG_SERIAL_JSM is not set 673# CONFIG_SERIAL_JSM is not set
674# CONFIG_SERIAL_OF_PLATFORM is not set
630CONFIG_UNIX98_PTYS=y 675CONFIG_UNIX98_PTYS=y
631CONFIG_LEGACY_PTYS=y 676CONFIG_LEGACY_PTYS=y
632CONFIG_LEGACY_PTY_COUNT=256 677CONFIG_LEGACY_PTY_COUNT=256
633
634#
635# IPMI
636#
637# CONFIG_IPMI_HANDLER is not set 678# CONFIG_IPMI_HANDLER is not set
638 679CONFIG_HW_RANDOM=y
639#
640# Watchdog Cards
641#
642# CONFIG_WATCHDOG is not set
643# CONFIG_NVRAM is not set 680# CONFIG_NVRAM is not set
644CONFIG_GEN_RTC=y 681CONFIG_GEN_RTC=y
645# CONFIG_GEN_RTC_X is not set 682# CONFIG_GEN_RTC_X is not set
646# CONFIG_DTLK is not set
647# CONFIG_R3964 is not set 683# CONFIG_R3964 is not set
648# CONFIG_APPLICOM is not set 684# CONFIG_APPLICOM is not set
649
650#
651# Ftape, the floppy tape device driver
652#
653# CONFIG_AGP is not set
654# CONFIG_DRM is not set
655# CONFIG_RAW_DRIVER is not set 685# CONFIG_RAW_DRIVER is not set
656
657#
658# TPM devices
659#
660# CONFIG_TCG_TPM is not set 686# CONFIG_TCG_TPM is not set
661# CONFIG_TELCLOCK is not set 687CONFIG_DEVPORT=y
662
663#
664# I2C support
665#
666CONFIG_I2C=y 688CONFIG_I2C=y
689CONFIG_I2C_BOARDINFO=y
667CONFIG_I2C_CHARDEV=y 690CONFIG_I2C_CHARDEV=y
668 691
669# 692#
@@ -686,56 +709,60 @@ CONFIG_I2C_CHARDEV=y
686# CONFIG_I2C_PIIX4 is not set 709# CONFIG_I2C_PIIX4 is not set
687CONFIG_I2C_MPC=y 710CONFIG_I2C_MPC=y
688# CONFIG_I2C_NFORCE2 is not set 711# CONFIG_I2C_NFORCE2 is not set
712# CONFIG_I2C_OCORES is not set
689# CONFIG_I2C_PARPORT_LIGHT is not set 713# CONFIG_I2C_PARPORT_LIGHT is not set
690# CONFIG_I2C_PROSAVAGE is not set 714# CONFIG_I2C_PROSAVAGE is not set
691# CONFIG_I2C_SAVAGE4 is not set 715# CONFIG_I2C_SAVAGE4 is not set
692# CONFIG_SCx200_ACB is not set 716# CONFIG_I2C_SIMTEC is not set
693# CONFIG_I2C_SIS5595 is not set 717# CONFIG_I2C_SIS5595 is not set
694# CONFIG_I2C_SIS630 is not set 718# CONFIG_I2C_SIS630 is not set
695# CONFIG_I2C_SIS96X is not set 719# CONFIG_I2C_SIS96X is not set
720# CONFIG_I2C_TAOS_EVM is not set
696# CONFIG_I2C_VIA is not set 721# CONFIG_I2C_VIA is not set
697# CONFIG_I2C_VIAPRO is not set 722# CONFIG_I2C_VIAPRO is not set
698# CONFIG_I2C_VOODOO3 is not set 723# CONFIG_I2C_VOODOO3 is not set
699# CONFIG_I2C_PCA_ISA is not set
700 724
701# 725#
702# Miscellaneous I2C Chip support 726# Miscellaneous I2C Chip support
703# 727#
704CONFIG_SENSORS_DS1337=y 728CONFIG_SENSORS_DS1337=y
705# CONFIG_SENSORS_DS1374 is not set 729# CONFIG_SENSORS_DS1374 is not set
730# CONFIG_DS1682 is not set
706# CONFIG_SENSORS_EEPROM is not set 731# CONFIG_SENSORS_EEPROM is not set
707# CONFIG_SENSORS_PCF8574 is not set 732# CONFIG_SENSORS_PCF8574 is not set
708# CONFIG_SENSORS_PCA9539 is not set 733# CONFIG_SENSORS_PCA9539 is not set
709# CONFIG_SENSORS_PCF8591 is not set 734# CONFIG_SENSORS_PCF8591 is not set
710# CONFIG_SENSORS_RTC8564 is not set
711# CONFIG_SENSORS_M41T00 is not set 735# CONFIG_SENSORS_M41T00 is not set
712# CONFIG_SENSORS_MAX6875 is not set 736# CONFIG_SENSORS_MAX6875 is not set
713# CONFIG_RTC_X1205_I2C is not set 737# CONFIG_SENSORS_TSL2550 is not set
714# CONFIG_I2C_DEBUG_CORE is not set 738# CONFIG_I2C_DEBUG_CORE is not set
715# CONFIG_I2C_DEBUG_ALGO is not set 739# CONFIG_I2C_DEBUG_ALGO is not set
716# CONFIG_I2C_DEBUG_BUS is not set 740# CONFIG_I2C_DEBUG_BUS is not set
717# CONFIG_I2C_DEBUG_CHIP is not set 741# CONFIG_I2C_DEBUG_CHIP is not set
718 742
719# 743#
720# Dallas's 1-wire bus 744# SPI support
721# 745#
746# CONFIG_SPI is not set
747# CONFIG_SPI_MASTER is not set
722# CONFIG_W1 is not set 748# CONFIG_W1 is not set
723 749# CONFIG_POWER_SUPPLY is not set
724#
725# Hardware Monitoring support
726#
727CONFIG_HWMON=y 750CONFIG_HWMON=y
728# CONFIG_HWMON_VID is not set 751# CONFIG_HWMON_VID is not set
752# CONFIG_SENSORS_AD7418 is not set
729# CONFIG_SENSORS_ADM1021 is not set 753# CONFIG_SENSORS_ADM1021 is not set
730# CONFIG_SENSORS_ADM1025 is not set 754# CONFIG_SENSORS_ADM1025 is not set
731# CONFIG_SENSORS_ADM1026 is not set 755# CONFIG_SENSORS_ADM1026 is not set
756# CONFIG_SENSORS_ADM1029 is not set
732# CONFIG_SENSORS_ADM1031 is not set 757# CONFIG_SENSORS_ADM1031 is not set
733# CONFIG_SENSORS_ADM9240 is not set 758# CONFIG_SENSORS_ADM9240 is not set
734# CONFIG_SENSORS_ASB100 is not set 759# CONFIG_SENSORS_ADT7470 is not set
735# CONFIG_SENSORS_ATXP1 is not set 760# CONFIG_SENSORS_ATXP1 is not set
736# CONFIG_SENSORS_DS1621 is not set 761# CONFIG_SENSORS_DS1621 is not set
737# CONFIG_SENSORS_FSCHER is not set 762# CONFIG_SENSORS_I5K_AMB is not set
738# CONFIG_SENSORS_FSCPOS is not set 763# CONFIG_SENSORS_F71805F is not set
764# CONFIG_SENSORS_F71882FG is not set
765# CONFIG_SENSORS_F75375S is not set
739# CONFIG_SENSORS_GL518SM is not set 766# CONFIG_SENSORS_GL518SM is not set
740# CONFIG_SENSORS_GL520SM is not set 767# CONFIG_SENSORS_GL520SM is not set
741# CONFIG_SENSORS_IT87 is not set 768# CONFIG_SENSORS_IT87 is not set
@@ -749,52 +776,75 @@ CONFIG_SENSORS_LM75=y
749# CONFIG_SENSORS_LM87 is not set 776# CONFIG_SENSORS_LM87 is not set
750# CONFIG_SENSORS_LM90 is not set 777# CONFIG_SENSORS_LM90 is not set
751# CONFIG_SENSORS_LM92 is not set 778# CONFIG_SENSORS_LM92 is not set
779# CONFIG_SENSORS_LM93 is not set
752# CONFIG_SENSORS_MAX1619 is not set 780# CONFIG_SENSORS_MAX1619 is not set
781# CONFIG_SENSORS_MAX6650 is not set
753# CONFIG_SENSORS_PC87360 is not set 782# CONFIG_SENSORS_PC87360 is not set
783# CONFIG_SENSORS_PC87427 is not set
754# CONFIG_SENSORS_SIS5595 is not set 784# CONFIG_SENSORS_SIS5595 is not set
785# CONFIG_SENSORS_DME1737 is not set
755# CONFIG_SENSORS_SMSC47M1 is not set 786# CONFIG_SENSORS_SMSC47M1 is not set
787# CONFIG_SENSORS_SMSC47M192 is not set
756# CONFIG_SENSORS_SMSC47B397 is not set 788# CONFIG_SENSORS_SMSC47B397 is not set
789# CONFIG_SENSORS_THMC50 is not set
757# CONFIG_SENSORS_VIA686A is not set 790# CONFIG_SENSORS_VIA686A is not set
791# CONFIG_SENSORS_VT1211 is not set
792# CONFIG_SENSORS_VT8231 is not set
758# CONFIG_SENSORS_W83781D is not set 793# CONFIG_SENSORS_W83781D is not set
794# CONFIG_SENSORS_W83791D is not set
759# CONFIG_SENSORS_W83792D is not set 795# CONFIG_SENSORS_W83792D is not set
796# CONFIG_SENSORS_W83793 is not set
760# CONFIG_SENSORS_W83L785TS is not set 797# CONFIG_SENSORS_W83L785TS is not set
761# CONFIG_SENSORS_W83627HF is not set 798# CONFIG_SENSORS_W83627HF is not set
762# CONFIG_SENSORS_W83627EHF is not set 799# CONFIG_SENSORS_W83627EHF is not set
763CONFIG_HWMON_DEBUG_CHIP=y 800CONFIG_HWMON_DEBUG_CHIP=y
801# CONFIG_WATCHDOG is not set
764 802
765# 803#
766# Misc devices 804# Sonics Silicon Backplane
767# 805#
806CONFIG_SSB_POSSIBLE=y
807# CONFIG_SSB is not set
768 808
769# 809#
770# Multimedia Capabilities Port drivers 810# Multifunction device drivers
771# 811#
812# CONFIG_MFD_SM501 is not set
772 813
773# 814#
774# Multimedia devices 815# Multimedia devices
775# 816#
776# CONFIG_VIDEO_DEV is not set 817# CONFIG_VIDEO_DEV is not set
777 818# CONFIG_DVB_CORE is not set
778# 819CONFIG_DAB=y
779# Digital Video Broadcasting Devices
780#
781# CONFIG_DVB is not set
782 820
783# 821#
784# Graphics support 822# Graphics support
785# 823#
824# CONFIG_AGP is not set
825# CONFIG_DRM is not set
826# CONFIG_VGASTATE is not set
827# CONFIG_VIDEO_OUTPUT_CONTROL is not set
786# CONFIG_FB is not set 828# CONFIG_FB is not set
829# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
787 830
788# 831#
789# Sound 832# Display device support
790# 833#
791# CONFIG_SOUND is not set 834# CONFIG_DISPLAY_SUPPORT is not set
792 835
793# 836#
794# USB support 837# Sound
795# 838#
839# CONFIG_SOUND is not set
840CONFIG_HID_SUPPORT=y
841CONFIG_HID=y
842# CONFIG_HID_DEBUG is not set
843# CONFIG_HIDRAW is not set
844CONFIG_USB_SUPPORT=y
796CONFIG_USB_ARCH_HAS_HCD=y 845CONFIG_USB_ARCH_HAS_HCD=y
797CONFIG_USB_ARCH_HAS_OHCI=y 846CONFIG_USB_ARCH_HAS_OHCI=y
847CONFIG_USB_ARCH_HAS_EHCI=y
798# CONFIG_USB is not set 848# CONFIG_USB is not set
799 849
800# 850#
@@ -805,20 +855,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
805# USB Gadget Support 855# USB Gadget Support
806# 856#
807# CONFIG_USB_GADGET is not set 857# CONFIG_USB_GADGET is not set
808
809#
810# MMC/SD Card support
811#
812# CONFIG_MMC is not set 858# CONFIG_MMC is not set
813 859# CONFIG_NEW_LEDS is not set
814#
815# InfiniBand support
816#
817# CONFIG_INFINIBAND is not set 860# CONFIG_INFINIBAND is not set
861# CONFIG_EDAC is not set
862# CONFIG_RTC_CLASS is not set
818 863
819# 864#
820# SN Devices 865# Userspace I/O
821# 866#
867# CONFIG_UIO is not set
822 868
823# 869#
824# File systems 870# File systems
@@ -830,16 +876,19 @@ CONFIG_EXT3_FS=y
830CONFIG_EXT3_FS_XATTR=y 876CONFIG_EXT3_FS_XATTR=y
831# CONFIG_EXT3_FS_POSIX_ACL is not set 877# CONFIG_EXT3_FS_POSIX_ACL is not set
832# CONFIG_EXT3_FS_SECURITY is not set 878# CONFIG_EXT3_FS_SECURITY is not set
879# CONFIG_EXT4DEV_FS is not set
833CONFIG_JBD=y 880CONFIG_JBD=y
834# CONFIG_JBD_DEBUG is not set
835CONFIG_FS_MBCACHE=y 881CONFIG_FS_MBCACHE=y
836# CONFIG_REISERFS_FS is not set 882# CONFIG_REISERFS_FS is not set
837# CONFIG_JFS_FS is not set 883# CONFIG_JFS_FS is not set
838# CONFIG_FS_POSIX_ACL is not set 884# CONFIG_FS_POSIX_ACL is not set
839# CONFIG_XFS_FS is not set 885# CONFIG_XFS_FS is not set
886# CONFIG_GFS2_FS is not set
887# CONFIG_OCFS2_FS is not set
840# CONFIG_MINIX_FS is not set 888# CONFIG_MINIX_FS is not set
841# CONFIG_ROMFS_FS is not set 889# CONFIG_ROMFS_FS is not set
842CONFIG_INOTIFY=y 890CONFIG_INOTIFY=y
891CONFIG_INOTIFY_USER=y
843# CONFIG_QUOTA is not set 892# CONFIG_QUOTA is not set
844CONFIG_DNOTIFY=y 893CONFIG_DNOTIFY=y
845# CONFIG_AUTOFS_FS is not set 894# CONFIG_AUTOFS_FS is not set
@@ -864,11 +913,12 @@ CONFIG_DNOTIFY=y
864# 913#
865CONFIG_PROC_FS=y 914CONFIG_PROC_FS=y
866CONFIG_PROC_KCORE=y 915CONFIG_PROC_KCORE=y
916CONFIG_PROC_SYSCTL=y
867CONFIG_SYSFS=y 917CONFIG_SYSFS=y
868CONFIG_TMPFS=y 918CONFIG_TMPFS=y
919# CONFIG_TMPFS_POSIX_ACL is not set
869# CONFIG_HUGETLB_PAGE is not set 920# CONFIG_HUGETLB_PAGE is not set
870CONFIG_RAMFS=y 921# CONFIG_CONFIGFS_FS is not set
871# CONFIG_RELAYFS_FS is not set
872 922
873# 923#
874# Miscellaneous filesystems 924# Miscellaneous filesystems
@@ -880,13 +930,15 @@ CONFIG_RAMFS=y
880# CONFIG_BEFS_FS is not set 930# CONFIG_BEFS_FS is not set
881# CONFIG_BFS_FS is not set 931# CONFIG_BFS_FS is not set
882# CONFIG_EFS_FS is not set 932# CONFIG_EFS_FS is not set
883# CONFIG_JFFS_FS is not set
884CONFIG_JFFS2_FS=y 933CONFIG_JFFS2_FS=y
885CONFIG_JFFS2_FS_DEBUG=0 934CONFIG_JFFS2_FS_DEBUG=0
886CONFIG_JFFS2_FS_WRITEBUFFER=y 935CONFIG_JFFS2_FS_WRITEBUFFER=y
936# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
887# CONFIG_JFFS2_SUMMARY is not set 937# CONFIG_JFFS2_SUMMARY is not set
938# CONFIG_JFFS2_FS_XATTR is not set
888# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 939# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
889CONFIG_JFFS2_ZLIB=y 940CONFIG_JFFS2_ZLIB=y
941# CONFIG_JFFS2_LZO is not set
890CONFIG_JFFS2_RTIME=y 942CONFIG_JFFS2_RTIME=y
891# CONFIG_JFFS2_RUBIN is not set 943# CONFIG_JFFS2_RUBIN is not set
892CONFIG_CRAMFS=y 944CONFIG_CRAMFS=y
@@ -895,10 +947,7 @@ CONFIG_CRAMFS=y
895# CONFIG_QNX4FS_FS is not set 947# CONFIG_QNX4FS_FS is not set
896# CONFIG_SYSV_FS is not set 948# CONFIG_SYSV_FS is not set
897# CONFIG_UFS_FS is not set 949# CONFIG_UFS_FS is not set
898 950CONFIG_NETWORK_FILESYSTEMS=y
899#
900# Network File Systems
901#
902CONFIG_NFS_FS=y 951CONFIG_NFS_FS=y
903# CONFIG_NFS_V3 is not set 952# CONFIG_NFS_V3 is not set
904# CONFIG_NFS_V4 is not set 953# CONFIG_NFS_V4 is not set
@@ -908,6 +957,7 @@ CONFIG_ROOT_NFS=y
908CONFIG_LOCKD=y 957CONFIG_LOCKD=y
909CONFIG_NFS_COMMON=y 958CONFIG_NFS_COMMON=y
910CONFIG_SUNRPC=y 959CONFIG_SUNRPC=y
960# CONFIG_SUNRPC_BIND34 is not set
911# CONFIG_RPCSEC_GSS_KRB5 is not set 961# CONFIG_RPCSEC_GSS_KRB5 is not set
912# CONFIG_RPCSEC_GSS_SPKM3 is not set 962# CONFIG_RPCSEC_GSS_SPKM3 is not set
913# CONFIG_SMB_FS is not set 963# CONFIG_SMB_FS is not set
@@ -915,7 +965,6 @@ CONFIG_SUNRPC=y
915# CONFIG_NCP_FS is not set 965# CONFIG_NCP_FS is not set
916# CONFIG_CODA_FS is not set 966# CONFIG_CODA_FS is not set
917# CONFIG_AFS_FS is not set 967# CONFIG_AFS_FS is not set
918# CONFIG_9P_FS is not set
919 968
920# 969#
921# Partition Types 970# Partition Types
@@ -931,43 +980,53 @@ CONFIG_PARTITION_ADVANCED=y
931# CONFIG_SGI_PARTITION is not set 980# CONFIG_SGI_PARTITION is not set
932# CONFIG_ULTRIX_PARTITION is not set 981# CONFIG_ULTRIX_PARTITION is not set
933# CONFIG_SUN_PARTITION is not set 982# CONFIG_SUN_PARTITION is not set
983# CONFIG_KARMA_PARTITION is not set
934# CONFIG_EFI_PARTITION is not set 984# CONFIG_EFI_PARTITION is not set
935 985# CONFIG_SYSV68_PARTITION is not set
936#
937# Native Language Support
938#
939# CONFIG_NLS is not set 986# CONFIG_NLS is not set
987# CONFIG_DLM is not set
940 988
941# 989#
942# Library routines 990# Library routines
943# 991#
992CONFIG_BITREVERSE=y
944# CONFIG_CRC_CCITT is not set 993# CONFIG_CRC_CCITT is not set
945# CONFIG_CRC16 is not set 994# CONFIG_CRC16 is not set
995# CONFIG_CRC_ITU_T is not set
946CONFIG_CRC32=y 996CONFIG_CRC32=y
997# CONFIG_CRC7 is not set
947# CONFIG_LIBCRC32C is not set 998# CONFIG_LIBCRC32C is not set
948CONFIG_ZLIB_INFLATE=y 999CONFIG_ZLIB_INFLATE=y
949CONFIG_ZLIB_DEFLATE=y 1000CONFIG_ZLIB_DEFLATE=y
1001CONFIG_PLIST=y
1002CONFIG_HAS_IOMEM=y
1003CONFIG_HAS_IOPORT=y
1004CONFIG_HAS_DMA=y
1005CONFIG_INSTRUMENTATION=y
950# CONFIG_PROFILING is not set 1006# CONFIG_PROFILING is not set
1007# CONFIG_MARKERS is not set
951 1008
952# 1009#
953# Kernel hacking 1010# Kernel hacking
954# 1011#
955# CONFIG_PRINTK_TIME is not set 1012# CONFIG_PRINTK_TIME is not set
1013CONFIG_ENABLE_WARN_DEPRECATED=y
1014CONFIG_ENABLE_MUST_CHECK=y
1015# CONFIG_MAGIC_SYSRQ is not set
1016# CONFIG_UNUSED_SYMBOLS is not set
1017# CONFIG_DEBUG_FS is not set
1018# CONFIG_HEADERS_CHECK is not set
956# CONFIG_DEBUG_KERNEL is not set 1019# CONFIG_DEBUG_KERNEL is not set
957CONFIG_LOG_BUF_SHIFT=14 1020# CONFIG_SLUB_DEBUG_ON is not set
958# CONFIG_SERIAL_TEXT_DEBUG is not set 1021# CONFIG_DEBUG_BUGVERBOSE is not set
1022# CONFIG_SAMPLES is not set
1023# CONFIG_PPC_EARLY_DEBUG is not set
959 1024
960# 1025#
961# Security options 1026# Security options
962# 1027#
963# CONFIG_KEYS is not set 1028# CONFIG_KEYS is not set
964# CONFIG_SECURITY is not set 1029# CONFIG_SECURITY is not set
965 1030# CONFIG_SECURITY_FILE_CAPABILITIES is not set
966#
967# Cryptographic options
968#
969# CONFIG_CRYPTO is not set 1031# CONFIG_CRYPTO is not set
970 1032# CONFIG_PPC_CLOCK is not set
971#
972# Hardware crypto devices
973#
diff --git a/arch/ppc/configs/TQM8541_defconfig b/arch/powerpc/configs/tqm8541_defconfig
index e00cd62daa3f..1aff35f0c53a 100644
--- a/arch/ppc/configs/TQM8541_defconfig
+++ b/arch/powerpc/configs/tqm8541_defconfig
@@ -1,66 +1,116 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.24-rc8
4# Wed Nov 30 13:36:28 2005 4# Fri Jan 25 01:31:28 2008
5# 5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
6CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
10CONFIG_PPC=y 40CONFIG_PPC=y
11CONFIG_PPC32=y 41CONFIG_EARLY_PRINTK=y
12CONFIG_GENERIC_NVRAM=y 42CONFIG_GENERIC_NVRAM=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y 44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 55
16# 56#
17# Code maturity level options 57# General setup
18# 58#
19CONFIG_EXPERIMENTAL=y 59CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 60CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 61CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION="" 62CONFIG_LOCALVERSION=""
28CONFIG_LOCALVERSION_AUTO=y 63CONFIG_LOCALVERSION_AUTO=y
29CONFIG_SWAP=y 64CONFIG_SWAP=y
30CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
31# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
32# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
34# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
35# CONFIG_HOTPLUG is not set
36CONFIG_KOBJECT_UEVENT=y
37# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
38CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
39CONFIG_EMBEDDED=y 85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
40# CONFIG_KALLSYMS is not set 87# CONFIG_KALLSYMS is not set
88# CONFIG_HOTPLUG is not set
41CONFIG_PRINTK=y 89CONFIG_PRINTK=y
42CONFIG_BUG=y 90CONFIG_BUG=y
91CONFIG_ELF_CORE=y
43CONFIG_BASE_FULL=y 92CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 93CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y
45# CONFIG_EPOLL is not set 95# CONFIG_EPOLL is not set
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 96CONFIG_SIGNALFD=y
97CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 98CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 99CONFIG_VM_EVENT_COUNTERS=y
49CONFIG_CC_ALIGN_LABELS=0 100CONFIG_SLUB_DEBUG=y
50CONFIG_CC_ALIGN_LOOPS=0 101# CONFIG_SLAB is not set
51CONFIG_CC_ALIGN_JUMPS=0 102CONFIG_SLUB=y
103# CONFIG_SLOB is not set
104CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58# CONFIG_MODULES is not set 108# CONFIG_MODULES is not set
59 109CONFIG_BLOCK=y
60#
61# Block layer
62#
63# CONFIG_LBD is not set 110# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_LSF is not set
113# CONFIG_BLK_DEV_BSG is not set
64 114
65# 115#
66# IO Schedulers 116# IO Schedulers
@@ -76,56 +126,63 @@ CONFIG_DEFAULT_AS=y
76CONFIG_DEFAULT_IOSCHED="anticipatory" 126CONFIG_DEFAULT_IOSCHED="anticipatory"
77 127
78# 128#
79# Processor 129# Platform support
80#
81# CONFIG_6xx is not set
82# CONFIG_40x is not set
83# CONFIG_44x is not set
84# CONFIG_POWER3 is not set
85# CONFIG_POWER4 is not set
86# CONFIG_8xx is not set
87# CONFIG_E200 is not set
88CONFIG_E500=y
89CONFIG_BOOKE=y
90CONFIG_FSL_BOOKE=y
91# CONFIG_PHYS_64BIT is not set
92CONFIG_SPE=y
93CONFIG_MATH_EMULATION=y
94# CONFIG_KEXEC is not set
95# CONFIG_CPU_FREQ is not set
96# CONFIG_WANT_EARLY_SERIAL is not set
97CONFIG_PPC_GEN550=y
98CONFIG_85xx=y
99CONFIG_PPC_INDIRECT_PCI_BE=y
100
101#
102# Freescale 85xx options
103# 130#
131# CONFIG_PPC_MPC52xx is not set
132# CONFIG_PPC_MPC5200 is not set
133# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set
104# CONFIG_MPC8540_ADS is not set 136# CONFIG_MPC8540_ADS is not set
105# CONFIG_MPC8548_CDS is not set
106# CONFIG_MPC8555_CDS is not set
107# CONFIG_MPC8560_ADS is not set 137# CONFIG_MPC8560_ADS is not set
108# CONFIG_SBC8560 is not set 138# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set
109# CONFIG_STX_GP3 is not set 141# CONFIG_STX_GP3 is not set
110# CONFIG_TQM8540 is not set 142# CONFIG_TQM8540 is not set
111CONFIG_TQM8541=y 143CONFIG_TQM8541=y
112# CONFIG_TQM8555 is not set 144# CONFIG_TQM8555 is not set
113# CONFIG_TQM8560 is not set 145# CONFIG_TQM8560 is not set
114CONFIG_MPC8555=y 146CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set
149CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set
152# CONFIG_PPC_RTAS is not set
153# CONFIG_MMIO_NVRAM is not set
154# CONFIG_PPC_MPC106 is not set
155# CONFIG_PPC_970_NAP is not set
156# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set
159CONFIG_CPM2=y
160CONFIG_PPC_CPM_NEW_BINDING=y
161# CONFIG_FSL_ULI1575 is not set
162CONFIG_CPM=y
115 163
116# 164#
117# Platform options 165# Kernel options
118# 166#
119CONFIG_CPM2=y
120# CONFIG_PC_KEYBOARD is not set
121# CONFIG_HIGHMEM is not set 167# CONFIG_HIGHMEM is not set
168# CONFIG_TICK_ONESHOT is not set
169# CONFIG_NO_HZ is not set
170# CONFIG_HIGH_RES_TIMERS is not set
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
122# CONFIG_HZ_100 is not set 172# CONFIG_HZ_100 is not set
123CONFIG_HZ_250=y 173CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set
124# CONFIG_HZ_1000 is not set 175# CONFIG_HZ_1000 is not set
125CONFIG_HZ=250 176CONFIG_HZ=250
126CONFIG_PREEMPT_NONE=y 177CONFIG_PREEMPT_NONE=y
127# CONFIG_PREEMPT_VOLUNTARY is not set 178# CONFIG_PREEMPT_VOLUNTARY is not set
128# CONFIG_PREEMPT is not set 179# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set
182CONFIG_MATH_EMULATION=y
183CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
184CONFIG_ARCH_FLATMEM_ENABLE=y
185CONFIG_ARCH_POPULATES_NODE_MAP=y
129CONFIG_SELECT_MEMORY_MODEL=y 186CONFIG_SELECT_MEMORY_MODEL=y
130CONFIG_FLATMEM_MANUAL=y 187CONFIG_FLATMEM_MANUAL=y
131# CONFIG_DISCONTIGMEM_MANUAL is not set 188# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -133,28 +190,36 @@ CONFIG_FLATMEM_MANUAL=y
133CONFIG_FLATMEM=y 190CONFIG_FLATMEM=y
134CONFIG_FLAT_NODE_MEM_MAP=y 191CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
193# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 194CONFIG_SPLIT_PTLOCK_CPUS=4
137CONFIG_BINFMT_ELF=y 195# CONFIG_RESOURCES_64BIT is not set
138# CONFIG_BINFMT_MISC is not set 196CONFIG_ZONE_DMA_FLAG=1
197CONFIG_BOUNCE=y
198CONFIG_VIRT_TO_BUS=y
199# CONFIG_PROC_DEVICETREE is not set
139# CONFIG_CMDLINE_BOOL is not set 200# CONFIG_CMDLINE_BOOL is not set
140# CONFIG_PM is not set 201# CONFIG_PM is not set
141# CONFIG_HIBERNATION is not set 202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
142CONFIG_SECCOMP=y 204CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="tqm8541.dts"
143CONFIG_ISA_DMA_API=y 207CONFIG_ISA_DMA_API=y
144 208
145# 209#
146# Bus options 210# Bus options
147# 211#
148CONFIG_PPC_I8259=y 212CONFIG_ZONE_DMA=y
149CONFIG_PPC_INDIRECT_PCI=y 213CONFIG_PPC_INDIRECT_PCI=y
214CONFIG_FSL_SOC=y
215CONFIG_FSL_PCI=y
150CONFIG_PCI=y 216CONFIG_PCI=y
151CONFIG_PCI_DOMAINS=y 217CONFIG_PCI_DOMAINS=y
152# CONFIG_PCI_LEGACY_PROC is not set 218CONFIG_PCI_SYSCALL=y
153 219# CONFIG_PCIEPORTBUS is not set
154# 220CONFIG_ARCH_SUPPORTS_MSI=y
155# PCCARD (PCMCIA/CardBus) support 221# CONFIG_PCI_MSI is not set
156# 222CONFIG_PCI_LEGACY=y
157# CONFIG_PCCARD is not set
158 223
159# 224#
160# Advanced setup 225# Advanced setup
@@ -167,7 +232,7 @@ CONFIG_PCI_DOMAINS=y
167CONFIG_HIGHMEM_START=0xfe000000 232CONFIG_HIGHMEM_START=0xfe000000
168CONFIG_LOWMEM_SIZE=0x30000000 233CONFIG_LOWMEM_SIZE=0x30000000
169CONFIG_KERNEL_START=0xc0000000 234CONFIG_KERNEL_START=0xc0000000
170CONFIG_TASK_SIZE=0x80000000 235CONFIG_TASK_SIZE=0xc0000000
171CONFIG_BOOT_LOAD=0x00800000 236CONFIG_BOOT_LOAD=0x00800000
172 237
173# 238#
@@ -181,6 +246,10 @@ CONFIG_NET=y
181CONFIG_PACKET=y 246CONFIG_PACKET=y
182# CONFIG_PACKET_MMAP is not set 247# CONFIG_PACKET_MMAP is not set
183CONFIG_UNIX=y 248CONFIG_UNIX=y
249CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set
184# CONFIG_NET_KEY is not set 253# CONFIG_NET_KEY is not set
185CONFIG_INET=y 254CONFIG_INET=y
186CONFIG_IP_MULTICAST=y 255CONFIG_IP_MULTICAST=y
@@ -198,23 +267,26 @@ CONFIG_SYN_COOKIES=y
198# CONFIG_INET_AH is not set 267# CONFIG_INET_AH is not set
199# CONFIG_INET_ESP is not set 268# CONFIG_INET_ESP is not set
200# CONFIG_INET_IPCOMP is not set 269# CONFIG_INET_IPCOMP is not set
270# CONFIG_INET_XFRM_TUNNEL is not set
201# CONFIG_INET_TUNNEL is not set 271# CONFIG_INET_TUNNEL is not set
272CONFIG_INET_XFRM_MODE_TRANSPORT=y
273CONFIG_INET_XFRM_MODE_TUNNEL=y
274CONFIG_INET_XFRM_MODE_BEET=y
275# CONFIG_INET_LRO is not set
202CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
203CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
204# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
205CONFIG_TCP_CONG_BIC=y 279CONFIG_TCP_CONG_CUBIC=y
280CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_TCP_MD5SIG is not set
206# CONFIG_IPV6 is not set 282# CONFIG_IPV6 is not set
283# CONFIG_INET6_XFRM_TUNNEL is not set
284# CONFIG_INET6_TUNNEL is not set
285# CONFIG_NETWORK_SECMARK is not set
207# CONFIG_NETFILTER is not set 286# CONFIG_NETFILTER is not set
208
209#
210# DCCP Configuration (EXPERIMENTAL)
211#
212# CONFIG_IP_DCCP is not set 287# CONFIG_IP_DCCP is not set
213
214#
215# SCTP Configuration (EXPERIMENTAL)
216#
217# CONFIG_IP_SCTP is not set 288# CONFIG_IP_SCTP is not set
289# CONFIG_TIPC is not set
218# CONFIG_ATM is not set 290# CONFIG_ATM is not set
219# CONFIG_BRIDGE is not set 291# CONFIG_BRIDGE is not set
220# CONFIG_VLAN_8021Q is not set 292# CONFIG_VLAN_8021Q is not set
@@ -224,13 +296,8 @@ CONFIG_TCP_CONG_BIC=y
224# CONFIG_ATALK is not set 296# CONFIG_ATALK is not set
225# CONFIG_X25 is not set 297# CONFIG_X25 is not set
226# CONFIG_LAPB is not set 298# CONFIG_LAPB is not set
227# CONFIG_NET_DIVERT is not set
228# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
229# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
230
231#
232# QoS and/or fair queueing
233#
234# CONFIG_NET_SCHED is not set 301# CONFIG_NET_SCHED is not set
235 302
236# 303#
@@ -240,7 +307,17 @@ CONFIG_TCP_CONG_BIC=y
240# CONFIG_HAMRADIO is not set 307# CONFIG_HAMRADIO is not set
241# CONFIG_IRDA is not set 308# CONFIG_IRDA is not set
242# CONFIG_BT is not set 309# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set
311
312#
313# Wireless
314#
315# CONFIG_CFG80211 is not set
316# CONFIG_WIRELESS_EXT is not set
317# CONFIG_MAC80211 is not set
243# CONFIG_IEEE80211 is not set 318# CONFIG_IEEE80211 is not set
319# CONFIG_RFKILL is not set
320# CONFIG_NET_9P is not set
244 321
245# 322#
246# Device Drivers 323# Device Drivers
@@ -251,16 +328,8 @@ CONFIG_TCP_CONG_BIC=y
251# 328#
252CONFIG_STANDALONE=y 329CONFIG_STANDALONE=y
253CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
254# CONFIG_FW_LOADER is not set 331# CONFIG_SYS_HYPERVISOR is not set
255
256#
257# Connector - unified userspace <-> kernelspace linker
258#
259# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
260
261#
262# Memory Technology Devices (MTD)
263#
264CONFIG_MTD=y 333CONFIG_MTD=y
265# CONFIG_MTD_DEBUG is not set 334# CONFIG_MTD_DEBUG is not set
266CONFIG_MTD_CONCAT=y 335CONFIG_MTD_CONCAT=y
@@ -272,11 +341,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
272# User Modules And Translation Layers 341# User Modules And Translation Layers
273# 342#
274CONFIG_MTD_CHAR=y 343CONFIG_MTD_CHAR=y
344CONFIG_MTD_BLKDEVS=y
275CONFIG_MTD_BLOCK=y 345CONFIG_MTD_BLOCK=y
276# CONFIG_FTL is not set 346# CONFIG_FTL is not set
277# CONFIG_NFTL is not set 347# CONFIG_NFTL is not set
278# CONFIG_INFTL is not set 348# CONFIG_INFTL is not set
279# CONFIG_RFD_FTL is not set 349# CONFIG_RFD_FTL is not set
350# CONFIG_SSFDC is not set
351# CONFIG_MTD_OOPS is not set
280 352
281# 353#
282# RAM/ROM/Flash chip drivers 354# RAM/ROM/Flash chip drivers
@@ -297,7 +369,6 @@ CONFIG_MTD_CFI_I2=y
297# CONFIG_MTD_CFI_I8 is not set 369# CONFIG_MTD_CFI_I8 is not set
298# CONFIG_MTD_CFI_INTELEXT is not set 370# CONFIG_MTD_CFI_INTELEXT is not set
299CONFIG_MTD_CFI_AMDSTD=y 371CONFIG_MTD_CFI_AMDSTD=y
300CONFIG_MTD_CFI_AMDSTD_RETRY=0
301# CONFIG_MTD_CFI_STAA is not set 372# CONFIG_MTD_CFI_STAA is not set
302CONFIG_MTD_CFI_UTIL=y 373CONFIG_MTD_CFI_UTIL=y
303# CONFIG_MTD_RAM is not set 374# CONFIG_MTD_RAM is not set
@@ -309,7 +380,8 @@ CONFIG_MTD_CFI_UTIL=y
309# 380#
310# CONFIG_MTD_COMPLEX_MAPPINGS is not set 381# CONFIG_MTD_COMPLEX_MAPPINGS is not set
311# CONFIG_MTD_PHYSMAP is not set 382# CONFIG_MTD_PHYSMAP is not set
312CONFIG_MTD_TQM85xx=y 383# CONFIG_MTD_PHYSMAP_OF is not set
384# CONFIG_MTD_INTEL_VR_NOR is not set
313# CONFIG_MTD_PLATRAM is not set 385# CONFIG_MTD_PLATRAM is not set
314 386
315# 387#
@@ -319,7 +391,6 @@ CONFIG_MTD_TQM85xx=y
319# CONFIG_MTD_SLRAM is not set 391# CONFIG_MTD_SLRAM is not set
320# CONFIG_MTD_PHRAM is not set 392# CONFIG_MTD_PHRAM is not set
321# CONFIG_MTD_MTDRAM is not set 393# CONFIG_MTD_MTDRAM is not set
322# CONFIG_MTD_BLKMTD is not set
323# CONFIG_MTD_BLOCK2MTD is not set 394# CONFIG_MTD_BLOCK2MTD is not set
324 395
325# 396#
@@ -328,29 +399,16 @@ CONFIG_MTD_TQM85xx=y
328# CONFIG_MTD_DOC2000 is not set 399# CONFIG_MTD_DOC2000 is not set
329# CONFIG_MTD_DOC2001 is not set 400# CONFIG_MTD_DOC2001 is not set
330# CONFIG_MTD_DOC2001PLUS is not set 401# CONFIG_MTD_DOC2001PLUS is not set
331
332#
333# NAND Flash Device Drivers
334#
335# CONFIG_MTD_NAND is not set 402# CONFIG_MTD_NAND is not set
336
337#
338# OneNAND Flash Device Drivers
339#
340# CONFIG_MTD_ONENAND is not set 403# CONFIG_MTD_ONENAND is not set
341 404
342# 405#
343# Parallel port support 406# UBI - Unsorted block images
344# 407#
408# CONFIG_MTD_UBI is not set
409CONFIG_OF_DEVICE=y
345# CONFIG_PARPORT is not set 410# CONFIG_PARPORT is not set
346 411CONFIG_BLK_DEV=y
347#
348# Plug and Play support
349#
350
351#
352# Block devices
353#
354# CONFIG_BLK_DEV_FD is not set 412# CONFIG_BLK_DEV_FD is not set
355# CONFIG_BLK_CPQ_DA is not set 413# CONFIG_BLK_CPQ_DA is not set
356# CONFIG_BLK_CPQ_CISS_DA is not set 414# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,14 +422,16 @@ CONFIG_BLK_DEV_LOOP=y
364CONFIG_BLK_DEV_RAM=y 422CONFIG_BLK_DEV_RAM=y
365CONFIG_BLK_DEV_RAM_COUNT=16 423CONFIG_BLK_DEV_RAM_COUNT=16
366CONFIG_BLK_DEV_RAM_SIZE=32768 424CONFIG_BLK_DEV_RAM_SIZE=32768
367CONFIG_BLK_DEV_INITRD=y 425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
368# CONFIG_CDROM_PKTCDVD is not set 426# CONFIG_CDROM_PKTCDVD is not set
369# CONFIG_ATA_OVER_ETH is not set 427# CONFIG_ATA_OVER_ETH is not set
370 428CONFIG_MISC_DEVICES=y
371# 429# CONFIG_PHANTOM is not set
372# ATA/ATAPI/MFM/RLL support 430# CONFIG_EEPROM_93CX6 is not set
373# 431# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set
374CONFIG_IDE=y 433CONFIG_IDE=y
434CONFIG_IDE_MAX_HWIFS=4
375CONFIG_BLK_DEV_IDE=y 435CONFIG_BLK_DEV_IDE=y
376 436
377# 437#
@@ -384,21 +444,24 @@ CONFIG_BLK_DEV_IDEDISK=y
384# CONFIG_BLK_DEV_IDETAPE is not set 444# CONFIG_BLK_DEV_IDETAPE is not set
385# CONFIG_BLK_DEV_IDEFLOPPY is not set 445# CONFIG_BLK_DEV_IDEFLOPPY is not set
386# CONFIG_IDE_TASK_IOCTL is not set 446# CONFIG_IDE_TASK_IOCTL is not set
447CONFIG_IDE_PROC_FS=y
387 448
388# 449#
389# IDE chipset support/bugfixes 450# IDE chipset support/bugfixes
390# 451#
391CONFIG_IDE_GENERIC=y 452CONFIG_IDE_GENERIC=y
453# CONFIG_BLK_DEV_PLATFORM is not set
454
455#
456# PCI IDE chipsets support
457#
392CONFIG_BLK_DEV_IDEPCI=y 458CONFIG_BLK_DEV_IDEPCI=y
393CONFIG_IDEPCI_SHARE_IRQ=y 459CONFIG_IDEPCI_SHARE_IRQ=y
460CONFIG_IDEPCI_PCIBUS_ORDER=y
394# CONFIG_BLK_DEV_OFFBOARD is not set 461# CONFIG_BLK_DEV_OFFBOARD is not set
395CONFIG_BLK_DEV_GENERIC=y 462CONFIG_BLK_DEV_GENERIC=y
396# CONFIG_BLK_DEV_OPTI621 is not set 463# CONFIG_BLK_DEV_OPTI621 is not set
397# CONFIG_BLK_DEV_SL82C105 is not set
398CONFIG_BLK_DEV_IDEDMA_PCI=y 464CONFIG_BLK_DEV_IDEDMA_PCI=y
399# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
400CONFIG_IDEDMA_PCI_AUTO=y
401# CONFIG_IDEDMA_ONLYDISK is not set
402# CONFIG_BLK_DEV_AEC62XX is not set 465# CONFIG_BLK_DEV_AEC62XX is not set
403# CONFIG_BLK_DEV_ALI15X3 is not set 466# CONFIG_BLK_DEV_ALI15X3 is not set
404# CONFIG_BLK_DEV_AMD74XX is not set 467# CONFIG_BLK_DEV_AMD74XX is not set
@@ -409,21 +472,24 @@ CONFIG_IDEDMA_PCI_AUTO=y
409# CONFIG_BLK_DEV_CS5530 is not set 472# CONFIG_BLK_DEV_CS5530 is not set
410# CONFIG_BLK_DEV_HPT34X is not set 473# CONFIG_BLK_DEV_HPT34X is not set
411# CONFIG_BLK_DEV_HPT366 is not set 474# CONFIG_BLK_DEV_HPT366 is not set
475# CONFIG_BLK_DEV_JMICRON is not set
412# CONFIG_BLK_DEV_SC1200 is not set 476# CONFIG_BLK_DEV_SC1200 is not set
413# CONFIG_BLK_DEV_PIIX is not set 477# CONFIG_BLK_DEV_PIIX is not set
478# CONFIG_BLK_DEV_IT8213 is not set
414# CONFIG_BLK_DEV_IT821X is not set 479# CONFIG_BLK_DEV_IT821X is not set
415# CONFIG_BLK_DEV_NS87415 is not set 480# CONFIG_BLK_DEV_NS87415 is not set
416# CONFIG_BLK_DEV_PDC202XX_OLD is not set 481# CONFIG_BLK_DEV_PDC202XX_OLD is not set
417# CONFIG_BLK_DEV_PDC202XX_NEW is not set 482# CONFIG_BLK_DEV_PDC202XX_NEW is not set
418# CONFIG_BLK_DEV_SVWKS is not set 483# CONFIG_BLK_DEV_SVWKS is not set
419# CONFIG_BLK_DEV_SIIMAGE is not set 484# CONFIG_BLK_DEV_SIIMAGE is not set
485# CONFIG_BLK_DEV_SL82C105 is not set
420# CONFIG_BLK_DEV_SLC90E66 is not set 486# CONFIG_BLK_DEV_SLC90E66 is not set
421# CONFIG_BLK_DEV_TRM290 is not set 487# CONFIG_BLK_DEV_TRM290 is not set
422CONFIG_BLK_DEV_VIA82CXXX=y 488CONFIG_BLK_DEV_VIA82CXXX=y
489# CONFIG_BLK_DEV_TC86C001 is not set
423# CONFIG_IDE_ARM is not set 490# CONFIG_IDE_ARM is not set
424CONFIG_BLK_DEV_IDEDMA=y 491CONFIG_BLK_DEV_IDEDMA=y
425# CONFIG_IDEDMA_IVB is not set 492CONFIG_IDE_ARCH_OBSOLETE_INIT=y
426CONFIG_IDEDMA_AUTO=y
427# CONFIG_BLK_DEV_HD is not set 493# CONFIG_BLK_DEV_HD is not set
428 494
429# 495#
@@ -431,49 +497,28 @@ CONFIG_IDEDMA_AUTO=y
431# 497#
432# CONFIG_RAID_ATTRS is not set 498# CONFIG_RAID_ATTRS is not set
433# CONFIG_SCSI is not set 499# CONFIG_SCSI is not set
434 500# CONFIG_SCSI_DMA is not set
435# 501# CONFIG_SCSI_NETLINK is not set
436# Multi-device support (RAID and LVM) 502# CONFIG_ATA is not set
437#
438# CONFIG_MD is not set 503# CONFIG_MD is not set
439
440#
441# Fusion MPT device support
442#
443# CONFIG_FUSION is not set 504# CONFIG_FUSION is not set
444 505
445# 506#
446# IEEE 1394 (FireWire) support 507# IEEE 1394 (FireWire) support
447# 508#
509# CONFIG_FIREWIRE is not set
448# CONFIG_IEEE1394 is not set 510# CONFIG_IEEE1394 is not set
449
450#
451# I2O device support
452#
453# CONFIG_I2O is not set 511# CONFIG_I2O is not set
454 512# CONFIG_MACINTOSH_DRIVERS is not set
455#
456# Macintosh device drivers
457#
458# CONFIG_WINDFARM is not set
459
460#
461# Network device support
462#
463CONFIG_NETDEVICES=y 513CONFIG_NETDEVICES=y
514# CONFIG_NETDEVICES_MULTIQUEUE is not set
464# CONFIG_DUMMY is not set 515# CONFIG_DUMMY is not set
465# CONFIG_BONDING is not set 516# CONFIG_BONDING is not set
517# CONFIG_MACVLAN is not set
466# CONFIG_EQUALIZER is not set 518# CONFIG_EQUALIZER is not set
467# CONFIG_TUN is not set 519# CONFIG_TUN is not set
468 520# CONFIG_VETH is not set
469#
470# ARCnet devices
471#
472# CONFIG_ARCNET is not set 521# CONFIG_ARCNET is not set
473
474#
475# PHY device support
476#
477CONFIG_PHYLIB=y 522CONFIG_PHYLIB=y
478 523
479# 524#
@@ -484,29 +529,30 @@ CONFIG_PHYLIB=y
484# CONFIG_QSEMI_PHY is not set 529# CONFIG_QSEMI_PHY is not set
485# CONFIG_LXT_PHY is not set 530# CONFIG_LXT_PHY is not set
486# CONFIG_CICADA_PHY is not set 531# CONFIG_CICADA_PHY is not set
487 532# CONFIG_VITESSE_PHY is not set
488# 533# CONFIG_SMSC_PHY is not set
489# Ethernet (10 or 100Mbit) 534# CONFIG_BROADCOM_PHY is not set
490# 535# CONFIG_ICPLUS_PHY is not set
536# CONFIG_FIXED_PHY is not set
537# CONFIG_MDIO_BITBANG is not set
491CONFIG_NET_ETHERNET=y 538CONFIG_NET_ETHERNET=y
492CONFIG_MII=y 539CONFIG_MII=y
493# CONFIG_HAPPYMEAL is not set 540# CONFIG_HAPPYMEAL is not set
494# CONFIG_SUNGEM is not set 541# CONFIG_SUNGEM is not set
495# CONFIG_CASSINI is not set 542# CONFIG_CASSINI is not set
496# CONFIG_NET_VENDOR_3COM is not set 543# CONFIG_NET_VENDOR_3COM is not set
497
498#
499# Tulip family network device support
500#
501# CONFIG_NET_TULIP is not set 544# CONFIG_NET_TULIP is not set
502# CONFIG_HP100 is not set 545# CONFIG_HP100 is not set
546# CONFIG_IBM_NEW_EMAC_ZMII is not set
547# CONFIG_IBM_NEW_EMAC_RGMII is not set
548# CONFIG_IBM_NEW_EMAC_TAH is not set
549# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
503CONFIG_NET_PCI=y 550CONFIG_NET_PCI=y
504# CONFIG_PCNET32 is not set 551# CONFIG_PCNET32 is not set
505# CONFIG_AMD8111_ETH is not set 552# CONFIG_AMD8111_ETH is not set
506# CONFIG_ADAPTEC_STARFIRE is not set 553# CONFIG_ADAPTEC_STARFIRE is not set
507# CONFIG_B44 is not set 554# CONFIG_B44 is not set
508# CONFIG_FORCEDETH is not set 555# CONFIG_FORCEDETH is not set
509# CONFIG_DGRS is not set
510# CONFIG_EEPRO100 is not set 556# CONFIG_EEPRO100 is not set
511CONFIG_E100=y 557CONFIG_E100=y
512# CONFIG_FEALNX is not set 558# CONFIG_FEALNX is not set
@@ -519,47 +565,47 @@ CONFIG_E100=y
519# CONFIG_SUNDANCE is not set 565# CONFIG_SUNDANCE is not set
520# CONFIG_TLAN is not set 566# CONFIG_TLAN is not set
521# CONFIG_VIA_RHINE is not set 567# CONFIG_VIA_RHINE is not set
568# CONFIG_SC92031 is not set
522# CONFIG_FS_ENET is not set 569# CONFIG_FS_ENET is not set
523 570CONFIG_NETDEV_1000=y
524#
525# Ethernet (1000 Mbit)
526#
527# CONFIG_ACENIC is not set 571# CONFIG_ACENIC is not set
528# CONFIG_DL2K is not set 572# CONFIG_DL2K is not set
529# CONFIG_E1000 is not set 573# CONFIG_E1000 is not set
574# CONFIG_E1000E is not set
575# CONFIG_IP1000 is not set
530# CONFIG_NS83820 is not set 576# CONFIG_NS83820 is not set
531# CONFIG_HAMACHI is not set 577# CONFIG_HAMACHI is not set
532# CONFIG_YELLOWFIN is not set 578# CONFIG_YELLOWFIN is not set
533# CONFIG_R8169 is not set 579# CONFIG_R8169 is not set
534# CONFIG_SIS190 is not set 580# CONFIG_SIS190 is not set
535# CONFIG_SKGE is not set 581# CONFIG_SKGE is not set
582# CONFIG_SKY2 is not set
536# CONFIG_SK98LIN is not set 583# CONFIG_SK98LIN is not set
537# CONFIG_VIA_VELOCITY is not set 584# CONFIG_VIA_VELOCITY is not set
538# CONFIG_TIGON3 is not set 585# CONFIG_TIGON3 is not set
539# CONFIG_BNX2 is not set 586# CONFIG_BNX2 is not set
540CONFIG_GIANFAR=y 587CONFIG_GIANFAR=y
541CONFIG_GFAR_NAPI=y 588CONFIG_GFAR_NAPI=y
542 589# CONFIG_QLA3XXX is not set
543# 590# CONFIG_ATL1 is not set
544# Ethernet (10000 Mbit) 591CONFIG_NETDEV_10000=y
545#
546# CONFIG_CHELSIO_T1 is not set 592# CONFIG_CHELSIO_T1 is not set
593# CONFIG_CHELSIO_T3 is not set
594# CONFIG_IXGBE is not set
547# CONFIG_IXGB is not set 595# CONFIG_IXGB is not set
548# CONFIG_S2IO is not set 596# CONFIG_S2IO is not set
549 597# CONFIG_MYRI10GE is not set
550# 598# CONFIG_NETXEN_NIC is not set
551# Token Ring devices 599# CONFIG_NIU is not set
552# 600# CONFIG_MLX4_CORE is not set
601# CONFIG_TEHUTI is not set
553# CONFIG_TR is not set 602# CONFIG_TR is not set
554 603
555# 604#
556# Wireless LAN (non-hamradio) 605# Wireless LAN
557#
558# CONFIG_NET_RADIO is not set
559
560#
561# Wan interfaces
562# 606#
607# CONFIG_WLAN_PRE80211 is not set
608# CONFIG_WLAN_80211 is not set
563# CONFIG_WAN is not set 609# CONFIG_WAN is not set
564# CONFIG_FDDI is not set 610# CONFIG_FDDI is not set
565# CONFIG_HIPPI is not set 611# CONFIG_HIPPI is not set
@@ -569,28 +615,21 @@ CONFIG_GFAR_NAPI=y
569# CONFIG_NETCONSOLE is not set 615# CONFIG_NETCONSOLE is not set
570# CONFIG_NETPOLL is not set 616# CONFIG_NETPOLL is not set
571# CONFIG_NET_POLL_CONTROLLER is not set 617# CONFIG_NET_POLL_CONTROLLER is not set
572
573#
574# ISDN subsystem
575#
576# CONFIG_ISDN is not set 618# CONFIG_ISDN is not set
577
578#
579# Telephony Support
580#
581# CONFIG_PHONE is not set 619# CONFIG_PHONE is not set
582 620
583# 621#
584# Input device support 622# Input device support
585# 623#
586CONFIG_INPUT=y 624CONFIG_INPUT=y
625# CONFIG_INPUT_FF_MEMLESS is not set
626# CONFIG_INPUT_POLLDEV is not set
587 627
588# 628#
589# Userland interfaces 629# Userland interfaces
590# 630#
591# CONFIG_INPUT_MOUSEDEV is not set 631# CONFIG_INPUT_MOUSEDEV is not set
592# CONFIG_INPUT_JOYDEV is not set 632# CONFIG_INPUT_JOYDEV is not set
593# CONFIG_INPUT_TSDEV is not set
594# CONFIG_INPUT_EVDEV is not set 633# CONFIG_INPUT_EVDEV is not set
595# CONFIG_INPUT_EVBUG is not set 634# CONFIG_INPUT_EVBUG is not set
596 635
@@ -600,6 +639,7 @@ CONFIG_INPUT=y
600# CONFIG_INPUT_KEYBOARD is not set 639# CONFIG_INPUT_KEYBOARD is not set
601# CONFIG_INPUT_MOUSE is not set 640# CONFIG_INPUT_MOUSE is not set
602# CONFIG_INPUT_JOYSTICK is not set 641# CONFIG_INPUT_JOYSTICK is not set
642# CONFIG_INPUT_TABLET is not set
603# CONFIG_INPUT_TOUCHSCREEN is not set 643# CONFIG_INPUT_TOUCHSCREEN is not set
604# CONFIG_INPUT_MISC is not set 644# CONFIG_INPUT_MISC is not set
605 645
@@ -620,53 +660,43 @@ CONFIG_INPUT=y
620# 660#
621CONFIG_SERIAL_8250=y 661CONFIG_SERIAL_8250=y
622CONFIG_SERIAL_8250_CONSOLE=y 662CONFIG_SERIAL_8250_CONSOLE=y
663CONFIG_SERIAL_8250_PCI=y
623CONFIG_SERIAL_8250_NR_UARTS=4 664CONFIG_SERIAL_8250_NR_UARTS=4
665CONFIG_SERIAL_8250_RUNTIME_UARTS=4
624# CONFIG_SERIAL_8250_EXTENDED is not set 666# CONFIG_SERIAL_8250_EXTENDED is not set
667CONFIG_SERIAL_8250_SHARE_IRQ=y
625 668
626# 669#
627# Non-8250 serial port support 670# Non-8250 serial port support
628# 671#
672# CONFIG_SERIAL_UARTLITE is not set
629CONFIG_SERIAL_CORE=y 673CONFIG_SERIAL_CORE=y
630CONFIG_SERIAL_CORE_CONSOLE=y 674CONFIG_SERIAL_CORE_CONSOLE=y
631# CONFIG_SERIAL_CPM is not set 675CONFIG_SERIAL_CPM=y
676CONFIG_SERIAL_CPM_CONSOLE=y
677CONFIG_SERIAL_CPM_SCC1=y
678# CONFIG_SERIAL_CPM_SCC2 is not set
679# CONFIG_SERIAL_CPM_SCC3 is not set
680# CONFIG_SERIAL_CPM_SCC4 is not set
681# CONFIG_SERIAL_CPM_SMC1 is not set
682# CONFIG_SERIAL_CPM_SMC2 is not set
632# CONFIG_SERIAL_JSM is not set 683# CONFIG_SERIAL_JSM is not set
684# CONFIG_SERIAL_OF_PLATFORM is not set
633CONFIG_UNIX98_PTYS=y 685CONFIG_UNIX98_PTYS=y
634CONFIG_LEGACY_PTYS=y 686CONFIG_LEGACY_PTYS=y
635CONFIG_LEGACY_PTY_COUNT=256 687CONFIG_LEGACY_PTY_COUNT=256
636
637#
638# IPMI
639#
640# CONFIG_IPMI_HANDLER is not set 688# CONFIG_IPMI_HANDLER is not set
641 689CONFIG_HW_RANDOM=y
642#
643# Watchdog Cards
644#
645# CONFIG_WATCHDOG is not set
646# CONFIG_NVRAM is not set 690# CONFIG_NVRAM is not set
647CONFIG_GEN_RTC=y 691CONFIG_GEN_RTC=y
648# CONFIG_GEN_RTC_X is not set 692# CONFIG_GEN_RTC_X is not set
649# CONFIG_DTLK is not set
650# CONFIG_R3964 is not set 693# CONFIG_R3964 is not set
651# CONFIG_APPLICOM is not set 694# CONFIG_APPLICOM is not set
652
653#
654# Ftape, the floppy tape device driver
655#
656# CONFIG_AGP is not set
657# CONFIG_DRM is not set
658# CONFIG_RAW_DRIVER is not set 695# CONFIG_RAW_DRIVER is not set
659
660#
661# TPM devices
662#
663# CONFIG_TCG_TPM is not set 696# CONFIG_TCG_TPM is not set
664# CONFIG_TELCLOCK is not set 697CONFIG_DEVPORT=y
665
666#
667# I2C support
668#
669CONFIG_I2C=y 698CONFIG_I2C=y
699CONFIG_I2C_BOARDINFO=y
670CONFIG_I2C_CHARDEV=y 700CONFIG_I2C_CHARDEV=y
671 701
672# 702#
@@ -688,60 +718,61 @@ CONFIG_I2C_CHARDEV=y
688# CONFIG_I2C_I810 is not set 718# CONFIG_I2C_I810 is not set
689# CONFIG_I2C_PIIX4 is not set 719# CONFIG_I2C_PIIX4 is not set
690CONFIG_I2C_MPC=y 720CONFIG_I2C_MPC=y
691# CONFIG_I2C_MPC8260 is not set
692# CONFIG_I2C_NFORCE2 is not set 721# CONFIG_I2C_NFORCE2 is not set
722# CONFIG_I2C_OCORES is not set
693# CONFIG_I2C_PARPORT_LIGHT is not set 723# CONFIG_I2C_PARPORT_LIGHT is not set
694# CONFIG_I2C_PROSAVAGE is not set 724# CONFIG_I2C_PROSAVAGE is not set
695# CONFIG_I2C_SAVAGE4 is not set 725# CONFIG_I2C_SAVAGE4 is not set
696# CONFIG_SCx200_ACB is not set 726# CONFIG_I2C_SIMTEC is not set
697# CONFIG_I2C_SIS5595 is not set 727# CONFIG_I2C_SIS5595 is not set
698# CONFIG_I2C_SIS630 is not set 728# CONFIG_I2C_SIS630 is not set
699# CONFIG_I2C_SIS96X is not set 729# CONFIG_I2C_SIS96X is not set
730# CONFIG_I2C_TAOS_EVM is not set
700# CONFIG_I2C_VIA is not set 731# CONFIG_I2C_VIA is not set
701# CONFIG_I2C_VIAPRO is not set 732# CONFIG_I2C_VIAPRO is not set
702# CONFIG_I2C_VOODOO3 is not set 733# CONFIG_I2C_VOODOO3 is not set
703# CONFIG_I2C_PCA_ISA is not set
704 734
705# 735#
706# Miscellaneous I2C Chip support 736# Miscellaneous I2C Chip support
707# 737#
708CONFIG_SENSORS_DS1337=y 738CONFIG_SENSORS_DS1337=y
709# CONFIG_SENSORS_DS1374 is not set 739# CONFIG_SENSORS_DS1374 is not set
740# CONFIG_DS1682 is not set
710# CONFIG_SENSORS_EEPROM is not set 741# CONFIG_SENSORS_EEPROM is not set
711# CONFIG_SENSORS_MAX6900 is not set
712# CONFIG_SENSORS_PCF8574 is not set 742# CONFIG_SENSORS_PCF8574 is not set
713# CONFIG_SENSORS_PCF8563 is not set
714# CONFIG_SENSORS_PCA9539 is not set 743# CONFIG_SENSORS_PCA9539 is not set
715# CONFIG_SENSORS_PCF8591 is not set 744# CONFIG_SENSORS_PCF8591 is not set
716# CONFIG_SENSORS_RTC8564 is not set
717# CONFIG_SENSORS_M41T00 is not set 745# CONFIG_SENSORS_M41T00 is not set
718# CONFIG_SENSORS_MAX6875 is not set 746# CONFIG_SENSORS_MAX6875 is not set
719# CONFIG_RTC_X1205_I2C is not set 747# CONFIG_SENSORS_TSL2550 is not set
720# CONFIG_I2C_DEBUG_CORE is not set 748# CONFIG_I2C_DEBUG_CORE is not set
721# CONFIG_I2C_DEBUG_ALGO is not set 749# CONFIG_I2C_DEBUG_ALGO is not set
722# CONFIG_I2C_DEBUG_BUS is not set 750# CONFIG_I2C_DEBUG_BUS is not set
723# CONFIG_I2C_DEBUG_CHIP is not set 751# CONFIG_I2C_DEBUG_CHIP is not set
724 752
725# 753#
726# Dallas's 1-wire bus 754# SPI support
727# 755#
756# CONFIG_SPI is not set
757# CONFIG_SPI_MASTER is not set
728# CONFIG_W1 is not set 758# CONFIG_W1 is not set
729 759# CONFIG_POWER_SUPPLY is not set
730#
731# Hardware Monitoring support
732#
733CONFIG_HWMON=y 760CONFIG_HWMON=y
734# CONFIG_HWMON_VID is not set 761# CONFIG_HWMON_VID is not set
762# CONFIG_SENSORS_AD7418 is not set
735# CONFIG_SENSORS_ADM1021 is not set 763# CONFIG_SENSORS_ADM1021 is not set
736# CONFIG_SENSORS_ADM1025 is not set 764# CONFIG_SENSORS_ADM1025 is not set
737# CONFIG_SENSORS_ADM1026 is not set 765# CONFIG_SENSORS_ADM1026 is not set
766# CONFIG_SENSORS_ADM1029 is not set
738# CONFIG_SENSORS_ADM1031 is not set 767# CONFIG_SENSORS_ADM1031 is not set
739# CONFIG_SENSORS_ADM9240 is not set 768# CONFIG_SENSORS_ADM9240 is not set
740# CONFIG_SENSORS_ASB100 is not set 769# CONFIG_SENSORS_ADT7470 is not set
741# CONFIG_SENSORS_ATXP1 is not set 770# CONFIG_SENSORS_ATXP1 is not set
742# CONFIG_SENSORS_DS1621 is not set 771# CONFIG_SENSORS_DS1621 is not set
743# CONFIG_SENSORS_FSCHER is not set 772# CONFIG_SENSORS_I5K_AMB is not set
744# CONFIG_SENSORS_FSCPOS is not set 773# CONFIG_SENSORS_F71805F is not set
774# CONFIG_SENSORS_F71882FG is not set
775# CONFIG_SENSORS_F75375S is not set
745# CONFIG_SENSORS_GL518SM is not set 776# CONFIG_SENSORS_GL518SM is not set
746# CONFIG_SENSORS_GL520SM is not set 777# CONFIG_SENSORS_GL520SM is not set
747# CONFIG_SENSORS_IT87 is not set 778# CONFIG_SENSORS_IT87 is not set
@@ -755,52 +786,75 @@ CONFIG_SENSORS_LM75=y
755# CONFIG_SENSORS_LM87 is not set 786# CONFIG_SENSORS_LM87 is not set
756# CONFIG_SENSORS_LM90 is not set 787# CONFIG_SENSORS_LM90 is not set
757# CONFIG_SENSORS_LM92 is not set 788# CONFIG_SENSORS_LM92 is not set
789# CONFIG_SENSORS_LM93 is not set
758# CONFIG_SENSORS_MAX1619 is not set 790# CONFIG_SENSORS_MAX1619 is not set
791# CONFIG_SENSORS_MAX6650 is not set
759# CONFIG_SENSORS_PC87360 is not set 792# CONFIG_SENSORS_PC87360 is not set
793# CONFIG_SENSORS_PC87427 is not set
760# CONFIG_SENSORS_SIS5595 is not set 794# CONFIG_SENSORS_SIS5595 is not set
795# CONFIG_SENSORS_DME1737 is not set
761# CONFIG_SENSORS_SMSC47M1 is not set 796# CONFIG_SENSORS_SMSC47M1 is not set
797# CONFIG_SENSORS_SMSC47M192 is not set
762# CONFIG_SENSORS_SMSC47B397 is not set 798# CONFIG_SENSORS_SMSC47B397 is not set
799# CONFIG_SENSORS_THMC50 is not set
763# CONFIG_SENSORS_VIA686A is not set 800# CONFIG_SENSORS_VIA686A is not set
801# CONFIG_SENSORS_VT1211 is not set
802# CONFIG_SENSORS_VT8231 is not set
764# CONFIG_SENSORS_W83781D is not set 803# CONFIG_SENSORS_W83781D is not set
804# CONFIG_SENSORS_W83791D is not set
765# CONFIG_SENSORS_W83792D is not set 805# CONFIG_SENSORS_W83792D is not set
806# CONFIG_SENSORS_W83793 is not set
766# CONFIG_SENSORS_W83L785TS is not set 807# CONFIG_SENSORS_W83L785TS is not set
767# CONFIG_SENSORS_W83627HF is not set 808# CONFIG_SENSORS_W83627HF is not set
768# CONFIG_SENSORS_W83627EHF is not set 809# CONFIG_SENSORS_W83627EHF is not set
769CONFIG_HWMON_DEBUG_CHIP=y 810CONFIG_HWMON_DEBUG_CHIP=y
811# CONFIG_WATCHDOG is not set
770 812
771# 813#
772# Misc devices 814# Sonics Silicon Backplane
773# 815#
816CONFIG_SSB_POSSIBLE=y
817# CONFIG_SSB is not set
774 818
775# 819#
776# Multimedia Capabilities Port drivers 820# Multifunction device drivers
777# 821#
822# CONFIG_MFD_SM501 is not set
778 823
779# 824#
780# Multimedia devices 825# Multimedia devices
781# 826#
782# CONFIG_VIDEO_DEV is not set 827# CONFIG_VIDEO_DEV is not set
783 828# CONFIG_DVB_CORE is not set
784# 829CONFIG_DAB=y
785# Digital Video Broadcasting Devices
786#
787# CONFIG_DVB is not set
788 830
789# 831#
790# Graphics support 832# Graphics support
791# 833#
834# CONFIG_AGP is not set
835# CONFIG_DRM is not set
836# CONFIG_VGASTATE is not set
837# CONFIG_VIDEO_OUTPUT_CONTROL is not set
792# CONFIG_FB is not set 838# CONFIG_FB is not set
839# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
793 840
794# 841#
795# Sound 842# Display device support
796# 843#
797# CONFIG_SOUND is not set 844# CONFIG_DISPLAY_SUPPORT is not set
798 845
799# 846#
800# USB support 847# Sound
801# 848#
849# CONFIG_SOUND is not set
850CONFIG_HID_SUPPORT=y
851CONFIG_HID=y
852# CONFIG_HID_DEBUG is not set
853# CONFIG_HIDRAW is not set
854CONFIG_USB_SUPPORT=y
802CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
803CONFIG_USB_ARCH_HAS_OHCI=y 856CONFIG_USB_ARCH_HAS_OHCI=y
857CONFIG_USB_ARCH_HAS_EHCI=y
804# CONFIG_USB is not set 858# CONFIG_USB is not set
805 859
806# 860#
@@ -811,20 +865,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
811# USB Gadget Support 865# USB Gadget Support
812# 866#
813# CONFIG_USB_GADGET is not set 867# CONFIG_USB_GADGET is not set
814
815#
816# MMC/SD Card support
817#
818# CONFIG_MMC is not set 868# CONFIG_MMC is not set
819 869# CONFIG_NEW_LEDS is not set
820#
821# InfiniBand support
822#
823# CONFIG_INFINIBAND is not set 870# CONFIG_INFINIBAND is not set
871# CONFIG_EDAC is not set
872# CONFIG_RTC_CLASS is not set
824 873
825# 874#
826# SN Devices 875# Userspace I/O
827# 876#
877# CONFIG_UIO is not set
828 878
829# 879#
830# File systems 880# File systems
@@ -836,16 +886,19 @@ CONFIG_EXT3_FS=y
836CONFIG_EXT3_FS_XATTR=y 886CONFIG_EXT3_FS_XATTR=y
837# CONFIG_EXT3_FS_POSIX_ACL is not set 887# CONFIG_EXT3_FS_POSIX_ACL is not set
838# CONFIG_EXT3_FS_SECURITY is not set 888# CONFIG_EXT3_FS_SECURITY is not set
889# CONFIG_EXT4DEV_FS is not set
839CONFIG_JBD=y 890CONFIG_JBD=y
840# CONFIG_JBD_DEBUG is not set
841CONFIG_FS_MBCACHE=y 891CONFIG_FS_MBCACHE=y
842# CONFIG_REISERFS_FS is not set 892# CONFIG_REISERFS_FS is not set
843# CONFIG_JFS_FS is not set 893# CONFIG_JFS_FS is not set
844# CONFIG_FS_POSIX_ACL is not set 894# CONFIG_FS_POSIX_ACL is not set
845# CONFIG_XFS_FS is not set 895# CONFIG_XFS_FS is not set
896# CONFIG_GFS2_FS is not set
897# CONFIG_OCFS2_FS is not set
846# CONFIG_MINIX_FS is not set 898# CONFIG_MINIX_FS is not set
847# CONFIG_ROMFS_FS is not set 899# CONFIG_ROMFS_FS is not set
848CONFIG_INOTIFY=y 900CONFIG_INOTIFY=y
901CONFIG_INOTIFY_USER=y
849# CONFIG_QUOTA is not set 902# CONFIG_QUOTA is not set
850CONFIG_DNOTIFY=y 903CONFIG_DNOTIFY=y
851# CONFIG_AUTOFS_FS is not set 904# CONFIG_AUTOFS_FS is not set
@@ -870,11 +923,12 @@ CONFIG_DNOTIFY=y
870# 923#
871CONFIG_PROC_FS=y 924CONFIG_PROC_FS=y
872CONFIG_PROC_KCORE=y 925CONFIG_PROC_KCORE=y
926CONFIG_PROC_SYSCTL=y
873CONFIG_SYSFS=y 927CONFIG_SYSFS=y
874CONFIG_TMPFS=y 928CONFIG_TMPFS=y
929# CONFIG_TMPFS_POSIX_ACL is not set
875# CONFIG_HUGETLB_PAGE is not set 930# CONFIG_HUGETLB_PAGE is not set
876CONFIG_RAMFS=y 931# CONFIG_CONFIGFS_FS is not set
877# CONFIG_RELAYFS_FS is not set
878 932
879# 933#
880# Miscellaneous filesystems 934# Miscellaneous filesystems
@@ -886,13 +940,15 @@ CONFIG_RAMFS=y
886# CONFIG_BEFS_FS is not set 940# CONFIG_BEFS_FS is not set
887# CONFIG_BFS_FS is not set 941# CONFIG_BFS_FS is not set
888# CONFIG_EFS_FS is not set 942# CONFIG_EFS_FS is not set
889# CONFIG_JFFS_FS is not set
890CONFIG_JFFS2_FS=y 943CONFIG_JFFS2_FS=y
891CONFIG_JFFS2_FS_DEBUG=0 944CONFIG_JFFS2_FS_DEBUG=0
892CONFIG_JFFS2_FS_WRITEBUFFER=y 945CONFIG_JFFS2_FS_WRITEBUFFER=y
946# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
893# CONFIG_JFFS2_SUMMARY is not set 947# CONFIG_JFFS2_SUMMARY is not set
948# CONFIG_JFFS2_FS_XATTR is not set
894# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 949# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
895CONFIG_JFFS2_ZLIB=y 950CONFIG_JFFS2_ZLIB=y
951# CONFIG_JFFS2_LZO is not set
896CONFIG_JFFS2_RTIME=y 952CONFIG_JFFS2_RTIME=y
897# CONFIG_JFFS2_RUBIN is not set 953# CONFIG_JFFS2_RUBIN is not set
898CONFIG_CRAMFS=y 954CONFIG_CRAMFS=y
@@ -901,10 +957,7 @@ CONFIG_CRAMFS=y
901# CONFIG_QNX4FS_FS is not set 957# CONFIG_QNX4FS_FS is not set
902# CONFIG_SYSV_FS is not set 958# CONFIG_SYSV_FS is not set
903# CONFIG_UFS_FS is not set 959# CONFIG_UFS_FS is not set
904 960CONFIG_NETWORK_FILESYSTEMS=y
905#
906# Network File Systems
907#
908CONFIG_NFS_FS=y 961CONFIG_NFS_FS=y
909# CONFIG_NFS_V3 is not set 962# CONFIG_NFS_V3 is not set
910# CONFIG_NFS_V4 is not set 963# CONFIG_NFS_V4 is not set
@@ -914,6 +967,7 @@ CONFIG_ROOT_NFS=y
914CONFIG_LOCKD=y 967CONFIG_LOCKD=y
915CONFIG_NFS_COMMON=y 968CONFIG_NFS_COMMON=y
916CONFIG_SUNRPC=y 969CONFIG_SUNRPC=y
970# CONFIG_SUNRPC_BIND34 is not set
917# CONFIG_RPCSEC_GSS_KRB5 is not set 971# CONFIG_RPCSEC_GSS_KRB5 is not set
918# CONFIG_RPCSEC_GSS_SPKM3 is not set 972# CONFIG_RPCSEC_GSS_SPKM3 is not set
919# CONFIG_SMB_FS is not set 973# CONFIG_SMB_FS is not set
@@ -921,7 +975,6 @@ CONFIG_SUNRPC=y
921# CONFIG_NCP_FS is not set 975# CONFIG_NCP_FS is not set
922# CONFIG_CODA_FS is not set 976# CONFIG_CODA_FS is not set
923# CONFIG_AFS_FS is not set 977# CONFIG_AFS_FS is not set
924# CONFIG_9P_FS is not set
925 978
926# 979#
927# Partition Types 980# Partition Types
@@ -937,50 +990,55 @@ CONFIG_PARTITION_ADVANCED=y
937# CONFIG_SGI_PARTITION is not set 990# CONFIG_SGI_PARTITION is not set
938# CONFIG_ULTRIX_PARTITION is not set 991# CONFIG_ULTRIX_PARTITION is not set
939# CONFIG_SUN_PARTITION is not set 992# CONFIG_SUN_PARTITION is not set
993# CONFIG_KARMA_PARTITION is not set
940# CONFIG_EFI_PARTITION is not set 994# CONFIG_EFI_PARTITION is not set
941 995# CONFIG_SYSV68_PARTITION is not set
942#
943# Native Language Support
944#
945# CONFIG_NLS is not set 996# CONFIG_NLS is not set
946# CONFIG_SCC_ENET is not set 997# CONFIG_DLM is not set
947# CONFIG_FEC_ENET is not set
948
949#
950# CPM2 Options
951#
952 998
953# 999#
954# Library routines 1000# Library routines
955# 1001#
1002CONFIG_BITREVERSE=y
956# CONFIG_CRC_CCITT is not set 1003# CONFIG_CRC_CCITT is not set
957# CONFIG_CRC16 is not set 1004# CONFIG_CRC16 is not set
1005# CONFIG_CRC_ITU_T is not set
958CONFIG_CRC32=y 1006CONFIG_CRC32=y
1007# CONFIG_CRC7 is not set
959# CONFIG_LIBCRC32C is not set 1008# CONFIG_LIBCRC32C is not set
960CONFIG_ZLIB_INFLATE=y 1009CONFIG_ZLIB_INFLATE=y
961CONFIG_ZLIB_DEFLATE=y 1010CONFIG_ZLIB_DEFLATE=y
1011CONFIG_PLIST=y
1012CONFIG_HAS_IOMEM=y
1013CONFIG_HAS_IOPORT=y
1014CONFIG_HAS_DMA=y
1015CONFIG_INSTRUMENTATION=y
962# CONFIG_PROFILING is not set 1016# CONFIG_PROFILING is not set
1017# CONFIG_MARKERS is not set
963 1018
964# 1019#
965# Kernel hacking 1020# Kernel hacking
966# 1021#
967# CONFIG_PRINTK_TIME is not set 1022# CONFIG_PRINTK_TIME is not set
1023CONFIG_ENABLE_WARN_DEPRECATED=y
1024CONFIG_ENABLE_MUST_CHECK=y
1025# CONFIG_MAGIC_SYSRQ is not set
1026# CONFIG_UNUSED_SYMBOLS is not set
1027# CONFIG_DEBUG_FS is not set
1028# CONFIG_HEADERS_CHECK is not set
968# CONFIG_DEBUG_KERNEL is not set 1029# CONFIG_DEBUG_KERNEL is not set
969CONFIG_LOG_BUF_SHIFT=14 1030# CONFIG_SLUB_DEBUG_ON is not set
1031# CONFIG_DEBUG_BUGVERBOSE is not set
1032# CONFIG_SAMPLES is not set
970# CONFIG_KGDB_CONSOLE is not set 1033# CONFIG_KGDB_CONSOLE is not set
971# CONFIG_SERIAL_TEXT_DEBUG is not set 1034# CONFIG_PPC_EARLY_DEBUG is not set
972 1035
973# 1036#
974# Security options 1037# Security options
975# 1038#
976# CONFIG_KEYS is not set 1039# CONFIG_KEYS is not set
977# CONFIG_SECURITY is not set 1040# CONFIG_SECURITY is not set
978 1041# CONFIG_SECURITY_FILE_CAPABILITIES is not set
979#
980# Cryptographic options
981#
982# CONFIG_CRYPTO is not set 1042# CONFIG_CRYPTO is not set
983 1043# CONFIG_PPC_CLOCK is not set
984# 1044CONFIG_PPC_LIB_RHEAP=y
985# Hardware crypto devices
986#
diff --git a/arch/ppc/configs/TQM8555_defconfig b/arch/powerpc/configs/tqm8555_defconfig
index 43a0d9df1e23..a3af2262128b 100644
--- a/arch/ppc/configs/TQM8555_defconfig
+++ b/arch/powerpc/configs/tqm8555_defconfig
@@ -1,66 +1,116 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.24-rc8
4# Thu Nov 24 17:10:52 2005 4# Fri Jan 25 01:15:24 2008
5# 5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
6CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
10CONFIG_PPC=y 40CONFIG_PPC=y
11CONFIG_PPC32=y 41CONFIG_EARLY_PRINTK=y
12CONFIG_GENERIC_NVRAM=y 42CONFIG_GENERIC_NVRAM=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y 44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 55
16# 56#
17# Code maturity level options 57# General setup
18# 58#
19CONFIG_EXPERIMENTAL=y 59CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 60CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 61CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION="" 62CONFIG_LOCALVERSION=""
28CONFIG_LOCALVERSION_AUTO=y 63CONFIG_LOCALVERSION_AUTO=y
29CONFIG_SWAP=y 64CONFIG_SWAP=y
30CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
31# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
32# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
34# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
35# CONFIG_HOTPLUG is not set
36CONFIG_KOBJECT_UEVENT=y
37# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
38CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
39CONFIG_EMBEDDED=y 85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
40# CONFIG_KALLSYMS is not set 87# CONFIG_KALLSYMS is not set
88# CONFIG_HOTPLUG is not set
41CONFIG_PRINTK=y 89CONFIG_PRINTK=y
42CONFIG_BUG=y 90CONFIG_BUG=y
91CONFIG_ELF_CORE=y
43CONFIG_BASE_FULL=y 92CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 93CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y
45# CONFIG_EPOLL is not set 95# CONFIG_EPOLL is not set
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 96CONFIG_SIGNALFD=y
97CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 98CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 99CONFIG_VM_EVENT_COUNTERS=y
49CONFIG_CC_ALIGN_LABELS=0 100CONFIG_SLUB_DEBUG=y
50CONFIG_CC_ALIGN_LOOPS=0 101# CONFIG_SLAB is not set
51CONFIG_CC_ALIGN_JUMPS=0 102CONFIG_SLUB=y
103# CONFIG_SLOB is not set
104CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58# CONFIG_MODULES is not set 108# CONFIG_MODULES is not set
59 109CONFIG_BLOCK=y
60#
61# Block layer
62#
63# CONFIG_LBD is not set 110# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_LSF is not set
113# CONFIG_BLK_DEV_BSG is not set
64 114
65# 115#
66# IO Schedulers 116# IO Schedulers
@@ -76,56 +126,63 @@ CONFIG_DEFAULT_AS=y
76CONFIG_DEFAULT_IOSCHED="anticipatory" 126CONFIG_DEFAULT_IOSCHED="anticipatory"
77 127
78# 128#
79# Processor 129# Platform support
80#
81# CONFIG_6xx is not set
82# CONFIG_40x is not set
83# CONFIG_44x is not set
84# CONFIG_POWER3 is not set
85# CONFIG_POWER4 is not set
86# CONFIG_8xx is not set
87# CONFIG_E200 is not set
88CONFIG_E500=y
89CONFIG_BOOKE=y
90CONFIG_FSL_BOOKE=y
91# CONFIG_PHYS_64BIT is not set
92CONFIG_SPE=y
93CONFIG_MATH_EMULATION=y
94# CONFIG_KEXEC is not set
95# CONFIG_CPU_FREQ is not set
96# CONFIG_WANT_EARLY_SERIAL is not set
97CONFIG_PPC_GEN550=y
98CONFIG_85xx=y
99CONFIG_PPC_INDIRECT_PCI_BE=y
100
101#
102# Freescale 85xx options
103# 130#
131# CONFIG_PPC_MPC52xx is not set
132# CONFIG_PPC_MPC5200 is not set
133# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set
104# CONFIG_MPC8540_ADS is not set 136# CONFIG_MPC8540_ADS is not set
105# CONFIG_MPC8548_CDS is not set
106# CONFIG_MPC8555_CDS is not set
107# CONFIG_MPC8560_ADS is not set 137# CONFIG_MPC8560_ADS is not set
108# CONFIG_SBC8560 is not set 138# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set
109# CONFIG_STX_GP3 is not set 141# CONFIG_STX_GP3 is not set
110# CONFIG_TQM8540 is not set 142# CONFIG_TQM8540 is not set
111# CONFIG_TQM8541 is not set 143# CONFIG_TQM8541 is not set
112CONFIG_TQM8555=y 144CONFIG_TQM8555=y
113# CONFIG_TQM8560 is not set 145# CONFIG_TQM8560 is not set
114CONFIG_MPC8555=y 146CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set
149CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set
152# CONFIG_PPC_RTAS is not set
153# CONFIG_MMIO_NVRAM is not set
154# CONFIG_PPC_MPC106 is not set
155# CONFIG_PPC_970_NAP is not set
156# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set
159CONFIG_CPM2=y
160CONFIG_PPC_CPM_NEW_BINDING=y
161# CONFIG_FSL_ULI1575 is not set
162CONFIG_CPM=y
115 163
116# 164#
117# Platform options 165# Kernel options
118# 166#
119CONFIG_CPM2=y
120# CONFIG_PC_KEYBOARD is not set
121# CONFIG_HIGHMEM is not set 167# CONFIG_HIGHMEM is not set
168# CONFIG_TICK_ONESHOT is not set
169# CONFIG_NO_HZ is not set
170# CONFIG_HIGH_RES_TIMERS is not set
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
122# CONFIG_HZ_100 is not set 172# CONFIG_HZ_100 is not set
123CONFIG_HZ_250=y 173CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set
124# CONFIG_HZ_1000 is not set 175# CONFIG_HZ_1000 is not set
125CONFIG_HZ=250 176CONFIG_HZ=250
126CONFIG_PREEMPT_NONE=y 177CONFIG_PREEMPT_NONE=y
127# CONFIG_PREEMPT_VOLUNTARY is not set 178# CONFIG_PREEMPT_VOLUNTARY is not set
128# CONFIG_PREEMPT is not set 179# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set
182CONFIG_MATH_EMULATION=y
183CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
184CONFIG_ARCH_FLATMEM_ENABLE=y
185CONFIG_ARCH_POPULATES_NODE_MAP=y
129CONFIG_SELECT_MEMORY_MODEL=y 186CONFIG_SELECT_MEMORY_MODEL=y
130CONFIG_FLATMEM_MANUAL=y 187CONFIG_FLATMEM_MANUAL=y
131# CONFIG_DISCONTIGMEM_MANUAL is not set 188# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -133,28 +190,36 @@ CONFIG_FLATMEM_MANUAL=y
133CONFIG_FLATMEM=y 190CONFIG_FLATMEM=y
134CONFIG_FLAT_NODE_MEM_MAP=y 191CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
193# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 194CONFIG_SPLIT_PTLOCK_CPUS=4
137CONFIG_BINFMT_ELF=y 195# CONFIG_RESOURCES_64BIT is not set
138# CONFIG_BINFMT_MISC is not set 196CONFIG_ZONE_DMA_FLAG=1
197CONFIG_BOUNCE=y
198CONFIG_VIRT_TO_BUS=y
199# CONFIG_PROC_DEVICETREE is not set
139# CONFIG_CMDLINE_BOOL is not set 200# CONFIG_CMDLINE_BOOL is not set
140# CONFIG_PM is not set 201# CONFIG_PM is not set
141# CONFIG_HIBERNATION is not set 202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
142CONFIG_SECCOMP=y 204CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="tqm8555.dts"
143CONFIG_ISA_DMA_API=y 207CONFIG_ISA_DMA_API=y
144 208
145# 209#
146# Bus options 210# Bus options
147# 211#
148CONFIG_PPC_I8259=y 212CONFIG_ZONE_DMA=y
149CONFIG_PPC_INDIRECT_PCI=y 213CONFIG_PPC_INDIRECT_PCI=y
214CONFIG_FSL_SOC=y
215CONFIG_FSL_PCI=y
150CONFIG_PCI=y 216CONFIG_PCI=y
151CONFIG_PCI_DOMAINS=y 217CONFIG_PCI_DOMAINS=y
152# CONFIG_PCI_LEGACY_PROC is not set 218CONFIG_PCI_SYSCALL=y
153 219# CONFIG_PCIEPORTBUS is not set
154# 220CONFIG_ARCH_SUPPORTS_MSI=y
155# PCCARD (PCMCIA/CardBus) support 221# CONFIG_PCI_MSI is not set
156# 222CONFIG_PCI_LEGACY=y
157# CONFIG_PCCARD is not set
158 223
159# 224#
160# Advanced setup 225# Advanced setup
@@ -167,7 +232,7 @@ CONFIG_PCI_DOMAINS=y
167CONFIG_HIGHMEM_START=0xfe000000 232CONFIG_HIGHMEM_START=0xfe000000
168CONFIG_LOWMEM_SIZE=0x30000000 233CONFIG_LOWMEM_SIZE=0x30000000
169CONFIG_KERNEL_START=0xc0000000 234CONFIG_KERNEL_START=0xc0000000
170CONFIG_TASK_SIZE=0x80000000 235CONFIG_TASK_SIZE=0xc0000000
171CONFIG_BOOT_LOAD=0x00800000 236CONFIG_BOOT_LOAD=0x00800000
172 237
173# 238#
@@ -181,6 +246,10 @@ CONFIG_NET=y
181CONFIG_PACKET=y 246CONFIG_PACKET=y
182# CONFIG_PACKET_MMAP is not set 247# CONFIG_PACKET_MMAP is not set
183CONFIG_UNIX=y 248CONFIG_UNIX=y
249CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set
184# CONFIG_NET_KEY is not set 253# CONFIG_NET_KEY is not set
185CONFIG_INET=y 254CONFIG_INET=y
186CONFIG_IP_MULTICAST=y 255CONFIG_IP_MULTICAST=y
@@ -198,23 +267,26 @@ CONFIG_SYN_COOKIES=y
198# CONFIG_INET_AH is not set 267# CONFIG_INET_AH is not set
199# CONFIG_INET_ESP is not set 268# CONFIG_INET_ESP is not set
200# CONFIG_INET_IPCOMP is not set 269# CONFIG_INET_IPCOMP is not set
270# CONFIG_INET_XFRM_TUNNEL is not set
201# CONFIG_INET_TUNNEL is not set 271# CONFIG_INET_TUNNEL is not set
272CONFIG_INET_XFRM_MODE_TRANSPORT=y
273CONFIG_INET_XFRM_MODE_TUNNEL=y
274CONFIG_INET_XFRM_MODE_BEET=y
275# CONFIG_INET_LRO is not set
202CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
203CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
204# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
205CONFIG_TCP_CONG_BIC=y 279CONFIG_TCP_CONG_CUBIC=y
280CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_TCP_MD5SIG is not set
206# CONFIG_IPV6 is not set 282# CONFIG_IPV6 is not set
283# CONFIG_INET6_XFRM_TUNNEL is not set
284# CONFIG_INET6_TUNNEL is not set
285# CONFIG_NETWORK_SECMARK is not set
207# CONFIG_NETFILTER is not set 286# CONFIG_NETFILTER is not set
208
209#
210# DCCP Configuration (EXPERIMENTAL)
211#
212# CONFIG_IP_DCCP is not set 287# CONFIG_IP_DCCP is not set
213
214#
215# SCTP Configuration (EXPERIMENTAL)
216#
217# CONFIG_IP_SCTP is not set 288# CONFIG_IP_SCTP is not set
289# CONFIG_TIPC is not set
218# CONFIG_ATM is not set 290# CONFIG_ATM is not set
219# CONFIG_BRIDGE is not set 291# CONFIG_BRIDGE is not set
220# CONFIG_VLAN_8021Q is not set 292# CONFIG_VLAN_8021Q is not set
@@ -224,13 +296,8 @@ CONFIG_TCP_CONG_BIC=y
224# CONFIG_ATALK is not set 296# CONFIG_ATALK is not set
225# CONFIG_X25 is not set 297# CONFIG_X25 is not set
226# CONFIG_LAPB is not set 298# CONFIG_LAPB is not set
227# CONFIG_NET_DIVERT is not set
228# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
229# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
230
231#
232# QoS and/or fair queueing
233#
234# CONFIG_NET_SCHED is not set 301# CONFIG_NET_SCHED is not set
235 302
236# 303#
@@ -240,7 +307,17 @@ CONFIG_TCP_CONG_BIC=y
240# CONFIG_HAMRADIO is not set 307# CONFIG_HAMRADIO is not set
241# CONFIG_IRDA is not set 308# CONFIG_IRDA is not set
242# CONFIG_BT is not set 309# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set
311
312#
313# Wireless
314#
315# CONFIG_CFG80211 is not set
316# CONFIG_WIRELESS_EXT is not set
317# CONFIG_MAC80211 is not set
243# CONFIG_IEEE80211 is not set 318# CONFIG_IEEE80211 is not set
319# CONFIG_RFKILL is not set
320# CONFIG_NET_9P is not set
244 321
245# 322#
246# Device Drivers 323# Device Drivers
@@ -251,16 +328,8 @@ CONFIG_TCP_CONG_BIC=y
251# 328#
252CONFIG_STANDALONE=y 329CONFIG_STANDALONE=y
253CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
254# CONFIG_FW_LOADER is not set 331# CONFIG_SYS_HYPERVISOR is not set
255
256#
257# Connector - unified userspace <-> kernelspace linker
258#
259# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
260
261#
262# Memory Technology Devices (MTD)
263#
264CONFIG_MTD=y 333CONFIG_MTD=y
265# CONFIG_MTD_DEBUG is not set 334# CONFIG_MTD_DEBUG is not set
266CONFIG_MTD_CONCAT=y 335CONFIG_MTD_CONCAT=y
@@ -272,11 +341,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
272# User Modules And Translation Layers 341# User Modules And Translation Layers
273# 342#
274CONFIG_MTD_CHAR=y 343CONFIG_MTD_CHAR=y
344CONFIG_MTD_BLKDEVS=y
275CONFIG_MTD_BLOCK=y 345CONFIG_MTD_BLOCK=y
276# CONFIG_FTL is not set 346# CONFIG_FTL is not set
277# CONFIG_NFTL is not set 347# CONFIG_NFTL is not set
278# CONFIG_INFTL is not set 348# CONFIG_INFTL is not set
279# CONFIG_RFD_FTL is not set 349# CONFIG_RFD_FTL is not set
350# CONFIG_SSFDC is not set
351# CONFIG_MTD_OOPS is not set
280 352
281# 353#
282# RAM/ROM/Flash chip drivers 354# RAM/ROM/Flash chip drivers
@@ -297,7 +369,6 @@ CONFIG_MTD_CFI_I2=y
297# CONFIG_MTD_CFI_I8 is not set 369# CONFIG_MTD_CFI_I8 is not set
298# CONFIG_MTD_CFI_INTELEXT is not set 370# CONFIG_MTD_CFI_INTELEXT is not set
299CONFIG_MTD_CFI_AMDSTD=y 371CONFIG_MTD_CFI_AMDSTD=y
300CONFIG_MTD_CFI_AMDSTD_RETRY=0
301# CONFIG_MTD_CFI_STAA is not set 372# CONFIG_MTD_CFI_STAA is not set
302CONFIG_MTD_CFI_UTIL=y 373CONFIG_MTD_CFI_UTIL=y
303# CONFIG_MTD_RAM is not set 374# CONFIG_MTD_RAM is not set
@@ -309,7 +380,8 @@ CONFIG_MTD_CFI_UTIL=y
309# 380#
310# CONFIG_MTD_COMPLEX_MAPPINGS is not set 381# CONFIG_MTD_COMPLEX_MAPPINGS is not set
311# CONFIG_MTD_PHYSMAP is not set 382# CONFIG_MTD_PHYSMAP is not set
312CONFIG_MTD_TQM85xx=y 383# CONFIG_MTD_PHYSMAP_OF is not set
384# CONFIG_MTD_INTEL_VR_NOR is not set
313# CONFIG_MTD_PLATRAM is not set 385# CONFIG_MTD_PLATRAM is not set
314 386
315# 387#
@@ -319,7 +391,6 @@ CONFIG_MTD_TQM85xx=y
319# CONFIG_MTD_SLRAM is not set 391# CONFIG_MTD_SLRAM is not set
320# CONFIG_MTD_PHRAM is not set 392# CONFIG_MTD_PHRAM is not set
321# CONFIG_MTD_MTDRAM is not set 393# CONFIG_MTD_MTDRAM is not set
322# CONFIG_MTD_BLKMTD is not set
323# CONFIG_MTD_BLOCK2MTD is not set 394# CONFIG_MTD_BLOCK2MTD is not set
324 395
325# 396#
@@ -328,29 +399,16 @@ CONFIG_MTD_TQM85xx=y
328# CONFIG_MTD_DOC2000 is not set 399# CONFIG_MTD_DOC2000 is not set
329# CONFIG_MTD_DOC2001 is not set 400# CONFIG_MTD_DOC2001 is not set
330# CONFIG_MTD_DOC2001PLUS is not set 401# CONFIG_MTD_DOC2001PLUS is not set
331
332#
333# NAND Flash Device Drivers
334#
335# CONFIG_MTD_NAND is not set 402# CONFIG_MTD_NAND is not set
336
337#
338# OneNAND Flash Device Drivers
339#
340# CONFIG_MTD_ONENAND is not set 403# CONFIG_MTD_ONENAND is not set
341 404
342# 405#
343# Parallel port support 406# UBI - Unsorted block images
344# 407#
408# CONFIG_MTD_UBI is not set
409CONFIG_OF_DEVICE=y
345# CONFIG_PARPORT is not set 410# CONFIG_PARPORT is not set
346 411CONFIG_BLK_DEV=y
347#
348# Plug and Play support
349#
350
351#
352# Block devices
353#
354# CONFIG_BLK_DEV_FD is not set 412# CONFIG_BLK_DEV_FD is not set
355# CONFIG_BLK_CPQ_DA is not set 413# CONFIG_BLK_CPQ_DA is not set
356# CONFIG_BLK_CPQ_CISS_DA is not set 414# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,14 +422,16 @@ CONFIG_BLK_DEV_LOOP=y
364CONFIG_BLK_DEV_RAM=y 422CONFIG_BLK_DEV_RAM=y
365CONFIG_BLK_DEV_RAM_COUNT=16 423CONFIG_BLK_DEV_RAM_COUNT=16
366CONFIG_BLK_DEV_RAM_SIZE=32768 424CONFIG_BLK_DEV_RAM_SIZE=32768
367CONFIG_BLK_DEV_INITRD=y 425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
368# CONFIG_CDROM_PKTCDVD is not set 426# CONFIG_CDROM_PKTCDVD is not set
369# CONFIG_ATA_OVER_ETH is not set 427# CONFIG_ATA_OVER_ETH is not set
370 428CONFIG_MISC_DEVICES=y
371# 429# CONFIG_PHANTOM is not set
372# ATA/ATAPI/MFM/RLL support 430# CONFIG_EEPROM_93CX6 is not set
373# 431# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set
374CONFIG_IDE=y 433CONFIG_IDE=y
434CONFIG_IDE_MAX_HWIFS=4
375CONFIG_BLK_DEV_IDE=y 435CONFIG_BLK_DEV_IDE=y
376 436
377# 437#
@@ -384,21 +444,24 @@ CONFIG_BLK_DEV_IDEDISK=y
384# CONFIG_BLK_DEV_IDETAPE is not set 444# CONFIG_BLK_DEV_IDETAPE is not set
385# CONFIG_BLK_DEV_IDEFLOPPY is not set 445# CONFIG_BLK_DEV_IDEFLOPPY is not set
386# CONFIG_IDE_TASK_IOCTL is not set 446# CONFIG_IDE_TASK_IOCTL is not set
447CONFIG_IDE_PROC_FS=y
387 448
388# 449#
389# IDE chipset support/bugfixes 450# IDE chipset support/bugfixes
390# 451#
391CONFIG_IDE_GENERIC=y 452CONFIG_IDE_GENERIC=y
453# CONFIG_BLK_DEV_PLATFORM is not set
454
455#
456# PCI IDE chipsets support
457#
392CONFIG_BLK_DEV_IDEPCI=y 458CONFIG_BLK_DEV_IDEPCI=y
393CONFIG_IDEPCI_SHARE_IRQ=y 459CONFIG_IDEPCI_SHARE_IRQ=y
460CONFIG_IDEPCI_PCIBUS_ORDER=y
394# CONFIG_BLK_DEV_OFFBOARD is not set 461# CONFIG_BLK_DEV_OFFBOARD is not set
395CONFIG_BLK_DEV_GENERIC=y 462CONFIG_BLK_DEV_GENERIC=y
396# CONFIG_BLK_DEV_OPTI621 is not set 463# CONFIG_BLK_DEV_OPTI621 is not set
397# CONFIG_BLK_DEV_SL82C105 is not set
398CONFIG_BLK_DEV_IDEDMA_PCI=y 464CONFIG_BLK_DEV_IDEDMA_PCI=y
399# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
400CONFIG_IDEDMA_PCI_AUTO=y
401# CONFIG_IDEDMA_ONLYDISK is not set
402# CONFIG_BLK_DEV_AEC62XX is not set 465# CONFIG_BLK_DEV_AEC62XX is not set
403# CONFIG_BLK_DEV_ALI15X3 is not set 466# CONFIG_BLK_DEV_ALI15X3 is not set
404# CONFIG_BLK_DEV_AMD74XX is not set 467# CONFIG_BLK_DEV_AMD74XX is not set
@@ -409,21 +472,24 @@ CONFIG_IDEDMA_PCI_AUTO=y
409# CONFIG_BLK_DEV_CS5530 is not set 472# CONFIG_BLK_DEV_CS5530 is not set
410# CONFIG_BLK_DEV_HPT34X is not set 473# CONFIG_BLK_DEV_HPT34X is not set
411# CONFIG_BLK_DEV_HPT366 is not set 474# CONFIG_BLK_DEV_HPT366 is not set
475# CONFIG_BLK_DEV_JMICRON is not set
412# CONFIG_BLK_DEV_SC1200 is not set 476# CONFIG_BLK_DEV_SC1200 is not set
413# CONFIG_BLK_DEV_PIIX is not set 477# CONFIG_BLK_DEV_PIIX is not set
478# CONFIG_BLK_DEV_IT8213 is not set
414# CONFIG_BLK_DEV_IT821X is not set 479# CONFIG_BLK_DEV_IT821X is not set
415# CONFIG_BLK_DEV_NS87415 is not set 480# CONFIG_BLK_DEV_NS87415 is not set
416# CONFIG_BLK_DEV_PDC202XX_OLD is not set 481# CONFIG_BLK_DEV_PDC202XX_OLD is not set
417# CONFIG_BLK_DEV_PDC202XX_NEW is not set 482# CONFIG_BLK_DEV_PDC202XX_NEW is not set
418# CONFIG_BLK_DEV_SVWKS is not set 483# CONFIG_BLK_DEV_SVWKS is not set
419# CONFIG_BLK_DEV_SIIMAGE is not set 484# CONFIG_BLK_DEV_SIIMAGE is not set
485# CONFIG_BLK_DEV_SL82C105 is not set
420# CONFIG_BLK_DEV_SLC90E66 is not set 486# CONFIG_BLK_DEV_SLC90E66 is not set
421# CONFIG_BLK_DEV_TRM290 is not set 487# CONFIG_BLK_DEV_TRM290 is not set
422CONFIG_BLK_DEV_VIA82CXXX=y 488CONFIG_BLK_DEV_VIA82CXXX=y
489# CONFIG_BLK_DEV_TC86C001 is not set
423# CONFIG_IDE_ARM is not set 490# CONFIG_IDE_ARM is not set
424CONFIG_BLK_DEV_IDEDMA=y 491CONFIG_BLK_DEV_IDEDMA=y
425# CONFIG_IDEDMA_IVB is not set 492CONFIG_IDE_ARCH_OBSOLETE_INIT=y
426CONFIG_IDEDMA_AUTO=y
427# CONFIG_BLK_DEV_HD is not set 493# CONFIG_BLK_DEV_HD is not set
428 494
429# 495#
@@ -431,49 +497,28 @@ CONFIG_IDEDMA_AUTO=y
431# 497#
432# CONFIG_RAID_ATTRS is not set 498# CONFIG_RAID_ATTRS is not set
433# CONFIG_SCSI is not set 499# CONFIG_SCSI is not set
434 500# CONFIG_SCSI_DMA is not set
435# 501# CONFIG_SCSI_NETLINK is not set
436# Multi-device support (RAID and LVM) 502# CONFIG_ATA is not set
437#
438# CONFIG_MD is not set 503# CONFIG_MD is not set
439
440#
441# Fusion MPT device support
442#
443# CONFIG_FUSION is not set 504# CONFIG_FUSION is not set
444 505
445# 506#
446# IEEE 1394 (FireWire) support 507# IEEE 1394 (FireWire) support
447# 508#
509# CONFIG_FIREWIRE is not set
448# CONFIG_IEEE1394 is not set 510# CONFIG_IEEE1394 is not set
449
450#
451# I2O device support
452#
453# CONFIG_I2O is not set 511# CONFIG_I2O is not set
454 512# CONFIG_MACINTOSH_DRIVERS is not set
455#
456# Macintosh device drivers
457#
458# CONFIG_WINDFARM is not set
459
460#
461# Network device support
462#
463CONFIG_NETDEVICES=y 513CONFIG_NETDEVICES=y
514# CONFIG_NETDEVICES_MULTIQUEUE is not set
464# CONFIG_DUMMY is not set 515# CONFIG_DUMMY is not set
465# CONFIG_BONDING is not set 516# CONFIG_BONDING is not set
517# CONFIG_MACVLAN is not set
466# CONFIG_EQUALIZER is not set 518# CONFIG_EQUALIZER is not set
467# CONFIG_TUN is not set 519# CONFIG_TUN is not set
468 520# CONFIG_VETH is not set
469#
470# ARCnet devices
471#
472# CONFIG_ARCNET is not set 521# CONFIG_ARCNET is not set
473
474#
475# PHY device support
476#
477CONFIG_PHYLIB=y 522CONFIG_PHYLIB=y
478 523
479# 524#
@@ -484,29 +529,30 @@ CONFIG_PHYLIB=y
484# CONFIG_QSEMI_PHY is not set 529# CONFIG_QSEMI_PHY is not set
485# CONFIG_LXT_PHY is not set 530# CONFIG_LXT_PHY is not set
486# CONFIG_CICADA_PHY is not set 531# CONFIG_CICADA_PHY is not set
487 532# CONFIG_VITESSE_PHY is not set
488# 533# CONFIG_SMSC_PHY is not set
489# Ethernet (10 or 100Mbit) 534# CONFIG_BROADCOM_PHY is not set
490# 535# CONFIG_ICPLUS_PHY is not set
536# CONFIG_FIXED_PHY is not set
537# CONFIG_MDIO_BITBANG is not set
491CONFIG_NET_ETHERNET=y 538CONFIG_NET_ETHERNET=y
492CONFIG_MII=y 539CONFIG_MII=y
493# CONFIG_HAPPYMEAL is not set 540# CONFIG_HAPPYMEAL is not set
494# CONFIG_SUNGEM is not set 541# CONFIG_SUNGEM is not set
495# CONFIG_CASSINI is not set 542# CONFIG_CASSINI is not set
496# CONFIG_NET_VENDOR_3COM is not set 543# CONFIG_NET_VENDOR_3COM is not set
497
498#
499# Tulip family network device support
500#
501# CONFIG_NET_TULIP is not set 544# CONFIG_NET_TULIP is not set
502# CONFIG_HP100 is not set 545# CONFIG_HP100 is not set
546# CONFIG_IBM_NEW_EMAC_ZMII is not set
547# CONFIG_IBM_NEW_EMAC_RGMII is not set
548# CONFIG_IBM_NEW_EMAC_TAH is not set
549# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
503CONFIG_NET_PCI=y 550CONFIG_NET_PCI=y
504# CONFIG_PCNET32 is not set 551# CONFIG_PCNET32 is not set
505# CONFIG_AMD8111_ETH is not set 552# CONFIG_AMD8111_ETH is not set
506# CONFIG_ADAPTEC_STARFIRE is not set 553# CONFIG_ADAPTEC_STARFIRE is not set
507# CONFIG_B44 is not set 554# CONFIG_B44 is not set
508# CONFIG_FORCEDETH is not set 555# CONFIG_FORCEDETH is not set
509# CONFIG_DGRS is not set
510# CONFIG_EEPRO100 is not set 556# CONFIG_EEPRO100 is not set
511CONFIG_E100=y 557CONFIG_E100=y
512# CONFIG_FEALNX is not set 558# CONFIG_FEALNX is not set
@@ -519,47 +565,47 @@ CONFIG_E100=y
519# CONFIG_SUNDANCE is not set 565# CONFIG_SUNDANCE is not set
520# CONFIG_TLAN is not set 566# CONFIG_TLAN is not set
521# CONFIG_VIA_RHINE is not set 567# CONFIG_VIA_RHINE is not set
568# CONFIG_SC92031 is not set
522# CONFIG_FS_ENET is not set 569# CONFIG_FS_ENET is not set
523 570CONFIG_NETDEV_1000=y
524#
525# Ethernet (1000 Mbit)
526#
527# CONFIG_ACENIC is not set 571# CONFIG_ACENIC is not set
528# CONFIG_DL2K is not set 572# CONFIG_DL2K is not set
529# CONFIG_E1000 is not set 573# CONFIG_E1000 is not set
574# CONFIG_E1000E is not set
575# CONFIG_IP1000 is not set
530# CONFIG_NS83820 is not set 576# CONFIG_NS83820 is not set
531# CONFIG_HAMACHI is not set 577# CONFIG_HAMACHI is not set
532# CONFIG_YELLOWFIN is not set 578# CONFIG_YELLOWFIN is not set
533# CONFIG_R8169 is not set 579# CONFIG_R8169 is not set
534# CONFIG_SIS190 is not set 580# CONFIG_SIS190 is not set
535# CONFIG_SKGE is not set 581# CONFIG_SKGE is not set
582# CONFIG_SKY2 is not set
536# CONFIG_SK98LIN is not set 583# CONFIG_SK98LIN is not set
537# CONFIG_VIA_VELOCITY is not set 584# CONFIG_VIA_VELOCITY is not set
538# CONFIG_TIGON3 is not set 585# CONFIG_TIGON3 is not set
539# CONFIG_BNX2 is not set 586# CONFIG_BNX2 is not set
540CONFIG_GIANFAR=y 587CONFIG_GIANFAR=y
541CONFIG_GFAR_NAPI=y 588CONFIG_GFAR_NAPI=y
542 589# CONFIG_QLA3XXX is not set
543# 590# CONFIG_ATL1 is not set
544# Ethernet (10000 Mbit) 591CONFIG_NETDEV_10000=y
545#
546# CONFIG_CHELSIO_T1 is not set 592# CONFIG_CHELSIO_T1 is not set
593# CONFIG_CHELSIO_T3 is not set
594# CONFIG_IXGBE is not set
547# CONFIG_IXGB is not set 595# CONFIG_IXGB is not set
548# CONFIG_S2IO is not set 596# CONFIG_S2IO is not set
549 597# CONFIG_MYRI10GE is not set
550# 598# CONFIG_NETXEN_NIC is not set
551# Token Ring devices 599# CONFIG_NIU is not set
552# 600# CONFIG_MLX4_CORE is not set
601# CONFIG_TEHUTI is not set
553# CONFIG_TR is not set 602# CONFIG_TR is not set
554 603
555# 604#
556# Wireless LAN (non-hamradio) 605# Wireless LAN
557#
558# CONFIG_NET_RADIO is not set
559
560#
561# Wan interfaces
562# 606#
607# CONFIG_WLAN_PRE80211 is not set
608# CONFIG_WLAN_80211 is not set
563# CONFIG_WAN is not set 609# CONFIG_WAN is not set
564# CONFIG_FDDI is not set 610# CONFIG_FDDI is not set
565# CONFIG_HIPPI is not set 611# CONFIG_HIPPI is not set
@@ -569,28 +615,21 @@ CONFIG_GFAR_NAPI=y
569# CONFIG_NETCONSOLE is not set 615# CONFIG_NETCONSOLE is not set
570# CONFIG_NETPOLL is not set 616# CONFIG_NETPOLL is not set
571# CONFIG_NET_POLL_CONTROLLER is not set 617# CONFIG_NET_POLL_CONTROLLER is not set
572
573#
574# ISDN subsystem
575#
576# CONFIG_ISDN is not set 618# CONFIG_ISDN is not set
577
578#
579# Telephony Support
580#
581# CONFIG_PHONE is not set 619# CONFIG_PHONE is not set
582 620
583# 621#
584# Input device support 622# Input device support
585# 623#
586CONFIG_INPUT=y 624CONFIG_INPUT=y
625# CONFIG_INPUT_FF_MEMLESS is not set
626# CONFIG_INPUT_POLLDEV is not set
587 627
588# 628#
589# Userland interfaces 629# Userland interfaces
590# 630#
591# CONFIG_INPUT_MOUSEDEV is not set 631# CONFIG_INPUT_MOUSEDEV is not set
592# CONFIG_INPUT_JOYDEV is not set 632# CONFIG_INPUT_JOYDEV is not set
593# CONFIG_INPUT_TSDEV is not set
594# CONFIG_INPUT_EVDEV is not set 633# CONFIG_INPUT_EVDEV is not set
595# CONFIG_INPUT_EVBUG is not set 634# CONFIG_INPUT_EVBUG is not set
596 635
@@ -600,6 +639,7 @@ CONFIG_INPUT=y
600# CONFIG_INPUT_KEYBOARD is not set 639# CONFIG_INPUT_KEYBOARD is not set
601# CONFIG_INPUT_MOUSE is not set 640# CONFIG_INPUT_MOUSE is not set
602# CONFIG_INPUT_JOYSTICK is not set 641# CONFIG_INPUT_JOYSTICK is not set
642# CONFIG_INPUT_TABLET is not set
603# CONFIG_INPUT_TOUCHSCREEN is not set 643# CONFIG_INPUT_TOUCHSCREEN is not set
604# CONFIG_INPUT_MISC is not set 644# CONFIG_INPUT_MISC is not set
605 645
@@ -620,53 +660,43 @@ CONFIG_INPUT=y
620# 660#
621CONFIG_SERIAL_8250=y 661CONFIG_SERIAL_8250=y
622CONFIG_SERIAL_8250_CONSOLE=y 662CONFIG_SERIAL_8250_CONSOLE=y
663CONFIG_SERIAL_8250_PCI=y
623CONFIG_SERIAL_8250_NR_UARTS=4 664CONFIG_SERIAL_8250_NR_UARTS=4
665CONFIG_SERIAL_8250_RUNTIME_UARTS=4
624# CONFIG_SERIAL_8250_EXTENDED is not set 666# CONFIG_SERIAL_8250_EXTENDED is not set
667CONFIG_SERIAL_8250_SHARE_IRQ=y
625 668
626# 669#
627# Non-8250 serial port support 670# Non-8250 serial port support
628# 671#
672# CONFIG_SERIAL_UARTLITE is not set
629CONFIG_SERIAL_CORE=y 673CONFIG_SERIAL_CORE=y
630CONFIG_SERIAL_CORE_CONSOLE=y 674CONFIG_SERIAL_CORE_CONSOLE=y
631# CONFIG_SERIAL_CPM is not set 675CONFIG_SERIAL_CPM=y
676CONFIG_SERIAL_CPM_CONSOLE=y
677CONFIG_SERIAL_CPM_SCC1=y
678# CONFIG_SERIAL_CPM_SCC2 is not set
679# CONFIG_SERIAL_CPM_SCC3 is not set
680# CONFIG_SERIAL_CPM_SCC4 is not set
681# CONFIG_SERIAL_CPM_SMC1 is not set
682# CONFIG_SERIAL_CPM_SMC2 is not set
632# CONFIG_SERIAL_JSM is not set 683# CONFIG_SERIAL_JSM is not set
684# CONFIG_SERIAL_OF_PLATFORM is not set
633CONFIG_UNIX98_PTYS=y 685CONFIG_UNIX98_PTYS=y
634CONFIG_LEGACY_PTYS=y 686CONFIG_LEGACY_PTYS=y
635CONFIG_LEGACY_PTY_COUNT=256 687CONFIG_LEGACY_PTY_COUNT=256
636
637#
638# IPMI
639#
640# CONFIG_IPMI_HANDLER is not set 688# CONFIG_IPMI_HANDLER is not set
641 689CONFIG_HW_RANDOM=y
642#
643# Watchdog Cards
644#
645# CONFIG_WATCHDOG is not set
646# CONFIG_NVRAM is not set 690# CONFIG_NVRAM is not set
647CONFIG_GEN_RTC=y 691CONFIG_GEN_RTC=y
648# CONFIG_GEN_RTC_X is not set 692# CONFIG_GEN_RTC_X is not set
649# CONFIG_DTLK is not set
650# CONFIG_R3964 is not set 693# CONFIG_R3964 is not set
651# CONFIG_APPLICOM is not set 694# CONFIG_APPLICOM is not set
652
653#
654# Ftape, the floppy tape device driver
655#
656# CONFIG_AGP is not set
657# CONFIG_DRM is not set
658# CONFIG_RAW_DRIVER is not set 695# CONFIG_RAW_DRIVER is not set
659
660#
661# TPM devices
662#
663# CONFIG_TCG_TPM is not set 696# CONFIG_TCG_TPM is not set
664# CONFIG_TELCLOCK is not set 697CONFIG_DEVPORT=y
665
666#
667# I2C support
668#
669CONFIG_I2C=y 698CONFIG_I2C=y
699CONFIG_I2C_BOARDINFO=y
670CONFIG_I2C_CHARDEV=y 700CONFIG_I2C_CHARDEV=y
671 701
672# 702#
@@ -689,56 +719,60 @@ CONFIG_I2C_CHARDEV=y
689# CONFIG_I2C_PIIX4 is not set 719# CONFIG_I2C_PIIX4 is not set
690CONFIG_I2C_MPC=y 720CONFIG_I2C_MPC=y
691# CONFIG_I2C_NFORCE2 is not set 721# CONFIG_I2C_NFORCE2 is not set
722# CONFIG_I2C_OCORES is not set
692# CONFIG_I2C_PARPORT_LIGHT is not set 723# CONFIG_I2C_PARPORT_LIGHT is not set
693# CONFIG_I2C_PROSAVAGE is not set 724# CONFIG_I2C_PROSAVAGE is not set
694# CONFIG_I2C_SAVAGE4 is not set 725# CONFIG_I2C_SAVAGE4 is not set
695# CONFIG_SCx200_ACB is not set 726# CONFIG_I2C_SIMTEC is not set
696# CONFIG_I2C_SIS5595 is not set 727# CONFIG_I2C_SIS5595 is not set
697# CONFIG_I2C_SIS630 is not set 728# CONFIG_I2C_SIS630 is not set
698# CONFIG_I2C_SIS96X is not set 729# CONFIG_I2C_SIS96X is not set
730# CONFIG_I2C_TAOS_EVM is not set
699# CONFIG_I2C_VIA is not set 731# CONFIG_I2C_VIA is not set
700# CONFIG_I2C_VIAPRO is not set 732# CONFIG_I2C_VIAPRO is not set
701# CONFIG_I2C_VOODOO3 is not set 733# CONFIG_I2C_VOODOO3 is not set
702# CONFIG_I2C_PCA_ISA is not set
703 734
704# 735#
705# Miscellaneous I2C Chip support 736# Miscellaneous I2C Chip support
706# 737#
707CONFIG_SENSORS_DS1337=y 738CONFIG_SENSORS_DS1337=y
708# CONFIG_SENSORS_DS1374 is not set 739# CONFIG_SENSORS_DS1374 is not set
740# CONFIG_DS1682 is not set
709# CONFIG_SENSORS_EEPROM is not set 741# CONFIG_SENSORS_EEPROM is not set
710# CONFIG_SENSORS_PCF8574 is not set 742# CONFIG_SENSORS_PCF8574 is not set
711# CONFIG_SENSORS_PCA9539 is not set 743# CONFIG_SENSORS_PCA9539 is not set
712# CONFIG_SENSORS_PCF8591 is not set 744# CONFIG_SENSORS_PCF8591 is not set
713# CONFIG_SENSORS_RTC8564 is not set
714# CONFIG_SENSORS_M41T00 is not set 745# CONFIG_SENSORS_M41T00 is not set
715# CONFIG_SENSORS_MAX6875 is not set 746# CONFIG_SENSORS_MAX6875 is not set
716# CONFIG_RTC_X1205_I2C is not set 747# CONFIG_SENSORS_TSL2550 is not set
717# CONFIG_I2C_DEBUG_CORE is not set 748# CONFIG_I2C_DEBUG_CORE is not set
718# CONFIG_I2C_DEBUG_ALGO is not set 749# CONFIG_I2C_DEBUG_ALGO is not set
719# CONFIG_I2C_DEBUG_BUS is not set 750# CONFIG_I2C_DEBUG_BUS is not set
720# CONFIG_I2C_DEBUG_CHIP is not set 751# CONFIG_I2C_DEBUG_CHIP is not set
721 752
722# 753#
723# Dallas's 1-wire bus 754# SPI support
724# 755#
756# CONFIG_SPI is not set
757# CONFIG_SPI_MASTER is not set
725# CONFIG_W1 is not set 758# CONFIG_W1 is not set
726 759# CONFIG_POWER_SUPPLY is not set
727#
728# Hardware Monitoring support
729#
730CONFIG_HWMON=y 760CONFIG_HWMON=y
731# CONFIG_HWMON_VID is not set 761# CONFIG_HWMON_VID is not set
762# CONFIG_SENSORS_AD7418 is not set
732# CONFIG_SENSORS_ADM1021 is not set 763# CONFIG_SENSORS_ADM1021 is not set
733# CONFIG_SENSORS_ADM1025 is not set 764# CONFIG_SENSORS_ADM1025 is not set
734# CONFIG_SENSORS_ADM1026 is not set 765# CONFIG_SENSORS_ADM1026 is not set
766# CONFIG_SENSORS_ADM1029 is not set
735# CONFIG_SENSORS_ADM1031 is not set 767# CONFIG_SENSORS_ADM1031 is not set
736# CONFIG_SENSORS_ADM9240 is not set 768# CONFIG_SENSORS_ADM9240 is not set
737# CONFIG_SENSORS_ASB100 is not set 769# CONFIG_SENSORS_ADT7470 is not set
738# CONFIG_SENSORS_ATXP1 is not set 770# CONFIG_SENSORS_ATXP1 is not set
739# CONFIG_SENSORS_DS1621 is not set 771# CONFIG_SENSORS_DS1621 is not set
740# CONFIG_SENSORS_FSCHER is not set 772# CONFIG_SENSORS_I5K_AMB is not set
741# CONFIG_SENSORS_FSCPOS is not set 773# CONFIG_SENSORS_F71805F is not set
774# CONFIG_SENSORS_F71882FG is not set
775# CONFIG_SENSORS_F75375S is not set
742# CONFIG_SENSORS_GL518SM is not set 776# CONFIG_SENSORS_GL518SM is not set
743# CONFIG_SENSORS_GL520SM is not set 777# CONFIG_SENSORS_GL520SM is not set
744# CONFIG_SENSORS_IT87 is not set 778# CONFIG_SENSORS_IT87 is not set
@@ -752,52 +786,75 @@ CONFIG_SENSORS_LM75=y
752# CONFIG_SENSORS_LM87 is not set 786# CONFIG_SENSORS_LM87 is not set
753# CONFIG_SENSORS_LM90 is not set 787# CONFIG_SENSORS_LM90 is not set
754# CONFIG_SENSORS_LM92 is not set 788# CONFIG_SENSORS_LM92 is not set
789# CONFIG_SENSORS_LM93 is not set
755# CONFIG_SENSORS_MAX1619 is not set 790# CONFIG_SENSORS_MAX1619 is not set
791# CONFIG_SENSORS_MAX6650 is not set
756# CONFIG_SENSORS_PC87360 is not set 792# CONFIG_SENSORS_PC87360 is not set
793# CONFIG_SENSORS_PC87427 is not set
757# CONFIG_SENSORS_SIS5595 is not set 794# CONFIG_SENSORS_SIS5595 is not set
795# CONFIG_SENSORS_DME1737 is not set
758# CONFIG_SENSORS_SMSC47M1 is not set 796# CONFIG_SENSORS_SMSC47M1 is not set
797# CONFIG_SENSORS_SMSC47M192 is not set
759# CONFIG_SENSORS_SMSC47B397 is not set 798# CONFIG_SENSORS_SMSC47B397 is not set
799# CONFIG_SENSORS_THMC50 is not set
760# CONFIG_SENSORS_VIA686A is not set 800# CONFIG_SENSORS_VIA686A is not set
801# CONFIG_SENSORS_VT1211 is not set
802# CONFIG_SENSORS_VT8231 is not set
761# CONFIG_SENSORS_W83781D is not set 803# CONFIG_SENSORS_W83781D is not set
804# CONFIG_SENSORS_W83791D is not set
762# CONFIG_SENSORS_W83792D is not set 805# CONFIG_SENSORS_W83792D is not set
806# CONFIG_SENSORS_W83793 is not set
763# CONFIG_SENSORS_W83L785TS is not set 807# CONFIG_SENSORS_W83L785TS is not set
764# CONFIG_SENSORS_W83627HF is not set 808# CONFIG_SENSORS_W83627HF is not set
765# CONFIG_SENSORS_W83627EHF is not set 809# CONFIG_SENSORS_W83627EHF is not set
766CONFIG_HWMON_DEBUG_CHIP=y 810CONFIG_HWMON_DEBUG_CHIP=y
811# CONFIG_WATCHDOG is not set
767 812
768# 813#
769# Misc devices 814# Sonics Silicon Backplane
770# 815#
816CONFIG_SSB_POSSIBLE=y
817# CONFIG_SSB is not set
771 818
772# 819#
773# Multimedia Capabilities Port drivers 820# Multifunction device drivers
774# 821#
822# CONFIG_MFD_SM501 is not set
775 823
776# 824#
777# Multimedia devices 825# Multimedia devices
778# 826#
779# CONFIG_VIDEO_DEV is not set 827# CONFIG_VIDEO_DEV is not set
780 828# CONFIG_DVB_CORE is not set
781# 829CONFIG_DAB=y
782# Digital Video Broadcasting Devices
783#
784# CONFIG_DVB is not set
785 830
786# 831#
787# Graphics support 832# Graphics support
788# 833#
834# CONFIG_AGP is not set
835# CONFIG_DRM is not set
836# CONFIG_VGASTATE is not set
837# CONFIG_VIDEO_OUTPUT_CONTROL is not set
789# CONFIG_FB is not set 838# CONFIG_FB is not set
839# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
790 840
791# 841#
792# Sound 842# Display device support
793# 843#
794# CONFIG_SOUND is not set 844# CONFIG_DISPLAY_SUPPORT is not set
795 845
796# 846#
797# USB support 847# Sound
798# 848#
849# CONFIG_SOUND is not set
850CONFIG_HID_SUPPORT=y
851CONFIG_HID=y
852# CONFIG_HID_DEBUG is not set
853# CONFIG_HIDRAW is not set
854CONFIG_USB_SUPPORT=y
799CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
800CONFIG_USB_ARCH_HAS_OHCI=y 856CONFIG_USB_ARCH_HAS_OHCI=y
857CONFIG_USB_ARCH_HAS_EHCI=y
801# CONFIG_USB is not set 858# CONFIG_USB is not set
802 859
803# 860#
@@ -808,20 +865,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
808# USB Gadget Support 865# USB Gadget Support
809# 866#
810# CONFIG_USB_GADGET is not set 867# CONFIG_USB_GADGET is not set
811
812#
813# MMC/SD Card support
814#
815# CONFIG_MMC is not set 868# CONFIG_MMC is not set
816 869# CONFIG_NEW_LEDS is not set
817#
818# InfiniBand support
819#
820# CONFIG_INFINIBAND is not set 870# CONFIG_INFINIBAND is not set
871# CONFIG_EDAC is not set
872# CONFIG_RTC_CLASS is not set
821 873
822# 874#
823# SN Devices 875# Userspace I/O
824# 876#
877# CONFIG_UIO is not set
825 878
826# 879#
827# File systems 880# File systems
@@ -833,16 +886,19 @@ CONFIG_EXT3_FS=y
833CONFIG_EXT3_FS_XATTR=y 886CONFIG_EXT3_FS_XATTR=y
834# CONFIG_EXT3_FS_POSIX_ACL is not set 887# CONFIG_EXT3_FS_POSIX_ACL is not set
835# CONFIG_EXT3_FS_SECURITY is not set 888# CONFIG_EXT3_FS_SECURITY is not set
889# CONFIG_EXT4DEV_FS is not set
836CONFIG_JBD=y 890CONFIG_JBD=y
837# CONFIG_JBD_DEBUG is not set
838CONFIG_FS_MBCACHE=y 891CONFIG_FS_MBCACHE=y
839# CONFIG_REISERFS_FS is not set 892# CONFIG_REISERFS_FS is not set
840# CONFIG_JFS_FS is not set 893# CONFIG_JFS_FS is not set
841# CONFIG_FS_POSIX_ACL is not set 894# CONFIG_FS_POSIX_ACL is not set
842# CONFIG_XFS_FS is not set 895# CONFIG_XFS_FS is not set
896# CONFIG_GFS2_FS is not set
897# CONFIG_OCFS2_FS is not set
843# CONFIG_MINIX_FS is not set 898# CONFIG_MINIX_FS is not set
844# CONFIG_ROMFS_FS is not set 899# CONFIG_ROMFS_FS is not set
845CONFIG_INOTIFY=y 900CONFIG_INOTIFY=y
901CONFIG_INOTIFY_USER=y
846# CONFIG_QUOTA is not set 902# CONFIG_QUOTA is not set
847CONFIG_DNOTIFY=y 903CONFIG_DNOTIFY=y
848# CONFIG_AUTOFS_FS is not set 904# CONFIG_AUTOFS_FS is not set
@@ -867,11 +923,12 @@ CONFIG_DNOTIFY=y
867# 923#
868CONFIG_PROC_FS=y 924CONFIG_PROC_FS=y
869CONFIG_PROC_KCORE=y 925CONFIG_PROC_KCORE=y
926CONFIG_PROC_SYSCTL=y
870CONFIG_SYSFS=y 927CONFIG_SYSFS=y
871CONFIG_TMPFS=y 928CONFIG_TMPFS=y
929# CONFIG_TMPFS_POSIX_ACL is not set
872# CONFIG_HUGETLB_PAGE is not set 930# CONFIG_HUGETLB_PAGE is not set
873CONFIG_RAMFS=y 931# CONFIG_CONFIGFS_FS is not set
874# CONFIG_RELAYFS_FS is not set
875 932
876# 933#
877# Miscellaneous filesystems 934# Miscellaneous filesystems
@@ -883,13 +940,15 @@ CONFIG_RAMFS=y
883# CONFIG_BEFS_FS is not set 940# CONFIG_BEFS_FS is not set
884# CONFIG_BFS_FS is not set 941# CONFIG_BFS_FS is not set
885# CONFIG_EFS_FS is not set 942# CONFIG_EFS_FS is not set
886# CONFIG_JFFS_FS is not set
887CONFIG_JFFS2_FS=y 943CONFIG_JFFS2_FS=y
888CONFIG_JFFS2_FS_DEBUG=0 944CONFIG_JFFS2_FS_DEBUG=0
889CONFIG_JFFS2_FS_WRITEBUFFER=y 945CONFIG_JFFS2_FS_WRITEBUFFER=y
946# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
890# CONFIG_JFFS2_SUMMARY is not set 947# CONFIG_JFFS2_SUMMARY is not set
948# CONFIG_JFFS2_FS_XATTR is not set
891# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 949# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
892CONFIG_JFFS2_ZLIB=y 950CONFIG_JFFS2_ZLIB=y
951# CONFIG_JFFS2_LZO is not set
893CONFIG_JFFS2_RTIME=y 952CONFIG_JFFS2_RTIME=y
894# CONFIG_JFFS2_RUBIN is not set 953# CONFIG_JFFS2_RUBIN is not set
895CONFIG_CRAMFS=y 954CONFIG_CRAMFS=y
@@ -898,10 +957,7 @@ CONFIG_CRAMFS=y
898# CONFIG_QNX4FS_FS is not set 957# CONFIG_QNX4FS_FS is not set
899# CONFIG_SYSV_FS is not set 958# CONFIG_SYSV_FS is not set
900# CONFIG_UFS_FS is not set 959# CONFIG_UFS_FS is not set
901 960CONFIG_NETWORK_FILESYSTEMS=y
902#
903# Network File Systems
904#
905CONFIG_NFS_FS=y 961CONFIG_NFS_FS=y
906# CONFIG_NFS_V3 is not set 962# CONFIG_NFS_V3 is not set
907# CONFIG_NFS_V4 is not set 963# CONFIG_NFS_V4 is not set
@@ -911,6 +967,7 @@ CONFIG_ROOT_NFS=y
911CONFIG_LOCKD=y 967CONFIG_LOCKD=y
912CONFIG_NFS_COMMON=y 968CONFIG_NFS_COMMON=y
913CONFIG_SUNRPC=y 969CONFIG_SUNRPC=y
970# CONFIG_SUNRPC_BIND34 is not set
914# CONFIG_RPCSEC_GSS_KRB5 is not set 971# CONFIG_RPCSEC_GSS_KRB5 is not set
915# CONFIG_RPCSEC_GSS_SPKM3 is not set 972# CONFIG_RPCSEC_GSS_SPKM3 is not set
916# CONFIG_SMB_FS is not set 973# CONFIG_SMB_FS is not set
@@ -918,7 +975,6 @@ CONFIG_SUNRPC=y
918# CONFIG_NCP_FS is not set 975# CONFIG_NCP_FS is not set
919# CONFIG_CODA_FS is not set 976# CONFIG_CODA_FS is not set
920# CONFIG_AFS_FS is not set 977# CONFIG_AFS_FS is not set
921# CONFIG_9P_FS is not set
922 978
923# 979#
924# Partition Types 980# Partition Types
@@ -934,50 +990,55 @@ CONFIG_PARTITION_ADVANCED=y
934# CONFIG_SGI_PARTITION is not set 990# CONFIG_SGI_PARTITION is not set
935# CONFIG_ULTRIX_PARTITION is not set 991# CONFIG_ULTRIX_PARTITION is not set
936# CONFIG_SUN_PARTITION is not set 992# CONFIG_SUN_PARTITION is not set
993# CONFIG_KARMA_PARTITION is not set
937# CONFIG_EFI_PARTITION is not set 994# CONFIG_EFI_PARTITION is not set
938 995# CONFIG_SYSV68_PARTITION is not set
939#
940# Native Language Support
941#
942# CONFIG_NLS is not set 996# CONFIG_NLS is not set
943# CONFIG_SCC_ENET is not set 997# CONFIG_DLM is not set
944# CONFIG_FEC_ENET is not set
945
946#
947# CPM2 Options
948#
949 998
950# 999#
951# Library routines 1000# Library routines
952# 1001#
1002CONFIG_BITREVERSE=y
953# CONFIG_CRC_CCITT is not set 1003# CONFIG_CRC_CCITT is not set
954# CONFIG_CRC16 is not set 1004# CONFIG_CRC16 is not set
1005# CONFIG_CRC_ITU_T is not set
955CONFIG_CRC32=y 1006CONFIG_CRC32=y
1007# CONFIG_CRC7 is not set
956# CONFIG_LIBCRC32C is not set 1008# CONFIG_LIBCRC32C is not set
957CONFIG_ZLIB_INFLATE=y 1009CONFIG_ZLIB_INFLATE=y
958CONFIG_ZLIB_DEFLATE=y 1010CONFIG_ZLIB_DEFLATE=y
1011CONFIG_PLIST=y
1012CONFIG_HAS_IOMEM=y
1013CONFIG_HAS_IOPORT=y
1014CONFIG_HAS_DMA=y
1015CONFIG_INSTRUMENTATION=y
959# CONFIG_PROFILING is not set 1016# CONFIG_PROFILING is not set
1017# CONFIG_MARKERS is not set
960 1018
961# 1019#
962# Kernel hacking 1020# Kernel hacking
963# 1021#
964# CONFIG_PRINTK_TIME is not set 1022# CONFIG_PRINTK_TIME is not set
1023CONFIG_ENABLE_WARN_DEPRECATED=y
1024CONFIG_ENABLE_MUST_CHECK=y
1025# CONFIG_MAGIC_SYSRQ is not set
1026# CONFIG_UNUSED_SYMBOLS is not set
1027# CONFIG_DEBUG_FS is not set
1028# CONFIG_HEADERS_CHECK is not set
965# CONFIG_DEBUG_KERNEL is not set 1029# CONFIG_DEBUG_KERNEL is not set
966CONFIG_LOG_BUF_SHIFT=14 1030# CONFIG_SLUB_DEBUG_ON is not set
1031# CONFIG_DEBUG_BUGVERBOSE is not set
1032# CONFIG_SAMPLES is not set
967# CONFIG_KGDB_CONSOLE is not set 1033# CONFIG_KGDB_CONSOLE is not set
968# CONFIG_SERIAL_TEXT_DEBUG is not set 1034# CONFIG_PPC_EARLY_DEBUG is not set
969 1035
970# 1036#
971# Security options 1037# Security options
972# 1038#
973# CONFIG_KEYS is not set 1039# CONFIG_KEYS is not set
974# CONFIG_SECURITY is not set 1040# CONFIG_SECURITY is not set
975 1041# CONFIG_SECURITY_FILE_CAPABILITIES is not set
976#
977# Cryptographic options
978#
979# CONFIG_CRYPTO is not set 1042# CONFIG_CRYPTO is not set
980 1043# CONFIG_PPC_CLOCK is not set
981# 1044CONFIG_PPC_LIB_RHEAP=y
982# Hardware crypto devices
983#
diff --git a/arch/ppc/configs/TQM8560_defconfig b/arch/powerpc/configs/tqm8560_defconfig
index a814d17a2be9..0832e8996ac2 100644
--- a/arch/ppc/configs/TQM8560_defconfig
+++ b/arch/powerpc/configs/tqm8560_defconfig
@@ -1,66 +1,116 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.24-rc8
4# Wed Nov 30 16:47:53 2005 4# Thu Jan 24 23:50:42 2008
5# 5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
6CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33CONFIG_IRQ_PER_CPU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
10CONFIG_PPC=y 40CONFIG_PPC=y
11CONFIG_PPC32=y 41CONFIG_EARLY_PRINTK=y
12CONFIG_GENERIC_NVRAM=y 42CONFIG_GENERIC_NVRAM=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y 44CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y
46CONFIG_OF=y
47CONFIG_PPC_UDBG_16550=y
48# CONFIG_GENERIC_TBSYNC is not set
49CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y
51CONFIG_DEFAULT_UIMAGE=y
52# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 55
16# 56#
17# Code maturity level options 57# General setup
18# 58#
19CONFIG_EXPERIMENTAL=y 59CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 60CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 61CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION="" 62CONFIG_LOCALVERSION=""
28CONFIG_LOCALVERSION_AUTO=y 63CONFIG_LOCALVERSION_AUTO=y
29CONFIG_SWAP=y 64CONFIG_SWAP=y
30CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66CONFIG_SYSVIPC_SYSCTL=y
31# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
32# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
34# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
35# CONFIG_HOTPLUG is not set
36CONFIG_KOBJECT_UEVENT=y
37# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set
81CONFIG_BLK_DEV_INITRD=y
38CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y
39CONFIG_EMBEDDED=y 85CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y
40# CONFIG_KALLSYMS is not set 87# CONFIG_KALLSYMS is not set
88# CONFIG_HOTPLUG is not set
41CONFIG_PRINTK=y 89CONFIG_PRINTK=y
42CONFIG_BUG=y 90CONFIG_BUG=y
91CONFIG_ELF_CORE=y
43CONFIG_BASE_FULL=y 92CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 93CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y
45# CONFIG_EPOLL is not set 95# CONFIG_EPOLL is not set
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 96CONFIG_SIGNALFD=y
97CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 98CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 99CONFIG_VM_EVENT_COUNTERS=y
49CONFIG_CC_ALIGN_LABELS=0 100CONFIG_SLUB_DEBUG=y
50CONFIG_CC_ALIGN_LOOPS=0 101# CONFIG_SLAB is not set
51CONFIG_CC_ALIGN_JUMPS=0 102CONFIG_SLUB=y
103# CONFIG_SLOB is not set
104CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58# CONFIG_MODULES is not set 108# CONFIG_MODULES is not set
59 109CONFIG_BLOCK=y
60#
61# Block layer
62#
63# CONFIG_LBD is not set 110# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_LSF is not set
113# CONFIG_BLK_DEV_BSG is not set
64 114
65# 115#
66# IO Schedulers 116# IO Schedulers
@@ -76,55 +126,63 @@ CONFIG_DEFAULT_AS=y
76CONFIG_DEFAULT_IOSCHED="anticipatory" 126CONFIG_DEFAULT_IOSCHED="anticipatory"
77 127
78# 128#
79# Processor 129# Platform support
80#
81# CONFIG_6xx is not set
82# CONFIG_40x is not set
83# CONFIG_44x is not set
84# CONFIG_POWER3 is not set
85# CONFIG_POWER4 is not set
86# CONFIG_8xx is not set
87# CONFIG_E200 is not set
88CONFIG_E500=y
89CONFIG_BOOKE=y
90CONFIG_FSL_BOOKE=y
91# CONFIG_PHYS_64BIT is not set
92CONFIG_SPE=y
93CONFIG_MATH_EMULATION=y
94# CONFIG_KEXEC is not set
95# CONFIG_CPU_FREQ is not set
96# CONFIG_WANT_EARLY_SERIAL is not set
97CONFIG_85xx=y
98CONFIG_PPC_INDIRECT_PCI_BE=y
99
100#
101# Freescale 85xx options
102# 130#
131# CONFIG_PPC_MPC52xx is not set
132# CONFIG_PPC_MPC5200 is not set
133# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set
103# CONFIG_MPC8540_ADS is not set 136# CONFIG_MPC8540_ADS is not set
104# CONFIG_MPC8548_CDS is not set
105# CONFIG_MPC8555_CDS is not set
106# CONFIG_MPC8560_ADS is not set 137# CONFIG_MPC8560_ADS is not set
107# CONFIG_SBC8560 is not set 138# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set
108# CONFIG_STX_GP3 is not set 141# CONFIG_STX_GP3 is not set
109# CONFIG_TQM8540 is not set 142# CONFIG_TQM8540 is not set
110# CONFIG_TQM8541 is not set 143# CONFIG_TQM8541 is not set
111# CONFIG_TQM8555 is not set 144# CONFIG_TQM8555 is not set
112CONFIG_TQM8560=y 145CONFIG_TQM8560=y
113CONFIG_MPC8560=y 146CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set
149CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set
152# CONFIG_PPC_RTAS is not set
153# CONFIG_MMIO_NVRAM is not set
154# CONFIG_PPC_MPC106 is not set
155# CONFIG_PPC_970_NAP is not set
156# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set
159CONFIG_CPM2=y
160CONFIG_PPC_CPM_NEW_BINDING=y
161# CONFIG_FSL_ULI1575 is not set
162CONFIG_CPM=y
114 163
115# 164#
116# Platform options 165# Kernel options
117# 166#
118CONFIG_CPM2=y
119# CONFIG_PC_KEYBOARD is not set
120# CONFIG_HIGHMEM is not set 167# CONFIG_HIGHMEM is not set
168# CONFIG_TICK_ONESHOT is not set
169# CONFIG_NO_HZ is not set
170# CONFIG_HIGH_RES_TIMERS is not set
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
121# CONFIG_HZ_100 is not set 172# CONFIG_HZ_100 is not set
122CONFIG_HZ_250=y 173CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set
123# CONFIG_HZ_1000 is not set 175# CONFIG_HZ_1000 is not set
124CONFIG_HZ=250 176CONFIG_HZ=250
125CONFIG_PREEMPT_NONE=y 177CONFIG_PREEMPT_NONE=y
126# CONFIG_PREEMPT_VOLUNTARY is not set 178# CONFIG_PREEMPT_VOLUNTARY is not set
127# CONFIG_PREEMPT is not set 179# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set
182CONFIG_MATH_EMULATION=y
183CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
184CONFIG_ARCH_FLATMEM_ENABLE=y
185CONFIG_ARCH_POPULATES_NODE_MAP=y
128CONFIG_SELECT_MEMORY_MODEL=y 186CONFIG_SELECT_MEMORY_MODEL=y
129CONFIG_FLATMEM_MANUAL=y 187CONFIG_FLATMEM_MANUAL=y
130# CONFIG_DISCONTIGMEM_MANUAL is not set 188# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -132,29 +190,36 @@ CONFIG_FLATMEM_MANUAL=y
132CONFIG_FLATMEM=y 190CONFIG_FLATMEM=y
133CONFIG_FLAT_NODE_MEM_MAP=y 191CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
193# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 194CONFIG_SPLIT_PTLOCK_CPUS=4
136CONFIG_BINFMT_ELF=y 195# CONFIG_RESOURCES_64BIT is not set
137# CONFIG_BINFMT_MISC is not set 196CONFIG_ZONE_DMA_FLAG=1
197CONFIG_BOUNCE=y
198CONFIG_VIRT_TO_BUS=y
199# CONFIG_PROC_DEVICETREE is not set
138# CONFIG_CMDLINE_BOOL is not set 200# CONFIG_CMDLINE_BOOL is not set
139# CONFIG_PM is not set 201# CONFIG_PM is not set
140# CONFIG_HIBERNATION is not set 202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
141CONFIG_SECCOMP=y 204CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="tqm8560.dts"
142CONFIG_ISA_DMA_API=y 207CONFIG_ISA_DMA_API=y
143 208
144# 209#
145# Bus options 210# Bus options
146# 211#
147CONFIG_PPC_I8259=y 212CONFIG_ZONE_DMA=y
148CONFIG_PPC_INDIRECT_PCI=y 213CONFIG_PPC_INDIRECT_PCI=y
214CONFIG_FSL_SOC=y
215CONFIG_FSL_PCI=y
149CONFIG_PCI=y 216CONFIG_PCI=y
150CONFIG_PCI_DOMAINS=y 217CONFIG_PCI_DOMAINS=y
151# CONFIG_PCI_LEGACY_PROC is not set 218CONFIG_PCI_SYSCALL=y
152 219# CONFIG_PCIEPORTBUS is not set
153# 220CONFIG_ARCH_SUPPORTS_MSI=y
154# PCCARD (PCMCIA/CardBus) support 221# CONFIG_PCI_MSI is not set
155# 222CONFIG_PCI_LEGACY=y
156# CONFIG_PCCARD is not set
157# CONFIG_RAPIDIO is not set
158 223
159# 224#
160# Advanced setup 225# Advanced setup
@@ -167,7 +232,7 @@ CONFIG_PCI_DOMAINS=y
167CONFIG_HIGHMEM_START=0xfe000000 232CONFIG_HIGHMEM_START=0xfe000000
168CONFIG_LOWMEM_SIZE=0x30000000 233CONFIG_LOWMEM_SIZE=0x30000000
169CONFIG_KERNEL_START=0xc0000000 234CONFIG_KERNEL_START=0xc0000000
170CONFIG_TASK_SIZE=0x80000000 235CONFIG_TASK_SIZE=0xc0000000
171CONFIG_BOOT_LOAD=0x00800000 236CONFIG_BOOT_LOAD=0x00800000
172 237
173# 238#
@@ -181,6 +246,10 @@ CONFIG_NET=y
181CONFIG_PACKET=y 246CONFIG_PACKET=y
182# CONFIG_PACKET_MMAP is not set 247# CONFIG_PACKET_MMAP is not set
183CONFIG_UNIX=y 248CONFIG_UNIX=y
249CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set
184# CONFIG_NET_KEY is not set 253# CONFIG_NET_KEY is not set
185CONFIG_INET=y 254CONFIG_INET=y
186CONFIG_IP_MULTICAST=y 255CONFIG_IP_MULTICAST=y
@@ -198,23 +267,26 @@ CONFIG_SYN_COOKIES=y
198# CONFIG_INET_AH is not set 267# CONFIG_INET_AH is not set
199# CONFIG_INET_ESP is not set 268# CONFIG_INET_ESP is not set
200# CONFIG_INET_IPCOMP is not set 269# CONFIG_INET_IPCOMP is not set
270# CONFIG_INET_XFRM_TUNNEL is not set
201# CONFIG_INET_TUNNEL is not set 271# CONFIG_INET_TUNNEL is not set
272CONFIG_INET_XFRM_MODE_TRANSPORT=y
273CONFIG_INET_XFRM_MODE_TUNNEL=y
274CONFIG_INET_XFRM_MODE_BEET=y
275# CONFIG_INET_LRO is not set
202CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
203CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
204# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
205CONFIG_TCP_CONG_BIC=y 279CONFIG_TCP_CONG_CUBIC=y
280CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_TCP_MD5SIG is not set
206# CONFIG_IPV6 is not set 282# CONFIG_IPV6 is not set
283# CONFIG_INET6_XFRM_TUNNEL is not set
284# CONFIG_INET6_TUNNEL is not set
285# CONFIG_NETWORK_SECMARK is not set
207# CONFIG_NETFILTER is not set 286# CONFIG_NETFILTER is not set
208
209#
210# DCCP Configuration (EXPERIMENTAL)
211#
212# CONFIG_IP_DCCP is not set 287# CONFIG_IP_DCCP is not set
213
214#
215# SCTP Configuration (EXPERIMENTAL)
216#
217# CONFIG_IP_SCTP is not set 288# CONFIG_IP_SCTP is not set
289# CONFIG_TIPC is not set
218# CONFIG_ATM is not set 290# CONFIG_ATM is not set
219# CONFIG_BRIDGE is not set 291# CONFIG_BRIDGE is not set
220# CONFIG_VLAN_8021Q is not set 292# CONFIG_VLAN_8021Q is not set
@@ -224,13 +296,8 @@ CONFIG_TCP_CONG_BIC=y
224# CONFIG_ATALK is not set 296# CONFIG_ATALK is not set
225# CONFIG_X25 is not set 297# CONFIG_X25 is not set
226# CONFIG_LAPB is not set 298# CONFIG_LAPB is not set
227# CONFIG_NET_DIVERT is not set
228# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
229# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
230
231#
232# QoS and/or fair queueing
233#
234# CONFIG_NET_SCHED is not set 301# CONFIG_NET_SCHED is not set
235 302
236# 303#
@@ -240,7 +307,17 @@ CONFIG_TCP_CONG_BIC=y
240# CONFIG_HAMRADIO is not set 307# CONFIG_HAMRADIO is not set
241# CONFIG_IRDA is not set 308# CONFIG_IRDA is not set
242# CONFIG_BT is not set 309# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set
311
312#
313# Wireless
314#
315# CONFIG_CFG80211 is not set
316# CONFIG_WIRELESS_EXT is not set
317# CONFIG_MAC80211 is not set
243# CONFIG_IEEE80211 is not set 318# CONFIG_IEEE80211 is not set
319# CONFIG_RFKILL is not set
320# CONFIG_NET_9P is not set
244 321
245# 322#
246# Device Drivers 323# Device Drivers
@@ -251,16 +328,8 @@ CONFIG_TCP_CONG_BIC=y
251# 328#
252CONFIG_STANDALONE=y 329CONFIG_STANDALONE=y
253CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
254# CONFIG_FW_LOADER is not set 331# CONFIG_SYS_HYPERVISOR is not set
255
256#
257# Connector - unified userspace <-> kernelspace linker
258#
259# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
260
261#
262# Memory Technology Devices (MTD)
263#
264CONFIG_MTD=y 333CONFIG_MTD=y
265# CONFIG_MTD_DEBUG is not set 334# CONFIG_MTD_DEBUG is not set
266CONFIG_MTD_CONCAT=y 335CONFIG_MTD_CONCAT=y
@@ -272,11 +341,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
272# User Modules And Translation Layers 341# User Modules And Translation Layers
273# 342#
274CONFIG_MTD_CHAR=y 343CONFIG_MTD_CHAR=y
344CONFIG_MTD_BLKDEVS=y
275CONFIG_MTD_BLOCK=y 345CONFIG_MTD_BLOCK=y
276# CONFIG_FTL is not set 346# CONFIG_FTL is not set
277# CONFIG_NFTL is not set 347# CONFIG_NFTL is not set
278# CONFIG_INFTL is not set 348# CONFIG_INFTL is not set
279# CONFIG_RFD_FTL is not set 349# CONFIG_RFD_FTL is not set
350# CONFIG_SSFDC is not set
351# CONFIG_MTD_OOPS is not set
280 352
281# 353#
282# RAM/ROM/Flash chip drivers 354# RAM/ROM/Flash chip drivers
@@ -297,7 +369,6 @@ CONFIG_MTD_CFI_I2=y
297# CONFIG_MTD_CFI_I8 is not set 369# CONFIG_MTD_CFI_I8 is not set
298# CONFIG_MTD_CFI_INTELEXT is not set 370# CONFIG_MTD_CFI_INTELEXT is not set
299CONFIG_MTD_CFI_AMDSTD=y 371CONFIG_MTD_CFI_AMDSTD=y
300CONFIG_MTD_CFI_AMDSTD_RETRY=0
301# CONFIG_MTD_CFI_STAA is not set 372# CONFIG_MTD_CFI_STAA is not set
302CONFIG_MTD_CFI_UTIL=y 373CONFIG_MTD_CFI_UTIL=y
303# CONFIG_MTD_RAM is not set 374# CONFIG_MTD_RAM is not set
@@ -309,7 +380,8 @@ CONFIG_MTD_CFI_UTIL=y
309# 380#
310# CONFIG_MTD_COMPLEX_MAPPINGS is not set 381# CONFIG_MTD_COMPLEX_MAPPINGS is not set
311# CONFIG_MTD_PHYSMAP is not set 382# CONFIG_MTD_PHYSMAP is not set
312CONFIG_MTD_TQM85xx=y 383# CONFIG_MTD_PHYSMAP_OF is not set
384# CONFIG_MTD_INTEL_VR_NOR is not set
313# CONFIG_MTD_PLATRAM is not set 385# CONFIG_MTD_PLATRAM is not set
314 386
315# 387#
@@ -319,7 +391,6 @@ CONFIG_MTD_TQM85xx=y
319# CONFIG_MTD_SLRAM is not set 391# CONFIG_MTD_SLRAM is not set
320# CONFIG_MTD_PHRAM is not set 392# CONFIG_MTD_PHRAM is not set
321# CONFIG_MTD_MTDRAM is not set 393# CONFIG_MTD_MTDRAM is not set
322# CONFIG_MTD_BLKMTD is not set
323# CONFIG_MTD_BLOCK2MTD is not set 394# CONFIG_MTD_BLOCK2MTD is not set
324 395
325# 396#
@@ -328,29 +399,16 @@ CONFIG_MTD_TQM85xx=y
328# CONFIG_MTD_DOC2000 is not set 399# CONFIG_MTD_DOC2000 is not set
329# CONFIG_MTD_DOC2001 is not set 400# CONFIG_MTD_DOC2001 is not set
330# CONFIG_MTD_DOC2001PLUS is not set 401# CONFIG_MTD_DOC2001PLUS is not set
331
332#
333# NAND Flash Device Drivers
334#
335# CONFIG_MTD_NAND is not set 402# CONFIG_MTD_NAND is not set
336
337#
338# OneNAND Flash Device Drivers
339#
340# CONFIG_MTD_ONENAND is not set 403# CONFIG_MTD_ONENAND is not set
341 404
342# 405#
343# Parallel port support 406# UBI - Unsorted block images
344# 407#
408# CONFIG_MTD_UBI is not set
409CONFIG_OF_DEVICE=y
345# CONFIG_PARPORT is not set 410# CONFIG_PARPORT is not set
346 411CONFIG_BLK_DEV=y
347#
348# Plug and Play support
349#
350
351#
352# Block devices
353#
354# CONFIG_BLK_DEV_FD is not set 412# CONFIG_BLK_DEV_FD is not set
355# CONFIG_BLK_CPQ_DA is not set 413# CONFIG_BLK_CPQ_DA is not set
356# CONFIG_BLK_CPQ_CISS_DA is not set 414# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,14 +422,16 @@ CONFIG_BLK_DEV_LOOP=y
364CONFIG_BLK_DEV_RAM=y 422CONFIG_BLK_DEV_RAM=y
365CONFIG_BLK_DEV_RAM_COUNT=16 423CONFIG_BLK_DEV_RAM_COUNT=16
366CONFIG_BLK_DEV_RAM_SIZE=32768 424CONFIG_BLK_DEV_RAM_SIZE=32768
367CONFIG_BLK_DEV_INITRD=y 425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
368# CONFIG_CDROM_PKTCDVD is not set 426# CONFIG_CDROM_PKTCDVD is not set
369# CONFIG_ATA_OVER_ETH is not set 427# CONFIG_ATA_OVER_ETH is not set
370 428CONFIG_MISC_DEVICES=y
371# 429# CONFIG_PHANTOM is not set
372# ATA/ATAPI/MFM/RLL support 430# CONFIG_EEPROM_93CX6 is not set
373# 431# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set
374CONFIG_IDE=y 433CONFIG_IDE=y
434CONFIG_IDE_MAX_HWIFS=4
375CONFIG_BLK_DEV_IDE=y 435CONFIG_BLK_DEV_IDE=y
376 436
377# 437#
@@ -384,21 +444,24 @@ CONFIG_BLK_DEV_IDEDISK=y
384# CONFIG_BLK_DEV_IDETAPE is not set 444# CONFIG_BLK_DEV_IDETAPE is not set
385# CONFIG_BLK_DEV_IDEFLOPPY is not set 445# CONFIG_BLK_DEV_IDEFLOPPY is not set
386# CONFIG_IDE_TASK_IOCTL is not set 446# CONFIG_IDE_TASK_IOCTL is not set
447CONFIG_IDE_PROC_FS=y
387 448
388# 449#
389# IDE chipset support/bugfixes 450# IDE chipset support/bugfixes
390# 451#
391CONFIG_IDE_GENERIC=y 452CONFIG_IDE_GENERIC=y
453# CONFIG_BLK_DEV_PLATFORM is not set
454
455#
456# PCI IDE chipsets support
457#
392CONFIG_BLK_DEV_IDEPCI=y 458CONFIG_BLK_DEV_IDEPCI=y
393CONFIG_IDEPCI_SHARE_IRQ=y 459CONFIG_IDEPCI_SHARE_IRQ=y
460CONFIG_IDEPCI_PCIBUS_ORDER=y
394# CONFIG_BLK_DEV_OFFBOARD is not set 461# CONFIG_BLK_DEV_OFFBOARD is not set
395CONFIG_BLK_DEV_GENERIC=y 462CONFIG_BLK_DEV_GENERIC=y
396# CONFIG_BLK_DEV_OPTI621 is not set 463# CONFIG_BLK_DEV_OPTI621 is not set
397# CONFIG_BLK_DEV_SL82C105 is not set
398CONFIG_BLK_DEV_IDEDMA_PCI=y 464CONFIG_BLK_DEV_IDEDMA_PCI=y
399# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
400CONFIG_IDEDMA_PCI_AUTO=y
401# CONFIG_IDEDMA_ONLYDISK is not set
402# CONFIG_BLK_DEV_AEC62XX is not set 465# CONFIG_BLK_DEV_AEC62XX is not set
403# CONFIG_BLK_DEV_ALI15X3 is not set 466# CONFIG_BLK_DEV_ALI15X3 is not set
404# CONFIG_BLK_DEV_AMD74XX is not set 467# CONFIG_BLK_DEV_AMD74XX is not set
@@ -409,21 +472,24 @@ CONFIG_IDEDMA_PCI_AUTO=y
409# CONFIG_BLK_DEV_CS5530 is not set 472# CONFIG_BLK_DEV_CS5530 is not set
410# CONFIG_BLK_DEV_HPT34X is not set 473# CONFIG_BLK_DEV_HPT34X is not set
411# CONFIG_BLK_DEV_HPT366 is not set 474# CONFIG_BLK_DEV_HPT366 is not set
475# CONFIG_BLK_DEV_JMICRON is not set
412# CONFIG_BLK_DEV_SC1200 is not set 476# CONFIG_BLK_DEV_SC1200 is not set
413# CONFIG_BLK_DEV_PIIX is not set 477# CONFIG_BLK_DEV_PIIX is not set
478# CONFIG_BLK_DEV_IT8213 is not set
414# CONFIG_BLK_DEV_IT821X is not set 479# CONFIG_BLK_DEV_IT821X is not set
415# CONFIG_BLK_DEV_NS87415 is not set 480# CONFIG_BLK_DEV_NS87415 is not set
416# CONFIG_BLK_DEV_PDC202XX_OLD is not set 481# CONFIG_BLK_DEV_PDC202XX_OLD is not set
417# CONFIG_BLK_DEV_PDC202XX_NEW is not set 482# CONFIG_BLK_DEV_PDC202XX_NEW is not set
418# CONFIG_BLK_DEV_SVWKS is not set 483# CONFIG_BLK_DEV_SVWKS is not set
419# CONFIG_BLK_DEV_SIIMAGE is not set 484# CONFIG_BLK_DEV_SIIMAGE is not set
485# CONFIG_BLK_DEV_SL82C105 is not set
420# CONFIG_BLK_DEV_SLC90E66 is not set 486# CONFIG_BLK_DEV_SLC90E66 is not set
421# CONFIG_BLK_DEV_TRM290 is not set 487# CONFIG_BLK_DEV_TRM290 is not set
422CONFIG_BLK_DEV_VIA82CXXX=y 488CONFIG_BLK_DEV_VIA82CXXX=y
489# CONFIG_BLK_DEV_TC86C001 is not set
423# CONFIG_IDE_ARM is not set 490# CONFIG_IDE_ARM is not set
424CONFIG_BLK_DEV_IDEDMA=y 491CONFIG_BLK_DEV_IDEDMA=y
425# CONFIG_IDEDMA_IVB is not set 492CONFIG_IDE_ARCH_OBSOLETE_INIT=y
426CONFIG_IDEDMA_AUTO=y
427# CONFIG_BLK_DEV_HD is not set 493# CONFIG_BLK_DEV_HD is not set
428 494
429# 495#
@@ -431,49 +497,28 @@ CONFIG_IDEDMA_AUTO=y
431# 497#
432# CONFIG_RAID_ATTRS is not set 498# CONFIG_RAID_ATTRS is not set
433# CONFIG_SCSI is not set 499# CONFIG_SCSI is not set
434 500# CONFIG_SCSI_DMA is not set
435# 501# CONFIG_SCSI_NETLINK is not set
436# Multi-device support (RAID and LVM) 502# CONFIG_ATA is not set
437#
438# CONFIG_MD is not set 503# CONFIG_MD is not set
439
440#
441# Fusion MPT device support
442#
443# CONFIG_FUSION is not set 504# CONFIG_FUSION is not set
444 505
445# 506#
446# IEEE 1394 (FireWire) support 507# IEEE 1394 (FireWire) support
447# 508#
509# CONFIG_FIREWIRE is not set
448# CONFIG_IEEE1394 is not set 510# CONFIG_IEEE1394 is not set
449
450#
451# I2O device support
452#
453# CONFIG_I2O is not set 511# CONFIG_I2O is not set
454 512# CONFIG_MACINTOSH_DRIVERS is not set
455#
456# Macintosh device drivers
457#
458# CONFIG_WINDFARM is not set
459
460#
461# Network device support
462#
463CONFIG_NETDEVICES=y 513CONFIG_NETDEVICES=y
514# CONFIG_NETDEVICES_MULTIQUEUE is not set
464# CONFIG_DUMMY is not set 515# CONFIG_DUMMY is not set
465# CONFIG_BONDING is not set 516# CONFIG_BONDING is not set
517# CONFIG_MACVLAN is not set
466# CONFIG_EQUALIZER is not set 518# CONFIG_EQUALIZER is not set
467# CONFIG_TUN is not set 519# CONFIG_TUN is not set
468 520# CONFIG_VETH is not set
469#
470# ARCnet devices
471#
472# CONFIG_ARCNET is not set 521# CONFIG_ARCNET is not set
473
474#
475# PHY device support
476#
477CONFIG_PHYLIB=y 522CONFIG_PHYLIB=y
478 523
479# 524#
@@ -484,29 +529,30 @@ CONFIG_PHYLIB=y
484# CONFIG_QSEMI_PHY is not set 529# CONFIG_QSEMI_PHY is not set
485# CONFIG_LXT_PHY is not set 530# CONFIG_LXT_PHY is not set
486# CONFIG_CICADA_PHY is not set 531# CONFIG_CICADA_PHY is not set
487 532# CONFIG_VITESSE_PHY is not set
488# 533# CONFIG_SMSC_PHY is not set
489# Ethernet (10 or 100Mbit) 534# CONFIG_BROADCOM_PHY is not set
490# 535# CONFIG_ICPLUS_PHY is not set
536# CONFIG_FIXED_PHY is not set
537# CONFIG_MDIO_BITBANG is not set
491CONFIG_NET_ETHERNET=y 538CONFIG_NET_ETHERNET=y
492CONFIG_MII=y 539CONFIG_MII=y
493# CONFIG_HAPPYMEAL is not set 540# CONFIG_HAPPYMEAL is not set
494# CONFIG_SUNGEM is not set 541# CONFIG_SUNGEM is not set
495# CONFIG_CASSINI is not set 542# CONFIG_CASSINI is not set
496# CONFIG_NET_VENDOR_3COM is not set 543# CONFIG_NET_VENDOR_3COM is not set
497
498#
499# Tulip family network device support
500#
501# CONFIG_NET_TULIP is not set 544# CONFIG_NET_TULIP is not set
502# CONFIG_HP100 is not set 545# CONFIG_HP100 is not set
546# CONFIG_IBM_NEW_EMAC_ZMII is not set
547# CONFIG_IBM_NEW_EMAC_RGMII is not set
548# CONFIG_IBM_NEW_EMAC_TAH is not set
549# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
503CONFIG_NET_PCI=y 550CONFIG_NET_PCI=y
504# CONFIG_PCNET32 is not set 551# CONFIG_PCNET32 is not set
505# CONFIG_AMD8111_ETH is not set 552# CONFIG_AMD8111_ETH is not set
506# CONFIG_ADAPTEC_STARFIRE is not set 553# CONFIG_ADAPTEC_STARFIRE is not set
507# CONFIG_B44 is not set 554# CONFIG_B44 is not set
508# CONFIG_FORCEDETH is not set 555# CONFIG_FORCEDETH is not set
509# CONFIG_DGRS is not set
510# CONFIG_EEPRO100 is not set 556# CONFIG_EEPRO100 is not set
511CONFIG_E100=y 557CONFIG_E100=y
512# CONFIG_FEALNX is not set 558# CONFIG_FEALNX is not set
@@ -519,47 +565,47 @@ CONFIG_E100=y
519# CONFIG_SUNDANCE is not set 565# CONFIG_SUNDANCE is not set
520# CONFIG_TLAN is not set 566# CONFIG_TLAN is not set
521# CONFIG_VIA_RHINE is not set 567# CONFIG_VIA_RHINE is not set
568# CONFIG_SC92031 is not set
522# CONFIG_FS_ENET is not set 569# CONFIG_FS_ENET is not set
523 570CONFIG_NETDEV_1000=y
524#
525# Ethernet (1000 Mbit)
526#
527# CONFIG_ACENIC is not set 571# CONFIG_ACENIC is not set
528# CONFIG_DL2K is not set 572# CONFIG_DL2K is not set
529# CONFIG_E1000 is not set 573# CONFIG_E1000 is not set
574# CONFIG_E1000E is not set
575# CONFIG_IP1000 is not set
530# CONFIG_NS83820 is not set 576# CONFIG_NS83820 is not set
531# CONFIG_HAMACHI is not set 577# CONFIG_HAMACHI is not set
532# CONFIG_YELLOWFIN is not set 578# CONFIG_YELLOWFIN is not set
533# CONFIG_R8169 is not set 579# CONFIG_R8169 is not set
534# CONFIG_SIS190 is not set 580# CONFIG_SIS190 is not set
535# CONFIG_SKGE is not set 581# CONFIG_SKGE is not set
582# CONFIG_SKY2 is not set
536# CONFIG_SK98LIN is not set 583# CONFIG_SK98LIN is not set
537# CONFIG_VIA_VELOCITY is not set 584# CONFIG_VIA_VELOCITY is not set
538# CONFIG_TIGON3 is not set 585# CONFIG_TIGON3 is not set
539# CONFIG_BNX2 is not set 586# CONFIG_BNX2 is not set
540CONFIG_GIANFAR=y 587CONFIG_GIANFAR=y
541CONFIG_GFAR_NAPI=y 588CONFIG_GFAR_NAPI=y
542 589# CONFIG_QLA3XXX is not set
543# 590# CONFIG_ATL1 is not set
544# Ethernet (10000 Mbit) 591CONFIG_NETDEV_10000=y
545#
546# CONFIG_CHELSIO_T1 is not set 592# CONFIG_CHELSIO_T1 is not set
593# CONFIG_CHELSIO_T3 is not set
594# CONFIG_IXGBE is not set
547# CONFIG_IXGB is not set 595# CONFIG_IXGB is not set
548# CONFIG_S2IO is not set 596# CONFIG_S2IO is not set
549 597# CONFIG_MYRI10GE is not set
550# 598# CONFIG_NETXEN_NIC is not set
551# Token Ring devices 599# CONFIG_NIU is not set
552# 600# CONFIG_MLX4_CORE is not set
601# CONFIG_TEHUTI is not set
553# CONFIG_TR is not set 602# CONFIG_TR is not set
554 603
555# 604#
556# Wireless LAN (non-hamradio) 605# Wireless LAN
557#
558# CONFIG_NET_RADIO is not set
559
560#
561# Wan interfaces
562# 606#
607# CONFIG_WLAN_PRE80211 is not set
608# CONFIG_WLAN_80211 is not set
563# CONFIG_WAN is not set 609# CONFIG_WAN is not set
564# CONFIG_FDDI is not set 610# CONFIG_FDDI is not set
565# CONFIG_HIPPI is not set 611# CONFIG_HIPPI is not set
@@ -569,28 +615,21 @@ CONFIG_GFAR_NAPI=y
569# CONFIG_NETCONSOLE is not set 615# CONFIG_NETCONSOLE is not set
570# CONFIG_NETPOLL is not set 616# CONFIG_NETPOLL is not set
571# CONFIG_NET_POLL_CONTROLLER is not set 617# CONFIG_NET_POLL_CONTROLLER is not set
572
573#
574# ISDN subsystem
575#
576# CONFIG_ISDN is not set 618# CONFIG_ISDN is not set
577
578#
579# Telephony Support
580#
581# CONFIG_PHONE is not set 619# CONFIG_PHONE is not set
582 620
583# 621#
584# Input device support 622# Input device support
585# 623#
586CONFIG_INPUT=y 624CONFIG_INPUT=y
625# CONFIG_INPUT_FF_MEMLESS is not set
626# CONFIG_INPUT_POLLDEV is not set
587 627
588# 628#
589# Userland interfaces 629# Userland interfaces
590# 630#
591# CONFIG_INPUT_MOUSEDEV is not set 631# CONFIG_INPUT_MOUSEDEV is not set
592# CONFIG_INPUT_JOYDEV is not set 632# CONFIG_INPUT_JOYDEV is not set
593# CONFIG_INPUT_TSDEV is not set
594# CONFIG_INPUT_EVDEV is not set 633# CONFIG_INPUT_EVDEV is not set
595# CONFIG_INPUT_EVBUG is not set 634# CONFIG_INPUT_EVBUG is not set
596 635
@@ -600,6 +639,7 @@ CONFIG_INPUT=y
600# CONFIG_INPUT_KEYBOARD is not set 639# CONFIG_INPUT_KEYBOARD is not set
601# CONFIG_INPUT_MOUSE is not set 640# CONFIG_INPUT_MOUSE is not set
602# CONFIG_INPUT_JOYSTICK is not set 641# CONFIG_INPUT_JOYSTICK is not set
642# CONFIG_INPUT_TABLET is not set
603# CONFIG_INPUT_TOUCHSCREEN is not set 643# CONFIG_INPUT_TOUCHSCREEN is not set
604# CONFIG_INPUT_MISC is not set 644# CONFIG_INPUT_MISC is not set
605 645
@@ -620,12 +660,16 @@ CONFIG_INPUT=y
620# 660#
621CONFIG_SERIAL_8250=y 661CONFIG_SERIAL_8250=y
622CONFIG_SERIAL_8250_CONSOLE=y 662CONFIG_SERIAL_8250_CONSOLE=y
663CONFIG_SERIAL_8250_PCI=y
623CONFIG_SERIAL_8250_NR_UARTS=4 664CONFIG_SERIAL_8250_NR_UARTS=4
665CONFIG_SERIAL_8250_RUNTIME_UARTS=4
624# CONFIG_SERIAL_8250_EXTENDED is not set 666# CONFIG_SERIAL_8250_EXTENDED is not set
667CONFIG_SERIAL_8250_SHARE_IRQ=y
625 668
626# 669#
627# Non-8250 serial port support 670# Non-8250 serial port support
628# 671#
672# CONFIG_SERIAL_UARTLITE is not set
629CONFIG_SERIAL_CORE=y 673CONFIG_SERIAL_CORE=y
630CONFIG_SERIAL_CORE_CONSOLE=y 674CONFIG_SERIAL_CORE_CONSOLE=y
631CONFIG_SERIAL_CPM=y 675CONFIG_SERIAL_CPM=y
@@ -637,43 +681,22 @@ CONFIG_SERIAL_CPM_SCC1=y
637# CONFIG_SERIAL_CPM_SMC1 is not set 681# CONFIG_SERIAL_CPM_SMC1 is not set
638# CONFIG_SERIAL_CPM_SMC2 is not set 682# CONFIG_SERIAL_CPM_SMC2 is not set
639# CONFIG_SERIAL_JSM is not set 683# CONFIG_SERIAL_JSM is not set
684# CONFIG_SERIAL_OF_PLATFORM is not set
640CONFIG_UNIX98_PTYS=y 685CONFIG_UNIX98_PTYS=y
641CONFIG_LEGACY_PTYS=y 686CONFIG_LEGACY_PTYS=y
642CONFIG_LEGACY_PTY_COUNT=256 687CONFIG_LEGACY_PTY_COUNT=256
643
644#
645# IPMI
646#
647# CONFIG_IPMI_HANDLER is not set 688# CONFIG_IPMI_HANDLER is not set
648 689CONFIG_HW_RANDOM=y
649#
650# Watchdog Cards
651#
652# CONFIG_WATCHDOG is not set
653# CONFIG_NVRAM is not set 690# CONFIG_NVRAM is not set
654CONFIG_GEN_RTC=y 691CONFIG_GEN_RTC=y
655# CONFIG_GEN_RTC_X is not set 692# CONFIG_GEN_RTC_X is not set
656# CONFIG_DTLK is not set
657# CONFIG_R3964 is not set 693# CONFIG_R3964 is not set
658# CONFIG_APPLICOM is not set 694# CONFIG_APPLICOM is not set
659
660#
661# Ftape, the floppy tape device driver
662#
663# CONFIG_AGP is not set
664# CONFIG_DRM is not set
665# CONFIG_RAW_DRIVER is not set 695# CONFIG_RAW_DRIVER is not set
666
667#
668# TPM devices
669#
670# CONFIG_TCG_TPM is not set 696# CONFIG_TCG_TPM is not set
671# CONFIG_TELCLOCK is not set 697CONFIG_DEVPORT=y
672
673#
674# I2C support
675#
676CONFIG_I2C=y 698CONFIG_I2C=y
699CONFIG_I2C_BOARDINFO=y
677CONFIG_I2C_CHARDEV=y 700CONFIG_I2C_CHARDEV=y
678 701
679# 702#
@@ -695,60 +718,61 @@ CONFIG_I2C_CHARDEV=y
695# CONFIG_I2C_I810 is not set 718# CONFIG_I2C_I810 is not set
696# CONFIG_I2C_PIIX4 is not set 719# CONFIG_I2C_PIIX4 is not set
697CONFIG_I2C_MPC=y 720CONFIG_I2C_MPC=y
698# CONFIG_I2C_MPC8260 is not set
699# CONFIG_I2C_NFORCE2 is not set 721# CONFIG_I2C_NFORCE2 is not set
722# CONFIG_I2C_OCORES is not set
700# CONFIG_I2C_PARPORT_LIGHT is not set 723# CONFIG_I2C_PARPORT_LIGHT is not set
701# CONFIG_I2C_PROSAVAGE is not set 724# CONFIG_I2C_PROSAVAGE is not set
702# CONFIG_I2C_SAVAGE4 is not set 725# CONFIG_I2C_SAVAGE4 is not set
703# CONFIG_SCx200_ACB is not set 726# CONFIG_I2C_SIMTEC is not set
704# CONFIG_I2C_SIS5595 is not set 727# CONFIG_I2C_SIS5595 is not set
705# CONFIG_I2C_SIS630 is not set 728# CONFIG_I2C_SIS630 is not set
706# CONFIG_I2C_SIS96X is not set 729# CONFIG_I2C_SIS96X is not set
730# CONFIG_I2C_TAOS_EVM is not set
707# CONFIG_I2C_VIA is not set 731# CONFIG_I2C_VIA is not set
708# CONFIG_I2C_VIAPRO is not set 732# CONFIG_I2C_VIAPRO is not set
709# CONFIG_I2C_VOODOO3 is not set 733# CONFIG_I2C_VOODOO3 is not set
710# CONFIG_I2C_PCA_ISA is not set
711 734
712# 735#
713# Miscellaneous I2C Chip support 736# Miscellaneous I2C Chip support
714# 737#
715CONFIG_SENSORS_DS1337=y 738CONFIG_SENSORS_DS1337=y
716# CONFIG_SENSORS_DS1374 is not set 739# CONFIG_SENSORS_DS1374 is not set
740# CONFIG_DS1682 is not set
717# CONFIG_SENSORS_EEPROM is not set 741# CONFIG_SENSORS_EEPROM is not set
718# CONFIG_SENSORS_MAX6900 is not set
719# CONFIG_SENSORS_PCF8574 is not set 742# CONFIG_SENSORS_PCF8574 is not set
720# CONFIG_SENSORS_PCF8563 is not set
721# CONFIG_SENSORS_PCA9539 is not set 743# CONFIG_SENSORS_PCA9539 is not set
722# CONFIG_SENSORS_PCF8591 is not set 744# CONFIG_SENSORS_PCF8591 is not set
723# CONFIG_SENSORS_RTC8564 is not set
724# CONFIG_SENSORS_M41T00 is not set 745# CONFIG_SENSORS_M41T00 is not set
725# CONFIG_SENSORS_MAX6875 is not set 746# CONFIG_SENSORS_MAX6875 is not set
726# CONFIG_RTC_X1205_I2C is not set 747# CONFIG_SENSORS_TSL2550 is not set
727# CONFIG_I2C_DEBUG_CORE is not set 748# CONFIG_I2C_DEBUG_CORE is not set
728# CONFIG_I2C_DEBUG_ALGO is not set 749# CONFIG_I2C_DEBUG_ALGO is not set
729# CONFIG_I2C_DEBUG_BUS is not set 750# CONFIG_I2C_DEBUG_BUS is not set
730# CONFIG_I2C_DEBUG_CHIP is not set 751# CONFIG_I2C_DEBUG_CHIP is not set
731 752
732# 753#
733# Dallas's 1-wire bus 754# SPI support
734# 755#
756# CONFIG_SPI is not set
757# CONFIG_SPI_MASTER is not set
735# CONFIG_W1 is not set 758# CONFIG_W1 is not set
736 759# CONFIG_POWER_SUPPLY is not set
737#
738# Hardware Monitoring support
739#
740CONFIG_HWMON=y 760CONFIG_HWMON=y
741# CONFIG_HWMON_VID is not set 761# CONFIG_HWMON_VID is not set
762# CONFIG_SENSORS_AD7418 is not set
742# CONFIG_SENSORS_ADM1021 is not set 763# CONFIG_SENSORS_ADM1021 is not set
743# CONFIG_SENSORS_ADM1025 is not set 764# CONFIG_SENSORS_ADM1025 is not set
744# CONFIG_SENSORS_ADM1026 is not set 765# CONFIG_SENSORS_ADM1026 is not set
766# CONFIG_SENSORS_ADM1029 is not set
745# CONFIG_SENSORS_ADM1031 is not set 767# CONFIG_SENSORS_ADM1031 is not set
746# CONFIG_SENSORS_ADM9240 is not set 768# CONFIG_SENSORS_ADM9240 is not set
747# CONFIG_SENSORS_ASB100 is not set 769# CONFIG_SENSORS_ADT7470 is not set
748# CONFIG_SENSORS_ATXP1 is not set 770# CONFIG_SENSORS_ATXP1 is not set
749# CONFIG_SENSORS_DS1621 is not set 771# CONFIG_SENSORS_DS1621 is not set
750# CONFIG_SENSORS_FSCHER is not set 772# CONFIG_SENSORS_I5K_AMB is not set
751# CONFIG_SENSORS_FSCPOS is not set 773# CONFIG_SENSORS_F71805F is not set
774# CONFIG_SENSORS_F71882FG is not set
775# CONFIG_SENSORS_F75375S is not set
752# CONFIG_SENSORS_GL518SM is not set 776# CONFIG_SENSORS_GL518SM is not set
753# CONFIG_SENSORS_GL520SM is not set 777# CONFIG_SENSORS_GL520SM is not set
754# CONFIG_SENSORS_IT87 is not set 778# CONFIG_SENSORS_IT87 is not set
@@ -762,52 +786,75 @@ CONFIG_SENSORS_LM75=y
762# CONFIG_SENSORS_LM87 is not set 786# CONFIG_SENSORS_LM87 is not set
763# CONFIG_SENSORS_LM90 is not set 787# CONFIG_SENSORS_LM90 is not set
764# CONFIG_SENSORS_LM92 is not set 788# CONFIG_SENSORS_LM92 is not set
789# CONFIG_SENSORS_LM93 is not set
765# CONFIG_SENSORS_MAX1619 is not set 790# CONFIG_SENSORS_MAX1619 is not set
791# CONFIG_SENSORS_MAX6650 is not set
766# CONFIG_SENSORS_PC87360 is not set 792# CONFIG_SENSORS_PC87360 is not set
793# CONFIG_SENSORS_PC87427 is not set
767# CONFIG_SENSORS_SIS5595 is not set 794# CONFIG_SENSORS_SIS5595 is not set
795# CONFIG_SENSORS_DME1737 is not set
768# CONFIG_SENSORS_SMSC47M1 is not set 796# CONFIG_SENSORS_SMSC47M1 is not set
797# CONFIG_SENSORS_SMSC47M192 is not set
769# CONFIG_SENSORS_SMSC47B397 is not set 798# CONFIG_SENSORS_SMSC47B397 is not set
799# CONFIG_SENSORS_THMC50 is not set
770# CONFIG_SENSORS_VIA686A is not set 800# CONFIG_SENSORS_VIA686A is not set
801# CONFIG_SENSORS_VT1211 is not set
802# CONFIG_SENSORS_VT8231 is not set
771# CONFIG_SENSORS_W83781D is not set 803# CONFIG_SENSORS_W83781D is not set
804# CONFIG_SENSORS_W83791D is not set
772# CONFIG_SENSORS_W83792D is not set 805# CONFIG_SENSORS_W83792D is not set
806# CONFIG_SENSORS_W83793 is not set
773# CONFIG_SENSORS_W83L785TS is not set 807# CONFIG_SENSORS_W83L785TS is not set
774# CONFIG_SENSORS_W83627HF is not set 808# CONFIG_SENSORS_W83627HF is not set
775# CONFIG_SENSORS_W83627EHF is not set 809# CONFIG_SENSORS_W83627EHF is not set
776CONFIG_HWMON_DEBUG_CHIP=y 810CONFIG_HWMON_DEBUG_CHIP=y
811# CONFIG_WATCHDOG is not set
777 812
778# 813#
779# Misc devices 814# Sonics Silicon Backplane
780# 815#
816CONFIG_SSB_POSSIBLE=y
817# CONFIG_SSB is not set
781 818
782# 819#
783# Multimedia Capabilities Port drivers 820# Multifunction device drivers
784# 821#
822# CONFIG_MFD_SM501 is not set
785 823
786# 824#
787# Multimedia devices 825# Multimedia devices
788# 826#
789# CONFIG_VIDEO_DEV is not set 827# CONFIG_VIDEO_DEV is not set
790 828# CONFIG_DVB_CORE is not set
791# 829CONFIG_DAB=y
792# Digital Video Broadcasting Devices
793#
794# CONFIG_DVB is not set
795 830
796# 831#
797# Graphics support 832# Graphics support
798# 833#
834# CONFIG_AGP is not set
835# CONFIG_DRM is not set
836# CONFIG_VGASTATE is not set
837# CONFIG_VIDEO_OUTPUT_CONTROL is not set
799# CONFIG_FB is not set 838# CONFIG_FB is not set
839# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
800 840
801# 841#
802# Sound 842# Display device support
803# 843#
804# CONFIG_SOUND is not set 844# CONFIG_DISPLAY_SUPPORT is not set
805 845
806# 846#
807# USB support 847# Sound
808# 848#
849# CONFIG_SOUND is not set
850CONFIG_HID_SUPPORT=y
851CONFIG_HID=y
852# CONFIG_HID_DEBUG is not set
853# CONFIG_HIDRAW is not set
854CONFIG_USB_SUPPORT=y
809CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
810CONFIG_USB_ARCH_HAS_OHCI=y 856CONFIG_USB_ARCH_HAS_OHCI=y
857CONFIG_USB_ARCH_HAS_EHCI=y
811# CONFIG_USB is not set 858# CONFIG_USB is not set
812 859
813# 860#
@@ -818,20 +865,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
818# USB Gadget Support 865# USB Gadget Support
819# 866#
820# CONFIG_USB_GADGET is not set 867# CONFIG_USB_GADGET is not set
821
822#
823# MMC/SD Card support
824#
825# CONFIG_MMC is not set 868# CONFIG_MMC is not set
826 869# CONFIG_NEW_LEDS is not set
827#
828# InfiniBand support
829#
830# CONFIG_INFINIBAND is not set 870# CONFIG_INFINIBAND is not set
871# CONFIG_EDAC is not set
872# CONFIG_RTC_CLASS is not set
831 873
832# 874#
833# SN Devices 875# Userspace I/O
834# 876#
877# CONFIG_UIO is not set
835 878
836# 879#
837# File systems 880# File systems
@@ -843,16 +886,19 @@ CONFIG_EXT3_FS=y
843CONFIG_EXT3_FS_XATTR=y 886CONFIG_EXT3_FS_XATTR=y
844# CONFIG_EXT3_FS_POSIX_ACL is not set 887# CONFIG_EXT3_FS_POSIX_ACL is not set
845# CONFIG_EXT3_FS_SECURITY is not set 888# CONFIG_EXT3_FS_SECURITY is not set
889# CONFIG_EXT4DEV_FS is not set
846CONFIG_JBD=y 890CONFIG_JBD=y
847# CONFIG_JBD_DEBUG is not set
848CONFIG_FS_MBCACHE=y 891CONFIG_FS_MBCACHE=y
849# CONFIG_REISERFS_FS is not set 892# CONFIG_REISERFS_FS is not set
850# CONFIG_JFS_FS is not set 893# CONFIG_JFS_FS is not set
851# CONFIG_FS_POSIX_ACL is not set 894# CONFIG_FS_POSIX_ACL is not set
852# CONFIG_XFS_FS is not set 895# CONFIG_XFS_FS is not set
896# CONFIG_GFS2_FS is not set
897# CONFIG_OCFS2_FS is not set
853# CONFIG_MINIX_FS is not set 898# CONFIG_MINIX_FS is not set
854# CONFIG_ROMFS_FS is not set 899# CONFIG_ROMFS_FS is not set
855CONFIG_INOTIFY=y 900CONFIG_INOTIFY=y
901CONFIG_INOTIFY_USER=y
856# CONFIG_QUOTA is not set 902# CONFIG_QUOTA is not set
857CONFIG_DNOTIFY=y 903CONFIG_DNOTIFY=y
858# CONFIG_AUTOFS_FS is not set 904# CONFIG_AUTOFS_FS is not set
@@ -877,11 +923,12 @@ CONFIG_DNOTIFY=y
877# 923#
878CONFIG_PROC_FS=y 924CONFIG_PROC_FS=y
879CONFIG_PROC_KCORE=y 925CONFIG_PROC_KCORE=y
926CONFIG_PROC_SYSCTL=y
880CONFIG_SYSFS=y 927CONFIG_SYSFS=y
881CONFIG_TMPFS=y 928CONFIG_TMPFS=y
929# CONFIG_TMPFS_POSIX_ACL is not set
882# CONFIG_HUGETLB_PAGE is not set 930# CONFIG_HUGETLB_PAGE is not set
883CONFIG_RAMFS=y 931# CONFIG_CONFIGFS_FS is not set
884# CONFIG_RELAYFS_FS is not set
885 932
886# 933#
887# Miscellaneous filesystems 934# Miscellaneous filesystems
@@ -893,13 +940,15 @@ CONFIG_RAMFS=y
893# CONFIG_BEFS_FS is not set 940# CONFIG_BEFS_FS is not set
894# CONFIG_BFS_FS is not set 941# CONFIG_BFS_FS is not set
895# CONFIG_EFS_FS is not set 942# CONFIG_EFS_FS is not set
896# CONFIG_JFFS_FS is not set
897CONFIG_JFFS2_FS=y 943CONFIG_JFFS2_FS=y
898CONFIG_JFFS2_FS_DEBUG=0 944CONFIG_JFFS2_FS_DEBUG=0
899CONFIG_JFFS2_FS_WRITEBUFFER=y 945CONFIG_JFFS2_FS_WRITEBUFFER=y
946# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
900# CONFIG_JFFS2_SUMMARY is not set 947# CONFIG_JFFS2_SUMMARY is not set
948# CONFIG_JFFS2_FS_XATTR is not set
901# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 949# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
902CONFIG_JFFS2_ZLIB=y 950CONFIG_JFFS2_ZLIB=y
951# CONFIG_JFFS2_LZO is not set
903CONFIG_JFFS2_RTIME=y 952CONFIG_JFFS2_RTIME=y
904# CONFIG_JFFS2_RUBIN is not set 953# CONFIG_JFFS2_RUBIN is not set
905CONFIG_CRAMFS=y 954CONFIG_CRAMFS=y
@@ -908,10 +957,7 @@ CONFIG_CRAMFS=y
908# CONFIG_QNX4FS_FS is not set 957# CONFIG_QNX4FS_FS is not set
909# CONFIG_SYSV_FS is not set 958# CONFIG_SYSV_FS is not set
910# CONFIG_UFS_FS is not set 959# CONFIG_UFS_FS is not set
911 960CONFIG_NETWORK_FILESYSTEMS=y
912#
913# Network File Systems
914#
915CONFIG_NFS_FS=y 961CONFIG_NFS_FS=y
916# CONFIG_NFS_V3 is not set 962# CONFIG_NFS_V3 is not set
917# CONFIG_NFS_V4 is not set 963# CONFIG_NFS_V4 is not set
@@ -921,6 +967,7 @@ CONFIG_ROOT_NFS=y
921CONFIG_LOCKD=y 967CONFIG_LOCKD=y
922CONFIG_NFS_COMMON=y 968CONFIG_NFS_COMMON=y
923CONFIG_SUNRPC=y 969CONFIG_SUNRPC=y
970# CONFIG_SUNRPC_BIND34 is not set
924# CONFIG_RPCSEC_GSS_KRB5 is not set 971# CONFIG_RPCSEC_GSS_KRB5 is not set
925# CONFIG_RPCSEC_GSS_SPKM3 is not set 972# CONFIG_RPCSEC_GSS_SPKM3 is not set
926# CONFIG_SMB_FS is not set 973# CONFIG_SMB_FS is not set
@@ -928,7 +975,6 @@ CONFIG_SUNRPC=y
928# CONFIG_NCP_FS is not set 975# CONFIG_NCP_FS is not set
929# CONFIG_CODA_FS is not set 976# CONFIG_CODA_FS is not set
930# CONFIG_AFS_FS is not set 977# CONFIG_AFS_FS is not set
931# CONFIG_9P_FS is not set
932 978
933# 979#
934# Partition Types 980# Partition Types
@@ -944,49 +990,55 @@ CONFIG_PARTITION_ADVANCED=y
944# CONFIG_SGI_PARTITION is not set 990# CONFIG_SGI_PARTITION is not set
945# CONFIG_ULTRIX_PARTITION is not set 991# CONFIG_ULTRIX_PARTITION is not set
946# CONFIG_SUN_PARTITION is not set 992# CONFIG_SUN_PARTITION is not set
993# CONFIG_KARMA_PARTITION is not set
947# CONFIG_EFI_PARTITION is not set 994# CONFIG_EFI_PARTITION is not set
948 995# CONFIG_SYSV68_PARTITION is not set
949#
950# Native Language Support
951#
952# CONFIG_NLS is not set 996# CONFIG_NLS is not set
953# CONFIG_SCC_ENET is not set 997# CONFIG_DLM is not set
954# CONFIG_FEC_ENET is not set
955
956#
957# CPM2 Options
958#
959 998
960# 999#
961# Library routines 1000# Library routines
962# 1001#
1002CONFIG_BITREVERSE=y
963# CONFIG_CRC_CCITT is not set 1003# CONFIG_CRC_CCITT is not set
964# CONFIG_CRC16 is not set 1004# CONFIG_CRC16 is not set
1005# CONFIG_CRC_ITU_T is not set
965CONFIG_CRC32=y 1006CONFIG_CRC32=y
1007# CONFIG_CRC7 is not set
966# CONFIG_LIBCRC32C is not set 1008# CONFIG_LIBCRC32C is not set
967CONFIG_ZLIB_INFLATE=y 1009CONFIG_ZLIB_INFLATE=y
968CONFIG_ZLIB_DEFLATE=y 1010CONFIG_ZLIB_DEFLATE=y
1011CONFIG_PLIST=y
1012CONFIG_HAS_IOMEM=y
1013CONFIG_HAS_IOPORT=y
1014CONFIG_HAS_DMA=y
1015CONFIG_INSTRUMENTATION=y
969# CONFIG_PROFILING is not set 1016# CONFIG_PROFILING is not set
1017# CONFIG_MARKERS is not set
970 1018
971# 1019#
972# Kernel hacking 1020# Kernel hacking
973# 1021#
974# CONFIG_PRINTK_TIME is not set 1022# CONFIG_PRINTK_TIME is not set
1023CONFIG_ENABLE_WARN_DEPRECATED=y
1024CONFIG_ENABLE_MUST_CHECK=y
1025# CONFIG_MAGIC_SYSRQ is not set
1026# CONFIG_UNUSED_SYMBOLS is not set
1027# CONFIG_DEBUG_FS is not set
1028# CONFIG_HEADERS_CHECK is not set
975# CONFIG_DEBUG_KERNEL is not set 1029# CONFIG_DEBUG_KERNEL is not set
976CONFIG_LOG_BUF_SHIFT=14 1030# CONFIG_SLUB_DEBUG_ON is not set
1031# CONFIG_DEBUG_BUGVERBOSE is not set
1032# CONFIG_SAMPLES is not set
977# CONFIG_KGDB_CONSOLE is not set 1033# CONFIG_KGDB_CONSOLE is not set
1034# CONFIG_PPC_EARLY_DEBUG is not set
978 1035
979# 1036#
980# Security options 1037# Security options
981# 1038#
982# CONFIG_KEYS is not set 1039# CONFIG_KEYS is not set
983# CONFIG_SECURITY is not set 1040# CONFIG_SECURITY is not set
984 1041# CONFIG_SECURITY_FILE_CAPABILITIES is not set
985#
986# Cryptographic options
987#
988# CONFIG_CRYPTO is not set 1042# CONFIG_CRYPTO is not set
989 1043# CONFIG_PPC_CLOCK is not set
990# 1044CONFIG_PPC_LIB_RHEAP=y
991# Hardware crypto devices
992#
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 4bfff8863bcb..76b862bd1fe9 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -4,6 +4,7 @@
4#include <linux/serial_core.h> 4#include <linux/serial_core.h>
5#include <linux/console.h> 5#include <linux/console.h>
6#include <linux/pci.h> 6#include <linux/pci.h>
7#include <linux/of_device.h>
7#include <asm/io.h> 8#include <asm/io.h>
8#include <asm/mmu.h> 9#include <asm/mmu.h>
9#include <asm/prom.h> 10#include <asm/prom.h>
@@ -31,6 +32,15 @@ static struct legacy_serial_info {
31 int irq_check_parent; 32 int irq_check_parent;
32 phys_addr_t taddr; 33 phys_addr_t taddr;
33} legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS]; 34} legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS];
35
36static struct __initdata of_device_id parents[] = {
37 {.type = "soc",},
38 {.type = "tsi-bridge",},
39 {.type = "opb", .compatible = "ibm,opb",},
40 {.compatible = "simple-bus",},
41 {.compatible = "wrs,epld-localbus",},
42};
43
34static unsigned int legacy_serial_count; 44static unsigned int legacy_serial_count;
35static int legacy_serial_console = -1; 45static int legacy_serial_console = -1;
36 46
@@ -306,18 +316,20 @@ void __init find_legacy_serial_ports(void)
306 DBG(" no linux,stdout-path !\n"); 316 DBG(" no linux,stdout-path !\n");
307 } 317 }
308 318
309 /* First fill our array with SOC ports */ 319 /* Iterate over all the 16550 ports, looking for known parents */
310 for_each_compatible_node(np, "serial", "ns16550") { 320 for_each_compatible_node(np, "serial", "ns16550") {
311 struct device_node *soc = of_get_parent(np); 321 struct device_node *parent = of_get_parent(np);
312 if (soc && !strcmp(soc->type, "soc")) { 322 if (!parent)
323 continue;
324 if (of_match_node(parents, parent) != NULL) {
313 index = add_legacy_soc_port(np, np); 325 index = add_legacy_soc_port(np, np);
314 if (index >= 0 && np == stdout) 326 if (index >= 0 && np == stdout)
315 legacy_serial_console = index; 327 legacy_serial_console = index;
316 } 328 }
317 of_node_put(soc); 329 of_node_put(parent);
318 } 330 }
319 331
320 /* First fill our array with ISA ports */ 332 /* Next, fill our array with ISA ports */
321 for_each_node_by_type(np, "serial") { 333 for_each_node_by_type(np, "serial") {
322 struct device_node *isa = of_get_parent(np); 334 struct device_node *isa = of_get_parent(np);
323 if (isa && !strcmp(isa->name, "isa")) { 335 if (isa && !strcmp(isa->name, "isa")) {
@@ -328,29 +340,6 @@ void __init find_legacy_serial_ports(void)
328 of_node_put(isa); 340 of_node_put(isa);
329 } 341 }
330 342
331 /* First fill our array with tsi-bridge ports */
332 for_each_compatible_node(np, "serial", "ns16550") {
333 struct device_node *tsi = of_get_parent(np);
334 if (tsi && !strcmp(tsi->type, "tsi-bridge")) {
335 index = add_legacy_soc_port(np, np);
336 if (index >= 0 && np == stdout)
337 legacy_serial_console = index;
338 }
339 of_node_put(tsi);
340 }
341
342 /* First fill our array with opb bus ports */
343 for_each_compatible_node(np, "serial", "ns16550") {
344 struct device_node *opb = of_get_parent(np);
345 if (opb && (!strcmp(opb->type, "opb") ||
346 of_device_is_compatible(opb, "ibm,opb"))) {
347 index = add_legacy_soc_port(np, np);
348 if (index >= 0 && np == stdout)
349 legacy_serial_console = index;
350 }
351 of_node_put(opb);
352 }
353
354#ifdef CONFIG_PCI 343#ifdef CONFIG_PCI
355 /* Next, try to locate PCI ports */ 344 /* Next, try to locate PCI ports */
356 for (np = NULL; (np = of_find_all_nodes(np));) { 345 for (np = NULL; (np = of_find_all_nodes(np));) {
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index be09f0d2d90b..5c2e253ddfb1 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -275,12 +275,6 @@ _GLOBAL(_tlbia)
275 /* Invalidate all entries in TLB1 */ 275 /* Invalidate all entries in TLB1 */
276 li r3, 0x0c 276 li r3, 0x0c
277 tlbivax 0,3 277 tlbivax 0,3
278 /* Invalidate all entries in TLB2 */
279 li r3, 0x14
280 tlbivax 0,3
281 /* Invalidate all entries in TLB3 */
282 li r3, 0x1c
283 tlbivax 0,3
284 msync 278 msync
285#ifdef CONFIG_SMP 279#ifdef CONFIG_SMP
286 tlbsync 280 tlbsync
@@ -375,12 +369,8 @@ _GLOBAL(_tlbie)
375#elif defined(CONFIG_FSL_BOOKE) 369#elif defined(CONFIG_FSL_BOOKE)
376 rlwinm r4, r3, 0, 0, 19 370 rlwinm r4, r3, 0, 0, 19
377 ori r5, r4, 0x08 /* TLBSEL = 1 */ 371 ori r5, r4, 0x08 /* TLBSEL = 1 */
378 ori r6, r4, 0x10 /* TLBSEL = 2 */
379 ori r7, r4, 0x18 /* TLBSEL = 3 */
380 tlbivax 0, r4 372 tlbivax 0, r4
381 tlbivax 0, r5 373 tlbivax 0, r5
382 tlbivax 0, r6
383 tlbivax 0, r7
384 msync 374 msync
385#if defined(CONFIG_SMP) 375#if defined(CONFIG_SMP)
386 tlbsync 376 tlbsync
diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index fd83440eb287..3fce6b375dbc 100644
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -165,14 +165,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
165 165
166static int __init declare_of_platform_devices(void) 166static int __init declare_of_platform_devices(void)
167{ 167{
168 if (!machine_is(mpc8272_ads))
169 return 0;
170
171 /* Publish the QE devices */ 168 /* Publish the QE devices */
172 of_platform_bus_probe(NULL, of_bus_ids, NULL); 169 of_platform_bus_probe(NULL, of_bus_ids, NULL);
173 return 0; 170 return 0;
174} 171}
175device_initcall(declare_of_platform_devices); 172machine_device_initcall(mpc8272_ads, declare_of_platform_devices);
176 173
177/* 174/*
178 * Called very early, device-tree isn't unflattened 175 * Called very early, device-tree isn't unflattened
diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
index 1be500501806..68196e349994 100644
--- a/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -176,14 +176,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
176 176
177static int __init declare_of_platform_devices(void) 177static int __init declare_of_platform_devices(void)
178{ 178{
179 if (!machine_is(pq2fads))
180 return 0;
181
182 /* Publish the QE devices */ 179 /* Publish the QE devices */
183 of_platform_bus_probe(NULL, of_bus_ids, NULL); 180 of_platform_bus_probe(NULL, of_bus_ids, NULL);
184 return 0; 181 return 0;
185} 182}
186device_initcall(declare_of_platform_devices); 183machine_device_initcall(pq2fads, declare_of_platform_devices);
187 184
188define_machine(pq2fads) 185define_machine(pq2fads)
189{ 186{
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 2430ac840493..13587e2e8680 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,18 +1,23 @@
1choice 1menuconfig MPC83xx
2 prompt "83xx Board Type" 2 bool "83xx Board Type"
3 depends on PPC_83xx 3 depends on PPC_83xx
4 default MPC834x_MDS 4 select PPC_UDBG_16550
5 select PPC_INDIRECT_PCI
6
7if MPC83xx
5 8
6config MPC8313_RDB 9config MPC831x_RDB
7 bool "Freescale MPC8313 RDB" 10 bool "Freescale MPC831x RDB"
8 select DEFAULT_UIMAGE 11 select DEFAULT_UIMAGE
12 select PPC_MPC831x
9 help 13 help
10 This option enables support for the MPC8313 RDB board. 14 This option enables support for the MPC8313 RDB and MPC8315 RDB boards.
11 15
12config MPC832x_MDS 16config MPC832x_MDS
13 bool "Freescale MPC832x MDS" 17 bool "Freescale MPC832x MDS"
14 select DEFAULT_UIMAGE 18 select DEFAULT_UIMAGE
15 select QUICC_ENGINE 19 select QUICC_ENGINE
20 select PPC_MPC832x
16 help 21 help
17 This option enables support for the MPC832x MDS evaluation board. 22 This option enables support for the MPC832x MDS evaluation board.
18 23
@@ -20,12 +25,14 @@ config MPC832x_RDB
20 bool "Freescale MPC832x RDB" 25 bool "Freescale MPC832x RDB"
21 select DEFAULT_UIMAGE 26 select DEFAULT_UIMAGE
22 select QUICC_ENGINE 27 select QUICC_ENGINE
28 select PPC_MPC832x
23 help 29 help
24 This option enables support for the MPC8323 RDB board. 30 This option enables support for the MPC8323 RDB board.
25 31
26config MPC834x_MDS 32config MPC834x_MDS
27 bool "Freescale MPC834x MDS" 33 bool "Freescale MPC834x MDS"
28 select DEFAULT_UIMAGE 34 select DEFAULT_UIMAGE
35 select PPC_MPC834x
29 help 36 help
30 This option enables support for the MPC 834x MDS evaluation board. 37 This option enables support for the MPC 834x MDS evaluation board.
31 38
@@ -37,6 +44,7 @@ config MPC834x_MDS
37config MPC834x_ITX 44config MPC834x_ITX
38 bool "Freescale MPC834x ITX" 45 bool "Freescale MPC834x ITX"
39 select DEFAULT_UIMAGE 46 select DEFAULT_UIMAGE
47 select PPC_MPC834x
40 help 48 help
41 This option enables support for the MPC 834x ITX evaluation board. 49 This option enables support for the MPC 834x ITX evaluation board.
42 50
@@ -53,36 +61,38 @@ config MPC836x_MDS
53config MPC837x_MDS 61config MPC837x_MDS
54 bool "Freescale MPC837x MDS" 62 bool "Freescale MPC837x MDS"
55 select DEFAULT_UIMAGE 63 select DEFAULT_UIMAGE
64 select PPC_MPC837x
56 help 65 help
57 This option enables support for the MPC837x MDS Processor Board. 66 This option enables support for the MPC837x MDS Processor Board.
58endchoice
59 67
68config MPC837x_RDB
69 bool "Freescale MPC837x RDB"
70 select DEFAULT_UIMAGE
71 select PPC_MPC837x
72 help
73 This option enables support for the MPC837x RDB Board.
74
75config SBC834x
76 bool "Wind River SBC834x"
77 select DEFAULT_UIMAGE
78 select PPC_MPC834x
79 help
80 This option enables support for the Wind River SBC834x board.
81
82endif
83
84# used for usb
60config PPC_MPC831x 85config PPC_MPC831x
61 bool 86 bool
62 select PPC_UDBG_16550
63 select PPC_INDIRECT_PCI
64 default y if MPC8313_RDB
65 87
88# used for math-emu
66config PPC_MPC832x 89config PPC_MPC832x
67 bool 90 bool
68 select PPC_UDBG_16550
69 select PPC_INDIRECT_PCI
70 default y if MPC832x_MDS || MPC832x_RDB
71 91
72config MPC834x 92# used for usb
93config PPC_MPC834x
73 bool 94 bool
74 select PPC_UDBG_16550
75 select PPC_INDIRECT_PCI
76 default y if MPC834x_MDS || MPC834x_ITX
77
78config PPC_MPC836x
79 bool
80 select PPC_UDBG_16550
81 select PPC_INDIRECT_PCI
82 default y if MPC836x_MDS
83 95
96# used for usb
84config PPC_MPC837x 97config PPC_MPC837x
85 bool 98 bool
86 select PPC_UDBG_16550
87 select PPC_INDIRECT_PCI
88 default y if MPC837x_MDS
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index df4662999a95..7e6dd3e259d8 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -3,10 +3,12 @@
3# 3#
4obj-y := misc.o usb.o 4obj-y := misc.o usb.o
5obj-$(CONFIG_PCI) += pci.o 5obj-$(CONFIG_PCI) += pci.o
6obj-$(CONFIG_MPC8313_RDB) += mpc8313_rdb.o 6obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o
7obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o 7obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o
8obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o 8obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o
9obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o 9obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o
10obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o 10obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o
11obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o 11obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o
12obj-$(CONFIG_MPC837x_MDS) += mpc837x_mds.o 12obj-$(CONFIG_MPC837x_MDS) += mpc837x_mds.o
13obj-$(CONFIG_SBC834x) += sbc834x.o
14obj-$(CONFIG_MPC837x_RDB) += mpc837x_rdb.o
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index 4996b7dfdf1d..c4db5172b27a 100644
--- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * arch/powerpc/platforms/83xx/mpc8313_rdb.c 2 * arch/powerpc/platforms/83xx/mpc831x_rdb.c
3 * 3 *
4 * Description: MPC8313x RDB board specific routines. 4 * Description: MPC831x RDB board specific routines.
5 * This file is based on mpc834x_sys.c 5 * This file is based on mpc834x_sys.c
6 * Author: Lo Wlison <r43300@freescale.com> 6 * Author: Lo Wlison <r43300@freescale.com>
7 * 7 *
@@ -22,26 +22,17 @@
22 22
23#include "mpc83xx.h" 23#include "mpc83xx.h"
24 24
25#undef DEBUG 25/*
26#ifdef DEBUG
27#define DBG(fmt...) udbg_printf(fmt)
28#else
29#define DBG(fmt...)
30#endif
31
32/* ************************************************************************
33 *
34 * Setup the architecture 26 * Setup the architecture
35 *
36 */ 27 */
37static void __init mpc8313_rdb_setup_arch(void) 28static void __init mpc831x_rdb_setup_arch(void)
38{ 29{
39#ifdef CONFIG_PCI 30#ifdef CONFIG_PCI
40 struct device_node *np; 31 struct device_node *np;
41#endif 32#endif
42 33
43 if (ppc_md.progress) 34 if (ppc_md.progress)
44 ppc_md.progress("mpc8313_rdb_setup_arch()", 0); 35 ppc_md.progress("mpc831x_rdb_setup_arch()", 0);
45 36
46#ifdef CONFIG_PCI 37#ifdef CONFIG_PCI
47 for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") 38 for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
@@ -50,7 +41,7 @@ static void __init mpc8313_rdb_setup_arch(void)
50 mpc831x_usb_cfg(); 41 mpc831x_usb_cfg();
51} 42}
52 43
53void __init mpc8313_rdb_init_IRQ(void) 44void __init mpc831x_rdb_init_IRQ(void)
54{ 45{
55 struct device_node *np; 46 struct device_node *np;
56 47
@@ -69,11 +60,12 @@ void __init mpc8313_rdb_init_IRQ(void)
69/* 60/*
70 * Called very early, MMU is off, device-tree isn't unflattened 61 * Called very early, MMU is off, device-tree isn't unflattened
71 */ 62 */
72static int __init mpc8313_rdb_probe(void) 63static int __init mpc831x_rdb_probe(void)
73{ 64{
74 unsigned long root = of_get_flat_dt_root(); 65 unsigned long root = of_get_flat_dt_root();
75 66
76 return of_flat_dt_is_compatible(root, "MPC8313ERDB"); 67 return of_flat_dt_is_compatible(root, "MPC8313ERDB") ||
68 of_flat_dt_is_compatible(root, "fsl,mpc8315erdb");
77} 69}
78 70
79static struct of_device_id __initdata of_bus_ids[] = { 71static struct of_device_id __initdata of_bus_ids[] = {
@@ -86,13 +78,13 @@ static int __init declare_of_platform_devices(void)
86 of_platform_bus_probe(NULL, of_bus_ids, NULL); 78 of_platform_bus_probe(NULL, of_bus_ids, NULL);
87 return 0; 79 return 0;
88} 80}
89machine_device_initcall(mpc8313_rdb, declare_of_platform_devices); 81machine_device_initcall(mpc831x_rdb, declare_of_platform_devices);
90 82
91define_machine(mpc8313_rdb) { 83define_machine(mpc831x_rdb) {
92 .name = "MPC8313 RDB", 84 .name = "MPC831x RDB",
93 .probe = mpc8313_rdb_probe, 85 .probe = mpc831x_rdb_probe,
94 .setup_arch = mpc8313_rdb_setup_arch, 86 .setup_arch = mpc831x_rdb_setup_arch,
95 .init_IRQ = mpc8313_rdb_init_IRQ, 87 .init_IRQ = mpc831x_rdb_init_IRQ,
96 .get_irq = ipic_get_irq, 88 .get_irq = ipic_get_irq,
97 .restart = mpc83xx_restart, 89 .restart = mpc83xx_restart,
98 .time_init = mpc83xx_time_init, 90 .time_init = mpc83xx_time_init,
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index dbdd4adef645..6dbc6eabcb02 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -105,6 +105,7 @@ static struct of_device_id mpc832x_ids[] = {
105 { .type = "soc", }, 105 { .type = "soc", },
106 { .compatible = "soc", }, 106 { .compatible = "soc", },
107 { .type = "qe", }, 107 { .type = "qe", },
108 { .compatible = "fsl,qe", },
108 {}, 109 {},
109}; 110};
110 111
@@ -134,10 +135,12 @@ static void __init mpc832x_sys_init_IRQ(void)
134 of_node_put(np); 135 of_node_put(np);
135 136
136#ifdef CONFIG_QUICC_ENGINE 137#ifdef CONFIG_QUICC_ENGINE
137 np = of_find_node_by_type(NULL, "qeic"); 138 np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
138 if (!np) 139 if (!np) {
139 return; 140 np = of_find_node_by_type(NULL, "qeic");
140 141 if (!np)
142 return;
143 }
141 qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); 144 qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
142 of_node_put(np); 145 of_node_put(np);
143#endif /* CONFIG_QUICC_ENGINE */ 146#endif /* CONFIG_QUICC_ENGINE */
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 5fddd2285abb..9f0fd88b2b1f 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -115,6 +115,7 @@ static struct of_device_id mpc832x_ids[] = {
115 { .type = "soc", }, 115 { .type = "soc", },
116 { .compatible = "soc", }, 116 { .compatible = "soc", },
117 { .type = "qe", }, 117 { .type = "qe", },
118 { .compatible = "fsl,qe", },
118 {}, 119 {},
119}; 120};
120 121
@@ -145,10 +146,12 @@ void __init mpc832x_rdb_init_IRQ(void)
145 of_node_put(np); 146 of_node_put(np);
146 147
147#ifdef CONFIG_QUICC_ENGINE 148#ifdef CONFIG_QUICC_ENGINE
148 np = of_find_node_by_type(NULL, "qeic"); 149 np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
149 if (!np) 150 if (!np) {
150 return; 151 np = of_find_node_by_type(NULL, "qeic");
151 152 if (!np)
153 return;
154 }
152 qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); 155 qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
153 of_node_put(np); 156 of_node_put(np);
154#endif /* CONFIG_QUICC_ENGINE */ 157#endif /* CONFIG_QUICC_ENGINE */
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index db491ec006e0..c2e5de60c055 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -136,6 +136,7 @@ static struct of_device_id mpc836x_ids[] = {
136 { .type = "soc", }, 136 { .type = "soc", },
137 { .compatible = "soc", }, 137 { .compatible = "soc", },
138 { .type = "qe", }, 138 { .type = "qe", },
139 { .compatible = "fsl,qe", },
139 {}, 140 {},
140}; 141};
141 142
@@ -165,10 +166,12 @@ static void __init mpc836x_mds_init_IRQ(void)
165 of_node_put(np); 166 of_node_put(np);
166 167
167#ifdef CONFIG_QUICC_ENGINE 168#ifdef CONFIG_QUICC_ENGINE
168 np = of_find_node_by_type(NULL, "qeic"); 169 np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
169 if (!np) 170 if (!np) {
170 return; 171 np = of_find_node_by_type(NULL, "qeic");
171 172 if (!np)
173 return;
174 }
172 qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); 175 qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
173 of_node_put(np); 176 of_node_put(np);
174#endif /* CONFIG_QUICC_ENGINE */ 177#endif /* CONFIG_QUICC_ENGINE */
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
new file mode 100644
index 000000000000..2293ae51383d
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -0,0 +1,99 @@
1/*
2 * arch/powerpc/platforms/83xx/mpc837x_rdb.c
3 *
4 * Copyright (C) 2007 Freescale Semicondutor, Inc. All rights reserved.
5 *
6 * MPC837x RDB board specific routines
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/pci.h>
15#include <linux/of_platform.h>
16
17#include <asm/time.h>
18#include <asm/ipic.h>
19#include <asm/udbg.h>
20
21#include "mpc83xx.h"
22
23extern int mpc837x_usb_cfg(void);
24
25/* ************************************************************************
26 *
27 * Setup the architecture
28 *
29 */
30static void __init mpc837x_rdb_setup_arch(void)
31{
32#ifdef CONFIG_PCI
33 struct device_node *np;
34#endif
35
36 if (ppc_md.progress)
37 ppc_md.progress("mpc837x_rdb_setup_arch()", 0);
38
39#ifdef CONFIG_PCI
40 for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
41 mpc83xx_add_bridge(np);
42#endif
43 mpc837x_usb_cfg();
44}
45
46static struct of_device_id mpc837x_ids[] = {
47 { .type = "soc", },
48 { .compatible = "soc", },
49 {},
50};
51
52static int __init mpc837x_declare_of_platform_devices(void)
53{
54 /* Publish of_device */
55 of_platform_bus_probe(NULL, mpc837x_ids, NULL);
56
57 return 0;
58}
59machine_device_initcall(mpc837x_rdb, mpc837x_declare_of_platform_devices);
60
61static void __init mpc837x_rdb_init_IRQ(void)
62{
63 struct device_node *np;
64
65 np = of_find_compatible_node(NULL, NULL, "fsl,ipic");
66 if (!np)
67 return;
68
69 ipic_init(np, 0);
70
71 /* Initialize the default interrupt mapping priorities,
72 * in case the boot rom changed something on us.
73 */
74 ipic_set_default_priority();
75}
76
77/*
78 * Called very early, MMU is off, device-tree isn't unflattened
79 */
80static int __init mpc837x_rdb_probe(void)
81{
82 unsigned long root = of_get_flat_dt_root();
83
84 return of_flat_dt_is_compatible(root, "fsl,mpc8377rdb") ||
85 of_flat_dt_is_compatible(root, "fsl,mpc8378rdb") ||
86 of_flat_dt_is_compatible(root, "fsl,mpc8379rdb");
87}
88
89define_machine(mpc837x_rdb) {
90 .name = "MPC837x RDB",
91 .probe = mpc837x_rdb_probe,
92 .setup_arch = mpc837x_rdb_setup_arch,
93 .init_IRQ = mpc837x_rdb_init_IRQ,
94 .get_irq = ipic_get_irq,
95 .restart = mpc83xx_restart,
96 .time_init = mpc83xx_time_init,
97 .calibrate_decr = generic_calibrate_decr,
98 .progress = udbg_progress,
99};
diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c
new file mode 100644
index 000000000000..cf382474a83d
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/sbc834x.c
@@ -0,0 +1,115 @@
1/*
2 * arch/powerpc/platforms/83xx/sbc834x.c
3 *
4 * Wind River SBC834x board specific routines
5 *
6 * By Paul Gortmaker (see MAINTAINERS for contact information)
7 *
8 * Based largely on the mpc834x_mds.c support by Kumar Gala.
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16#include <linux/stddef.h>
17#include <linux/kernel.h>
18#include <linux/init.h>
19#include <linux/errno.h>
20#include <linux/reboot.h>
21#include <linux/pci.h>
22#include <linux/kdev_t.h>
23#include <linux/major.h>
24#include <linux/console.h>
25#include <linux/delay.h>
26#include <linux/seq_file.h>
27#include <linux/root_dev.h>
28#include <linux/of_platform.h>
29
30#include <asm/system.h>
31#include <asm/atomic.h>
32#include <asm/time.h>
33#include <asm/io.h>
34#include <asm/machdep.h>
35#include <asm/ipic.h>
36#include <asm/irq.h>
37#include <asm/prom.h>
38#include <asm/udbg.h>
39#include <sysdev/fsl_soc.h>
40
41#include "mpc83xx.h"
42
43/* ************************************************************************
44 *
45 * Setup the architecture
46 *
47 */
48static void __init sbc834x_setup_arch(void)
49{
50#ifdef CONFIG_PCI
51 struct device_node *np;
52#endif
53
54 if (ppc_md.progress)
55 ppc_md.progress("sbc834x_setup_arch()", 0);
56
57#ifdef CONFIG_PCI
58 for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
59 mpc83xx_add_bridge(np);
60#endif
61
62}
63
64static void __init sbc834x_init_IRQ(void)
65{
66 struct device_node *np;
67
68 np = of_find_node_by_type(NULL, "ipic");
69 if (!np)
70 return;
71
72 ipic_init(np, 0);
73
74 /* Initialize the default interrupt mapping priorities,
75 * in case the boot rom changed something on us.
76 */
77 ipic_set_default_priority();
78
79 of_node_put(np);
80}
81
82static struct __initdata of_device_id sbc834x_ids[] = {
83 { .type = "soc", },
84 { .compatible = "soc", },
85 {},
86};
87
88static int __init sbc834x_declare_of_platform_devices(void)
89{
90 of_platform_bus_probe(NULL, sbc834x_ids, NULL);
91 return 0;
92}
93machine_device_initcall(sbc834x, sbc834x_declare_of_platform_devices);
94
95/*
96 * Called very early, MMU is off, device-tree isn't unflattened
97 */
98static int __init sbc834x_probe(void)
99{
100 unsigned long root = of_get_flat_dt_root();
101
102 return of_flat_dt_is_compatible(root, "SBC834x");
103}
104
105define_machine(sbc834x) {
106 .name = "SBC834x",
107 .probe = sbc834x_probe,
108 .setup_arch = sbc834x_setup_arch,
109 .init_IRQ = sbc834x_init_IRQ,
110 .get_irq = ipic_get_irq,
111 .restart = mpc83xx_restart,
112 .time_init = mpc83xx_time_init,
113 .calibrate_decr = generic_calibrate_decr,
114 .progress = udbg_progress,
115};
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index 6a454a4087c8..681230a30acd 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -22,7 +22,7 @@
22#include "mpc83xx.h" 22#include "mpc83xx.h"
23 23
24 24
25#ifdef CONFIG_MPC834x 25#ifdef CONFIG_PPC_MPC834x
26int mpc834x_usb_cfg(void) 26int mpc834x_usb_cfg(void)
27{ 27{
28 unsigned long sccr, sicrl, sicrh; 28 unsigned long sccr, sicrl, sicrh;
@@ -96,7 +96,7 @@ int mpc834x_usb_cfg(void)
96 iounmap(immap); 96 iounmap(immap);
97 return 0; 97 return 0;
98} 98}
99#endif /* CONFIG_MPC834x */ 99#endif /* CONFIG_PPC_MPC834x */
100 100
101#ifdef CONFIG_PPC_MPC831x 101#ifdef CONFIG_PPC_MPC831x
102int mpc831x_usb_cfg(void) 102int mpc831x_usb_cfg(void)
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 7748a3a426db..7e76ddbd5821 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,7 +1,14 @@
1choice 1menuconfig MPC85xx
2 prompt "Machine Type" 2 bool "Machine Type"
3 depends on PPC_85xx 3 depends on PPC_85xx
4 default MPC8540_ADS 4 select PPC_UDBG_16550
5 select PPC_INDIRECT_PCI if PCI
6 select MPIC
7 select FSL_PCI if PCI
8 select SERIAL_8250_SHARE_IRQ if SERIAL_8250
9 default y
10
11if MPC85xx
5 12
6config MPC8540_ADS 13config MPC8540_ADS
7 bool "Freescale MPC8540 ADS" 14 bool "Freescale MPC8540 ADS"
@@ -13,6 +20,7 @@ config MPC8560_ADS
13 bool "Freescale MPC8560 ADS" 20 bool "Freescale MPC8560 ADS"
14 select DEFAULT_UIMAGE 21 select DEFAULT_UIMAGE
15 select PPC_CPM_NEW_BINDING 22 select PPC_CPM_NEW_BINDING
23 select CPM2
16 help 24 help
17 This option enables support for the MPC 8560 ADS board 25 This option enables support for the MPC 8560 ADS board
18 26
@@ -38,25 +46,64 @@ config MPC85xx_DS
38 help 46 help
39 This option enables support for the MPC85xx DS (MPC8544 DS) board 47 This option enables support for the MPC85xx DS (MPC8544 DS) board
40 48
41endchoice 49config STX_GP3
50 bool "Silicon Turnkey Express GP3"
51 help
52 This option enables support for the Silicon Turnkey Express GP3
53 board.
54 select CPM2
55 select DEFAULT_UIMAGE
56 select PPC_CPM_NEW_BINDING
42 57
43config MPC8540 58config TQM8540
44 bool 59 bool "TQ Components TQM8540"
45 select PPC_UDBG_16550 60 help
46 select PPC_INDIRECT_PCI 61 This option enables support for the TQ Components TQM8540 board.
47 default y if MPC8540_ADS || MPC85xx_CDS 62 select DEFAULT_UIMAGE
63 select PPC_CPM_NEW_BINDING
64 select TQM85xx
48 65
49config MPC8560 66config TQM8541
50 bool 67 bool "TQ Components TQM8541"
68 help
69 This option enables support for the TQ Components TQM8541 board.
70 select DEFAULT_UIMAGE
71 select PPC_CPM_NEW_BINDING
72 select TQM85xx
73 select CPM2
74
75config TQM8555
76 bool "TQ Components TQM8555"
77 help
78 This option enables support for the TQ Components TQM8555 board.
79 select DEFAULT_UIMAGE
80 select PPC_CPM_NEW_BINDING
81 select TQM85xx
51 select CPM2 82 select CPM2
52 default y if MPC8560_ADS
53 83
54config MPC85xx 84config TQM8560
85 bool "TQ Components TQM8560"
86 help
87 This option enables support for the TQ Components TQM8560 board.
88 select DEFAULT_UIMAGE
89 select PPC_CPM_NEW_BINDING
90 select TQM85xx
91 select CPM2
92
93config SBC8548
94 bool "Wind River SBC8548"
95 select DEFAULT_UIMAGE
96 help
97 This option enables support for the Wind River SBC8548 board
98
99config SBC8560
100 bool "Wind River SBC8560"
101 select DEFAULT_UIMAGE
102 select PPC_CPM_NEW_BINDING if CPM2
103 help
104 This option enables support for the Wind River SBC8560 board
105
106endif # MPC85xx
107
108config TQM85xx
55 bool 109 bool
56 select PPC_UDBG_16550
57 select PPC_INDIRECT_PCI if PCI
58 select MPIC
59 select FSL_PCI if PCI
60 select SERIAL_8250_SHARE_IRQ if SERIAL_8250
61 default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
62 || MPC85xx_MDS || MPC85xx_DS
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 5eca92023ec8..cb7af4ebd75f 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -6,3 +6,7 @@ obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
6obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o 6obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
7obj-$(CONFIG_MPC85xx_DS) += mpc85xx_ds.o 7obj-$(CONFIG_MPC85xx_DS) += mpc85xx_ds.o
8obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o 8obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
9obj-$(CONFIG_STX_GP3) += stx_gp3.o
10obj-$(CONFIG_TQM85xx) += tqm85xx.o
11obj-$(CONFIG_SBC8560) += sbc8560.o
12obj-$(CONFIG_SBC8548) += sbc8548.o
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 4fdf5abefffd..25f8bc75e838 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -94,21 +94,25 @@ static void __init mpc85xx_mds_setup_arch(void)
94#endif 94#endif
95 95
96#ifdef CONFIG_QUICC_ENGINE 96#ifdef CONFIG_QUICC_ENGINE
97 if ((np = of_find_node_by_name(NULL, "qe")) != NULL) { 97 np = of_find_compatible_node(NULL, NULL, "fsl,qe");
98 qe_reset(); 98 if (!np) {
99 of_node_put(np); 99 np = of_find_node_by_name(NULL, "qe");
100 if (!np)
101 return;
100 } 102 }
101 103
102 if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { 104 qe_reset();
103 struct device_node *ucc = NULL; 105 of_node_put(np);
106
107 np = of_find_node_by_name(NULL, "par_io");
108 if (np) {
109 struct device_node *ucc;
104 110
105 par_io_init(np); 111 par_io_init(np);
106 of_node_put(np); 112 of_node_put(np);
107 113
108 for ( ;(ucc = of_find_node_by_name(ucc, "ucc")) != NULL;) 114 for_each_node_by_name(ucc, "ucc")
109 par_io_of_config(ucc); 115 par_io_of_config(ucc);
110
111 of_node_put(ucc);
112 } 116 }
113 117
114 if (bcsr_regs) { 118 if (bcsr_regs) {
@@ -131,7 +135,6 @@ static void __init mpc85xx_mds_setup_arch(void)
131 135
132 iounmap(bcsr_regs); 136 iounmap(bcsr_regs);
133 } 137 }
134
135#endif /* CONFIG_QUICC_ENGINE */ 138#endif /* CONFIG_QUICC_ENGINE */
136} 139}
137 140
@@ -139,6 +142,7 @@ static struct of_device_id mpc85xx_ids[] = {
139 { .type = "soc", }, 142 { .type = "soc", },
140 { .compatible = "soc", }, 143 { .compatible = "soc", },
141 { .type = "qe", }, 144 { .type = "qe", },
145 { .compatible = "fsl,qe", },
142 {}, 146 {},
143}; 147};
144 148
@@ -176,10 +180,12 @@ static void __init mpc85xx_mds_pic_init(void)
176 mpic_init(mpic); 180 mpic_init(mpic);
177 181
178#ifdef CONFIG_QUICC_ENGINE 182#ifdef CONFIG_QUICC_ENGINE
179 np = of_find_node_by_type(NULL, "qeic"); 183 np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
180 if (!np) 184 if (!np) {
181 return; 185 np = of_find_node_by_type(NULL, "qeic");
182 186 if (!np)
187 return;
188 }
183 qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL); 189 qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);
184 of_node_put(np); 190 of_node_put(np);
185#endif /* CONFIG_QUICC_ENGINE */ 191#endif /* CONFIG_QUICC_ENGINE */
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c
new file mode 100644
index 000000000000..488facb99fe8
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/sbc8548.c
@@ -0,0 +1,167 @@
1/*
2 * Wind River SBC8548 setup and early boot code.
3 *
4 * Copyright 2007 Wind River Systems Inc.
5 *
6 * By Paul Gortmaker (see MAINTAINERS for contact information)
7 *
8 * Based largely on the MPC8548CDS support - Copyright 2005 Freescale Inc.
9 *
10 *
11 * This program is free software; you can redistribute it and/or modify it
12 * under the terms of the GNU General Public License as published by the
13 * Free Software Foundation; either version 2 of the License, or (at your
14 * option) any later version.
15 */
16
17#include <linux/stddef.h>
18#include <linux/kernel.h>
19#include <linux/init.h>
20#include <linux/errno.h>
21#include <linux/reboot.h>
22#include <linux/pci.h>
23#include <linux/kdev_t.h>
24#include <linux/major.h>
25#include <linux/console.h>
26#include <linux/delay.h>
27#include <linux/seq_file.h>
28#include <linux/initrd.h>
29#include <linux/module.h>
30#include <linux/interrupt.h>
31#include <linux/fsl_devices.h>
32#include <linux/of_platform.h>
33
34#include <asm/system.h>
35#include <asm/pgtable.h>
36#include <asm/page.h>
37#include <asm/atomic.h>
38#include <asm/time.h>
39#include <asm/io.h>
40#include <asm/machdep.h>
41#include <asm/ipic.h>
42#include <asm/pci-bridge.h>
43#include <asm/irq.h>
44#include <mm/mmu_decl.h>
45#include <asm/prom.h>
46#include <asm/udbg.h>
47#include <asm/mpic.h>
48
49#include <sysdev/fsl_soc.h>
50#include <sysdev/fsl_pci.h>
51
52static void __init sbc8548_pic_init(void)
53{
54 struct mpic *mpic;
55 struct resource r;
56 struct device_node *np = NULL;
57
58 np = of_find_node_by_type(np, "open-pic");
59
60 if (np == NULL) {
61 printk(KERN_ERR "Could not find open-pic node\n");
62 return;
63 }
64
65 if (of_address_to_resource(np, 0, &r)) {
66 printk(KERN_ERR "Failed to map mpic register space\n");
67 of_node_put(np);
68 return;
69 }
70
71 mpic = mpic_alloc(np, r.start,
72 MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
73 0, 256, " OpenPIC ");
74 BUG_ON(mpic == NULL);
75
76 /* Return the mpic node */
77 of_node_put(np);
78
79 mpic_init(mpic);
80}
81
82/*
83 * Setup the architecture
84 */
85static void __init sbc8548_setup_arch(void)
86{
87#ifdef CONFIG_PCI
88 struct device_node *np;
89#endif
90
91 if (ppc_md.progress)
92 ppc_md.progress("sbc8548_setup_arch()", 0);
93
94#ifdef CONFIG_PCI
95 for_each_node_by_type(np, "pci") {
96 if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
97 of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
98 struct resource rsrc;
99 of_address_to_resource(np, 0, &rsrc);
100 if ((rsrc.start & 0xfffff) == 0x8000)
101 fsl_add_bridge(np, 1);
102 else
103 fsl_add_bridge(np, 0);
104 }
105 }
106#endif
107}
108
109static void sbc8548_show_cpuinfo(struct seq_file *m)
110{
111 uint pvid, svid, phid1;
112 uint memsize = total_memory;
113
114 pvid = mfspr(SPRN_PVR);
115 svid = mfspr(SPRN_SVR);
116
117 seq_printf(m, "Vendor\t\t: Wind River\n");
118 seq_printf(m, "Machine\t\t: SBC8548\n");
119 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
120 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
121
122 /* Display cpu Pll setting */
123 phid1 = mfspr(SPRN_HID1);
124 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
125
126 /* Display the amount of memory */
127 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
128}
129
130static struct of_device_id __initdata of_bus_ids[] = {
131 { .name = "soc", },
132 { .type = "soc", },
133 {},
134};
135
136static int __init declare_of_platform_devices(void)
137{
138 of_platform_bus_probe(NULL, of_bus_ids, NULL);
139
140 return 0;
141}
142machine_device_initcall(sbc8548, declare_of_platform_devices);
143
144/*
145 * Called very early, device-tree isn't unflattened
146 */
147static int __init sbc8548_probe(void)
148{
149 unsigned long root = of_get_flat_dt_root();
150
151 return of_flat_dt_is_compatible(root, "SBC8548");
152}
153
154define_machine(sbc8548) {
155 .name = "SBC8548",
156 .probe = sbc8548_probe,
157 .setup_arch = sbc8548_setup_arch,
158 .init_IRQ = sbc8548_pic_init,
159 .show_cpuinfo = sbc8548_show_cpuinfo,
160 .get_irq = mpic_get_irq,
161 .restart = fsl_rstcr_restart,
162#ifdef CONFIG_PCI
163 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
164#endif
165 .calibrate_decr = generic_calibrate_decr,
166 .progress = udbg_progress,
167};
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
new file mode 100644
index 000000000000..2c580cd24e4f
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -0,0 +1,283 @@
1/*
2 * Wind River SBC8560 setup and early boot code.
3 *
4 * Copyright 2007 Wind River Systems Inc.
5 *
6 * By Paul Gortmaker (see MAINTAINERS for contact information)
7 *
8 * Based largely on the MPC8560ADS support - Copyright 2005 Freescale Inc.
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16#include <linux/stddef.h>
17#include <linux/kernel.h>
18#include <linux/pci.h>
19#include <linux/kdev_t.h>
20#include <linux/delay.h>
21#include <linux/seq_file.h>
22#include <linux/of_platform.h>
23
24#include <asm/system.h>
25#include <asm/time.h>
26#include <asm/machdep.h>
27#include <asm/pci-bridge.h>
28#include <asm/mpic.h>
29#include <mm/mmu_decl.h>
30#include <asm/udbg.h>
31
32#include <sysdev/fsl_soc.h>
33#include <sysdev/fsl_pci.h>
34
35#ifdef CONFIG_CPM2
36#include <asm/cpm2.h>
37#include <sysdev/cpm2_pic.h>
38#endif
39
40#ifdef CONFIG_CPM2
41
42static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
43{
44 int cascade_irq;
45
46 while ((cascade_irq = cpm2_get_irq()) >= 0)
47 generic_handle_irq(cascade_irq);
48
49 desc->chip->eoi(irq);
50}
51
52#endif /* CONFIG_CPM2 */
53
54static void __init sbc8560_pic_init(void)
55{
56 struct mpic *mpic;
57 struct resource r;
58 struct device_node *np = NULL;
59#ifdef CONFIG_CPM2
60 int irq;
61#endif
62
63 np = of_find_node_by_type(np, "open-pic");
64 if (!np) {
65 printk(KERN_ERR "Could not find open-pic node\n");
66 return;
67 }
68
69 if (of_address_to_resource(np, 0, &r)) {
70 printk(KERN_ERR "Could not map mpic register space\n");
71 of_node_put(np);
72 return;
73 }
74
75 mpic = mpic_alloc(np, r.start,
76 MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
77 0, 256, " OpenPIC ");
78 BUG_ON(mpic == NULL);
79 of_node_put(np);
80
81 mpic_init(mpic);
82
83#ifdef CONFIG_CPM2
84 /* Setup CPM2 PIC */
85 np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
86 if (np == NULL) {
87 printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
88 return;
89 }
90 irq = irq_of_parse_and_map(np, 0);
91
92 cpm2_pic_init(np);
93 of_node_put(np);
94 set_irq_chained_handler(irq, cpm2_cascade);
95#endif
96}
97
98/*
99 * Setup the architecture
100 */
101#ifdef CONFIG_CPM2
102struct cpm_pin {
103 int port, pin, flags;
104};
105
106static const struct cpm_pin sbc8560_pins[] = {
107 /* SCC1 */
108 {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
109 {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
110 {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
111
112 /* SCC2 */
113 {3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
114 {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
115 {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
116
117 /* FCC2 */
118 {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
119 {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
120 {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
121 {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
122 {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
123 {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
124 {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
125 {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
126 {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
127 {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
128 {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
129 {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
130 {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
131 {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
132 {2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK14 */
133 {2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK13 */
134
135 /* FCC3 */
136 {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
137 {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
138 {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
139 {1, 7, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
140 {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
141 {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
142 {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
143 {1, 11, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
144 {1, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
145 {1, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
146 {1, 14, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
147 {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
148 {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
149 {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
150 {2, 16, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK16 */
151 {2, 17, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK15 */
152};
153
154static void __init init_ioports(void)
155{
156 int i;
157
158 for (i = 0; i < ARRAY_SIZE(sbc8560_pins); i++) {
159 struct cpm_pin *pin = &sbc8560_pins[i];
160 cpm2_set_pin(pin->port, pin->pin, pin->flags);
161 }
162
163 cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
164 cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
165 cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
166 cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
167 cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK13, CPM_CLK_RX);
168 cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
169 cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK15, CPM_CLK_RX);
170 cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK16, CPM_CLK_TX);
171}
172#endif
173
174static void __init sbc8560_setup_arch(void)
175{
176#ifdef CONFIG_PCI
177 struct device_node *np;
178#endif
179
180 if (ppc_md.progress)
181 ppc_md.progress("sbc8560_setup_arch()", 0);
182
183#ifdef CONFIG_CPM2
184 cpm2_reset();
185 init_ioports();
186#endif
187
188#ifdef CONFIG_PCI
189 for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
190 fsl_add_bridge(np, 1);
191#endif
192}
193
194static void sbc8560_show_cpuinfo(struct seq_file *m)
195{
196 uint pvid, svid, phid1;
197 uint memsize = total_memory;
198
199 pvid = mfspr(SPRN_PVR);
200 svid = mfspr(SPRN_SVR);
201
202 seq_printf(m, "Vendor\t\t: Wind River\n");
203 seq_printf(m, "Machine\t\t: SBC8560\n");
204 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
205 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
206
207 /* Display cpu Pll setting */
208 phid1 = mfspr(SPRN_HID1);
209 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
210
211 /* Display the amount of memory */
212 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
213}
214
215static struct of_device_id __initdata of_bus_ids[] = {
216 { .name = "soc", },
217 { .type = "soc", },
218 { .name = "cpm", },
219 { .name = "localbus", },
220 {},
221};
222
223static int __init declare_of_platform_devices(void)
224{
225 of_platform_bus_probe(NULL, of_bus_ids, NULL);
226
227 return 0;
228}
229machine_device_initcall(sbc8560, declare_of_platform_devices);
230
231/*
232 * Called very early, device-tree isn't unflattened
233 */
234static int __init sbc8560_probe(void)
235{
236 unsigned long root = of_get_flat_dt_root();
237
238 return of_flat_dt_is_compatible(root, "SBC8560");
239}
240
241#ifdef CONFIG_RTC_DRV_M48T59
242static int __init sbc8560_rtc_init(void)
243{
244 struct device_node *np;
245 struct resource res;
246 struct platform_device *rtc_dev;
247
248 np = of_find_compatible_node(NULL, NULL, "m48t59");
249 if (np == NULL) {
250 printk("No RTC in DTB. Has it been eaten by wild dogs?\n");
251 return -ENODEV;
252 }
253
254 of_address_to_resource(np, 0, &res);
255 of_node_put(np);
256
257 printk("Found RTC (m48t59) at i/o 0x%x\n", res.start);
258
259 rtc_dev = platform_device_register_simple("rtc-m48t59", 0, &res, 1);
260
261 if (IS_ERR(rtc_dev)) {
262 printk("Registering sbc8560 RTC device failed\n");
263 return PTR_ERR(rtc_dev);
264 }
265
266 return 0;
267}
268
269arch_initcall(sbc8560_rtc_init);
270
271#endif /* M48T59 */
272
273define_machine(sbc8560) {
274 .name = "SBC8560",
275 .probe = sbc8560_probe,
276 .setup_arch = sbc8560_setup_arch,
277 .init_IRQ = sbc8560_pic_init,
278 .show_cpuinfo = sbc8560_show_cpuinfo,
279 .get_irq = mpic_get_irq,
280 .restart = fsl_rstcr_restart,
281 .calibrate_decr = generic_calibrate_decr,
282 .progress = udbg_progress,
283};
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
new file mode 100644
index 000000000000..18499d7c9d9e
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -0,0 +1,183 @@
1/*
2 * Based on MPC8560 ADS and arch/ppc stx_gp3 ports
3 *
4 * Maintained by Kumar Gala (see MAINTAINERS for contact information)
5 *
6 * Copyright 2008 Freescale Semiconductor Inc.
7 *
8 * Dan Malek <dan@embeddededge.com>
9 * Copyright 2004 Embedded Edge, LLC
10 *
11 * Copied from mpc8560_ads.c
12 * Copyright 2002, 2003 Motorola Inc.
13 *
14 * Ported to 2.6, Matt Porter <mporter@kernel.crashing.org>
15 * Copyright 2004-2005 MontaVista Software, Inc.
16 *
17 * This program is free software; you can redistribute it and/or modify it
18 * under the terms of the GNU General Public License as published by the
19 * Free Software Foundation; either version 2 of the License, or (at your
20 * option) any later version.
21 */
22
23#include <linux/stddef.h>
24#include <linux/kernel.h>
25#include <linux/pci.h>
26#include <linux/kdev_t.h>
27#include <linux/delay.h>
28#include <linux/seq_file.h>
29#include <linux/of_platform.h>
30
31#include <asm/system.h>
32#include <asm/time.h>
33#include <asm/machdep.h>
34#include <asm/pci-bridge.h>
35#include <asm/mpic.h>
36#include <asm/prom.h>
37#include <mm/mmu_decl.h>
38#include <asm/udbg.h>
39
40#include <sysdev/fsl_soc.h>
41#include <sysdev/fsl_pci.h>
42
43#ifdef CONFIG_CPM2
44#include <asm/cpm2.h>
45#include <sysdev/cpm2_pic.h>
46
47static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
48{
49 int cascade_irq;
50
51 while ((cascade_irq = cpm2_get_irq()) >= 0)
52 generic_handle_irq(cascade_irq);
53
54 desc->chip->eoi(irq);
55}
56#endif /* CONFIG_CPM2 */
57
58static void __init stx_gp3_pic_init(void)
59{
60 struct mpic *mpic;
61 struct resource r;
62 struct device_node *np;
63#ifdef CONFIG_CPM2
64 int irq;
65#endif
66
67 np = of_find_node_by_type(NULL, "open-pic");
68 if (!np) {
69 printk(KERN_ERR "Could not find open-pic node\n");
70 return;
71 }
72
73 if (of_address_to_resource(np, 0, &r)) {
74 printk(KERN_ERR "Could not map mpic register space\n");
75 of_node_put(np);
76 return;
77 }
78
79 mpic = mpic_alloc(np, r.start,
80 MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
81 0, 256, " OpenPIC ");
82 BUG_ON(mpic == NULL);
83 of_node_put(np);
84
85 mpic_init(mpic);
86
87#ifdef CONFIG_CPM2
88 /* Setup CPM2 PIC */
89 np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
90 if (np == NULL) {
91 printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
92 return;
93 }
94 irq = irq_of_parse_and_map(np, 0);
95
96 if (irq == NO_IRQ) {
97 of_node_put(np);
98 printk(KERN_ERR "PIC init: got no IRQ for cpm cascade\n");
99 return;
100 }
101
102 cpm2_pic_init(np);
103 of_node_put(np);
104 set_irq_chained_handler(irq, cpm2_cascade);
105#endif
106}
107
108/*
109 * Setup the architecture
110 */
111static void __init stx_gp3_setup_arch(void)
112{
113#ifdef CONFIG_PCI
114 struct device_node *np;
115#endif
116
117 if (ppc_md.progress)
118 ppc_md.progress("stx_gp3_setup_arch()", 0);
119
120#ifdef CONFIG_CPM2
121 cpm2_reset();
122#endif
123
124#ifdef CONFIG_PCI
125 for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
126 fsl_add_bridge(np, 1);
127#endif
128}
129
130static void stx_gp3_show_cpuinfo(struct seq_file *m)
131{
132 uint pvid, svid, phid1;
133 uint memsize = total_memory;
134
135 pvid = mfspr(SPRN_PVR);
136 svid = mfspr(SPRN_SVR);
137
138 seq_printf(m, "Vendor\t\t: RPC Electronics STx \n");
139 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
140 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
141
142 /* Display cpu Pll setting */
143 phid1 = mfspr(SPRN_HID1);
144 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
145
146 /* Display the amount of memory */
147 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
148}
149
150static struct of_device_id __initdata of_bus_ids[] = {
151 { .compatible = "simple-bus", },
152 {},
153};
154
155static int __init declare_of_platform_devices(void)
156{
157 of_platform_bus_probe(NULL, of_bus_ids, NULL);
158
159 return 0;
160}
161machine_device_initcall(stx_gp3, declare_of_platform_devices);
162
163/*
164 * Called very early, device-tree isn't unflattened
165 */
166static int __init stx_gp3_probe(void)
167{
168 unsigned long root = of_get_flat_dt_root();
169
170 return of_flat_dt_is_compatible(root, "stx,gp3-8560");
171}
172
173define_machine(stx_gp3) {
174 .name = "STX GP3",
175 .probe = stx_gp3_probe,
176 .setup_arch = stx_gp3_setup_arch,
177 .init_IRQ = stx_gp3_pic_init,
178 .show_cpuinfo = stx_gp3_show_cpuinfo,
179 .get_irq = mpic_get_irq,
180 .restart = fsl_rstcr_restart,
181 .calibrate_decr = generic_calibrate_decr,
182 .progress = udbg_progress,
183};
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
new file mode 100644
index 000000000000..77681acf1bae
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -0,0 +1,187 @@
1/*
2 * Based on MPC8560 ADS and arch/ppc tqm85xx ports
3 *
4 * Maintained by Kumar Gala (see MAINTAINERS for contact information)
5 *
6 * Copyright 2008 Freescale Semiconductor Inc.
7 *
8 * Copyright (c) 2005-2006 DENX Software Engineering
9 * Stefan Roese <sr@denx.de>
10 *
11 * Based on original work by
12 * Kumar Gala <kumar.gala@freescale.com>
13 * Copyright 2004 Freescale Semiconductor Inc.
14 *
15 * This program is free software; you can redistribute it and/or modify it
16 * under the terms of the GNU General Public License as published by the
17 * Free Software Foundation; either version 2 of the License, or (at your
18 * option) any later version.
19 */
20
21#include <linux/stddef.h>
22#include <linux/kernel.h>
23#include <linux/pci.h>
24#include <linux/kdev_t.h>
25#include <linux/delay.h>
26#include <linux/seq_file.h>
27#include <linux/of_platform.h>
28
29#include <asm/system.h>
30#include <asm/time.h>
31#include <asm/machdep.h>
32#include <asm/pci-bridge.h>
33#include <asm/mpic.h>
34#include <asm/prom.h>
35#include <mm/mmu_decl.h>
36#include <asm/udbg.h>
37
38#include <sysdev/fsl_soc.h>
39#include <sysdev/fsl_pci.h>
40
41#ifdef CONFIG_CPM2
42#include <asm/cpm2.h>
43#include <sysdev/cpm2_pic.h>
44
45static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
46{
47 int cascade_irq;
48
49 while ((cascade_irq = cpm2_get_irq()) >= 0)
50 generic_handle_irq(cascade_irq);
51
52 desc->chip->eoi(irq);
53}
54#endif /* CONFIG_CPM2 */
55
56static void __init tqm85xx_pic_init(void)
57{
58 struct mpic *mpic;
59 struct resource r;
60 struct device_node *np;
61#ifdef CONFIG_CPM2
62 int irq;
63#endif
64
65 np = of_find_node_by_type(NULL, "open-pic");
66 if (!np) {
67 printk(KERN_ERR "Could not find open-pic node\n");
68 return;
69 }
70
71 if (of_address_to_resource(np, 0, &r)) {
72 printk(KERN_ERR "Could not map mpic register space\n");
73 of_node_put(np);
74 return;
75 }
76
77 mpic = mpic_alloc(np, r.start,
78 MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
79 0, 256, " OpenPIC ");
80 BUG_ON(mpic == NULL);
81 of_node_put(np);
82
83 mpic_init(mpic);
84
85#ifdef CONFIG_CPM2
86 /* Setup CPM2 PIC */
87 np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
88 if (np == NULL) {
89 printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
90 return;
91 }
92 irq = irq_of_parse_and_map(np, 0);
93
94 if (irq == NO_IRQ) {
95 of_node_put(np);
96 printk(KERN_ERR "PIC init: got no IRQ for cpm cascade\n");
97 return;
98 }
99
100 cpm2_pic_init(np);
101 of_node_put(np);
102 set_irq_chained_handler(irq, cpm2_cascade);
103#endif
104}
105
106/*
107 * Setup the architecture
108 */
109static void __init tqm85xx_setup_arch(void)
110{
111#ifdef CONFIG_PCI
112 struct device_node *np;
113#endif
114
115 if (ppc_md.progress)
116 ppc_md.progress("tqm85xx_setup_arch()", 0);
117
118#ifdef CONFIG_CPM2
119 cpm2_reset();
120#endif
121
122#ifdef CONFIG_PCI
123 for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
124 fsl_add_bridge(np, 1);
125#endif
126}
127
128static void tqm85xx_show_cpuinfo(struct seq_file *m)
129{
130 uint pvid, svid, phid1;
131 uint memsize = total_memory;
132
133 pvid = mfspr(SPRN_PVR);
134 svid = mfspr(SPRN_SVR);
135
136 seq_printf(m, "Vendor\t\t: TQ Components\n");
137 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
138 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
139
140 /* Display cpu Pll setting */
141 phid1 = mfspr(SPRN_HID1);
142 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
143
144 /* Display the amount of memory */
145 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
146}
147
148static struct of_device_id __initdata of_bus_ids[] = {
149 { .compatible = "simple-bus", },
150 {},
151};
152
153static int __init declare_of_platform_devices(void)
154{
155 of_platform_bus_probe(NULL, of_bus_ids, NULL);
156
157 return 0;
158}
159machine_device_initcall(tqm85xx, declare_of_platform_devices);
160
161/*
162 * Called very early, device-tree isn't unflattened
163 */
164static int __init tqm85xx_probe(void)
165{
166 unsigned long root = of_get_flat_dt_root();
167
168 if ((of_flat_dt_is_compatible(root, "tqm,8540")) ||
169 (of_flat_dt_is_compatible(root, "tqm,8541")) ||
170 (of_flat_dt_is_compatible(root, "tqm,8555")) ||
171 (of_flat_dt_is_compatible(root, "tqm,8560")))
172 return 1;
173
174 return 0;
175}
176
177define_machine(tqm85xx) {
178 .name = "TQM85xx",
179 .probe = tqm85xx_probe,
180 .setup_arch = tqm85xx_setup_arch,
181 .init_IRQ = tqm85xx_pic_init,
182 .show_cpuinfo = tqm85xx_show_cpuinfo,
183 .get_irq = mpic_get_irq,
184 .restart = fsl_rstcr_restart,
185 .calibrate_decr = generic_calibrate_decr,
186 .progress = udbg_progress,
187};
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
index 88afa353f1d2..a8dffa005775 100644
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -16,8 +16,9 @@
16#include <asm/io.h> 16#include <asm/io.h>
17#include <asm/udbg.h> 17#include <asm/udbg.h>
18#include <asm/commproc.h> 18#include <asm/commproc.h>
19#include <asm/cpm1.h>
19 20
20#include <sysdev/commproc.h> 21#include "mpc8xx.h"
21 22
22struct cpm_pin { 23struct cpm_pin {
23 int port, pin, flags; 24 int port, pin, flags;
@@ -165,7 +166,7 @@ define_machine(ep88xc) {
165 .name = "Embedded Planet EP88xC", 166 .name = "Embedded Planet EP88xC",
166 .probe = ep88xc_probe, 167 .probe = ep88xc_probe,
167 .setup_arch = ep88xc_setup_arch, 168 .setup_arch = ep88xc_setup_arch,
168 .init_IRQ = m8xx_pic_init, 169 .init_IRQ = mpc8xx_pics_init,
169 .get_irq = mpc8xx_get_irq, 170 .get_irq = mpc8xx_get_irq,
170 .restart = mpc8xx_restart, 171 .restart = mpc8xx_restart,
171 .calibrate_decr = mpc8xx_calibrate_decr, 172 .calibrate_decr = mpc8xx_calibrate_decr,
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index ba645c2b63f6..184f998d1be2 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -16,6 +16,7 @@
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/time.h> 17#include <linux/time.h>
18#include <linux/rtc.h> 18#include <linux/rtc.h>
19#include <linux/fsl_devices.h>
19 20
20#include <asm/io.h> 21#include <asm/io.h>
21#include <asm/mpc8xx.h> 22#include <asm/mpc8xx.h>
@@ -25,13 +26,11 @@
25#include <mm/mmu_decl.h> 26#include <mm/mmu_decl.h>
26 27
27#include <sysdev/mpc8xx_pic.h> 28#include <sysdev/mpc8xx_pic.h>
28#include <sysdev/commproc.h>
29 29
30#ifdef CONFIG_PCMCIA_M8XX 30#include "mpc8xx.h"
31
31struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; 32struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
32#endif
33 33
34void m8xx_calibrate_decr(void);
35extern int cpm_pic_init(void); 34extern int cpm_pic_init(void);
36extern int cpm_get_irq(void); 35extern int cpm_get_irq(void);
37 36
@@ -237,13 +236,13 @@ static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
237 desc->chip->eoi(irq); 236 desc->chip->eoi(irq);
238} 237}
239 238
240/* Initialize the internal interrupt controller. The number of 239/* Initialize the internal interrupt controllers. The number of
241 * interrupts supported can vary with the processor type, and the 240 * interrupts supported can vary with the processor type, and the
242 * 82xx family can have up to 64. 241 * 82xx family can have up to 64.
243 * External interrupts can be either edge or level triggered, and 242 * External interrupts can be either edge or level triggered, and
244 * need to be initialized by the appropriate driver. 243 * need to be initialized by the appropriate driver.
245 */ 244 */
246void __init m8xx_pic_init(void) 245void __init mpc8xx_pics_init(void)
247{ 246{
248 int irq; 247 int irq;
249 248
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index d7965f885209..c028a5b71bbb 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -21,15 +21,13 @@
21#include <asm/machdep.h> 21#include <asm/machdep.h>
22#include <asm/system.h> 22#include <asm/system.h>
23#include <asm/time.h> 23#include <asm/time.h>
24#include <asm/mpc8xx.h>
25#include <asm/8xx_immap.h> 24#include <asm/8xx_immap.h>
26#include <asm/commproc.h> 25#include <asm/cpm1.h>
27#include <asm/fs_pd.h> 26#include <asm/fs_pd.h>
28#include <asm/udbg.h> 27#include <asm/udbg.h>
29 28
30#include <sysdev/commproc.h>
31
32#include "mpc86xads.h" 29#include "mpc86xads.h"
30#include "mpc8xx.h"
33 31
34struct cpm_pin { 32struct cpm_pin {
35 int port, pin, flags; 33 int port, pin, flags;
@@ -138,7 +136,7 @@ define_machine(mpc86x_ads) {
138 .name = "MPC86x ADS", 136 .name = "MPC86x ADS",
139 .probe = mpc86xads_probe, 137 .probe = mpc86xads_probe,
140 .setup_arch = mpc86xads_setup_arch, 138 .setup_arch = mpc86xads_setup_arch,
141 .init_IRQ = m8xx_pic_init, 139 .init_IRQ = mpc8xx_pics_init,
142 .get_irq = mpc8xx_get_irq, 140 .get_irq = mpc8xx_get_irq,
143 .restart = mpc8xx_restart, 141 .restart = mpc8xx_restart,
144 .calibrate_decr = mpc8xx_calibrate_decr, 142 .calibrate_decr = mpc8xx_calibrate_decr,
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 6ef8e9e6b8c3..6e7ded0233f6 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -36,11 +36,12 @@
36#include <asm/time.h> 36#include <asm/time.h>
37#include <asm/mpc8xx.h> 37#include <asm/mpc8xx.h>
38#include <asm/8xx_immap.h> 38#include <asm/8xx_immap.h>
39#include <asm/commproc.h> 39#include <asm/cpm1.h>
40#include <asm/fs_pd.h> 40#include <asm/fs_pd.h>
41#include <asm/udbg.h> 41#include <asm/udbg.h>
42 42
43#include <sysdev/commproc.h> 43#include "mpc885ads.h"
44#include "mpc8xx.h"
44 45
45static u32 __iomem *bcsr, *bcsr5; 46static u32 __iomem *bcsr, *bcsr5;
46 47
@@ -274,7 +275,7 @@ define_machine(mpc885_ads) {
274 .name = "Freescale MPC885 ADS", 275 .name = "Freescale MPC885 ADS",
275 .probe = mpc885ads_probe, 276 .probe = mpc885ads_probe,
276 .setup_arch = mpc885ads_setup_arch, 277 .setup_arch = mpc885ads_setup_arch,
277 .init_IRQ = m8xx_pic_init, 278 .init_IRQ = mpc8xx_pics_init,
278 .get_irq = mpc8xx_get_irq, 279 .get_irq = mpc8xx_get_irq,
279 .restart = mpc8xx_restart, 280 .restart = mpc8xx_restart,
280 .calibrate_decr = mpc8xx_calibrate_decr, 281 .calibrate_decr = mpc8xx_calibrate_decr,
diff --git a/arch/powerpc/platforms/8xx/mpc8xx.h b/arch/powerpc/platforms/8xx/mpc8xx.h
new file mode 100644
index 000000000000..239a243a6161
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/mpc8xx.h
@@ -0,0 +1,21 @@
1/*
2 * Prototypes, etc. for the Freescale MPC8xx embedded cpu chips
3 * May need to be cleaned as the port goes on ...
4 *
5 * Copyright (C) 2008 Jochen Friedrich <jochen@scram.de>
6 *
7 * This file is licensed under the terms of the GNU General Public License
8 * version 2. This program is licensed "as is" without any warranty of any
9 * kind, whether express or implied.
10 */
11#ifndef __MPC8xx_H
12#define __MPC8xx_H
13
14extern void mpc8xx_restart(char *cmd);
15extern void mpc8xx_calibrate_decr(void);
16extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
17extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
18extern void mpc8xx_pics_init(void);
19extern unsigned int mpc8xx_get_irq(void);
20
21#endif /* __MPC8xx_H */
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 4286664741dd..fdce10c4f074 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -21,7 +21,7 @@ config PPC_83xx
21 bool "Freescale 83xx" 21 bool "Freescale 83xx"
22 depends on 6xx 22 depends on 6xx
23 select FSL_SOC 23 select FSL_SOC
24 select 83xx 24 select MPC83xx
25 select IPIC 25 select IPIC
26 select WANT_DEVICE_TREE 26 select WANT_DEVICE_TREE
27 27
@@ -278,8 +278,8 @@ config QUICC_ENGINE
278 for a machine with a QE coprocessor. 278 for a machine with a QE coprocessor.
279 279
280config CPM2 280config CPM2
281 bool 281 bool "Enable support for the CPM2 (Communications Processor Module)"
282 default n 282 depends on MPC85xx || 8260
283 select CPM 283 select CPM
284 select PPC_LIB_RHEAP 284 select PPC_LIB_RHEAP
285 help 285 help
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index c3ee0b58d539..7fc41104d53e 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -29,8 +29,8 @@ config PPC_85xx
29 bool "Freescale 85xx" 29 bool "Freescale 85xx"
30 select E500 30 select E500
31 select FSL_SOC 31 select FSL_SOC
32 select 85xx
33 select WANT_DEVICE_TREE 32 select WANT_DEVICE_TREE
33 select MPC85xx
34 34
35config PPC_8xx 35config PPC_8xx
36 bool "Freescale 8xx" 36 bool "Freescale 8xx"
@@ -93,14 +93,6 @@ config 6xx
93config 8xx 93config 8xx
94 bool 94 bool
95 95
96# this is temp to handle compat with arch=ppc
97config 83xx
98 bool
99
100# this is temp to handle compat with arch=ppc
101config 85xx
102 bool
103
104config E500 96config E500
105 bool 97 bool
106 98
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c
index c99264cedda5..9d891bd5df5a 100644
--- a/arch/powerpc/platforms/embedded6xx/ls_uart.c
+++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c
@@ -117,9 +117,6 @@ static int __init ls_uarts_init(void)
117 phys_addr_t phys_addr; 117 phys_addr_t phys_addr;
118 int len; 118 int len;
119 119
120 if (!machine_is(linkstation))
121 return 0;
122
123 avr = of_find_node_by_path("/soc10x/serial@80004500"); 120 avr = of_find_node_by_path("/soc10x/serial@80004500");
124 if (!avr) 121 if (!avr)
125 return -EINVAL; 122 return -EINVAL;
@@ -142,4 +139,4 @@ static int __init ls_uarts_init(void)
142 return 0; 139 return 0;
143} 140}
144 141
145late_initcall(ls_uarts_init); 142machine_late_initcall(linkstation, ls_uarts_init);
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 702916bf28fa..15f3e8527d77 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -37,8 +37,8 @@ endif
37# Temporary hack until we have migrated to asm-powerpc 37# Temporary hack until we have migrated to asm-powerpc
38ifeq ($(ARCH),powerpc) 38ifeq ($(ARCH),powerpc)
39obj-$(CONFIG_CPM) += cpm_common.o 39obj-$(CONFIG_CPM) += cpm_common.o
40obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o 40obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
41obj-$(CONFIG_PPC_DCR) += dcr.o 41obj-$(CONFIG_PPC_DCR) += dcr.o
42obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o 42obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
43obj-$(CONFIG_UCODE_PATCH) += micropatch.o 43obj-$(CONFIG_UCODE_PATCH) += micropatch.o
44endif 44endif
diff --git a/arch/powerpc/sysdev/commproc.h b/arch/powerpc/sysdev/commproc.h
deleted file mode 100644
index 9155ba467274..000000000000
--- a/arch/powerpc/sysdev/commproc.h
+++ /dev/null
@@ -1,12 +0,0 @@
1#ifndef _POWERPC_SYSDEV_COMMPROC_H
2#define _POWERPC_SYSDEV_COMMPROC_H
3
4extern void cpm_reset(void);
5extern void mpc8xx_restart(char *cmd);
6extern void mpc8xx_calibrate_decr(void);
7extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
8extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
9extern void m8xx_pic_init(void);
10extern unsigned int mpc8xx_get_irq(void);
11
12#endif
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/cpm1.c
index 621bc6c1d408..df8bd2b64796 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -30,11 +30,10 @@
30#include <linux/interrupt.h> 30#include <linux/interrupt.h>
31#include <linux/irq.h> 31#include <linux/irq.h>
32#include <linux/module.h> 32#include <linux/module.h>
33#include <asm/mpc8xx.h>
34#include <asm/page.h> 33#include <asm/page.h>
35#include <asm/pgtable.h> 34#include <asm/pgtable.h>
36#include <asm/8xx_immap.h> 35#include <asm/8xx_immap.h>
37#include <asm/commproc.h> 36#include <asm/cpm1.h>
38#include <asm/io.h> 37#include <asm/io.h>
39#include <asm/tlbflush.h> 38#include <asm/tlbflush.h>
40#include <asm/rheap.h> 39#include <asm/rheap.h>
@@ -48,8 +47,6 @@
48#ifndef CONFIG_PPC_CPM_NEW_BINDING 47#ifndef CONFIG_PPC_CPM_NEW_BINDING
49static void m8xx_cpm_dpinit(void); 48static void m8xx_cpm_dpinit(void);
50#endif 49#endif
51static uint host_buffer; /* One page of host buffer */
52static uint host_end; /* end + 1 */
53cpm8xx_t __iomem *cpmp; /* Pointer to comm processor space */ 50cpm8xx_t __iomem *cpmp; /* Pointer to comm processor space */
54immap_t __iomem *mpc8xx_immr; 51immap_t __iomem *mpc8xx_immr;
55static cpic8xx_t __iomem *cpic_reg; 52static cpic8xx_t __iomem *cpic_reg;
@@ -268,41 +265,6 @@ out:
268} 265}
269EXPORT_SYMBOL(cpm_command); 266EXPORT_SYMBOL(cpm_command);
270 267
271/* We used to do this earlier, but have to postpone as long as possible
272 * to ensure the kernel VM is now running.
273 */
274static void
275alloc_host_memory(void)
276{
277 dma_addr_t physaddr;
278
279 /* Set the host page for allocation.
280 */
281 host_buffer = (uint)dma_alloc_coherent(NULL, PAGE_SIZE, &physaddr,
282 GFP_KERNEL);
283 host_end = host_buffer + PAGE_SIZE;
284}
285
286/* We also own one page of host buffer space for the allocation of
287 * UART "fifos" and the like.
288 */
289uint
290m8xx_cpm_hostalloc(uint size)
291{
292 uint retloc;
293
294 if (host_buffer == 0)
295 alloc_host_memory();
296
297 if ((host_buffer + size) >= host_end)
298 return(0);
299
300 retloc = host_buffer;
301 host_buffer += size;
302
303 return(retloc);
304}
305
306/* Set a baud rate generator. This needs lots of work. There are 268/* Set a baud rate generator. This needs lots of work. There are
307 * four BRGs, any of which can be wired to any channel. 269 * four BRGs, any of which can be wired to any channel.
308 * The internal baud rate clock is the system clock divided by 16. 270 * The internal baud rate clock is the system clock divided by 16.
@@ -328,7 +290,7 @@ cpm_setbrg(uint brg, uint rate)
328 out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN); 290 out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
329 else 291 else
330 out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) | 292 out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |
331 CPM_BRG_EN | CPM_BRG_DIV16); 293 CPM_BRG_EN | CPM_BRG_DIV16);
332} 294}
333 295
334#ifndef CONFIG_PPC_CPM_NEW_BINDING 296#ifndef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2.c
index f7188e2ba669..7be711232124 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -153,8 +153,7 @@ cpm2_fastbrg(uint brg, uint rate, int div16)
153 153
154 if (brg < 4) { 154 if (brg < 4) {
155 bp = cpm2_map_size(im_brgc1, 16); 155 bp = cpm2_map_size(im_brgc1, 16);
156 } 156 } else {
157 else {
158 bp = cpm2_map_size(im_brgc5, 16); 157 bp = cpm2_map_size(im_brgc5, 16);
159 brg -= 4; 158 brg -= 4;
160 } 159 }
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index f2c0988a03b8..e48b20e934ca 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -75,7 +75,7 @@ phys_addr_t get_immrbase(void)
75 75
76EXPORT_SYMBOL(get_immrbase); 76EXPORT_SYMBOL(get_immrbase);
77 77
78#if defined(CONFIG_CPM2) || defined(CONFIG_8xx) 78#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
79 79
80static u32 brgfreq = -1; 80static u32 brgfreq = -1;
81 81
@@ -100,11 +100,21 @@ u32 get_brgfreq(void)
100 100
101 /* Legacy device binding -- will go away when no users are left. */ 101 /* Legacy device binding -- will go away when no users are left. */
102 node = of_find_node_by_type(NULL, "cpm"); 102 node = of_find_node_by_type(NULL, "cpm");
103 if (!node)
104 node = of_find_compatible_node(NULL, NULL, "fsl,qe");
105 if (!node)
106 node = of_find_node_by_type(NULL, "qe");
107
103 if (node) { 108 if (node) {
104 prop = of_get_property(node, "brg-frequency", &size); 109 prop = of_get_property(node, "brg-frequency", &size);
105 if (prop && size == 4) 110 if (prop && size == 4)
106 brgfreq = *prop; 111 brgfreq = *prop;
107 112
113 if (brgfreq == -1 || brgfreq == 0) {
114 prop = of_get_property(node, "bus-frequency", &size);
115 if (prop && size == 4)
116 brgfreq = *prop / 2;
117 }
108 of_node_put(node); 118 of_node_put(node);
109 } 119 }
110 120
@@ -1266,31 +1276,17 @@ arch_initcall(cpm_smc_uart_of_init);
1266#endif /* CONFIG_8xx */ 1276#endif /* CONFIG_8xx */
1267#endif /* CONFIG_PPC_CPM_NEW_BINDING */ 1277#endif /* CONFIG_PPC_CPM_NEW_BINDING */
1268 1278
1269int __init fsl_spi_init(struct spi_board_info *board_infos, 1279static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
1270 unsigned int num_board_infos, 1280 struct spi_board_info *board_infos,
1271 void (*activate_cs)(u8 cs, u8 polarity), 1281 unsigned int num_board_infos,
1272 void (*deactivate_cs)(u8 cs, u8 polarity)) 1282 void (*activate_cs)(u8 cs, u8 polarity),
1283 void (*deactivate_cs)(u8 cs, u8 polarity))
1273{ 1284{
1274 struct device_node *np; 1285 struct device_node *np;
1275 unsigned int i; 1286 unsigned int i = 0;
1276 const u32 *sysclk;
1277
1278 /* SPI controller is either clocked from QE or SoC clock */
1279 np = of_find_node_by_type(NULL, "qe");
1280 if (!np)
1281 np = of_find_node_by_type(NULL, "soc");
1282
1283 if (!np)
1284 return -ENODEV;
1285
1286 sysclk = of_get_property(np, "bus-frequency", NULL);
1287 if (!sysclk)
1288 return -ENODEV;
1289 1287
1290 for (np = NULL, i = 1; 1288 for_each_compatible_node(np, type, compatible) {
1291 (np = of_find_compatible_node(np, "spi", "fsl_spi")) != NULL; 1289 int ret;
1292 i++) {
1293 int ret = 0;
1294 unsigned int j; 1290 unsigned int j;
1295 const void *prop; 1291 const void *prop;
1296 struct resource res[2]; 1292 struct resource res[2];
@@ -1302,13 +1298,17 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
1302 1298
1303 memset(res, 0, sizeof(res)); 1299 memset(res, 0, sizeof(res));
1304 1300
1305 pdata.sysclk = *sysclk; 1301 pdata.sysclk = sysclk;
1306 1302
1307 prop = of_get_property(np, "reg", NULL); 1303 prop = of_get_property(np, "reg", NULL);
1308 if (!prop) 1304 if (!prop)
1309 goto err; 1305 goto err;
1310 pdata.bus_num = *(u32 *)prop; 1306 pdata.bus_num = *(u32 *)prop;
1311 1307
1308 prop = of_get_property(np, "cell-index", NULL);
1309 if (prop)
1310 i = *(u32 *)prop;
1311
1312 prop = of_get_property(np, "mode", NULL); 1312 prop = of_get_property(np, "mode", NULL);
1313 if (prop && !strcmp(prop, "cpu-qe")) 1313 if (prop && !strcmp(prop, "cpu-qe"))
1314 pdata.qe_mode = 1; 1314 pdata.qe_mode = 1;
@@ -1319,7 +1319,7 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
1319 } 1319 }
1320 1320
1321 if (!pdata.max_chipselect) 1321 if (!pdata.max_chipselect)
1322 goto err; 1322 continue;
1323 1323
1324 ret = of_address_to_resource(np, 0, &res[0]); 1324 ret = of_address_to_resource(np, 0, &res[0]);
1325 if (ret) 1325 if (ret)
@@ -1346,13 +1346,58 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
1346 if (ret) 1346 if (ret)
1347 goto unreg; 1347 goto unreg;
1348 1348
1349 continue; 1349 goto next;
1350unreg: 1350unreg:
1351 platform_device_del(pdev); 1351 platform_device_del(pdev);
1352err: 1352err:
1353 continue; 1353 pr_err("%s: registration failed\n", np->full_name);
1354next:
1355 i++;
1354 } 1356 }
1355 1357
1358 return i;
1359}
1360
1361int __init fsl_spi_init(struct spi_board_info *board_infos,
1362 unsigned int num_board_infos,
1363 void (*activate_cs)(u8 cs, u8 polarity),
1364 void (*deactivate_cs)(u8 cs, u8 polarity))
1365{
1366 u32 sysclk = -1;
1367 int ret;
1368
1369#ifdef CONFIG_QUICC_ENGINE
1370 /* SPI controller is either clocked from QE or SoC clock */
1371 sysclk = get_brgfreq();
1372#endif
1373 if (sysclk == -1) {
1374 struct device_node *np;
1375 const u32 *freq;
1376 int size;
1377
1378 np = of_find_node_by_type(NULL, "soc");
1379 if (!np)
1380 return -ENODEV;
1381
1382 freq = of_get_property(np, "clock-frequency", &size);
1383 if (!freq || size != sizeof(*freq) || *freq == 0) {
1384 freq = of_get_property(np, "bus-frequency", &size);
1385 if (!freq || size != sizeof(*freq) || *freq == 0) {
1386 of_node_put(np);
1387 return -ENODEV;
1388 }
1389 }
1390
1391 sysclk = *freq;
1392 of_node_put(np);
1393 }
1394
1395 ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
1396 num_board_infos, activate_cs, deactivate_cs);
1397 if (!ret)
1398 of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
1399 num_board_infos, activate_cs, deactivate_cs);
1400
1356 return spi_register_board_info(board_infos, num_board_infos); 1401 return spi_register_board_info(board_infos, num_board_infos);
1357} 1402}
1358 1403
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 4c016da68426..d7f6a70e78df 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -497,6 +497,12 @@ static struct ipic_info ipic_info[] = {
497 .force = IPIC_SIFCR_L, 497 .force = IPIC_SIFCR_L,
498 .bit = 27, 498 .bit = 27,
499 }, 499 },
500 [94] = {
501 .mask = IPIC_SIMSR_L,
502 .prio = 0,
503 .force = IPIC_SIFCR_L,
504 .bit = 30,
505 },
500}; 506};
501 507
502static inline u32 ipic_read(volatile u32 __iomem *base, unsigned int reg) 508static inline u32 ipic_read(volatile u32 __iomem *base, unsigned int reg)
diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/sysdev/micropatch.c
index 712b10a55f87..d8d602840757 100644
--- a/arch/powerpc/sysdev/micropatch.c
+++ b/arch/powerpc/sysdev/micropatch.c
@@ -16,7 +16,7 @@
16#include <asm/page.h> 16#include <asm/page.h>
17#include <asm/pgtable.h> 17#include <asm/pgtable.h>
18#include <asm/8xx_immap.h> 18#include <asm/8xx_immap.h>
19#include <asm/commproc.h> 19#include <asm/cpm1.h>
20 20
21/* 21/*
22 * I2C/SPI relocation patch arrays. 22 * I2C/SPI relocation patch arrays.
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index 7aa4ff5f5ec8..0e74a4bd9827 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -10,7 +10,6 @@
10#include <asm/irq.h> 10#include <asm/irq.h>
11#include <asm/io.h> 11#include <asm/io.h>
12#include <asm/8xx_immap.h> 12#include <asm/8xx_immap.h>
13#include <asm/mpc8xx.h>
14 13
15#include "mpc8xx_pic.h" 14#include "mpc8xx_pic.h"
16 15
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 3925eae9b0f5..5ef844da9355 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -65,17 +65,22 @@ static phys_addr_t qebase = -1;
65phys_addr_t get_qe_base(void) 65phys_addr_t get_qe_base(void)
66{ 66{
67 struct device_node *qe; 67 struct device_node *qe;
68 unsigned int size;
69 const void *prop;
68 70
69 if (qebase != -1) 71 if (qebase != -1)
70 return qebase; 72 return qebase;
71 73
72 qe = of_find_node_by_type(NULL, "qe"); 74 qe = of_find_compatible_node(NULL, NULL, "fsl,qe");
73 if (qe) { 75 if (!qe) {
74 unsigned int size; 76 qe = of_find_node_by_type(NULL, "qe");
75 const void *prop = of_get_property(qe, "reg", &size); 77 if (!qe)
76 qebase = of_translate_address(qe, prop); 78 return qebase;
77 of_node_put(qe); 79 }
78 }; 80
81 prop = of_get_property(qe, "reg", &size);
82 qebase = of_translate_address(qe, prop);
83 of_node_put(qe);
79 84
80 return qebase; 85 return qebase;
81} 86}
@@ -153,16 +158,26 @@ static unsigned int brg_clk = 0;
153unsigned int get_brg_clk(void) 158unsigned int get_brg_clk(void)
154{ 159{
155 struct device_node *qe; 160 struct device_node *qe;
161 unsigned int size;
162 const u32 *prop;
163
156 if (brg_clk) 164 if (brg_clk)
157 return brg_clk; 165 return brg_clk;
158 166
159 qe = of_find_node_by_type(NULL, "qe"); 167 qe = of_find_compatible_node(NULL, NULL, "fsl,qe");
160 if (qe) { 168 if (!qe) {
161 unsigned int size; 169 qe = of_find_node_by_type(NULL, "qe");
162 const u32 *prop = of_get_property(qe, "brg-frequency", &size); 170 if (!qe)
163 brg_clk = *prop; 171 return brg_clk;
164 of_node_put(qe); 172 }
165 }; 173
174 prop = of_get_property(qe, "brg-frequency", &size);
175 if (!prop || size != sizeof(*prop))
176 return brg_clk;
177
178 brg_clk = *prop;
179 of_node_put(qe);
180
166 return brg_clk; 181 return brg_clk;
167} 182}
168 183
@@ -322,7 +337,7 @@ static rh_info_t qe_muram_info;
322static void qe_muram_init(void) 337static void qe_muram_init(void)
323{ 338{
324 struct device_node *np; 339 struct device_node *np;
325 u32 address; 340 const u32 *address;
326 u64 size; 341 u64 size;
327 unsigned int flags; 342 unsigned int flags;
328 343
@@ -335,11 +350,21 @@ static void qe_muram_init(void)
335 /* XXX: This is a subset of the available muram. It 350 /* XXX: This is a subset of the available muram. It
336 * varies with the processor and the microcode patches activated. 351 * varies with the processor and the microcode patches activated.
337 */ 352 */
338 if ((np = of_find_node_by_name(NULL, "data-only")) != NULL) { 353 np = of_find_compatible_node(NULL, NULL, "fsl,qe-muram-data");
339 address = *of_get_address(np, 0, &size, &flags); 354 if (!np) {
340 of_node_put(np); 355 np = of_find_node_by_name(NULL, "data-only");
341 rh_attach_region(&qe_muram_info, address, (int) size); 356 if (!np) {
357 WARN_ON(1);
358 return;
359 }
342 } 360 }
361
362 address = of_get_address(np, 0, &size, &flags);
363 WARN_ON(!address);
364
365 of_node_put(np);
366 if (address)
367 rh_attach_region(&qe_muram_info, *address, (int)size);
343} 368}
344 369
345/* This function returns an index into the MURAM area. 370/* This function returns an index into the MURAM area.
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 615b6583d9b0..3ea4db2cc9e9 100644
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -10,7 +10,7 @@
10 * This version of the driver is somewhat selectable for the different 10 * This version of the driver is somewhat selectable for the different
11 * processor/board combinations. It works for the boards I know about 11 * processor/board combinations. It works for the boards I know about
12 * now, and should be easily modified to include others. Some of the 12 * now, and should be easily modified to include others. Some of the
13 * configuration information is contained in <asm/commproc.h> and the 13 * configuration information is contained in <asm/cpm1.h> and the
14 * remainder is here. 14 * remainder is here.
15 * 15 *
16 * Buffer descriptors are kept in the CPM dual port RAM, and the frame 16 * Buffer descriptors are kept in the CPM dual port RAM, and the frame
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 9da880be4dc0..9d656de0f0f1 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -34,7 +34,7 @@
34#include <asm/page.h> 34#include <asm/page.h>
35#include <asm/pgtable.h> 35#include <asm/pgtable.h>
36#include <asm/8xx_immap.h> 36#include <asm/8xx_immap.h>
37#include <asm/commproc.h> 37#include <asm/cpm1.h>
38#include <asm/io.h> 38#include <asm/io.h>
39#include <asm/tlbflush.h> 39#include <asm/tlbflush.h>
40#include <asm/rheap.h> 40#include <asm/rheap.h>
@@ -55,8 +55,6 @@
55}) 55})
56 56
57static void m8xx_cpm_dpinit(void); 57static void m8xx_cpm_dpinit(void);
58static uint host_buffer; /* One page of host buffer */
59static uint host_end; /* end + 1 */
60cpm8xx_t *cpmp; /* Pointer to comm processor space */ 58cpm8xx_t *cpmp; /* Pointer to comm processor space */
61 59
62/* CPM interrupt vector functions. 60/* CPM interrupt vector functions.
@@ -68,7 +66,6 @@ struct cpm_action {
68static struct cpm_action cpm_vecs[CPMVEC_NR]; 66static struct cpm_action cpm_vecs[CPMVEC_NR];
69static irqreturn_t cpm_interrupt(int irq, void * dev); 67static irqreturn_t cpm_interrupt(int irq, void * dev);
70static irqreturn_t cpm_error_interrupt(int irq, void *dev); 68static irqreturn_t cpm_error_interrupt(int irq, void *dev);
71static void alloc_host_memory(void);
72/* Define a table of names to identify CPM interrupt handlers in 69/* Define a table of names to identify CPM interrupt handlers in
73 * /proc/interrupts. 70 * /proc/interrupts.
74 */ 71 */
@@ -158,21 +155,6 @@ m8xx_cpm_reset(void)
158 cpmp = (cpm8xx_t *)commproc; 155 cpmp = (cpm8xx_t *)commproc;
159} 156}
160 157
161/* We used to do this earlier, but have to postpone as long as possible
162 * to ensure the kernel VM is now running.
163 */
164static void
165alloc_host_memory(void)
166{
167 dma_addr_t physaddr;
168
169 /* Set the host page for allocation.
170 */
171 host_buffer = (uint)dma_alloc_coherent(NULL, PAGE_SIZE, &physaddr,
172 GFP_KERNEL);
173 host_end = host_buffer + PAGE_SIZE;
174}
175
176/* This is called during init_IRQ. We used to do it above, but this 158/* This is called during init_IRQ. We used to do it above, but this
177 * was too early since init_IRQ was not yet called. 159 * was too early since init_IRQ was not yet called.
178 */ 160 */
@@ -319,26 +301,6 @@ cpm_free_handler(int cpm_vec)
319 cpm_vecs[cpm_vec].dev_id = NULL; 301 cpm_vecs[cpm_vec].dev_id = NULL;
320} 302}
321 303
322/* We also own one page of host buffer space for the allocation of
323 * UART "fifos" and the like.
324 */
325uint
326m8xx_cpm_hostalloc(uint size)
327{
328 uint retloc;
329
330 if (host_buffer == 0)
331 alloc_host_memory();
332
333 if ((host_buffer + size) >= host_end)
334 return(0);
335
336 retloc = host_buffer;
337 host_buffer += size;
338
339 return(retloc);
340}
341
342/* Set a baud rate generator. This needs lots of work. There are 304/* Set a baud rate generator. This needs lots of work. There are
343 * four BRGs, any of which can be wired to any channel. 305 * four BRGs, any of which can be wired to any channel.
344 * The internal baud rate clock is the system clock divided by 16. 306 * The internal baud rate clock is the system clock divided by 16.
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index eace3bc118d2..c6d047ae77ac 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -8,7 +8,7 @@
8 * This version of the driver is somewhat selectable for the different 8 * This version of the driver is somewhat selectable for the different
9 * processor/board combinations. It works for the boards I know about 9 * processor/board combinations. It works for the boards I know about
10 * now, and should be easily modified to include others. Some of the 10 * now, and should be easily modified to include others. Some of the
11 * configuration information is contained in <asm/commproc.h> and the 11 * configuration information is contained in <asm/cpm1.h> and the
12 * remainder is here. 12 * remainder is here.
13 * 13 *
14 * Buffer descriptors are kept in the CPM dual port RAM, and the frame 14 * Buffer descriptors are kept in the CPM dual port RAM, and the frame
@@ -43,7 +43,7 @@
43#include <asm/pgtable.h> 43#include <asm/pgtable.h>
44#include <asm/mpc8xx.h> 44#include <asm/mpc8xx.h>
45#include <asm/uaccess.h> 45#include <asm/uaccess.h>
46#include <asm/commproc.h> 46#include <asm/cpm1.h>
47#include <asm/cacheflush.h> 47#include <asm/cacheflush.h>
48 48
49/* 49/*
@@ -80,7 +80,7 @@
80 * programming documents for details unique to your board. 80 * programming documents for details unique to your board.
81 * 81 *
82 * For the TQM8xx(L) modules, there is no control register interface. 82 * For the TQM8xx(L) modules, there is no control register interface.
83 * All functions are directly controlled using I/O pins. See <asm/commproc.h>. 83 * All functions are directly controlled using I/O pins. See <asm/cpm1.h>.
84 */ 84 */
85 85
86/* The transmitter timeout 86/* The transmitter timeout
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 0288279be9aa..11b0aa6ca97e 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -53,7 +53,7 @@
53#include <asm/mpc8xx.h> 53#include <asm/mpc8xx.h>
54#include <asm/irq.h> 54#include <asm/irq.h>
55#include <asm/uaccess.h> 55#include <asm/uaccess.h>
56#include <asm/commproc.h> 56#include <asm/cpm1.h>
57 57
58#ifdef CONFIG_USE_MDIO 58#ifdef CONFIG_USE_MDIO
59/* Forward declarations of some structures to support different PHYs 59/* Forward declarations of some structures to support different PHYs
diff --git a/arch/ppc/8xx_io/micropatch.c b/arch/ppc/8xx_io/micropatch.c
index cfad46ba17e3..9a5d95da7c28 100644
--- a/arch/ppc/8xx_io/micropatch.c
+++ b/arch/ppc/8xx_io/micropatch.c
@@ -16,7 +16,7 @@
16#include <asm/page.h> 16#include <asm/page.h>
17#include <asm/pgtable.h> 17#include <asm/pgtable.h>
18#include <asm/8xx_immap.h> 18#include <asm/8xx_immap.h>
19#include <asm/commproc.h> 19#include <asm/cpm1.h>
20 20
21/* 21/*
22 * I2C/SPI relocation patch arrays. 22 * I2C/SPI relocation patch arrays.
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 6473fa7cb4b9..db5934cdafb3 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -78,18 +78,18 @@ choice
78 default 6xx 78 default 6xx
79 79
80config 6xx 80config 6xx
81 bool "6xx/7xx/74xx/52xx/82xx/83xx" 81 bool "6xx/7xx/74xx/52xx/82xx"
82 select PPC_FPU 82 select PPC_FPU
83 help 83 help
84 There are four types of PowerPC chips supported. The more common 84 There are four types of PowerPC chips supported. The more common
85 types (601, 603, 604, 740, 750, 7400), the older Freescale 85 types (601, 603, 604, 740, 750, 7400), the older Freescale
86 (formerly Motorola) embedded versions (821, 823, 850, 855, 860, 86 (formerly Motorola) embedded versions (821, 823, 850, 855, 860,
87 52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and 87 52xx, 82xx), the IBM embedded versions (403 and 405) and
88 the Book E embedded processors from IBM (44x) and Freescale (85xx). 88 the Book E embedded processors from IBM (44x) and Freescale (85xx).
89 For support for 64-bit processors, set ARCH=powerpc. 89 For support for 64-bit processors, set ARCH=powerpc.
90 Unless you are building a kernel for one of the embedded processor 90 Unless you are building a kernel for one of the embedded processor
91 systems, choose 6xx. 91 systems, choose 6xx.
92 Also note that because the 52xx, 82xx, & 83xx family have a 603e 92 Also note that because the 52xx, 82xx family have a 603e
93 core, specific support for that chipset is asked later on. 93 core, specific support for that chipset is asked later on.
94 94
95config 40x 95config 40x
@@ -104,12 +104,6 @@ config 8xx
104 bool "8xx" 104 bool "8xx"
105 select PPC_LIB_RHEAP 105 select PPC_LIB_RHEAP
106 106
107config E200
108 bool "e200"
109
110config E500
111 bool "e500"
112
113endchoice 107endchoice
114 108
115config PPC_FPU 109config PPC_FPU
@@ -124,25 +118,14 @@ config PPC_DCR
124 depends on PPC_DCR_NATIVE 118 depends on PPC_DCR_NATIVE
125 default y 119 default y
126 120
127config BOOKE
128 bool
129 depends on E200 || E500
130 default y
131
132config FSL_BOOKE
133 bool
134 depends on E200 || E500
135 default y
136
137config PTE_64BIT 121config PTE_64BIT
138 bool 122 bool
139 depends on 44x || E500 123 depends on 44x
140 default y if 44x 124 default y if 44x
141 default y if E500 && PHYS_64BIT
142 125
143config PHYS_64BIT 126config PHYS_64BIT
144 bool 'Large physical address support' if E500 127 bool
145 depends on 44x || E500 128 depends on 44x
146 default y if 44x 129 default y if 44x
147 ---help--- 130 ---help---
148 This option enables kernel support for larger than 32-bit physical 131 This option enables kernel support for larger than 32-bit physical
@@ -153,7 +136,7 @@ config PHYS_64BIT
153config ALTIVEC 136config ALTIVEC
154 bool "AltiVec Support" 137 bool "AltiVec Support"
155 depends on 6xx 138 depends on 6xx
156 depends on !8260 && !83xx 139 depends on !8260
157 ---help--- 140 ---help---
158 This option enables kernel support for the Altivec extensions to the 141 This option enables kernel support for the Altivec extensions to the
159 PowerPC processor. The kernel currently supports saving and restoring 142 PowerPC processor. The kernel currently supports saving and restoring
@@ -167,24 +150,9 @@ config ALTIVEC
167 150
168 If in doubt, say Y here. 151 If in doubt, say Y here.
169 152
170config SPE
171 bool "SPE Support"
172 depends on E200 || E500
173 ---help---
174 This option enables kernel support for the Signal Processing
175 Extensions (SPE) to the PowerPC processor. The kernel currently
176 supports saving and restoring SPE registers, and turning on the
177 'spe enable' bit so user processes can execute SPE instructions.
178
179 This option is only useful if you have a processor that supports
180 SPE (e500, otherwise known as 85xx series), but does not have any
181 effect on a non-spe cpu (it does, however add code to the kernel).
182
183 If in doubt, say Y here.
184
185config TAU 153config TAU
186 bool "Thermal Management Support" 154 bool "Thermal Management Support"
187 depends on 6xx && !8260 && !83xx 155 depends on 6xx && !8260
188 help 156 help
189 G3 and G4 processors have an on-chip temperature sensor called the 157 G3 and G4 processors have an on-chip temperature sensor called the
190 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die 158 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
@@ -228,7 +196,7 @@ config TAU_AVERAGE
228 196
229config MATH_EMULATION 197config MATH_EMULATION
230 bool "Math emulation" 198 bool "Math emulation"
231 depends on 4xx || 8xx || E200 || E500 199 depends on 4xx || 8xx
232 ---help--- 200 ---help---
233 Some PowerPC chips designed for embedded applications do not have 201 Some PowerPC chips designed for embedded applications do not have
234 a floating-point unit and therefore do not implement the 202 a floating-point unit and therefore do not implement the
@@ -279,7 +247,6 @@ config PPC601_SYNC_FIX
279 If in doubt, say Y here. 247 If in doubt, say Y here.
280 248
281source arch/ppc/platforms/4xx/Kconfig 249source arch/ppc/platforms/4xx/Kconfig
282source arch/ppc/platforms/85xx/Kconfig
283 250
284config PPC_STD_MMU 251config PPC_STD_MMU
285 bool 252 bool
@@ -288,7 +255,7 @@ config PPC_STD_MMU
288 255
289config NOT_COHERENT_CACHE 256config NOT_COHERENT_CACHE
290 bool 257 bool
291 depends on 4xx || 8xx || E200 258 depends on 4xx || 8xx
292 default y 259 default y
293 260
294endmenu 261endmenu
@@ -721,16 +688,6 @@ config LITE5200B
721 Support for the LITE5200B dev board for the MPC5200 from Freescale. 688 Support for the LITE5200B dev board for the MPC5200 from Freescale.
722 This is the new board with 2 PCI slots. 689 This is the new board with 2 PCI slots.
723 690
724config MPC834x_SYS
725 bool "Freescale MPC834x SYS"
726 help
727 This option enables support for the MPC 834x SYS evaluation board.
728
729 Be aware that PCI buses can only function when SYS board is plugged
730 into the PIB (Platform IO Board) board from Freescale which provide
731 3 PCI slots. The PIBs PCI initialization is the bootloader's
732 responsibility.
733
734config EV64360 691config EV64360
735 bool "Marvell-EV64360BP" 692 bool "Marvell-EV64360BP"
736 help 693 help
@@ -774,18 +731,6 @@ config 8272
774 The MPC8272 CPM has a different internal dpram setup than other CPM2 731 The MPC8272 CPM has a different internal dpram setup than other CPM2
775 devices 732 devices
776 733
777config 83xx
778 bool
779 default y if MPC834x_SYS
780
781config MPC834x
782 bool
783 default y if MPC834x_SYS
784
785config PPC_83xx
786 bool
787 default y if 83xx
788
789config CPM1 734config CPM1
790 bool 735 bool
791 depends on 8xx 736 depends on 8xx
@@ -811,8 +756,7 @@ config PPC_GEN550
811 bool 756 bool
812 depends on SANDPOINT || SPRUCE || PPLUS || \ 757 depends on SANDPOINT || SPRUCE || PPLUS || \
813 PRPMC750 || PRPMC800 || LOPEC || \ 758 PRPMC750 || PRPMC800 || LOPEC || \
814 (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \ 759 (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D
815 83xx
816 default y 760 default y
817 761
818config FORCE 762config FORCE
@@ -1068,13 +1012,13 @@ config GENERIC_ISA_DMA
1068 1012
1069config PPC_I8259 1013config PPC_I8259
1070 bool 1014 bool
1071 default y if 85xx || PPC_PREP 1015 default y if PPC_PREP
1072 default n 1016 default n
1073 1017
1074config PPC_INDIRECT_PCI 1018config PPC_INDIRECT_PCI
1075 bool 1019 bool
1076 depends on PCI 1020 depends on PCI
1077 default y if 40x || 44x || 85xx || 83xx || PPC_PREP 1021 default y if 40x || 44x || PPC_PREP
1078 default n 1022 default n
1079 1023
1080config EISA 1024config EISA
@@ -1091,8 +1035,8 @@ config MCA
1091 bool 1035 bool
1092 1036
1093config PCI 1037config PCI
1094 bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx 1038 bool "PCI support" if 40x || CPM2 || PPC_MPC52xx
1095 default y if !40x && !CPM2 && !8xx && !83xx && !85xx 1039 default y if !40x && !CPM2 && !8xx
1096 default PCI_QSPAN if !4xx && !CPM2 && 8xx 1040 default PCI_QSPAN if !4xx && !CPM2 && 8xx
1097 help 1041 help
1098 Find out whether your system includes a PCI bus. PCI is the name of 1042 Find out whether your system includes a PCI bus. PCI is the name of
@@ -1106,11 +1050,6 @@ config PCI_DOMAINS
1106config PCI_SYSCALL 1050config PCI_SYSCALL
1107 def_bool PCI 1051 def_bool PCI
1108 1052
1109config MPC83xx_PCI2
1110 bool "Support for 2nd PCI host controller"
1111 depends on PCI && MPC834x
1112 default y if MPC834x_SYS
1113
1114config PCI_QSPAN 1053config PCI_QSPAN
1115 bool "QSpan PCI" 1054 bool "QSpan PCI"
1116 depends on !4xx && !CPM2 && 8xx 1055 depends on !4xx && !CPM2 && 8xx
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 95894ef7beaa..8df7f0e4c3a6 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -36,14 +36,8 @@ LINUXINCLUDE += -Iarch/$(ARCH)/include
36 36
37CHECKFLAGS += -D__powerpc__ 37CHECKFLAGS += -D__powerpc__
38 38
39ifndef CONFIG_FSL_BOOKE
40KBUILD_CFLAGS += -mstring
41endif
42
43cpu-as-$(CONFIG_4xx) += -Wa,-m405 39cpu-as-$(CONFIG_4xx) += -Wa,-m405
44cpu-as-$(CONFIG_6xx) += -Wa,-maltivec 40cpu-as-$(CONFIG_6xx) += -Wa,-maltivec
45cpu-as-$(CONFIG_E500) += -Wa,-me500
46cpu-as-$(CONFIG_E200) += -Wa,-me200
47 41
48KBUILD_AFLAGS += $(cpu-as-y) 42KBUILD_AFLAGS += $(cpu-as-y)
49KBUILD_CFLAGS += $(cpu-as-y) 43KBUILD_CFLAGS += $(cpu-as-y)
@@ -55,7 +49,6 @@ head-y := arch/ppc/kernel/head.o
55head-$(CONFIG_8xx) := arch/ppc/kernel/head_8xx.o 49head-$(CONFIG_8xx) := arch/ppc/kernel/head_8xx.o
56head-$(CONFIG_4xx) := arch/ppc/kernel/head_4xx.o 50head-$(CONFIG_4xx) := arch/ppc/kernel/head_4xx.o
57head-$(CONFIG_44x) := arch/ppc/kernel/head_44x.o 51head-$(CONFIG_44x) := arch/ppc/kernel/head_44x.o
58head-$(CONFIG_FSL_BOOKE) := arch/ppc/kernel/head_fsl_booke.o
59 52
60head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o 53head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o
61 54
@@ -65,8 +58,6 @@ core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \
65 arch/ppc/syslib/ arch/powerpc/sysdev/ \ 58 arch/ppc/syslib/ arch/powerpc/sysdev/ \
66 arch/powerpc/lib/ 59 arch/powerpc/lib/
67core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ 60core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/
68core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/
69core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/
70core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ 61core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/
71core-$(CONFIG_XMON) += arch/ppc/xmon/ 62core-$(CONFIG_XMON) += arch/ppc/xmon/
72drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ 63drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/
diff --git a/arch/ppc/boot/simple/iic.c b/arch/ppc/boot/simple/iic.c
index e4efd838bfaa..5e91489426b4 100644
--- a/arch/ppc/boot/simple/iic.c
+++ b/arch/ppc/boot/simple/iic.c
@@ -5,7 +5,7 @@
5#include <linux/types.h> 5#include <linux/types.h>
6#include <asm/uaccess.h> 6#include <asm/uaccess.h>
7#include <asm/mpc8xx.h> 7#include <asm/mpc8xx.h>
8#include <asm/commproc.h> 8#include <asm/cpm1.h>
9 9
10 10
11/* IIC functions. 11/* IIC functions.
diff --git a/arch/ppc/boot/simple/m8xx_tty.c b/arch/ppc/boot/simple/m8xx_tty.c
index ea615d8ca541..f28924e6aeb4 100644
--- a/arch/ppc/boot/simple/m8xx_tty.c
+++ b/arch/ppc/boot/simple/m8xx_tty.c
@@ -11,7 +11,7 @@
11#include <linux/types.h> 11#include <linux/types.h>
12#include <asm/uaccess.h> 12#include <asm/uaccess.h>
13#include <asm/mpc8xx.h> 13#include <asm/mpc8xx.h>
14#include <asm/commproc.h> 14#include <asm/cpm1.h>
15 15
16#ifdef CONFIG_MBX 16#ifdef CONFIG_MBX
17#define MBX_CSR1 ((volatile u_char *)0xfa100000) 17#define MBX_CSR1 ((volatile u_char *)0xfa100000)
diff --git a/arch/ppc/configs/mpc8540_ads_defconfig b/arch/ppc/configs/mpc8540_ads_defconfig
deleted file mode 100644
index bf676ebd99ab..000000000000
--- a/arch/ppc/configs/mpc8540_ads_defconfig
+++ /dev/null
@@ -1,706 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.11-rc1
4# Thu Jan 20 01:23:13 2005
5#
6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y
12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y
14
15#
16# Code maturity level options
17#
18CONFIG_EXPERIMENTAL=y
19CONFIG_CLEAN_COMPILE=y
20CONFIG_BROKEN_ON_SMP=y
21
22#
23# General setup
24#
25CONFIG_LOCALVERSION=""
26CONFIG_SWAP=y
27CONFIG_SYSVIPC=y
28# CONFIG_POSIX_MQUEUE is not set
29# CONFIG_BSD_PROCESS_ACCT is not set
30CONFIG_SYSCTL=y
31# CONFIG_AUDIT is not set
32CONFIG_LOG_BUF_SHIFT=14
33# CONFIG_HOTPLUG is not set
34CONFIG_KOBJECT_UEVENT=y
35# CONFIG_IKCONFIG is not set
36CONFIG_EMBEDDED=y
37# CONFIG_KALLSYMS is not set
38CONFIG_FUTEX=y
39# CONFIG_EPOLL is not set
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Processor
55#
56# CONFIG_6xx is not set
57# CONFIG_40x is not set
58# CONFIG_44x is not set
59# CONFIG_POWER3 is not set
60# CONFIG_POWER4 is not set
61# CONFIG_8xx is not set
62CONFIG_E500=y
63CONFIG_BOOKE=y
64CONFIG_FSL_BOOKE=y
65CONFIG_SPE=y
66CONFIG_MATH_EMULATION=y
67# CONFIG_CPU_FREQ is not set
68CONFIG_PPC_GEN550=y
69CONFIG_85xx=y
70CONFIG_PPC_INDIRECT_PCI_BE=y
71
72#
73# Freescale 85xx options
74#
75CONFIG_MPC8540_ADS=y
76# CONFIG_MPC8555_CDS is not set
77# CONFIG_MPC8560_ADS is not set
78# CONFIG_SBC8560 is not set
79CONFIG_MPC8540=y
80
81#
82# Platform options
83#
84# CONFIG_SMP is not set
85# CONFIG_PREEMPT is not set
86# CONFIG_HIGHMEM is not set
87CONFIG_BINFMT_ELF=y
88# CONFIG_BINFMT_MISC is not set
89# CONFIG_CMDLINE_BOOL is not set
90
91#
92# Bus options
93#
94CONFIG_PCI=y
95CONFIG_PCI_DOMAINS=y
96# CONFIG_PCI_LEGACY_PROC is not set
97CONFIG_PCI_NAMES=y
98
99#
100# PCCARD (PCMCIA/CardBus) support
101#
102# CONFIG_PCCARD is not set
103
104#
105# PC-card bridges
106#
107
108#
109# Advanced setup
110#
111# CONFIG_ADVANCED_OPTIONS is not set
112
113#
114# Default settings for advanced configuration options are used
115#
116CONFIG_HIGHMEM_START=0xfe000000
117CONFIG_LOWMEM_SIZE=0x30000000
118CONFIG_KERNEL_START=0xc0000000
119CONFIG_TASK_SIZE=0x80000000
120CONFIG_BOOT_LOAD=0x00800000
121
122#
123# Device Drivers
124#
125
126#
127# Generic Driver Options
128#
129CONFIG_STANDALONE=y
130CONFIG_PREVENT_FIRMWARE_BUILD=y
131# CONFIG_FW_LOADER is not set
132
133#
134# Memory Technology Devices (MTD)
135#
136# CONFIG_MTD is not set
137
138#
139# Parallel port support
140#
141# CONFIG_PARPORT is not set
142
143#
144# Plug and Play support
145#
146
147#
148# Block devices
149#
150# CONFIG_BLK_DEV_FD is not set
151# CONFIG_BLK_CPQ_DA is not set
152# CONFIG_BLK_CPQ_CISS_DA is not set
153# CONFIG_BLK_DEV_DAC960 is not set
154# CONFIG_BLK_DEV_UMEM is not set
155# CONFIG_BLK_DEV_COW_COMMON is not set
156CONFIG_BLK_DEV_LOOP=y
157# CONFIG_BLK_DEV_CRYPTOLOOP is not set
158# CONFIG_BLK_DEV_NBD is not set
159# CONFIG_BLK_DEV_SX8 is not set
160CONFIG_BLK_DEV_RAM=y
161CONFIG_BLK_DEV_RAM_COUNT=16
162CONFIG_BLK_DEV_RAM_SIZE=32768
163CONFIG_BLK_DEV_INITRD=y
164CONFIG_INITRAMFS_SOURCE=""
165# CONFIG_LBD is not set
166# CONFIG_CDROM_PKTCDVD is not set
167
168#
169# IO Schedulers
170#
171CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y
175# CONFIG_ATA_OVER_ETH is not set
176
177#
178# ATA/ATAPI/MFM/RLL support
179#
180# CONFIG_IDE is not set
181
182#
183# SCSI device support
184#
185# CONFIG_SCSI is not set
186
187#
188# Multi-device support (RAID and LVM)
189#
190# CONFIG_MD is not set
191
192#
193# Fusion MPT device support
194#
195
196#
197# IEEE 1394 (FireWire) support
198#
199# CONFIG_IEEE1394 is not set
200
201#
202# I2O device support
203#
204# CONFIG_I2O is not set
205
206#
207# Macintosh device drivers
208#
209
210#
211# Networking support
212#
213CONFIG_NET=y
214
215#
216# Networking options
217#
218CONFIG_PACKET=y
219# CONFIG_PACKET_MMAP is not set
220# CONFIG_NETLINK_DEV is not set
221CONFIG_UNIX=y
222# CONFIG_NET_KEY is not set
223CONFIG_INET=y
224CONFIG_IP_MULTICAST=y
225# CONFIG_IP_ADVANCED_ROUTER is not set
226CONFIG_IP_PNP=y
227CONFIG_IP_PNP_DHCP=y
228CONFIG_IP_PNP_BOOTP=y
229# CONFIG_IP_PNP_RARP is not set
230# CONFIG_NET_IPIP is not set
231# CONFIG_NET_IPGRE is not set
232# CONFIG_IP_MROUTE is not set
233# CONFIG_ARPD is not set
234CONFIG_SYN_COOKIES=y
235# CONFIG_INET_AH is not set
236# CONFIG_INET_ESP is not set
237# CONFIG_INET_IPCOMP is not set
238# CONFIG_INET_TUNNEL is not set
239CONFIG_IP_TCPDIAG=y
240# CONFIG_IP_TCPDIAG_IPV6 is not set
241# CONFIG_IPV6 is not set
242# CONFIG_NETFILTER is not set
243
244#
245# SCTP Configuration (EXPERIMENTAL)
246#
247# CONFIG_IP_SCTP is not set
248# CONFIG_ATM is not set
249# CONFIG_BRIDGE is not set
250# CONFIG_VLAN_8021Q is not set
251# CONFIG_DECNET is not set
252# CONFIG_LLC2 is not set
253# CONFIG_IPX is not set
254# CONFIG_ATALK is not set
255# CONFIG_X25 is not set
256# CONFIG_LAPB is not set
257# CONFIG_NET_DIVERT is not set
258# CONFIG_ECONET is not set
259# CONFIG_WAN_ROUTER is not set
260
261#
262# QoS and/or fair queueing
263#
264# CONFIG_NET_SCHED is not set
265# CONFIG_NET_CLS_ROUTE is not set
266
267#
268# Network testing
269#
270# CONFIG_NET_PKTGEN is not set
271# CONFIG_NETPOLL is not set
272# CONFIG_NET_POLL_CONTROLLER is not set
273# CONFIG_HAMRADIO is not set
274# CONFIG_IRDA is not set
275# CONFIG_BT is not set
276CONFIG_NETDEVICES=y
277# CONFIG_DUMMY is not set
278# CONFIG_BONDING is not set
279# CONFIG_EQUALIZER is not set
280# CONFIG_TUN is not set
281
282#
283# ARCnet devices
284#
285# CONFIG_ARCNET is not set
286
287#
288# Ethernet (10 or 100Mbit)
289#
290CONFIG_NET_ETHERNET=y
291CONFIG_MII=y
292# CONFIG_HAPPYMEAL is not set
293# CONFIG_SUNGEM is not set
294# CONFIG_NET_VENDOR_3COM is not set
295
296#
297# Tulip family network device support
298#
299# CONFIG_NET_TULIP is not set
300# CONFIG_HP100 is not set
301# CONFIG_NET_PCI is not set
302
303#
304# Ethernet (1000 Mbit)
305#
306# CONFIG_ACENIC is not set
307# CONFIG_DL2K is not set
308# CONFIG_E1000 is not set
309# CONFIG_NS83820 is not set
310# CONFIG_HAMACHI is not set
311# CONFIG_YELLOWFIN is not set
312# CONFIG_R8169 is not set
313# CONFIG_SK98LIN is not set
314# CONFIG_TIGON3 is not set
315CONFIG_GIANFAR=y
316CONFIG_GFAR_NAPI=y
317
318#
319# Ethernet (10000 Mbit)
320#
321# CONFIG_IXGB is not set
322# CONFIG_S2IO is not set
323
324#
325# Token Ring devices
326#
327# CONFIG_TR is not set
328
329#
330# Wireless LAN (non-hamradio)
331#
332# CONFIG_NET_RADIO is not set
333
334#
335# Wan interfaces
336#
337# CONFIG_WAN is not set
338# CONFIG_FDDI is not set
339# CONFIG_HIPPI is not set
340# CONFIG_PPP is not set
341# CONFIG_SLIP is not set
342# CONFIG_SHAPER is not set
343# CONFIG_NETCONSOLE is not set
344
345#
346# ISDN subsystem
347#
348# CONFIG_ISDN is not set
349
350#
351# Telephony Support
352#
353# CONFIG_PHONE is not set
354
355#
356# Input device support
357#
358CONFIG_INPUT=y
359
360#
361# Userland interfaces
362#
363# CONFIG_INPUT_MOUSEDEV is not set
364# CONFIG_INPUT_JOYDEV is not set
365# CONFIG_INPUT_TSDEV is not set
366# CONFIG_INPUT_EVDEV is not set
367# CONFIG_INPUT_EVBUG is not set
368
369#
370# Input I/O drivers
371#
372# CONFIG_GAMEPORT is not set
373CONFIG_SOUND_GAMEPORT=y
374# CONFIG_SERIO is not set
375# CONFIG_SERIO_I8042 is not set
376
377#
378# Input Device Drivers
379#
380# CONFIG_INPUT_KEYBOARD is not set
381# CONFIG_INPUT_MOUSE is not set
382# CONFIG_INPUT_JOYSTICK is not set
383# CONFIG_INPUT_TOUCHSCREEN is not set
384# CONFIG_INPUT_MISC is not set
385
386#
387# Character devices
388#
389# CONFIG_VT is not set
390# CONFIG_SERIAL_NONSTANDARD is not set
391
392#
393# Serial drivers
394#
395CONFIG_SERIAL_8250=y
396CONFIG_SERIAL_8250_CONSOLE=y
397CONFIG_SERIAL_8250_NR_UARTS=4
398# CONFIG_SERIAL_8250_EXTENDED is not set
399
400#
401# Non-8250 serial port support
402#
403CONFIG_SERIAL_CORE=y
404CONFIG_SERIAL_CORE_CONSOLE=y
405CONFIG_UNIX98_PTYS=y
406CONFIG_LEGACY_PTYS=y
407CONFIG_LEGACY_PTY_COUNT=256
408
409#
410# IPMI
411#
412# CONFIG_IPMI_HANDLER is not set
413
414#
415# Watchdog Cards
416#
417# CONFIG_WATCHDOG is not set
418# CONFIG_NVRAM is not set
419CONFIG_GEN_RTC=y
420# CONFIG_GEN_RTC_X is not set
421# CONFIG_DTLK is not set
422# CONFIG_R3964 is not set
423# CONFIG_APPLICOM is not set
424
425#
426# Ftape, the floppy tape device driver
427#
428# CONFIG_AGP is not set
429# CONFIG_DRM is not set
430# CONFIG_RAW_DRIVER is not set
431
432#
433# I2C support
434#
435CONFIG_I2C=y
436CONFIG_I2C_CHARDEV=y
437
438#
439# I2C Algorithms
440#
441# CONFIG_I2C_ALGOBIT is not set
442# CONFIG_I2C_ALGOPCF is not set
443# CONFIG_I2C_ALGOPCA is not set
444
445#
446# I2C Hardware Bus support
447#
448# CONFIG_I2C_ALI1535 is not set
449# CONFIG_I2C_ALI1563 is not set
450# CONFIG_I2C_ALI15X3 is not set
451# CONFIG_I2C_AMD756 is not set
452# CONFIG_I2C_AMD8111 is not set
453# CONFIG_I2C_I801 is not set
454# CONFIG_I2C_I810 is not set
455CONFIG_I2C_MPC=y
456# CONFIG_I2C_NFORCE2 is not set
457# CONFIG_I2C_PARPORT_LIGHT is not set
458# CONFIG_I2C_PIIX4 is not set
459# CONFIG_I2C_PROSAVAGE is not set
460# CONFIG_I2C_SAVAGE4 is not set
461# CONFIG_SCx200_ACB is not set
462# CONFIG_I2C_SIS5595 is not set
463# CONFIG_I2C_SIS630 is not set
464# CONFIG_I2C_SIS96X is not set
465# CONFIG_I2C_VIA is not set
466# CONFIG_I2C_VIAPRO is not set
467# CONFIG_I2C_VOODOO3 is not set
468# CONFIG_I2C_PCA_ISA is not set
469
470#
471# Hardware Sensors Chip support
472#
473# CONFIG_I2C_SENSOR is not set
474# CONFIG_SENSORS_ADM1021 is not set
475# CONFIG_SENSORS_ADM1025 is not set
476# CONFIG_SENSORS_ADM1026 is not set
477# CONFIG_SENSORS_ADM1031 is not set
478# CONFIG_SENSORS_ASB100 is not set
479# CONFIG_SENSORS_DS1621 is not set
480# CONFIG_SENSORS_FSCHER is not set
481# CONFIG_SENSORS_GL518SM is not set
482# CONFIG_SENSORS_IT87 is not set
483# CONFIG_SENSORS_LM63 is not set
484# CONFIG_SENSORS_LM75 is not set
485# CONFIG_SENSORS_LM77 is not set
486# CONFIG_SENSORS_LM78 is not set
487# CONFIG_SENSORS_LM80 is not set
488# CONFIG_SENSORS_LM83 is not set
489# CONFIG_SENSORS_LM85 is not set
490# CONFIG_SENSORS_LM87 is not set
491# CONFIG_SENSORS_LM90 is not set
492# CONFIG_SENSORS_MAX1619 is not set
493# CONFIG_SENSORS_PC87360 is not set
494# CONFIG_SENSORS_SMSC47B397 is not set
495# CONFIG_SENSORS_SMSC47M1 is not set
496# CONFIG_SENSORS_VIA686A is not set
497# CONFIG_SENSORS_W83781D is not set
498# CONFIG_SENSORS_W83L785TS is not set
499# CONFIG_SENSORS_W83627HF is not set
500
501#
502# Other I2C Chip support
503#
504# CONFIG_SENSORS_EEPROM is not set
505# CONFIG_SENSORS_PCF8574 is not set
506# CONFIG_SENSORS_PCF8591 is not set
507# CONFIG_SENSORS_RTC8564 is not set
508# CONFIG_I2C_DEBUG_CORE is not set
509# CONFIG_I2C_DEBUG_ALGO is not set
510# CONFIG_I2C_DEBUG_BUS is not set
511# CONFIG_I2C_DEBUG_CHIP is not set
512
513#
514# Dallas's 1-wire bus
515#
516# CONFIG_W1 is not set
517
518#
519# Misc devices
520#
521
522#
523# Multimedia devices
524#
525# CONFIG_VIDEO_DEV is not set
526
527#
528# Digital Video Broadcasting Devices
529#
530# CONFIG_DVB is not set
531
532#
533# Graphics support
534#
535# CONFIG_FB is not set
536# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
537
538#
539# Sound
540#
541# CONFIG_SOUND is not set
542
543#
544# USB support
545#
546# CONFIG_USB is not set
547CONFIG_USB_ARCH_HAS_HCD=y
548CONFIG_USB_ARCH_HAS_OHCI=y
549
550#
551# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
552#
553
554#
555# USB Gadget Support
556#
557# CONFIG_USB_GADGET is not set
558
559#
560# MMC/SD Card support
561#
562# CONFIG_MMC is not set
563
564#
565# InfiniBand support
566#
567# CONFIG_INFINIBAND is not set
568
569#
570# File systems
571#
572CONFIG_EXT2_FS=y
573# CONFIG_EXT2_FS_XATTR is not set
574CONFIG_EXT3_FS=y
575CONFIG_EXT3_FS_XATTR=y
576# CONFIG_EXT3_FS_POSIX_ACL is not set
577# CONFIG_EXT3_FS_SECURITY is not set
578CONFIG_JBD=y
579# CONFIG_JBD_DEBUG is not set
580CONFIG_FS_MBCACHE=y
581# CONFIG_REISERFS_FS is not set
582# CONFIG_JFS_FS is not set
583# CONFIG_XFS_FS is not set
584# CONFIG_MINIX_FS is not set
585# CONFIG_ROMFS_FS is not set
586# CONFIG_QUOTA is not set
587CONFIG_DNOTIFY=y
588# CONFIG_AUTOFS_FS is not set
589# CONFIG_AUTOFS4_FS is not set
590
591#
592# CD-ROM/DVD Filesystems
593#
594# CONFIG_ISO9660_FS is not set
595# CONFIG_UDF_FS is not set
596
597#
598# DOS/FAT/NT Filesystems
599#
600# CONFIG_MSDOS_FS is not set
601# CONFIG_VFAT_FS is not set
602# CONFIG_NTFS_FS is not set
603
604#
605# Pseudo filesystems
606#
607CONFIG_PROC_FS=y
608CONFIG_PROC_KCORE=y
609CONFIG_SYSFS=y
610# CONFIG_DEVFS_FS is not set
611# CONFIG_DEVPTS_FS_XATTR is not set
612CONFIG_TMPFS=y
613# CONFIG_TMPFS_XATTR is not set
614# CONFIG_HUGETLB_PAGE is not set
615CONFIG_RAMFS=y
616
617#
618# Miscellaneous filesystems
619#
620# CONFIG_ADFS_FS is not set
621# CONFIG_AFFS_FS is not set
622# CONFIG_HFS_FS is not set
623# CONFIG_HFSPLUS_FS is not set
624# CONFIG_BEFS_FS is not set
625# CONFIG_BFS_FS is not set
626# CONFIG_EFS_FS is not set
627# CONFIG_CRAMFS is not set
628# CONFIG_VXFS_FS is not set
629# CONFIG_HPFS_FS is not set
630# CONFIG_QNX4FS_FS is not set
631# CONFIG_SYSV_FS is not set
632# CONFIG_UFS_FS is not set
633
634#
635# Network File Systems
636#
637CONFIG_NFS_FS=y
638# CONFIG_NFS_V3 is not set
639# CONFIG_NFS_V4 is not set
640# CONFIG_NFS_DIRECTIO is not set
641# CONFIG_NFSD is not set
642CONFIG_ROOT_NFS=y
643CONFIG_LOCKD=y
644# CONFIG_EXPORTFS is not set
645CONFIG_SUNRPC=y
646# CONFIG_RPCSEC_GSS_KRB5 is not set
647# CONFIG_RPCSEC_GSS_SPKM3 is not set
648# CONFIG_SMB_FS is not set
649# CONFIG_CIFS is not set
650# CONFIG_NCP_FS is not set
651# CONFIG_CODA_FS is not set
652# CONFIG_AFS_FS is not set
653
654#
655# Partition Types
656#
657CONFIG_PARTITION_ADVANCED=y
658# CONFIG_ACORN_PARTITION is not set
659# CONFIG_OSF_PARTITION is not set
660# CONFIG_AMIGA_PARTITION is not set
661# CONFIG_ATARI_PARTITION is not set
662# CONFIG_MAC_PARTITION is not set
663# CONFIG_MSDOS_PARTITION is not set
664# CONFIG_LDM_PARTITION is not set
665# CONFIG_SGI_PARTITION is not set
666# CONFIG_ULTRIX_PARTITION is not set
667# CONFIG_SUN_PARTITION is not set
668# CONFIG_EFI_PARTITION is not set
669
670#
671# Native Language Support
672#
673# CONFIG_NLS is not set
674
675#
676# Library routines
677#
678# CONFIG_CRC_CCITT is not set
679CONFIG_CRC32=y
680# CONFIG_LIBCRC32C is not set
681
682#
683# Profiling support
684#
685# CONFIG_PROFILING is not set
686
687#
688# Kernel hacking
689#
690# CONFIG_DEBUG_KERNEL is not set
691# CONFIG_SERIAL_TEXT_DEBUG is not set
692
693#
694# Security options
695#
696# CONFIG_KEYS is not set
697# CONFIG_SECURITY is not set
698
699#
700# Cryptographic options
701#
702# CONFIG_CRYPTO is not set
703
704#
705# Hardware crypto devices
706#
diff --git a/arch/ppc/configs/mpc8548_cds_defconfig b/arch/ppc/configs/mpc8548_cds_defconfig
deleted file mode 100644
index f36fc5db540b..000000000000
--- a/arch/ppc/configs/mpc8548_cds_defconfig
+++ /dev/null
@@ -1,658 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc4
4# Tue May 24 22:36:27 2005
5#
6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y
12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
15
16#
17# Code maturity level options
18#
19CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION=""
28CONFIG_SWAP=y
29CONFIG_SYSVIPC=y
30# CONFIG_POSIX_MQUEUE is not set
31# CONFIG_BSD_PROCESS_ACCT is not set
32CONFIG_SYSCTL=y
33# CONFIG_AUDIT is not set
34# CONFIG_HOTPLUG is not set
35CONFIG_KOBJECT_UEVENT=y
36# CONFIG_IKCONFIG is not set
37CONFIG_EMBEDDED=y
38# CONFIG_KALLSYMS is not set
39CONFIG_PRINTK=y
40CONFIG_BUG=y
41CONFIG_BASE_FULL=y
42CONFIG_FUTEX=y
43# CONFIG_EPOLL is not set
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SHMEM=y
46CONFIG_CC_ALIGN_FUNCTIONS=0
47CONFIG_CC_ALIGN_LABELS=0
48CONFIG_CC_ALIGN_LOOPS=0
49CONFIG_CC_ALIGN_JUMPS=0
50# CONFIG_TINY_SHMEM is not set
51CONFIG_BASE_SMALL=0
52
53#
54# Loadable module support
55#
56# CONFIG_MODULES is not set
57
58#
59# Processor
60#
61# CONFIG_6xx is not set
62# CONFIG_40x is not set
63# CONFIG_44x is not set
64# CONFIG_POWER3 is not set
65# CONFIG_POWER4 is not set
66# CONFIG_8xx is not set
67CONFIG_E500=y
68CONFIG_BOOKE=y
69CONFIG_FSL_BOOKE=y
70# CONFIG_PHYS_64BIT is not set
71CONFIG_SPE=y
72CONFIG_MATH_EMULATION=y
73# CONFIG_CPU_FREQ is not set
74# CONFIG_PM is not set
75CONFIG_85xx=y
76CONFIG_PPC_INDIRECT_PCI_BE=y
77
78#
79# Freescale 85xx options
80#
81# CONFIG_MPC8540_ADS is not set
82CONFIG_MPC8548_CDS=y
83# CONFIG_MPC8555_CDS is not set
84# CONFIG_MPC8560_ADS is not set
85# CONFIG_SBC8560 is not set
86# CONFIG_STX_GP3 is not set
87CONFIG_MPC8548=y
88
89#
90# Platform options
91#
92# CONFIG_SMP is not set
93# CONFIG_PREEMPT is not set
94# CONFIG_HIGHMEM is not set
95CONFIG_BINFMT_ELF=y
96# CONFIG_BINFMT_MISC is not set
97# CONFIG_CMDLINE_BOOL is not set
98CONFIG_ISA_DMA_API=y
99
100#
101# Bus options
102#
103# CONFIG_PCI is not set
104# CONFIG_PCI_DOMAINS is not set
105
106#
107# PCCARD (PCMCIA/CardBus) support
108#
109# CONFIG_PCCARD is not set
110
111#
112# Advanced setup
113#
114# CONFIG_ADVANCED_OPTIONS is not set
115
116#
117# Default settings for advanced configuration options are used
118#
119CONFIG_HIGHMEM_START=0xfe000000
120CONFIG_LOWMEM_SIZE=0x30000000
121CONFIG_KERNEL_START=0xc0000000
122CONFIG_TASK_SIZE=0x80000000
123CONFIG_BOOT_LOAD=0x00800000
124
125#
126# Device Drivers
127#
128
129#
130# Generic Driver Options
131#
132CONFIG_STANDALONE=y
133CONFIG_PREVENT_FIRMWARE_BUILD=y
134# CONFIG_FW_LOADER is not set
135
136#
137# Memory Technology Devices (MTD)
138#
139# CONFIG_MTD is not set
140
141#
142# Parallel port support
143#
144# CONFIG_PARPORT is not set
145
146#
147# Plug and Play support
148#
149
150#
151# Block devices
152#
153# CONFIG_BLK_DEV_FD is not set
154# CONFIG_BLK_DEV_COW_COMMON is not set
155CONFIG_BLK_DEV_LOOP=y
156# CONFIG_BLK_DEV_CRYPTOLOOP is not set
157# CONFIG_BLK_DEV_NBD is not set
158CONFIG_BLK_DEV_RAM=y
159CONFIG_BLK_DEV_RAM_COUNT=16
160CONFIG_BLK_DEV_RAM_SIZE=32768
161CONFIG_BLK_DEV_INITRD=y
162CONFIG_INITRAMFS_SOURCE=""
163# CONFIG_LBD is not set
164# CONFIG_CDROM_PKTCDVD is not set
165
166#
167# IO Schedulers
168#
169CONFIG_IOSCHED_NOOP=y
170CONFIG_IOSCHED_AS=y
171CONFIG_IOSCHED_DEADLINE=y
172CONFIG_IOSCHED_CFQ=y
173# CONFIG_ATA_OVER_ETH is not set
174
175#
176# ATA/ATAPI/MFM/RLL support
177#
178# CONFIG_IDE is not set
179
180#
181# SCSI device support
182#
183# CONFIG_SCSI is not set
184
185#
186# Multi-device support (RAID and LVM)
187#
188# CONFIG_MD is not set
189
190#
191# Fusion MPT device support
192#
193
194#
195# IEEE 1394 (FireWire) support
196#
197
198#
199# I2O device support
200#
201
202#
203# Macintosh device drivers
204#
205
206#
207# Networking support
208#
209CONFIG_NET=y
210
211#
212# Networking options
213#
214CONFIG_PACKET=y
215# CONFIG_PACKET_MMAP is not set
216CONFIG_UNIX=y
217# CONFIG_NET_KEY is not set
218CONFIG_INET=y
219CONFIG_IP_MULTICAST=y
220# CONFIG_IP_ADVANCED_ROUTER is not set
221CONFIG_IP_PNP=y
222CONFIG_IP_PNP_DHCP=y
223CONFIG_IP_PNP_BOOTP=y
224# CONFIG_IP_PNP_RARP is not set
225# CONFIG_NET_IPIP is not set
226# CONFIG_NET_IPGRE is not set
227# CONFIG_IP_MROUTE is not set
228# CONFIG_ARPD is not set
229CONFIG_SYN_COOKIES=y
230# CONFIG_INET_AH is not set
231# CONFIG_INET_ESP is not set
232# CONFIG_INET_IPCOMP is not set
233# CONFIG_INET_TUNNEL is not set
234CONFIG_IP_TCPDIAG=y
235# CONFIG_IP_TCPDIAG_IPV6 is not set
236# CONFIG_IPV6 is not set
237# CONFIG_NETFILTER is not set
238
239#
240# SCTP Configuration (EXPERIMENTAL)
241#
242# CONFIG_IP_SCTP is not set
243# CONFIG_ATM is not set
244# CONFIG_BRIDGE is not set
245# CONFIG_VLAN_8021Q is not set
246# CONFIG_DECNET is not set
247# CONFIG_LLC2 is not set
248# CONFIG_IPX is not set
249# CONFIG_ATALK is not set
250# CONFIG_X25 is not set
251# CONFIG_LAPB is not set
252# CONFIG_NET_DIVERT is not set
253# CONFIG_ECONET is not set
254# CONFIG_WAN_ROUTER is not set
255
256#
257# QoS and/or fair queueing
258#
259# CONFIG_NET_SCHED is not set
260# CONFIG_NET_CLS_ROUTE is not set
261
262#
263# Network testing
264#
265# CONFIG_NET_PKTGEN is not set
266# CONFIG_NETPOLL is not set
267# CONFIG_NET_POLL_CONTROLLER is not set
268# CONFIG_HAMRADIO is not set
269# CONFIG_IRDA is not set
270# CONFIG_BT is not set
271CONFIG_NETDEVICES=y
272# CONFIG_DUMMY is not set
273# CONFIG_BONDING is not set
274# CONFIG_EQUALIZER is not set
275# CONFIG_TUN is not set
276
277#
278# Ethernet (10 or 100Mbit)
279#
280CONFIG_NET_ETHERNET=y
281CONFIG_MII=y
282
283#
284# Ethernet (1000 Mbit)
285#
286CONFIG_GIANFAR=y
287CONFIG_GFAR_NAPI=y
288
289#
290# Ethernet (10000 Mbit)
291#
292
293#
294# Token Ring devices
295#
296
297#
298# Wireless LAN (non-hamradio)
299#
300# CONFIG_NET_RADIO is not set
301
302#
303# Wan interfaces
304#
305# CONFIG_WAN is not set
306# CONFIG_PPP is not set
307# CONFIG_SLIP is not set
308# CONFIG_SHAPER is not set
309# CONFIG_NETCONSOLE is not set
310
311#
312# ISDN subsystem
313#
314# CONFIG_ISDN is not set
315
316#
317# Telephony Support
318#
319# CONFIG_PHONE is not set
320
321#
322# Input device support
323#
324CONFIG_INPUT=y
325
326#
327# Userland interfaces
328#
329# CONFIG_INPUT_MOUSEDEV is not set
330# CONFIG_INPUT_JOYDEV is not set
331# CONFIG_INPUT_TSDEV is not set
332# CONFIG_INPUT_EVDEV is not set
333# CONFIG_INPUT_EVBUG is not set
334
335#
336# Input Device Drivers
337#
338# CONFIG_INPUT_KEYBOARD is not set
339# CONFIG_INPUT_MOUSE is not set
340# CONFIG_INPUT_JOYSTICK is not set
341# CONFIG_INPUT_TOUCHSCREEN is not set
342# CONFIG_INPUT_MISC is not set
343
344#
345# Hardware I/O ports
346#
347# CONFIG_SERIO is not set
348# CONFIG_GAMEPORT is not set
349CONFIG_SOUND_GAMEPORT=y
350
351#
352# Character devices
353#
354# CONFIG_VT is not set
355# CONFIG_SERIAL_NONSTANDARD is not set
356
357#
358# Serial drivers
359#
360CONFIG_SERIAL_8250=y
361CONFIG_SERIAL_8250_CONSOLE=y
362CONFIG_SERIAL_8250_NR_UARTS=4
363# CONFIG_SERIAL_8250_EXTENDED is not set
364
365#
366# Non-8250 serial port support
367#
368CONFIG_SERIAL_CORE=y
369CONFIG_SERIAL_CORE_CONSOLE=y
370CONFIG_UNIX98_PTYS=y
371CONFIG_LEGACY_PTYS=y
372CONFIG_LEGACY_PTY_COUNT=256
373
374#
375# IPMI
376#
377# CONFIG_IPMI_HANDLER is not set
378
379#
380# Watchdog Cards
381#
382# CONFIG_WATCHDOG is not set
383# CONFIG_NVRAM is not set
384CONFIG_GEN_RTC=y
385# CONFIG_GEN_RTC_X is not set
386# CONFIG_DTLK is not set
387# CONFIG_R3964 is not set
388
389#
390# Ftape, the floppy tape device driver
391#
392# CONFIG_AGP is not set
393# CONFIG_DRM is not set
394# CONFIG_RAW_DRIVER is not set
395
396#
397# TPM devices
398#
399
400#
401# I2C support
402#
403CONFIG_I2C=y
404CONFIG_I2C_CHARDEV=y
405
406#
407# I2C Algorithms
408#
409# CONFIG_I2C_ALGOBIT is not set
410# CONFIG_I2C_ALGOPCF is not set
411# CONFIG_I2C_ALGOPCA is not set
412
413#
414# I2C Hardware Bus support
415#
416CONFIG_I2C_MPC=y
417# CONFIG_I2C_PARPORT_LIGHT is not set
418# CONFIG_I2C_PCA_ISA is not set
419
420#
421# Hardware Sensors Chip support
422#
423# CONFIG_I2C_SENSOR is not set
424# CONFIG_SENSORS_ADM1021 is not set
425# CONFIG_SENSORS_ADM1025 is not set
426# CONFIG_SENSORS_ADM1026 is not set
427# CONFIG_SENSORS_ADM1031 is not set
428# CONFIG_SENSORS_ASB100 is not set
429# CONFIG_SENSORS_DS1621 is not set
430# CONFIG_SENSORS_FSCHER is not set
431# CONFIG_SENSORS_FSCPOS is not set
432# CONFIG_SENSORS_GL518SM is not set
433# CONFIG_SENSORS_GL520SM is not set
434# CONFIG_SENSORS_IT87 is not set
435# CONFIG_SENSORS_LM63 is not set
436# CONFIG_SENSORS_LM75 is not set
437# CONFIG_SENSORS_LM77 is not set
438# CONFIG_SENSORS_LM78 is not set
439# CONFIG_SENSORS_LM80 is not set
440# CONFIG_SENSORS_LM83 is not set
441# CONFIG_SENSORS_LM85 is not set
442# CONFIG_SENSORS_LM87 is not set
443# CONFIG_SENSORS_LM90 is not set
444# CONFIG_SENSORS_LM92 is not set
445# CONFIG_SENSORS_MAX1619 is not set
446# CONFIG_SENSORS_PC87360 is not set
447# CONFIG_SENSORS_SMSC47B397 is not set
448# CONFIG_SENSORS_SMSC47M1 is not set
449# CONFIG_SENSORS_W83781D is not set
450# CONFIG_SENSORS_W83L785TS is not set
451# CONFIG_SENSORS_W83627HF is not set
452
453#
454# Other I2C Chip support
455#
456# CONFIG_SENSORS_DS1337 is not set
457# CONFIG_SENSORS_EEPROM is not set
458# CONFIG_SENSORS_PCF8574 is not set
459# CONFIG_SENSORS_PCF8591 is not set
460# CONFIG_SENSORS_RTC8564 is not set
461# CONFIG_SENSORS_M41T00 is not set
462# CONFIG_I2C_DEBUG_CORE is not set
463# CONFIG_I2C_DEBUG_ALGO is not set
464# CONFIG_I2C_DEBUG_BUS is not set
465# CONFIG_I2C_DEBUG_CHIP is not set
466
467#
468# Dallas's 1-wire bus
469#
470# CONFIG_W1 is not set
471
472#
473# Misc devices
474#
475
476#
477# Multimedia devices
478#
479# CONFIG_VIDEO_DEV is not set
480
481#
482# Digital Video Broadcasting Devices
483#
484# CONFIG_DVB is not set
485
486#
487# Graphics support
488#
489# CONFIG_FB is not set
490
491#
492# Sound
493#
494# CONFIG_SOUND is not set
495
496#
497# USB support
498#
499# CONFIG_USB_ARCH_HAS_HCD is not set
500# CONFIG_USB_ARCH_HAS_OHCI is not set
501
502#
503# USB Gadget Support
504#
505# CONFIG_USB_GADGET is not set
506
507#
508# MMC/SD Card support
509#
510# CONFIG_MMC is not set
511
512#
513# InfiniBand support
514#
515# CONFIG_INFINIBAND is not set
516
517#
518# File systems
519#
520CONFIG_EXT2_FS=y
521# CONFIG_EXT2_FS_XATTR is not set
522CONFIG_EXT3_FS=y
523CONFIG_EXT3_FS_XATTR=y
524# CONFIG_EXT3_FS_POSIX_ACL is not set
525# CONFIG_EXT3_FS_SECURITY is not set
526CONFIG_JBD=y
527# CONFIG_JBD_DEBUG is not set
528CONFIG_FS_MBCACHE=y
529# CONFIG_REISERFS_FS is not set
530# CONFIG_JFS_FS is not set
531
532#
533# XFS support
534#
535# CONFIG_XFS_FS is not set
536# CONFIG_MINIX_FS is not set
537# CONFIG_ROMFS_FS is not set
538# CONFIG_QUOTA is not set
539CONFIG_DNOTIFY=y
540# CONFIG_AUTOFS_FS is not set
541# CONFIG_AUTOFS4_FS is not set
542
543#
544# CD-ROM/DVD Filesystems
545#
546# CONFIG_ISO9660_FS is not set
547# CONFIG_UDF_FS is not set
548
549#
550# DOS/FAT/NT Filesystems
551#
552# CONFIG_MSDOS_FS is not set
553# CONFIG_VFAT_FS is not set
554# CONFIG_NTFS_FS is not set
555
556#
557# Pseudo filesystems
558#
559CONFIG_PROC_FS=y
560CONFIG_PROC_KCORE=y
561CONFIG_SYSFS=y
562# CONFIG_DEVFS_FS is not set
563# CONFIG_DEVPTS_FS_XATTR is not set
564CONFIG_TMPFS=y
565# CONFIG_TMPFS_XATTR is not set
566# CONFIG_HUGETLB_PAGE is not set
567CONFIG_RAMFS=y
568
569#
570# Miscellaneous filesystems
571#
572# CONFIG_ADFS_FS is not set
573# CONFIG_AFFS_FS is not set
574# CONFIG_HFS_FS is not set
575# CONFIG_HFSPLUS_FS is not set
576# CONFIG_BEFS_FS is not set
577# CONFIG_BFS_FS is not set
578# CONFIG_EFS_FS is not set
579# CONFIG_CRAMFS is not set
580# CONFIG_VXFS_FS is not set
581# CONFIG_HPFS_FS is not set
582# CONFIG_QNX4FS_FS is not set
583# CONFIG_SYSV_FS is not set
584# CONFIG_UFS_FS is not set
585
586#
587# Network File Systems
588#
589CONFIG_NFS_FS=y
590# CONFIG_NFS_V3 is not set
591# CONFIG_NFS_V4 is not set
592# CONFIG_NFS_DIRECTIO is not set
593# CONFIG_NFSD is not set
594CONFIG_ROOT_NFS=y
595CONFIG_LOCKD=y
596CONFIG_SUNRPC=y
597# CONFIG_RPCSEC_GSS_KRB5 is not set
598# CONFIG_RPCSEC_GSS_SPKM3 is not set
599# CONFIG_SMB_FS is not set
600# CONFIG_CIFS is not set
601# CONFIG_NCP_FS is not set
602# CONFIG_CODA_FS is not set
603# CONFIG_AFS_FS is not set
604
605#
606# Partition Types
607#
608CONFIG_PARTITION_ADVANCED=y
609# CONFIG_ACORN_PARTITION is not set
610# CONFIG_OSF_PARTITION is not set
611# CONFIG_AMIGA_PARTITION is not set
612# CONFIG_ATARI_PARTITION is not set
613# CONFIG_MAC_PARTITION is not set
614# CONFIG_MSDOS_PARTITION is not set
615# CONFIG_LDM_PARTITION is not set
616# CONFIG_SGI_PARTITION is not set
617# CONFIG_ULTRIX_PARTITION is not set
618# CONFIG_SUN_PARTITION is not set
619# CONFIG_EFI_PARTITION is not set
620
621#
622# Native Language Support
623#
624# CONFIG_NLS is not set
625
626#
627# Library routines
628#
629# CONFIG_CRC_CCITT is not set
630CONFIG_CRC32=y
631# CONFIG_LIBCRC32C is not set
632
633#
634# Profiling support
635#
636# CONFIG_PROFILING is not set
637
638#
639# Kernel hacking
640#
641# CONFIG_PRINTK_TIME is not set
642# CONFIG_DEBUG_KERNEL is not set
643CONFIG_LOG_BUF_SHIFT=14
644
645#
646# Security options
647#
648# CONFIG_KEYS is not set
649# CONFIG_SECURITY is not set
650
651#
652# Cryptographic options
653#
654# CONFIG_CRYPTO is not set
655
656#
657# Hardware crypto devices
658#
diff --git a/arch/ppc/configs/mpc8555_cds_defconfig b/arch/ppc/configs/mpc8555_cds_defconfig
deleted file mode 100644
index 4f1e320acfbe..000000000000
--- a/arch/ppc/configs/mpc8555_cds_defconfig
+++ /dev/null
@@ -1,784 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc4
4# Tue May 17 11:56:01 2005
5#
6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y
12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
15
16#
17# Code maturity level options
18#
19CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION=""
28CONFIG_SWAP=y
29CONFIG_SYSVIPC=y
30# CONFIG_POSIX_MQUEUE is not set
31# CONFIG_BSD_PROCESS_ACCT is not set
32CONFIG_SYSCTL=y
33# CONFIG_AUDIT is not set
34# CONFIG_HOTPLUG is not set
35CONFIG_KOBJECT_UEVENT=y
36# CONFIG_IKCONFIG is not set
37CONFIG_EMBEDDED=y
38# CONFIG_KALLSYMS is not set
39CONFIG_PRINTK=y
40CONFIG_BUG=y
41CONFIG_BASE_FULL=y
42CONFIG_FUTEX=y
43# CONFIG_EPOLL is not set
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SHMEM=y
46CONFIG_CC_ALIGN_FUNCTIONS=0
47CONFIG_CC_ALIGN_LABELS=0
48CONFIG_CC_ALIGN_LOOPS=0
49CONFIG_CC_ALIGN_JUMPS=0
50# CONFIG_TINY_SHMEM is not set
51CONFIG_BASE_SMALL=0
52
53#
54# Loadable module support
55#
56# CONFIG_MODULES is not set
57
58#
59# Processor
60#
61# CONFIG_6xx is not set
62# CONFIG_40x is not set
63# CONFIG_44x is not set
64# CONFIG_POWER3 is not set
65# CONFIG_POWER4 is not set
66# CONFIG_8xx is not set
67CONFIG_E500=y
68CONFIG_BOOKE=y
69CONFIG_FSL_BOOKE=y
70# CONFIG_PHYS_64BIT is not set
71CONFIG_SPE=y
72CONFIG_MATH_EMULATION=y
73# CONFIG_CPU_FREQ is not set
74CONFIG_PPC_GEN550=y
75# CONFIG_PM is not set
76CONFIG_85xx=y
77CONFIG_PPC_INDIRECT_PCI_BE=y
78
79#
80# Freescale 85xx options
81#
82# CONFIG_MPC8540_ADS is not set
83CONFIG_MPC8555_CDS=y
84# CONFIG_MPC8560_ADS is not set
85# CONFIG_SBC8560 is not set
86# CONFIG_STX_GP3 is not set
87CONFIG_MPC8555=y
88CONFIG_85xx_PCI2=y
89
90#
91# Platform options
92#
93CONFIG_CPM2=y
94# CONFIG_PC_KEYBOARD is not set
95# CONFIG_SMP is not set
96# CONFIG_PREEMPT is not set
97# CONFIG_HIGHMEM is not set
98CONFIG_BINFMT_ELF=y
99# CONFIG_BINFMT_MISC is not set
100# CONFIG_CMDLINE_BOOL is not set
101CONFIG_ISA_DMA_API=y
102
103#
104# Bus options
105#
106CONFIG_PCI=y
107CONFIG_PCI_DOMAINS=y
108# CONFIG_PCI_LEGACY_PROC is not set
109CONFIG_PCI_NAMES=y
110
111#
112# PCCARD (PCMCIA/CardBus) support
113#
114# CONFIG_PCCARD is not set
115
116#
117# Advanced setup
118#
119# CONFIG_ADVANCED_OPTIONS is not set
120
121#
122# Default settings for advanced configuration options are used
123#
124CONFIG_HIGHMEM_START=0xfe000000
125CONFIG_LOWMEM_SIZE=0x30000000
126CONFIG_KERNEL_START=0xc0000000
127CONFIG_TASK_SIZE=0x80000000
128CONFIG_BOOT_LOAD=0x00800000
129
130#
131# Device Drivers
132#
133
134#
135# Generic Driver Options
136#
137CONFIG_STANDALONE=y
138CONFIG_PREVENT_FIRMWARE_BUILD=y
139# CONFIG_FW_LOADER is not set
140
141#
142# Memory Technology Devices (MTD)
143#
144# CONFIG_MTD is not set
145
146#
147# Parallel port support
148#
149# CONFIG_PARPORT is not set
150
151#
152# Plug and Play support
153#
154
155#
156# Block devices
157#
158# CONFIG_BLK_DEV_FD is not set
159# CONFIG_BLK_CPQ_DA is not set
160# CONFIG_BLK_CPQ_CISS_DA is not set
161# CONFIG_BLK_DEV_DAC960 is not set
162# CONFIG_BLK_DEV_UMEM is not set
163# CONFIG_BLK_DEV_COW_COMMON is not set
164CONFIG_BLK_DEV_LOOP=y
165# CONFIG_BLK_DEV_CRYPTOLOOP is not set
166# CONFIG_BLK_DEV_NBD is not set
167# CONFIG_BLK_DEV_SX8 is not set
168CONFIG_BLK_DEV_RAM=y
169CONFIG_BLK_DEV_RAM_COUNT=16
170CONFIG_BLK_DEV_RAM_SIZE=32768
171CONFIG_BLK_DEV_INITRD=y
172CONFIG_INITRAMFS_SOURCE=""
173# CONFIG_LBD is not set
174# CONFIG_CDROM_PKTCDVD is not set
175
176#
177# IO Schedulers
178#
179CONFIG_IOSCHED_NOOP=y
180CONFIG_IOSCHED_AS=y
181CONFIG_IOSCHED_DEADLINE=y
182CONFIG_IOSCHED_CFQ=y
183# CONFIG_ATA_OVER_ETH is not set
184
185#
186# ATA/ATAPI/MFM/RLL support
187#
188CONFIG_IDE=y
189CONFIG_BLK_DEV_IDE=y
190
191#
192# Please see Documentation/ide.txt for help/info on IDE drives
193#
194# CONFIG_BLK_DEV_IDE_SATA is not set
195CONFIG_BLK_DEV_IDEDISK=y
196# CONFIG_IDEDISK_MULTI_MODE is not set
197# CONFIG_BLK_DEV_IDECD is not set
198# CONFIG_BLK_DEV_IDETAPE is not set
199# CONFIG_BLK_DEV_IDEFLOPPY is not set
200# CONFIG_IDE_TASK_IOCTL is not set
201
202#
203# IDE chipset support/bugfixes
204#
205CONFIG_IDE_GENERIC=y
206CONFIG_BLK_DEV_IDEPCI=y
207CONFIG_IDEPCI_SHARE_IRQ=y
208# CONFIG_BLK_DEV_OFFBOARD is not set
209CONFIG_BLK_DEV_GENERIC=y
210# CONFIG_BLK_DEV_OPTI621 is not set
211# CONFIG_BLK_DEV_SL82C105 is not set
212CONFIG_BLK_DEV_IDEDMA_PCI=y
213# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
214CONFIG_IDEDMA_PCI_AUTO=y
215# CONFIG_IDEDMA_ONLYDISK is not set
216# CONFIG_BLK_DEV_AEC62XX is not set
217# CONFIG_BLK_DEV_ALI15X3 is not set
218# CONFIG_BLK_DEV_AMD74XX is not set
219# CONFIG_BLK_DEV_CMD64X is not set
220# CONFIG_BLK_DEV_TRIFLEX is not set
221# CONFIG_BLK_DEV_CY82C693 is not set
222# CONFIG_BLK_DEV_CS5520 is not set
223# CONFIG_BLK_DEV_CS5530 is not set
224# CONFIG_BLK_DEV_HPT34X is not set
225# CONFIG_BLK_DEV_HPT366 is not set
226# CONFIG_BLK_DEV_SC1200 is not set
227# CONFIG_BLK_DEV_PIIX is not set
228# CONFIG_BLK_DEV_NS87415 is not set
229# CONFIG_BLK_DEV_PDC202XX_OLD is not set
230# CONFIG_BLK_DEV_PDC202XX_NEW is not set
231# CONFIG_BLK_DEV_SVWKS is not set
232# CONFIG_BLK_DEV_SIIMAGE is not set
233# CONFIG_BLK_DEV_SLC90E66 is not set
234# CONFIG_BLK_DEV_TRM290 is not set
235CONFIG_BLK_DEV_VIA82CXXX=y
236# CONFIG_IDE_ARM is not set
237CONFIG_BLK_DEV_IDEDMA=y
238# CONFIG_IDEDMA_IVB is not set
239CONFIG_IDEDMA_AUTO=y
240# CONFIG_BLK_DEV_HD is not set
241
242#
243# SCSI device support
244#
245# CONFIG_SCSI is not set
246
247#
248# Multi-device support (RAID and LVM)
249#
250# CONFIG_MD is not set
251
252#
253# Fusion MPT device support
254#
255
256#
257# IEEE 1394 (FireWire) support
258#
259# CONFIG_IEEE1394 is not set
260
261#
262# I2O device support
263#
264# CONFIG_I2O is not set
265
266#
267# Macintosh device drivers
268#
269
270#
271# Networking support
272#
273CONFIG_NET=y
274
275#
276# Networking options
277#
278CONFIG_PACKET=y
279# CONFIG_PACKET_MMAP is not set
280CONFIG_UNIX=y
281# CONFIG_NET_KEY is not set
282CONFIG_INET=y
283CONFIG_IP_MULTICAST=y
284# CONFIG_IP_ADVANCED_ROUTER is not set
285CONFIG_IP_PNP=y
286CONFIG_IP_PNP_DHCP=y
287CONFIG_IP_PNP_BOOTP=y
288# CONFIG_IP_PNP_RARP is not set
289# CONFIG_NET_IPIP is not set
290# CONFIG_NET_IPGRE is not set
291# CONFIG_IP_MROUTE is not set
292# CONFIG_ARPD is not set
293CONFIG_SYN_COOKIES=y
294# CONFIG_INET_AH is not set
295# CONFIG_INET_ESP is not set
296# CONFIG_INET_IPCOMP is not set
297# CONFIG_INET_TUNNEL is not set
298CONFIG_IP_TCPDIAG=y
299# CONFIG_IP_TCPDIAG_IPV6 is not set
300# CONFIG_IPV6 is not set
301# CONFIG_NETFILTER is not set
302
303#
304# SCTP Configuration (EXPERIMENTAL)
305#
306# CONFIG_IP_SCTP is not set
307# CONFIG_ATM is not set
308# CONFIG_BRIDGE is not set
309# CONFIG_VLAN_8021Q is not set
310# CONFIG_DECNET is not set
311# CONFIG_LLC2 is not set
312# CONFIG_IPX is not set
313# CONFIG_ATALK is not set
314# CONFIG_X25 is not set
315# CONFIG_LAPB is not set
316# CONFIG_NET_DIVERT is not set
317# CONFIG_ECONET is not set
318# CONFIG_WAN_ROUTER is not set
319
320#
321# QoS and/or fair queueing
322#
323# CONFIG_NET_SCHED is not set
324# CONFIG_NET_CLS_ROUTE is not set
325
326#
327# Network testing
328#
329# CONFIG_NET_PKTGEN is not set
330# CONFIG_NETPOLL is not set
331# CONFIG_NET_POLL_CONTROLLER is not set
332# CONFIG_HAMRADIO is not set
333# CONFIG_IRDA is not set
334# CONFIG_BT is not set
335CONFIG_NETDEVICES=y
336# CONFIG_DUMMY is not set
337# CONFIG_BONDING is not set
338# CONFIG_EQUALIZER is not set
339# CONFIG_TUN is not set
340
341#
342# ARCnet devices
343#
344# CONFIG_ARCNET is not set
345
346#
347# Ethernet (10 or 100Mbit)
348#
349CONFIG_NET_ETHERNET=y
350CONFIG_MII=y
351# CONFIG_HAPPYMEAL is not set
352# CONFIG_SUNGEM is not set
353# CONFIG_NET_VENDOR_3COM is not set
354
355#
356# Tulip family network device support
357#
358# CONFIG_NET_TULIP is not set
359# CONFIG_HP100 is not set
360# CONFIG_NET_PCI is not set
361
362#
363# Ethernet (1000 Mbit)
364#
365# CONFIG_ACENIC is not set
366# CONFIG_DL2K is not set
367# CONFIG_E1000 is not set
368# CONFIG_NS83820 is not set
369# CONFIG_HAMACHI is not set
370# CONFIG_YELLOWFIN is not set
371# CONFIG_R8169 is not set
372# CONFIG_SK98LIN is not set
373# CONFIG_TIGON3 is not set
374CONFIG_GIANFAR=y
375CONFIG_GFAR_NAPI=y
376
377#
378# Ethernet (10000 Mbit)
379#
380# CONFIG_IXGB is not set
381# CONFIG_S2IO is not set
382
383#
384# Token Ring devices
385#
386# CONFIG_TR is not set
387
388#
389# Wireless LAN (non-hamradio)
390#
391# CONFIG_NET_RADIO is not set
392
393#
394# Wan interfaces
395#
396# CONFIG_WAN is not set
397# CONFIG_FDDI is not set
398# CONFIG_HIPPI is not set
399# CONFIG_PPP is not set
400# CONFIG_SLIP is not set
401# CONFIG_SHAPER is not set
402# CONFIG_NETCONSOLE is not set
403
404#
405# ISDN subsystem
406#
407# CONFIG_ISDN is not set
408
409#
410# Telephony Support
411#
412# CONFIG_PHONE is not set
413
414#
415# Input device support
416#
417CONFIG_INPUT=y
418
419#
420# Userland interfaces
421#
422# CONFIG_INPUT_MOUSEDEV is not set
423# CONFIG_INPUT_JOYDEV is not set
424# CONFIG_INPUT_TSDEV is not set
425# CONFIG_INPUT_EVDEV is not set
426# CONFIG_INPUT_EVBUG is not set
427
428#
429# Input Device Drivers
430#
431# CONFIG_INPUT_KEYBOARD is not set
432# CONFIG_INPUT_MOUSE is not set
433# CONFIG_INPUT_JOYSTICK is not set
434# CONFIG_INPUT_TOUCHSCREEN is not set
435# CONFIG_INPUT_MISC is not set
436
437#
438# Hardware I/O ports
439#
440# CONFIG_SERIO is not set
441# CONFIG_GAMEPORT is not set
442CONFIG_SOUND_GAMEPORT=y
443
444#
445# Character devices
446#
447# CONFIG_VT is not set
448# CONFIG_SERIAL_NONSTANDARD is not set
449
450#
451# Serial drivers
452#
453CONFIG_SERIAL_8250=y
454CONFIG_SERIAL_8250_CONSOLE=y
455CONFIG_SERIAL_8250_NR_UARTS=4
456# CONFIG_SERIAL_8250_EXTENDED is not set
457
458#
459# Non-8250 serial port support
460#
461CONFIG_SERIAL_CORE=y
462CONFIG_SERIAL_CORE_CONSOLE=y
463# CONFIG_SERIAL_CPM is not set
464# CONFIG_SERIAL_JSM is not set
465CONFIG_UNIX98_PTYS=y
466CONFIG_LEGACY_PTYS=y
467CONFIG_LEGACY_PTY_COUNT=256
468
469#
470# IPMI
471#
472# CONFIG_IPMI_HANDLER is not set
473
474#
475# Watchdog Cards
476#
477# CONFIG_WATCHDOG is not set
478# CONFIG_NVRAM is not set
479CONFIG_GEN_RTC=y
480# CONFIG_GEN_RTC_X is not set
481# CONFIG_DTLK is not set
482# CONFIG_R3964 is not set
483# CONFIG_APPLICOM is not set
484
485#
486# Ftape, the floppy tape device driver
487#
488# CONFIG_AGP is not set
489# CONFIG_DRM is not set
490# CONFIG_RAW_DRIVER is not set
491
492#
493# TPM devices
494#
495# CONFIG_TCG_TPM is not set
496
497#
498# I2C support
499#
500CONFIG_I2C=y
501CONFIG_I2C_CHARDEV=y
502
503#
504# I2C Algorithms
505#
506# CONFIG_I2C_ALGOBIT is not set
507# CONFIG_I2C_ALGOPCF is not set
508# CONFIG_I2C_ALGOPCA is not set
509
510#
511# I2C Hardware Bus support
512#
513# CONFIG_I2C_ALI1535 is not set
514# CONFIG_I2C_ALI1563 is not set
515# CONFIG_I2C_ALI15X3 is not set
516# CONFIG_I2C_AMD756 is not set
517# CONFIG_I2C_AMD8111 is not set
518# CONFIG_I2C_I801 is not set
519# CONFIG_I2C_I810 is not set
520# CONFIG_I2C_PIIX4 is not set
521CONFIG_I2C_MPC=y
522# CONFIG_I2C_NFORCE2 is not set
523# CONFIG_I2C_PARPORT_LIGHT is not set
524# CONFIG_I2C_PROSAVAGE is not set
525# CONFIG_I2C_SAVAGE4 is not set
526# CONFIG_SCx200_ACB is not set
527# CONFIG_I2C_SIS5595 is not set
528# CONFIG_I2C_SIS630 is not set
529# CONFIG_I2C_SIS96X is not set
530# CONFIG_I2C_VIA is not set
531# CONFIG_I2C_VIAPRO is not set
532# CONFIG_I2C_VOODOO3 is not set
533# CONFIG_I2C_PCA_ISA is not set
534
535#
536# Hardware Sensors Chip support
537#
538# CONFIG_I2C_SENSOR is not set
539# CONFIG_SENSORS_ADM1021 is not set
540# CONFIG_SENSORS_ADM1025 is not set
541# CONFIG_SENSORS_ADM1026 is not set
542# CONFIG_SENSORS_ADM1031 is not set
543# CONFIG_SENSORS_ASB100 is not set
544# CONFIG_SENSORS_DS1621 is not set
545# CONFIG_SENSORS_FSCHER is not set
546# CONFIG_SENSORS_FSCPOS is not set
547# CONFIG_SENSORS_GL518SM is not set
548# CONFIG_SENSORS_GL520SM is not set
549# CONFIG_SENSORS_IT87 is not set
550# CONFIG_SENSORS_LM63 is not set
551# CONFIG_SENSORS_LM75 is not set
552# CONFIG_SENSORS_LM77 is not set
553# CONFIG_SENSORS_LM78 is not set
554# CONFIG_SENSORS_LM80 is not set
555# CONFIG_SENSORS_LM83 is not set
556# CONFIG_SENSORS_LM85 is not set
557# CONFIG_SENSORS_LM87 is not set
558# CONFIG_SENSORS_LM90 is not set
559# CONFIG_SENSORS_LM92 is not set
560# CONFIG_SENSORS_MAX1619 is not set
561# CONFIG_SENSORS_PC87360 is not set
562# CONFIG_SENSORS_SMSC47B397 is not set
563# CONFIG_SENSORS_SIS5595 is not set
564# CONFIG_SENSORS_SMSC47M1 is not set
565# CONFIG_SENSORS_VIA686A is not set
566# CONFIG_SENSORS_W83781D is not set
567# CONFIG_SENSORS_W83L785TS is not set
568# CONFIG_SENSORS_W83627HF is not set
569
570#
571# Other I2C Chip support
572#
573# CONFIG_SENSORS_DS1337 is not set
574# CONFIG_SENSORS_EEPROM is not set
575# CONFIG_SENSORS_PCF8574 is not set
576# CONFIG_SENSORS_PCF8591 is not set
577# CONFIG_SENSORS_RTC8564 is not set
578# CONFIG_SENSORS_M41T00 is not set
579# CONFIG_I2C_DEBUG_CORE is not set
580# CONFIG_I2C_DEBUG_ALGO is not set
581# CONFIG_I2C_DEBUG_BUS is not set
582# CONFIG_I2C_DEBUG_CHIP is not set
583
584#
585# Dallas's 1-wire bus
586#
587# CONFIG_W1 is not set
588
589#
590# Misc devices
591#
592
593#
594# Multimedia devices
595#
596# CONFIG_VIDEO_DEV is not set
597
598#
599# Digital Video Broadcasting Devices
600#
601# CONFIG_DVB is not set
602
603#
604# Graphics support
605#
606# CONFIG_FB is not set
607
608#
609# Sound
610#
611# CONFIG_SOUND is not set
612
613#
614# USB support
615#
616CONFIG_USB_ARCH_HAS_HCD=y
617CONFIG_USB_ARCH_HAS_OHCI=y
618# CONFIG_USB is not set
619
620#
621# USB Gadget Support
622#
623# CONFIG_USB_GADGET is not set
624
625#
626# MMC/SD Card support
627#
628# CONFIG_MMC is not set
629
630#
631# InfiniBand support
632#
633# CONFIG_INFINIBAND is not set
634
635#
636# File systems
637#
638CONFIG_EXT2_FS=y
639# CONFIG_EXT2_FS_XATTR is not set
640CONFIG_EXT3_FS=y
641CONFIG_EXT3_FS_XATTR=y
642# CONFIG_EXT3_FS_POSIX_ACL is not set
643# CONFIG_EXT3_FS_SECURITY is not set
644CONFIG_JBD=y
645# CONFIG_JBD_DEBUG is not set
646CONFIG_FS_MBCACHE=y
647# CONFIG_REISERFS_FS is not set
648# CONFIG_JFS_FS is not set
649
650#
651# XFS support
652#
653# CONFIG_XFS_FS is not set
654# CONFIG_MINIX_FS is not set
655# CONFIG_ROMFS_FS is not set
656# CONFIG_QUOTA is not set
657CONFIG_DNOTIFY=y
658# CONFIG_AUTOFS_FS is not set
659# CONFIG_AUTOFS4_FS is not set
660
661#
662# CD-ROM/DVD Filesystems
663#
664# CONFIG_ISO9660_FS is not set
665# CONFIG_UDF_FS is not set
666
667#
668# DOS/FAT/NT Filesystems
669#
670# CONFIG_MSDOS_FS is not set
671# CONFIG_VFAT_FS is not set
672# CONFIG_NTFS_FS is not set
673
674#
675# Pseudo filesystems
676#
677CONFIG_PROC_FS=y
678CONFIG_PROC_KCORE=y
679CONFIG_SYSFS=y
680# CONFIG_DEVFS_FS is not set
681# CONFIG_DEVPTS_FS_XATTR is not set
682CONFIG_TMPFS=y
683# CONFIG_TMPFS_XATTR is not set
684# CONFIG_HUGETLB_PAGE is not set
685CONFIG_RAMFS=y
686
687#
688# Miscellaneous filesystems
689#
690# CONFIG_ADFS_FS is not set
691# CONFIG_AFFS_FS is not set
692# CONFIG_HFS_FS is not set
693# CONFIG_HFSPLUS_FS is not set
694# CONFIG_BEFS_FS is not set
695# CONFIG_BFS_FS is not set
696# CONFIG_EFS_FS is not set
697# CONFIG_CRAMFS is not set
698# CONFIG_VXFS_FS is not set
699# CONFIG_HPFS_FS is not set
700# CONFIG_QNX4FS_FS is not set
701# CONFIG_SYSV_FS is not set
702# CONFIG_UFS_FS is not set
703
704#
705# Network File Systems
706#
707CONFIG_NFS_FS=y
708# CONFIG_NFS_V3 is not set
709# CONFIG_NFS_V4 is not set
710# CONFIG_NFS_DIRECTIO is not set
711# CONFIG_NFSD is not set
712CONFIG_ROOT_NFS=y
713CONFIG_LOCKD=y
714CONFIG_SUNRPC=y
715# CONFIG_RPCSEC_GSS_KRB5 is not set
716# CONFIG_RPCSEC_GSS_SPKM3 is not set
717# CONFIG_SMB_FS is not set
718# CONFIG_CIFS is not set
719# CONFIG_NCP_FS is not set
720# CONFIG_CODA_FS is not set
721# CONFIG_AFS_FS is not set
722
723#
724# Partition Types
725#
726CONFIG_PARTITION_ADVANCED=y
727# CONFIG_ACORN_PARTITION is not set
728# CONFIG_OSF_PARTITION is not set
729# CONFIG_AMIGA_PARTITION is not set
730# CONFIG_ATARI_PARTITION is not set
731# CONFIG_MAC_PARTITION is not set
732# CONFIG_MSDOS_PARTITION is not set
733# CONFIG_LDM_PARTITION is not set
734# CONFIG_SGI_PARTITION is not set
735# CONFIG_ULTRIX_PARTITION is not set
736# CONFIG_SUN_PARTITION is not set
737# CONFIG_EFI_PARTITION is not set
738
739#
740# Native Language Support
741#
742# CONFIG_NLS is not set
743# CONFIG_SCC_ENET is not set
744# CONFIG_FEC_ENET is not set
745
746#
747# CPM2 Options
748#
749
750#
751# Library routines
752#
753# CONFIG_CRC_CCITT is not set
754CONFIG_CRC32=y
755# CONFIG_LIBCRC32C is not set
756
757#
758# Profiling support
759#
760# CONFIG_PROFILING is not set
761
762#
763# Kernel hacking
764#
765# CONFIG_PRINTK_TIME is not set
766# CONFIG_DEBUG_KERNEL is not set
767CONFIG_LOG_BUF_SHIFT=14
768# CONFIG_KGDB_CONSOLE is not set
769# CONFIG_SERIAL_TEXT_DEBUG is not set
770
771#
772# Security options
773#
774# CONFIG_KEYS is not set
775# CONFIG_SECURITY is not set
776
777#
778# Cryptographic options
779#
780# CONFIG_CRYPTO is not set
781
782#
783# Hardware crypto devices
784#
diff --git a/arch/ppc/configs/mpc8560_ads_defconfig b/arch/ppc/configs/mpc8560_ads_defconfig
deleted file mode 100644
index f12d48fcbba7..000000000000
--- a/arch/ppc/configs/mpc8560_ads_defconfig
+++ /dev/null
@@ -1,769 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.13-rc6
4# Thu Aug 11 18:14:45 2005
5#
6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y
12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
15
16#
17# Code maturity level options
18#
19CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32
23
24#
25# General setup
26#
27CONFIG_LOCALVERSION=""
28CONFIG_SWAP=y
29CONFIG_SYSVIPC=y
30# CONFIG_POSIX_MQUEUE is not set
31# CONFIG_BSD_PROCESS_ACCT is not set
32CONFIG_SYSCTL=y
33# CONFIG_AUDIT is not set
34# CONFIG_HOTPLUG is not set
35CONFIG_KOBJECT_UEVENT=y
36# CONFIG_IKCONFIG is not set
37CONFIG_EMBEDDED=y
38# CONFIG_KALLSYMS is not set
39CONFIG_PRINTK=y
40CONFIG_BUG=y
41CONFIG_BASE_FULL=y
42CONFIG_FUTEX=y
43# CONFIG_EPOLL is not set
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SHMEM=y
46CONFIG_CC_ALIGN_FUNCTIONS=0
47CONFIG_CC_ALIGN_LABELS=0
48CONFIG_CC_ALIGN_LOOPS=0
49CONFIG_CC_ALIGN_JUMPS=0
50# CONFIG_TINY_SHMEM is not set
51CONFIG_BASE_SMALL=0
52
53#
54# Loadable module support
55#
56# CONFIG_MODULES is not set
57
58#
59# Processor
60#
61# CONFIG_6xx is not set
62# CONFIG_40x is not set
63# CONFIG_44x is not set
64# CONFIG_POWER3 is not set
65# CONFIG_POWER4 is not set
66# CONFIG_8xx is not set
67# CONFIG_E200 is not set
68CONFIG_E500=y
69CONFIG_BOOKE=y
70CONFIG_FSL_BOOKE=y
71# CONFIG_PHYS_64BIT is not set
72CONFIG_SPE=y
73CONFIG_MATH_EMULATION=y
74# CONFIG_KEXEC is not set
75# CONFIG_CPU_FREQ is not set
76# CONFIG_PM is not set
77CONFIG_85xx=y
78CONFIG_PPC_INDIRECT_PCI_BE=y
79
80#
81# Freescale 85xx options
82#
83# CONFIG_MPC8540_ADS is not set
84# CONFIG_MPC8548_CDS is not set
85# CONFIG_MPC8555_CDS is not set
86CONFIG_MPC8560_ADS=y
87# CONFIG_SBC8560 is not set
88# CONFIG_STX_GP3 is not set
89CONFIG_MPC8560=y
90
91#
92# Platform options
93#
94CONFIG_CPM2=y
95# CONFIG_PC_KEYBOARD is not set
96# CONFIG_SMP is not set
97# CONFIG_HIGHMEM is not set
98# CONFIG_HZ_100 is not set
99CONFIG_HZ_250=y
100# CONFIG_HZ_1000 is not set
101CONFIG_HZ=250
102CONFIG_PREEMPT_NONE=y
103# CONFIG_PREEMPT_VOLUNTARY is not set
104# CONFIG_PREEMPT is not set
105CONFIG_SELECT_MEMORY_MODEL=y
106CONFIG_FLATMEM_MANUAL=y
107# CONFIG_DISCONTIGMEM_MANUAL is not set
108# CONFIG_SPARSEMEM_MANUAL is not set
109CONFIG_FLATMEM=y
110CONFIG_FLAT_NODE_MEM_MAP=y
111CONFIG_BINFMT_ELF=y
112# CONFIG_BINFMT_MISC is not set
113# CONFIG_CMDLINE_BOOL is not set
114CONFIG_SECCOMP=y
115CONFIG_ISA_DMA_API=y
116
117#
118# Bus options
119#
120CONFIG_PCI=y
121CONFIG_PCI_DOMAINS=y
122# CONFIG_PCI_LEGACY_PROC is not set
123CONFIG_PCI_NAMES=y
124
125#
126# PCCARD (PCMCIA/CardBus) support
127#
128# CONFIG_PCCARD is not set
129
130#
131# Advanced setup
132#
133# CONFIG_ADVANCED_OPTIONS is not set
134
135#
136# Default settings for advanced configuration options are used
137#
138CONFIG_HIGHMEM_START=0xfe000000
139CONFIG_LOWMEM_SIZE=0x30000000
140CONFIG_KERNEL_START=0xc0000000
141CONFIG_TASK_SIZE=0x80000000
142CONFIG_BOOT_LOAD=0x00800000
143
144#
145# Networking
146#
147CONFIG_NET=y
148
149#
150# Networking options
151#
152CONFIG_PACKET=y
153# CONFIG_PACKET_MMAP is not set
154CONFIG_UNIX=y
155# CONFIG_NET_KEY is not set
156CONFIG_INET=y
157CONFIG_IP_MULTICAST=y
158# CONFIG_IP_ADVANCED_ROUTER is not set
159CONFIG_IP_FIB_HASH=y
160CONFIG_IP_PNP=y
161CONFIG_IP_PNP_DHCP=y
162CONFIG_IP_PNP_BOOTP=y
163# CONFIG_IP_PNP_RARP is not set
164# CONFIG_NET_IPIP is not set
165# CONFIG_NET_IPGRE is not set
166# CONFIG_IP_MROUTE is not set
167# CONFIG_ARPD is not set
168CONFIG_SYN_COOKIES=y
169# CONFIG_INET_AH is not set
170# CONFIG_INET_ESP is not set
171# CONFIG_INET_IPCOMP is not set
172# CONFIG_INET_TUNNEL is not set
173CONFIG_IP_TCPDIAG=y
174# CONFIG_IP_TCPDIAG_IPV6 is not set
175# CONFIG_TCP_CONG_ADVANCED is not set
176CONFIG_TCP_CONG_BIC=y
177# CONFIG_IPV6 is not set
178# CONFIG_NETFILTER is not set
179
180#
181# SCTP Configuration (EXPERIMENTAL)
182#
183# CONFIG_IP_SCTP is not set
184# CONFIG_ATM is not set
185# CONFIG_BRIDGE is not set
186# CONFIG_VLAN_8021Q is not set
187# CONFIG_DECNET is not set
188# CONFIG_LLC2 is not set
189# CONFIG_IPX is not set
190# CONFIG_ATALK is not set
191# CONFIG_X25 is not set
192# CONFIG_LAPB is not set
193# CONFIG_NET_DIVERT is not set
194# CONFIG_ECONET is not set
195# CONFIG_WAN_ROUTER is not set
196# CONFIG_NET_SCHED is not set
197# CONFIG_NET_CLS_ROUTE is not set
198
199#
200# Network testing
201#
202# CONFIG_NET_PKTGEN is not set
203# CONFIG_HAMRADIO is not set
204# CONFIG_IRDA is not set
205# CONFIG_BT is not set
206
207#
208# Device Drivers
209#
210
211#
212# Generic Driver Options
213#
214CONFIG_STANDALONE=y
215CONFIG_PREVENT_FIRMWARE_BUILD=y
216# CONFIG_FW_LOADER is not set
217
218#
219# Memory Technology Devices (MTD)
220#
221# CONFIG_MTD is not set
222
223#
224# Parallel port support
225#
226# CONFIG_PARPORT is not set
227
228#
229# Plug and Play support
230#
231
232#
233# Block devices
234#
235# CONFIG_BLK_DEV_FD is not set
236# CONFIG_BLK_CPQ_DA is not set
237# CONFIG_BLK_CPQ_CISS_DA is not set
238# CONFIG_BLK_DEV_DAC960 is not set
239# CONFIG_BLK_DEV_UMEM is not set
240# CONFIG_BLK_DEV_COW_COMMON is not set
241CONFIG_BLK_DEV_LOOP=y
242# CONFIG_BLK_DEV_CRYPTOLOOP is not set
243# CONFIG_BLK_DEV_NBD is not set
244# CONFIG_BLK_DEV_SX8 is not set
245CONFIG_BLK_DEV_RAM=y
246CONFIG_BLK_DEV_RAM_COUNT=16
247CONFIG_BLK_DEV_RAM_SIZE=32768
248CONFIG_BLK_DEV_INITRD=y
249CONFIG_INITRAMFS_SOURCE=""
250# CONFIG_LBD is not set
251# CONFIG_CDROM_PKTCDVD is not set
252
253#
254# IO Schedulers
255#
256CONFIG_IOSCHED_NOOP=y
257CONFIG_IOSCHED_AS=y
258CONFIG_IOSCHED_DEADLINE=y
259CONFIG_IOSCHED_CFQ=y
260# CONFIG_ATA_OVER_ETH is not set
261
262#
263# ATA/ATAPI/MFM/RLL support
264#
265# CONFIG_IDE is not set
266
267#
268# SCSI device support
269#
270# CONFIG_SCSI is not set
271
272#
273# Multi-device support (RAID and LVM)
274#
275# CONFIG_MD is not set
276
277#
278# Fusion MPT device support
279#
280# CONFIG_FUSION is not set
281
282#
283# IEEE 1394 (FireWire) support
284#
285# CONFIG_IEEE1394 is not set
286
287#
288# I2O device support
289#
290# CONFIG_I2O is not set
291
292#
293# Macintosh device drivers
294#
295
296#
297# Network device support
298#
299CONFIG_NETDEVICES=y
300# CONFIG_DUMMY is not set
301# CONFIG_BONDING is not set
302# CONFIG_EQUALIZER is not set
303# CONFIG_TUN is not set
304
305#
306# ARCnet devices
307#
308# CONFIG_ARCNET is not set
309
310#
311# Ethernet (10 or 100Mbit)
312#
313CONFIG_NET_ETHERNET=y
314CONFIG_MII=y
315# CONFIG_HAPPYMEAL is not set
316# CONFIG_SUNGEM is not set
317# CONFIG_NET_VENDOR_3COM is not set
318
319#
320# Tulip family network device support
321#
322# CONFIG_NET_TULIP is not set
323# CONFIG_HP100 is not set
324# CONFIG_NET_PCI is not set
325
326#
327# Ethernet (1000 Mbit)
328#
329# CONFIG_ACENIC is not set
330# CONFIG_DL2K is not set
331# CONFIG_E1000 is not set
332# CONFIG_NS83820 is not set
333# CONFIG_HAMACHI is not set
334# CONFIG_YELLOWFIN is not set
335# CONFIG_R8169 is not set
336# CONFIG_SKGE is not set
337# CONFIG_SK98LIN is not set
338# CONFIG_TIGON3 is not set
339# CONFIG_BNX2 is not set
340CONFIG_GIANFAR=y
341CONFIG_GFAR_NAPI=y
342
343#
344# Ethernet (10000 Mbit)
345#
346# CONFIG_IXGB is not set
347# CONFIG_S2IO is not set
348
349#
350# Token Ring devices
351#
352# CONFIG_TR is not set
353
354#
355# Wireless LAN (non-hamradio)
356#
357# CONFIG_NET_RADIO is not set
358
359#
360# Wan interfaces
361#
362# CONFIG_WAN is not set
363# CONFIG_FDDI is not set
364# CONFIG_HIPPI is not set
365# CONFIG_PPP is not set
366# CONFIG_SLIP is not set
367# CONFIG_SHAPER is not set
368# CONFIG_NETCONSOLE is not set
369# CONFIG_NETPOLL is not set
370# CONFIG_NET_POLL_CONTROLLER is not set
371
372#
373# ISDN subsystem
374#
375# CONFIG_ISDN is not set
376
377#
378# Telephony Support
379#
380# CONFIG_PHONE is not set
381
382#
383# Input device support
384#
385CONFIG_INPUT=y
386
387#
388# Userland interfaces
389#
390# CONFIG_INPUT_MOUSEDEV is not set
391# CONFIG_INPUT_JOYDEV is not set
392# CONFIG_INPUT_TSDEV is not set
393# CONFIG_INPUT_EVDEV is not set
394# CONFIG_INPUT_EVBUG is not set
395
396#
397# Input Device Drivers
398#
399# CONFIG_INPUT_KEYBOARD is not set
400# CONFIG_INPUT_MOUSE is not set
401# CONFIG_INPUT_JOYSTICK is not set
402# CONFIG_INPUT_TOUCHSCREEN is not set
403# CONFIG_INPUT_MISC is not set
404
405#
406# Hardware I/O ports
407#
408# CONFIG_SERIO is not set
409# CONFIG_GAMEPORT is not set
410
411#
412# Character devices
413#
414# CONFIG_VT is not set
415# CONFIG_SERIAL_NONSTANDARD is not set
416
417#
418# Serial drivers
419#
420# CONFIG_SERIAL_8250 is not set
421
422#
423# Non-8250 serial port support
424#
425CONFIG_SERIAL_CORE=y
426CONFIG_SERIAL_CORE_CONSOLE=y
427CONFIG_SERIAL_CPM=y
428CONFIG_SERIAL_CPM_CONSOLE=y
429CONFIG_SERIAL_CPM_SCC1=y
430CONFIG_SERIAL_CPM_SCC2=y
431# CONFIG_SERIAL_CPM_SCC3 is not set
432# CONFIG_SERIAL_CPM_SCC4 is not set
433# CONFIG_SERIAL_CPM_SMC1 is not set
434# CONFIG_SERIAL_CPM_SMC2 is not set
435# CONFIG_SERIAL_JSM is not set
436CONFIG_UNIX98_PTYS=y
437CONFIG_LEGACY_PTYS=y
438CONFIG_LEGACY_PTY_COUNT=256
439
440#
441# IPMI
442#
443# CONFIG_IPMI_HANDLER is not set
444
445#
446# Watchdog Cards
447#
448# CONFIG_WATCHDOG is not set
449# CONFIG_NVRAM is not set
450CONFIG_GEN_RTC=y
451# CONFIG_GEN_RTC_X is not set
452# CONFIG_DTLK is not set
453# CONFIG_R3964 is not set
454# CONFIG_APPLICOM is not set
455
456#
457# Ftape, the floppy tape device driver
458#
459# CONFIG_AGP is not set
460# CONFIG_DRM is not set
461# CONFIG_RAW_DRIVER is not set
462
463#
464# TPM devices
465#
466# CONFIG_TCG_TPM is not set
467
468#
469# I2C support
470#
471CONFIG_I2C=y
472CONFIG_I2C_CHARDEV=y
473
474#
475# I2C Algorithms
476#
477# CONFIG_I2C_ALGOBIT is not set
478# CONFIG_I2C_ALGOPCF is not set
479# CONFIG_I2C_ALGOPCA is not set
480
481#
482# I2C Hardware Bus support
483#
484# CONFIG_I2C_ALI1535 is not set
485# CONFIG_I2C_ALI1563 is not set
486# CONFIG_I2C_ALI15X3 is not set
487# CONFIG_I2C_AMD756 is not set
488# CONFIG_I2C_AMD8111 is not set
489# CONFIG_I2C_I801 is not set
490# CONFIG_I2C_I810 is not set
491# CONFIG_I2C_PIIX4 is not set
492CONFIG_I2C_MPC=y
493# CONFIG_I2C_NFORCE2 is not set
494# CONFIG_I2C_PARPORT_LIGHT is not set
495# CONFIG_I2C_PROSAVAGE is not set
496# CONFIG_I2C_SAVAGE4 is not set
497# CONFIG_SCx200_ACB is not set
498# CONFIG_I2C_SIS5595 is not set
499# CONFIG_I2C_SIS630 is not set
500# CONFIG_I2C_SIS96X is not set
501# CONFIG_I2C_VIA is not set
502# CONFIG_I2C_VIAPRO is not set
503# CONFIG_I2C_VOODOO3 is not set
504# CONFIG_I2C_PCA_ISA is not set
505# CONFIG_I2C_SENSOR is not set
506
507#
508# Miscellaneous I2C Chip support
509#
510# CONFIG_SENSORS_DS1337 is not set
511# CONFIG_SENSORS_DS1374 is not set
512# CONFIG_SENSORS_EEPROM is not set
513# CONFIG_SENSORS_PCF8574 is not set
514# CONFIG_SENSORS_PCA9539 is not set
515# CONFIG_SENSORS_PCF8591 is not set
516# CONFIG_SENSORS_RTC8564 is not set
517# CONFIG_SENSORS_M41T00 is not set
518# CONFIG_SENSORS_MAX6875 is not set
519# CONFIG_I2C_DEBUG_CORE is not set
520# CONFIG_I2C_DEBUG_ALGO is not set
521# CONFIG_I2C_DEBUG_BUS is not set
522# CONFIG_I2C_DEBUG_CHIP is not set
523
524#
525# Dallas's 1-wire bus
526#
527# CONFIG_W1 is not set
528
529#
530# Hardware Monitoring support
531#
532CONFIG_HWMON=y
533# CONFIG_SENSORS_ADM1021 is not set
534# CONFIG_SENSORS_ADM1025 is not set
535# CONFIG_SENSORS_ADM1026 is not set
536# CONFIG_SENSORS_ADM1031 is not set
537# CONFIG_SENSORS_ADM9240 is not set
538# CONFIG_SENSORS_ASB100 is not set
539# CONFIG_SENSORS_ATXP1 is not set
540# CONFIG_SENSORS_DS1621 is not set
541# CONFIG_SENSORS_FSCHER is not set
542# CONFIG_SENSORS_FSCPOS is not set
543# CONFIG_SENSORS_GL518SM is not set
544# CONFIG_SENSORS_GL520SM is not set
545# CONFIG_SENSORS_IT87 is not set
546# CONFIG_SENSORS_LM63 is not set
547# CONFIG_SENSORS_LM75 is not set
548# CONFIG_SENSORS_LM77 is not set
549# CONFIG_SENSORS_LM78 is not set
550# CONFIG_SENSORS_LM80 is not set
551# CONFIG_SENSORS_LM83 is not set
552# CONFIG_SENSORS_LM85 is not set
553# CONFIG_SENSORS_LM87 is not set
554# CONFIG_SENSORS_LM90 is not set
555# CONFIG_SENSORS_LM92 is not set
556# CONFIG_SENSORS_MAX1619 is not set
557# CONFIG_SENSORS_PC87360 is not set
558# CONFIG_SENSORS_SIS5595 is not set
559# CONFIG_SENSORS_SMSC47M1 is not set
560# CONFIG_SENSORS_SMSC47B397 is not set
561# CONFIG_SENSORS_VIA686A is not set
562# CONFIG_SENSORS_W83781D is not set
563# CONFIG_SENSORS_W83L785TS is not set
564# CONFIG_SENSORS_W83627HF is not set
565# CONFIG_SENSORS_W83627EHF is not set
566# CONFIG_HWMON_DEBUG_CHIP is not set
567
568#
569# Misc devices
570#
571
572#
573# Multimedia devices
574#
575# CONFIG_VIDEO_DEV is not set
576
577#
578# Digital Video Broadcasting Devices
579#
580# CONFIG_DVB is not set
581
582#
583# Graphics support
584#
585# CONFIG_FB is not set
586
587#
588# Sound
589#
590# CONFIG_SOUND is not set
591
592#
593# USB support
594#
595CONFIG_USB_ARCH_HAS_HCD=y
596CONFIG_USB_ARCH_HAS_OHCI=y
597# CONFIG_USB is not set
598
599#
600# USB Gadget Support
601#
602# CONFIG_USB_GADGET is not set
603
604#
605# MMC/SD Card support
606#
607# CONFIG_MMC is not set
608
609#
610# InfiniBand support
611#
612# CONFIG_INFINIBAND is not set
613
614#
615# SN Devices
616#
617
618#
619# File systems
620#
621CONFIG_EXT2_FS=y
622# CONFIG_EXT2_FS_XATTR is not set
623# CONFIG_EXT2_FS_XIP is not set
624CONFIG_EXT3_FS=y
625CONFIG_EXT3_FS_XATTR=y
626# CONFIG_EXT3_FS_POSIX_ACL is not set
627# CONFIG_EXT3_FS_SECURITY is not set
628CONFIG_JBD=y
629# CONFIG_JBD_DEBUG is not set
630CONFIG_FS_MBCACHE=y
631# CONFIG_REISERFS_FS is not set
632# CONFIG_JFS_FS is not set
633# CONFIG_FS_POSIX_ACL is not set
634
635#
636# XFS support
637#
638# CONFIG_XFS_FS is not set
639# CONFIG_MINIX_FS is not set
640# CONFIG_ROMFS_FS is not set
641CONFIG_INOTIFY=y
642# CONFIG_QUOTA is not set
643CONFIG_DNOTIFY=y
644# CONFIG_AUTOFS_FS is not set
645# CONFIG_AUTOFS4_FS is not set
646
647#
648# CD-ROM/DVD Filesystems
649#
650# CONFIG_ISO9660_FS is not set
651# CONFIG_UDF_FS is not set
652
653#
654# DOS/FAT/NT Filesystems
655#
656# CONFIG_MSDOS_FS is not set
657# CONFIG_VFAT_FS is not set
658# CONFIG_NTFS_FS is not set
659
660#
661# Pseudo filesystems
662#
663CONFIG_PROC_FS=y
664CONFIG_PROC_KCORE=y
665CONFIG_SYSFS=y
666# CONFIG_DEVPTS_FS_XATTR is not set
667CONFIG_TMPFS=y
668# CONFIG_TMPFS_XATTR is not set
669# CONFIG_HUGETLB_PAGE is not set
670CONFIG_RAMFS=y
671
672#
673# Miscellaneous filesystems
674#
675# CONFIG_ADFS_FS is not set
676# CONFIG_AFFS_FS is not set
677# CONFIG_HFS_FS is not set
678# CONFIG_HFSPLUS_FS is not set
679# CONFIG_BEFS_FS is not set
680# CONFIG_BFS_FS is not set
681# CONFIG_EFS_FS is not set
682# CONFIG_CRAMFS is not set
683# CONFIG_VXFS_FS is not set
684# CONFIG_HPFS_FS is not set
685# CONFIG_QNX4FS_FS is not set
686# CONFIG_SYSV_FS is not set
687# CONFIG_UFS_FS is not set
688
689#
690# Network File Systems
691#
692CONFIG_NFS_FS=y
693# CONFIG_NFS_V3 is not set
694# CONFIG_NFS_V4 is not set
695# CONFIG_NFS_DIRECTIO is not set
696# CONFIG_NFSD is not set
697CONFIG_ROOT_NFS=y
698CONFIG_LOCKD=y
699CONFIG_NFS_COMMON=y
700CONFIG_SUNRPC=y
701# CONFIG_RPCSEC_GSS_KRB5 is not set
702# CONFIG_RPCSEC_GSS_SPKM3 is not set
703# CONFIG_SMB_FS is not set
704# CONFIG_CIFS is not set
705# CONFIG_NCP_FS is not set
706# CONFIG_CODA_FS is not set
707# CONFIG_AFS_FS is not set
708
709#
710# Partition Types
711#
712CONFIG_PARTITION_ADVANCED=y
713# CONFIG_ACORN_PARTITION is not set
714# CONFIG_OSF_PARTITION is not set
715# CONFIG_AMIGA_PARTITION is not set
716# CONFIG_ATARI_PARTITION is not set
717# CONFIG_MAC_PARTITION is not set
718# CONFIG_MSDOS_PARTITION is not set
719# CONFIG_LDM_PARTITION is not set
720# CONFIG_SGI_PARTITION is not set
721# CONFIG_ULTRIX_PARTITION is not set
722# CONFIG_SUN_PARTITION is not set
723# CONFIG_EFI_PARTITION is not set
724
725#
726# Native Language Support
727#
728# CONFIG_NLS is not set
729# CONFIG_SCC_ENET is not set
730# CONFIG_FEC_ENET is not set
731
732#
733# CPM2 Options
734#
735
736#
737# Library routines
738#
739# CONFIG_CRC_CCITT is not set
740CONFIG_CRC32=y
741# CONFIG_LIBCRC32C is not set
742
743#
744# Profiling support
745#
746# CONFIG_PROFILING is not set
747
748#
749# Kernel hacking
750#
751# CONFIG_PRINTK_TIME is not set
752# CONFIG_DEBUG_KERNEL is not set
753CONFIG_LOG_BUF_SHIFT=14
754# CONFIG_KGDB_CONSOLE is not set
755
756#
757# Security options
758#
759# CONFIG_KEYS is not set
760# CONFIG_SECURITY is not set
761
762#
763# Cryptographic options
764#
765# CONFIG_CRYPTO is not set
766
767#
768# Hardware crypto devices
769#
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 5da0ca7c302f..7b739054968f 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -4,7 +4,6 @@
4extra-$(CONFIG_PPC_STD_MMU) := head.o 4extra-$(CONFIG_PPC_STD_MMU) := head.o
5extra-$(CONFIG_40x) := head_4xx.o 5extra-$(CONFIG_40x) := head_4xx.o
6extra-$(CONFIG_44x) := head_44x.o 6extra-$(CONFIG_44x) := head_44x.o
7extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
8extra-$(CONFIG_8xx) := head_8xx.o 7extra-$(CONFIG_8xx) := head_8xx.o
9extra-y += vmlinux.lds 8extra-y += vmlinux.lds
10 9
diff --git a/arch/ppc/kernel/asm-offsets.c b/arch/ppc/kernel/asm-offsets.c
index e8e94321b59e..a51a17714231 100644
--- a/arch/ppc/kernel/asm-offsets.c
+++ b/arch/ppc/kernel/asm-offsets.c
@@ -54,12 +54,6 @@ main(void)
54 DEFINE(THREAD_VSCR, offsetof(struct thread_struct, vscr)); 54 DEFINE(THREAD_VSCR, offsetof(struct thread_struct, vscr));
55 DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr)); 55 DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));
56#endif /* CONFIG_ALTIVEC */ 56#endif /* CONFIG_ALTIVEC */
57#ifdef CONFIG_SPE
58 DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
59 DEFINE(THREAD_ACC, offsetof(struct thread_struct, acc));
60 DEFINE(THREAD_SPEFSCR, offsetof(struct thread_struct, spefscr));
61 DEFINE(THREAD_USED_SPE, offsetof(struct thread_struct, used_spe));
62#endif /* CONFIG_SPE */
63 /* Interrupt register frame */ 57 /* Interrupt register frame */
64 DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD); 58 DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD);
65 DEFINE(INT_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs)); 59 DEFINE(INT_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs));
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index 59e77eb63338..5f3a5d068a5c 100644
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -519,12 +519,7 @@ BEGIN_FTR_SECTION
519 stw r12,THREAD+THREAD_VRSAVE(r2) 519 stw r12,THREAD+THREAD_VRSAVE(r2)
520END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) 520END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
521#endif /* CONFIG_ALTIVEC */ 521#endif /* CONFIG_ALTIVEC */
522#ifdef CONFIG_SPE 522 and. r0,r0,r11 /* FP or altivec enabled? */
523 oris r0,r0,MSR_SPE@h /* Disable SPE */
524 mfspr r12,SPRN_SPEFSCR /* save spefscr register value */
525 stw r12,THREAD+THREAD_SPEFSCR(r2)
526#endif /* CONFIG_SPE */
527 and. r0,r0,r11 /* FP or altivec or SPE enabled? */
528 beq+ 1f 523 beq+ 1f
529 andc r11,r11,r0 524 andc r11,r11,r0
530 MTMSRD(r11) 525 MTMSRD(r11)
@@ -557,11 +552,6 @@ BEGIN_FTR_SECTION
557 mtspr SPRN_VRSAVE,r0 /* if G4, restore VRSAVE reg */ 552 mtspr SPRN_VRSAVE,r0 /* if G4, restore VRSAVE reg */
558END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) 553END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
559#endif /* CONFIG_ALTIVEC */ 554#endif /* CONFIG_ALTIVEC */
560#ifdef CONFIG_SPE
561 lwz r0,THREAD+THREAD_SPEFSCR(r2)
562 mtspr SPRN_SPEFSCR,r0 /* restore SPEFSCR reg */
563#endif /* CONFIG_SPE */
564
565 lwz r0,_CCR(r1) 555 lwz r0,_CCR(r1)
566 mtcrf 0xFF,r0 556 mtcrf 0xFF,r0
567 /* r3-r12 are destroyed -- Cort */ 557 /* r3-r12 are destroyed -- Cort */
diff --git a/arch/ppc/kernel/head_booke.h b/arch/ppc/kernel/head_booke.h
index f3d274c6b231..166d597b6db2 100644
--- a/arch/ppc/kernel/head_booke.h
+++ b/arch/ppc/kernel/head_booke.h
@@ -212,60 +212,6 @@ label:
212 * save (and later restore) the MSR via SPRN_CSRR1, which will still have 212 * save (and later restore) the MSR via SPRN_CSRR1, which will still have
213 * the MSR_DE bit set. 213 * the MSR_DE bit set.
214 */ 214 */
215#ifdef CONFIG_E200
216#define DEBUG_EXCEPTION \
217 START_EXCEPTION(Debug); \
218 DEBUG_EXCEPTION_PROLOG; \
219 \
220 /* \
221 * If there is a single step or branch-taken exception in an \
222 * exception entry sequence, it was probably meant to apply to \
223 * the code where the exception occurred (since exception entry \
224 * doesn't turn off DE automatically). We simulate the effect \
225 * of turning off DE on entry to an exception handler by turning \
226 * off DE in the CSRR1 value and clearing the debug status. \
227 */ \
228 mfspr r10,SPRN_DBSR; /* check single-step/branch taken */ \
229 andis. r10,r10,DBSR_IC@h; \
230 beq+ 2f; \
231 \
232 lis r10,KERNELBASE@h; /* check if exception in vectors */ \
233 ori r10,r10,KERNELBASE@l; \
234 cmplw r12,r10; \
235 blt+ 2f; /* addr below exception vectors */ \
236 \
237 lis r10,Debug@h; \
238 ori r10,r10,Debug@l; \
239 cmplw r12,r10; \
240 bgt+ 2f; /* addr above exception vectors */ \
241 \
242 /* here it looks like we got an inappropriate debug exception. */ \
2431: rlwinm r9,r9,0,~MSR_DE; /* clear DE in the CDRR1 value */ \
244 lis r10,DBSR_IC@h; /* clear the IC event */ \
245 mtspr SPRN_DBSR,r10; \
246 /* restore state and get out */ \
247 lwz r10,_CCR(r11); \
248 lwz r0,GPR0(r11); \
249 lwz r1,GPR1(r11); \
250 mtcrf 0x80,r10; \
251 mtspr SPRN_DSRR0,r12; \
252 mtspr SPRN_DSRR1,r9; \
253 lwz r9,GPR9(r11); \
254 lwz r12,GPR12(r11); \
255 mtspr DEBUG_SPRG,r8; \
256 BOOKE_LOAD_EXC_LEVEL_STACK(DEBUG); /* r8 points to the debug stack */ \
257 lwz r10,GPR10-INT_FRAME_SIZE(r8); \
258 lwz r11,GPR11-INT_FRAME_SIZE(r8); \
259 mfspr r8,DEBUG_SPRG; \
260 \
261 RFDI; \
262 b .; \
263 \
264 /* continue normal handling for a critical exception... */ \
2652: mfspr r4,SPRN_DBSR; \
266 addi r3,r1,STACK_FRAME_OVERHEAD; \
267 EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
268#else
269#define DEBUG_EXCEPTION \ 215#define DEBUG_EXCEPTION \
270 START_EXCEPTION(Debug); \ 216 START_EXCEPTION(Debug); \
271 CRITICAL_EXCEPTION_PROLOG; \ 217 CRITICAL_EXCEPTION_PROLOG; \
@@ -318,7 +264,6 @@ label:
3182: mfspr r4,SPRN_DBSR; \ 2642: mfspr r4,SPRN_DBSR; \
319 addi r3,r1,STACK_FRAME_OVERHEAD; \ 265 addi r3,r1,STACK_FRAME_OVERHEAD; \
320 EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc) 266 EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
321#endif
322 267
323#define INSTRUCTION_STORAGE_EXCEPTION \ 268#define INSTRUCTION_STORAGE_EXCEPTION \
324 START_EXCEPTION(InstructionStorage) \ 269 START_EXCEPTION(InstructionStorage) \
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S
deleted file mode 100644
index 1f155d399d57..000000000000
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ /dev/null
@@ -1,1065 +0,0 @@
1/*
2 * Kernel execution entry point code.
3 *
4 * Copyright (c) 1995-1996 Gary Thomas <gdt@linuxppc.org>
5 * Initial PowerPC version.
6 * Copyright (c) 1996 Cort Dougan <cort@cs.nmt.edu>
7 * Rewritten for PReP
8 * Copyright (c) 1996 Paul Mackerras <paulus@cs.anu.edu.au>
9 * Low-level exception handers, MMU support, and rewrite.
10 * Copyright (c) 1997 Dan Malek <dmalek@jlc.net>
11 * PowerPC 8xx modifications.
12 * Copyright (c) 1998-1999 TiVo, Inc.
13 * PowerPC 403GCX modifications.
14 * Copyright (c) 1999 Grant Erickson <grant@lcse.umn.edu>
15 * PowerPC 403GCX/405GP modifications.
16 * Copyright 2000 MontaVista Software Inc.
17 * PPC405 modifications
18 * PowerPC 403GCX/405GP modifications.
19 * Author: MontaVista Software, Inc.
20 * frank_rowand@mvista.com or source@mvista.com
21 * debbie_chu@mvista.com
22 * Copyright 2002-2004 MontaVista Software, Inc.
23 * PowerPC 44x support, Matt Porter <mporter@kernel.crashing.org>
24 * Copyright 2004 Freescale Semiconductor, Inc
25 * PowerPC e500 modifications, Kumar Gala <galak@kernel.crashing.org>
26 *
27 * This program is free software; you can redistribute it and/or modify it
28 * under the terms of the GNU General Public License as published by the
29 * Free Software Foundation; either version 2 of the License, or (at your
30 * option) any later version.
31 */
32
33#include <linux/threads.h>
34#include <asm/processor.h>
35#include <asm/page.h>
36#include <asm/mmu.h>
37#include <asm/pgtable.h>
38#include <asm/cputable.h>
39#include <asm/thread_info.h>
40#include <asm/ppc_asm.h>
41#include <asm/asm-offsets.h>
42#include "head_booke.h"
43
44/* As with the other PowerPC ports, it is expected that when code
45 * execution begins here, the following registers contain valid, yet
46 * optional, information:
47 *
48 * r3 - Board info structure pointer (DRAM, frequency, MAC address, etc.)
49 * r4 - Starting address of the init RAM disk
50 * r5 - Ending address of the init RAM disk
51 * r6 - Start of kernel command line string (e.g. "mem=128")
52 * r7 - End of kernel command line string
53 *
54 */
55 .text
56_GLOBAL(_stext)
57_GLOBAL(_start)
58 /*
59 * Reserve a word at a fixed location to store the address
60 * of abatron_pteptrs
61 */
62 nop
63/*
64 * Save parameters we are passed
65 */
66 mr r31,r3
67 mr r30,r4
68 mr r29,r5
69 mr r28,r6
70 mr r27,r7
71 li r24,0 /* CPU number */
72
73/* We try to not make any assumptions about how the boot loader
74 * setup or used the TLBs. We invalidate all mappings from the
75 * boot loader and load a single entry in TLB1[0] to map the
76 * first 16M of kernel memory. Any boot info passed from the
77 * bootloader needs to live in this first 16M.
78 *
79 * Requirement on bootloader:
80 * - The page we're executing in needs to reside in TLB1 and
81 * have IPROT=1. If not an invalidate broadcast could
82 * evict the entry we're currently executing in.
83 *
84 * r3 = Index of TLB1 were executing in
85 * r4 = Current MSR[IS]
86 * r5 = Index of TLB1 temp mapping
87 *
88 * Later in mapin_ram we will correctly map lowmem, and resize TLB1[0]
89 * if needed
90 */
91
92/* 1. Find the index of the entry we're executing in */
93 bl invstr /* Find our address */
94invstr: mflr r6 /* Make it accessible */
95 mfmsr r7
96 rlwinm r4,r7,27,31,31 /* extract MSR[IS] */
97 mfspr r7, SPRN_PID0
98 slwi r7,r7,16
99 or r7,r7,r4
100 mtspr SPRN_MAS6,r7
101 tlbsx 0,r6 /* search MSR[IS], SPID=PID0 */
102#ifndef CONFIG_E200
103 mfspr r7,SPRN_MAS1
104 andis. r7,r7,MAS1_VALID@h
105 bne match_TLB
106 mfspr r7,SPRN_PID1
107 slwi r7,r7,16
108 or r7,r7,r4
109 mtspr SPRN_MAS6,r7
110 tlbsx 0,r6 /* search MSR[IS], SPID=PID1 */
111 mfspr r7,SPRN_MAS1
112 andis. r7,r7,MAS1_VALID@h
113 bne match_TLB
114 mfspr r7, SPRN_PID2
115 slwi r7,r7,16
116 or r7,r7,r4
117 mtspr SPRN_MAS6,r7
118 tlbsx 0,r6 /* Fall through, we had to match */
119#endif
120match_TLB:
121 mfspr r7,SPRN_MAS0
122 rlwinm r3,r7,16,20,31 /* Extract MAS0(Entry) */
123
124 mfspr r7,SPRN_MAS1 /* Insure IPROT set */
125 oris r7,r7,MAS1_IPROT@h
126 mtspr SPRN_MAS1,r7
127 tlbwe
128
129/* 2. Invalidate all entries except the entry we're executing in */
130 mfspr r9,SPRN_TLB1CFG
131 andi. r9,r9,0xfff
132 li r6,0 /* Set Entry counter to 0 */
1331: lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
134 rlwimi r7,r6,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r6) */
135 mtspr SPRN_MAS0,r7
136 tlbre
137 mfspr r7,SPRN_MAS1
138 rlwinm r7,r7,0,2,31 /* Clear MAS1 Valid and IPROT */
139 cmpw r3,r6
140 beq skpinv /* Dont update the current execution TLB */
141 mtspr SPRN_MAS1,r7
142 tlbwe
143 isync
144skpinv: addi r6,r6,1 /* Increment */
145 cmpw r6,r9 /* Are we done? */
146 bne 1b /* If not, repeat */
147
148 /* Invalidate TLB0 */
149 li r6,0x04
150 tlbivax 0,r6
151#ifdef CONFIG_SMP
152 tlbsync
153#endif
154 /* Invalidate TLB1 */
155 li r6,0x0c
156 tlbivax 0,r6
157#ifdef CONFIG_SMP
158 tlbsync
159#endif
160 msync
161
162/* 3. Setup a temp mapping and jump to it */
163 andi. r5, r3, 0x1 /* Find an entry not used and is non-zero */
164 addi r5, r5, 0x1
165 lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
166 rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */
167 mtspr SPRN_MAS0,r7
168 tlbre
169
170 /* Just modify the entry ID and EPN for the temp mapping */
171 lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
172 rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */
173 mtspr SPRN_MAS0,r7
174 xori r6,r4,1 /* Setup TMP mapping in the other Address space */
175 slwi r6,r6,12
176 oris r6,r6,(MAS1_VALID|MAS1_IPROT)@h
177 ori r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
178 mtspr SPRN_MAS1,r6
179 mfspr r6,SPRN_MAS2
180 li r7,0 /* temp EPN = 0 */
181 rlwimi r7,r6,0,20,31
182 mtspr SPRN_MAS2,r7
183 tlbwe
184
185 xori r6,r4,1
186 slwi r6,r6,5 /* setup new context with other address space */
187 bl 1f /* Find our address */
1881: mflr r9
189 rlwimi r7,r9,0,20,31
190 addi r7,r7,24
191 mtspr SPRN_SRR0,r7
192 mtspr SPRN_SRR1,r6
193 rfi
194
195/* 4. Clear out PIDs & Search info */
196 li r6,0
197 mtspr SPRN_PID0,r6
198#ifndef CONFIG_E200
199 mtspr SPRN_PID1,r6
200 mtspr SPRN_PID2,r6
201#endif
202 mtspr SPRN_MAS6,r6
203
204/* 5. Invalidate mapping we started in */
205 lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
206 rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */
207 mtspr SPRN_MAS0,r7
208 tlbre
209 mfspr r6,SPRN_MAS1
210 rlwinm r6,r6,0,2,0 /* clear IPROT */
211 mtspr SPRN_MAS1,r6
212 tlbwe
213 /* Invalidate TLB1 */
214 li r9,0x0c
215 tlbivax 0,r9
216#ifdef CONFIG_SMP
217 tlbsync
218#endif
219 msync
220
221/* 6. Setup KERNELBASE mapping in TLB1[0] */
222 lis r6,0x1000 /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */
223 mtspr SPRN_MAS0,r6
224 lis r6,(MAS1_VALID|MAS1_IPROT)@h
225 ori r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_16M))@l
226 mtspr SPRN_MAS1,r6
227 li r7,0
228 lis r6,KERNELBASE@h
229 ori r6,r6,KERNELBASE@l
230 rlwimi r6,r7,0,20,31
231 mtspr SPRN_MAS2,r6
232 li r7,(MAS3_SX|MAS3_SW|MAS3_SR)
233 mtspr SPRN_MAS3,r7
234 tlbwe
235
236/* 7. Jump to KERNELBASE mapping */
237 lis r7,MSR_KERNEL@h
238 ori r7,r7,MSR_KERNEL@l
239 bl 1f /* Find our address */
2401: mflr r9
241 rlwimi r6,r9,0,20,31
242 addi r6,r6,24
243 mtspr SPRN_SRR0,r6
244 mtspr SPRN_SRR1,r7
245 rfi /* start execution out of TLB1[0] entry */
246
247/* 8. Clear out the temp mapping */
248 lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
249 rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */
250 mtspr SPRN_MAS0,r7
251 tlbre
252 mfspr r8,SPRN_MAS1
253 rlwinm r8,r8,0,2,0 /* clear IPROT */
254 mtspr SPRN_MAS1,r8
255 tlbwe
256 /* Invalidate TLB1 */
257 li r9,0x0c
258 tlbivax 0,r9
259#ifdef CONFIG_SMP
260 tlbsync
261#endif
262 msync
263
264 /* Establish the interrupt vector offsets */
265 SET_IVOR(0, CriticalInput);
266 SET_IVOR(1, MachineCheck);
267 SET_IVOR(2, DataStorage);
268 SET_IVOR(3, InstructionStorage);
269 SET_IVOR(4, ExternalInput);
270 SET_IVOR(5, Alignment);
271 SET_IVOR(6, Program);
272 SET_IVOR(7, FloatingPointUnavailable);
273 SET_IVOR(8, SystemCall);
274 SET_IVOR(9, AuxillaryProcessorUnavailable);
275 SET_IVOR(10, Decrementer);
276 SET_IVOR(11, FixedIntervalTimer);
277 SET_IVOR(12, WatchdogTimer);
278 SET_IVOR(13, DataTLBError);
279 SET_IVOR(14, InstructionTLBError);
280 SET_IVOR(15, Debug);
281 SET_IVOR(32, SPEUnavailable);
282 SET_IVOR(33, SPEFloatingPointData);
283 SET_IVOR(34, SPEFloatingPointRound);
284#ifndef CONFIG_E200
285 SET_IVOR(35, PerformanceMonitor);
286#endif
287
288 /* Establish the interrupt vector base */
289 lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */
290 mtspr SPRN_IVPR,r4
291
292 /* Setup the defaults for TLB entries */
293 li r2,(MAS4_TSIZED(BOOKE_PAGESZ_4K))@l
294#ifdef CONFIG_E200
295 oris r2,r2,MAS4_TLBSELD(1)@h
296#endif
297 mtspr SPRN_MAS4, r2
298
299#if 0
300 /* Enable DOZE */
301 mfspr r2,SPRN_HID0
302 oris r2,r2,HID0_DOZE@h
303 mtspr SPRN_HID0, r2
304#endif
305#ifdef CONFIG_E200
306 /* enable dedicated debug exception handling resources (Debug APU) */
307 mfspr r2,SPRN_HID0
308 ori r2,r2,HID0_DAPUEN@l
309 mtspr SPRN_HID0,r2
310#endif
311
312#if !defined(CONFIG_BDI_SWITCH)
313 /*
314 * The Abatron BDI JTAG debugger does not tolerate others
315 * mucking with the debug registers.
316 */
317 lis r2,DBCR0_IDM@h
318 mtspr SPRN_DBCR0,r2
319 isync
320 /* clear any residual debug events */
321 li r2,-1
322 mtspr SPRN_DBSR,r2
323#endif
324
325 /*
326 * This is where the main kernel code starts.
327 */
328
329 /* ptr to current */
330 lis r2,init_task@h
331 ori r2,r2,init_task@l
332
333 /* ptr to current thread */
334 addi r4,r2,THREAD /* init task's THREAD */
335 mtspr SPRN_SPRG3,r4
336
337 /* stack */
338 lis r1,init_thread_union@h
339 ori r1,r1,init_thread_union@l
340 li r0,0
341 stwu r0,THREAD_SIZE-STACK_FRAME_OVERHEAD(r1)
342
343 bl early_init
344
345 mfspr r3,SPRN_TLB1CFG
346 andi. r3,r3,0xfff
347 lis r4,num_tlbcam_entries@ha
348 stw r3,num_tlbcam_entries@l(r4)
349/*
350 * Decide what sort of machine this is and initialize the MMU.
351 */
352 mr r3,r31
353 mr r4,r30
354 mr r5,r29
355 mr r6,r28
356 mr r7,r27
357 bl machine_init
358 bl MMU_init
359
360 /* Setup PTE pointers for the Abatron bdiGDB */
361 lis r6, swapper_pg_dir@h
362 ori r6, r6, swapper_pg_dir@l
363 lis r5, abatron_pteptrs@h
364 ori r5, r5, abatron_pteptrs@l
365 lis r4, KERNELBASE@h
366 ori r4, r4, KERNELBASE@l
367 stw r5, 0(r4) /* Save abatron_pteptrs at a fixed location */
368 stw r6, 0(r5)
369
370 /* Let's move on */
371 lis r4,start_kernel@h
372 ori r4,r4,start_kernel@l
373 lis r3,MSR_KERNEL@h
374 ori r3,r3,MSR_KERNEL@l
375 mtspr SPRN_SRR0,r4
376 mtspr SPRN_SRR1,r3
377 rfi /* change context and jump to start_kernel */
378
379/* Macros to hide the PTE size differences
380 *
381 * FIND_PTE -- walks the page tables given EA & pgdir pointer
382 * r10 -- EA of fault
383 * r11 -- PGDIR pointer
384 * r12 -- free
385 * label 2: is the bailout case
386 *
387 * if we find the pte (fall through):
388 * r11 is low pte word
389 * r12 is pointer to the pte
390 */
391#ifdef CONFIG_PTE_64BIT
392#define PTE_FLAGS_OFFSET 4
393#define FIND_PTE \
394 rlwinm r12, r10, 13, 19, 29; /* Compute pgdir/pmd offset */ \
395 lwzx r11, r12, r11; /* Get pgd/pmd entry */ \
396 rlwinm. r12, r11, 0, 0, 20; /* Extract pt base address */ \
397 beq 2f; /* Bail if no table */ \
398 rlwimi r12, r10, 23, 20, 28; /* Compute pte address */ \
399 lwz r11, 4(r12); /* Get pte entry */
400#else
401#define PTE_FLAGS_OFFSET 0
402#define FIND_PTE \
403 rlwimi r11, r10, 12, 20, 29; /* Create L1 (pgdir/pmd) address */ \
404 lwz r11, 0(r11); /* Get L1 entry */ \
405 rlwinm. r12, r11, 0, 0, 19; /* Extract L2 (pte) base address */ \
406 beq 2f; /* Bail if no table */ \
407 rlwimi r12, r10, 22, 20, 29; /* Compute PTE address */ \
408 lwz r11, 0(r12); /* Get Linux PTE */
409#endif
410
411/*
412 * Interrupt vector entry code
413 *
414 * The Book E MMUs are always on so we don't need to handle
415 * interrupts in real mode as with previous PPC processors. In
416 * this case we handle interrupts in the kernel virtual address
417 * space.
418 *
419 * Interrupt vectors are dynamically placed relative to the
420 * interrupt prefix as determined by the address of interrupt_base.
421 * The interrupt vectors offsets are programmed using the labels
422 * for each interrupt vector entry.
423 *
424 * Interrupt vectors must be aligned on a 16 byte boundary.
425 * We align on a 32 byte cache line boundary for good measure.
426 */
427
428interrupt_base:
429 /* Critical Input Interrupt */
430 CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
431
432 /* Machine Check Interrupt */
433#ifdef CONFIG_E200
434 /* no RFMCI, MCSRRs on E200 */
435 CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
436#else
437 MCHECK_EXCEPTION(0x0200, MachineCheck, machine_check_exception)
438#endif
439
440 /* Data Storage Interrupt */
441 START_EXCEPTION(DataStorage)
442 mtspr SPRN_SPRG0, r10 /* Save some working registers */
443 mtspr SPRN_SPRG1, r11
444 mtspr SPRN_SPRG4W, r12
445 mtspr SPRN_SPRG5W, r13
446 mfcr r11
447 mtspr SPRN_SPRG7W, r11
448
449 /*
450 * Check if it was a store fault, if not then bail
451 * because a user tried to access a kernel or
452 * read-protected page. Otherwise, get the
453 * offending address and handle it.
454 */
455 mfspr r10, SPRN_ESR
456 andis. r10, r10, ESR_ST@h
457 beq 2f
458
459 mfspr r10, SPRN_DEAR /* Get faulting address */
460
461 /* If we are faulting a kernel address, we have to use the
462 * kernel page tables.
463 */
464 lis r11, TASK_SIZE@h
465 ori r11, r11, TASK_SIZE@l
466 cmplw 0, r10, r11
467 bge 2f
468
469 /* Get the PGD for the current thread */
4703:
471 mfspr r11,SPRN_SPRG3
472 lwz r11,PGDIR(r11)
4734:
474 FIND_PTE
475
476 /* Are _PAGE_USER & _PAGE_RW set & _PAGE_HWWRITE not? */
477 andi. r13, r11, _PAGE_RW|_PAGE_USER|_PAGE_HWWRITE
478 cmpwi 0, r13, _PAGE_RW|_PAGE_USER
479 bne 2f /* Bail if not */
480
481 /* Update 'changed'. */
482 ori r11, r11, _PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_HWWRITE
483 stw r11, PTE_FLAGS_OFFSET(r12) /* Update Linux page table */
484
485 /* MAS2 not updated as the entry does exist in the tlb, this
486 fault taken to detect state transition (eg: COW -> DIRTY)
487 */
488 andi. r11, r11, _PAGE_HWEXEC
489 rlwimi r11, r11, 31, 27, 27 /* SX <- _PAGE_HWEXEC */
490 ori r11, r11, (MAS3_UW|MAS3_SW|MAS3_UR|MAS3_SR)@l /* set static perms */
491
492 /* update search PID in MAS6, AS = 0 */
493 mfspr r12, SPRN_PID0
494 slwi r12, r12, 16
495 mtspr SPRN_MAS6, r12
496
497 /* find the TLB index that caused the fault. It has to be here. */
498 tlbsx 0, r10
499
500 /* only update the perm bits, assume the RPN is fine */
501 mfspr r12, SPRN_MAS3
502 rlwimi r12, r11, 0, 20, 31
503 mtspr SPRN_MAS3,r12
504 tlbwe
505
506 /* Done...restore registers and get out of here. */
507 mfspr r11, SPRN_SPRG7R
508 mtcr r11
509 mfspr r13, SPRN_SPRG5R
510 mfspr r12, SPRN_SPRG4R
511 mfspr r11, SPRN_SPRG1
512 mfspr r10, SPRN_SPRG0
513 rfi /* Force context change */
514
5152:
516 /*
517 * The bailout. Restore registers to pre-exception conditions
518 * and call the heavyweights to help us out.
519 */
520 mfspr r11, SPRN_SPRG7R
521 mtcr r11
522 mfspr r13, SPRN_SPRG5R
523 mfspr r12, SPRN_SPRG4R
524 mfspr r11, SPRN_SPRG1
525 mfspr r10, SPRN_SPRG0
526 b data_access
527
528 /* Instruction Storage Interrupt */
529 INSTRUCTION_STORAGE_EXCEPTION
530
531 /* External Input Interrupt */
532 EXCEPTION(0x0500, ExternalInput, do_IRQ, EXC_XFER_LITE)
533
534 /* Alignment Interrupt */
535 ALIGNMENT_EXCEPTION
536
537 /* Program Interrupt */
538 PROGRAM_EXCEPTION
539
540 /* Floating Point Unavailable Interrupt */
541#ifdef CONFIG_PPC_FPU
542 FP_UNAVAILABLE_EXCEPTION
543#else
544#ifdef CONFIG_E200
545 /* E200 treats 'normal' floating point instructions as FP Unavail exception */
546 EXCEPTION(0x0800, FloatingPointUnavailable, program_check_exception, EXC_XFER_EE)
547#else
548 EXCEPTION(0x0800, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE)
549#endif
550#endif
551
552 /* System Call Interrupt */
553 START_EXCEPTION(SystemCall)
554 NORMAL_EXCEPTION_PROLOG
555 EXC_XFER_EE_LITE(0x0c00, DoSyscall)
556
557 /* Auxillary Processor Unavailable Interrupt */
558 EXCEPTION(0x2900, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
559
560 /* Decrementer Interrupt */
561 DECREMENTER_EXCEPTION
562
563 /* Fixed Internal Timer Interrupt */
564 /* TODO: Add FIT support */
565 EXCEPTION(0x3100, FixedIntervalTimer, unknown_exception, EXC_XFER_EE)
566
567 /* Watchdog Timer Interrupt */
568#ifdef CONFIG_BOOKE_WDT
569 CRITICAL_EXCEPTION(0x3200, WatchdogTimer, WatchdogException)
570#else
571 CRITICAL_EXCEPTION(0x3200, WatchdogTimer, unknown_exception)
572#endif
573
574 /* Data TLB Error Interrupt */
575 START_EXCEPTION(DataTLBError)
576 mtspr SPRN_SPRG0, r10 /* Save some working registers */
577 mtspr SPRN_SPRG1, r11
578 mtspr SPRN_SPRG4W, r12
579 mtspr SPRN_SPRG5W, r13
580 mfcr r11
581 mtspr SPRN_SPRG7W, r11
582 mfspr r10, SPRN_DEAR /* Get faulting address */
583
584 /* If we are faulting a kernel address, we have to use the
585 * kernel page tables.
586 */
587 lis r11, TASK_SIZE@h
588 ori r11, r11, TASK_SIZE@l
589 cmplw 5, r10, r11
590 blt 5, 3f
591 lis r11, swapper_pg_dir@h
592 ori r11, r11, swapper_pg_dir@l
593
594 mfspr r12,SPRN_MAS1 /* Set TID to 0 */
595 rlwinm r12,r12,0,16,1
596 mtspr SPRN_MAS1,r12
597
598 b 4f
599
600 /* Get the PGD for the current thread */
6013:
602 mfspr r11,SPRN_SPRG3
603 lwz r11,PGDIR(r11)
604
6054:
606 FIND_PTE
607 andi. r13, r11, _PAGE_PRESENT /* Is the page present? */
608 beq 2f /* Bail if not present */
609
610#ifdef CONFIG_PTE_64BIT
611 lwz r13, 0(r12)
612#endif
613 ori r11, r11, _PAGE_ACCESSED
614 stw r11, PTE_FLAGS_OFFSET(r12)
615
616 /* Jump to common tlb load */
617 b finish_tlb_load
6182:
619 /* The bailout. Restore registers to pre-exception conditions
620 * and call the heavyweights to help us out.
621 */
622 mfspr r11, SPRN_SPRG7R
623 mtcr r11
624 mfspr r13, SPRN_SPRG5R
625 mfspr r12, SPRN_SPRG4R
626 mfspr r11, SPRN_SPRG1
627 mfspr r10, SPRN_SPRG0
628 b data_access
629
630 /* Instruction TLB Error Interrupt */
631 /*
632 * Nearly the same as above, except we get our
633 * information from different registers and bailout
634 * to a different point.
635 */
636 START_EXCEPTION(InstructionTLBError)
637 mtspr SPRN_SPRG0, r10 /* Save some working registers */
638 mtspr SPRN_SPRG1, r11
639 mtspr SPRN_SPRG4W, r12
640 mtspr SPRN_SPRG5W, r13
641 mfcr r11
642 mtspr SPRN_SPRG7W, r11
643 mfspr r10, SPRN_SRR0 /* Get faulting address */
644
645 /* If we are faulting a kernel address, we have to use the
646 * kernel page tables.
647 */
648 lis r11, TASK_SIZE@h
649 ori r11, r11, TASK_SIZE@l
650 cmplw 5, r10, r11
651 blt 5, 3f
652 lis r11, swapper_pg_dir@h
653 ori r11, r11, swapper_pg_dir@l
654
655 mfspr r12,SPRN_MAS1 /* Set TID to 0 */
656 rlwinm r12,r12,0,16,1
657 mtspr SPRN_MAS1,r12
658
659 b 4f
660
661 /* Get the PGD for the current thread */
6623:
663 mfspr r11,SPRN_SPRG3
664 lwz r11,PGDIR(r11)
665
6664:
667 FIND_PTE
668 andi. r13, r11, _PAGE_PRESENT /* Is the page present? */
669 beq 2f /* Bail if not present */
670
671#ifdef CONFIG_PTE_64BIT
672 lwz r13, 0(r12)
673#endif
674 ori r11, r11, _PAGE_ACCESSED
675 stw r11, PTE_FLAGS_OFFSET(r12)
676
677 /* Jump to common TLB load point */
678 b finish_tlb_load
679
6802:
681 /* The bailout. Restore registers to pre-exception conditions
682 * and call the heavyweights to help us out.
683 */
684 mfspr r11, SPRN_SPRG7R
685 mtcr r11
686 mfspr r13, SPRN_SPRG5R
687 mfspr r12, SPRN_SPRG4R
688 mfspr r11, SPRN_SPRG1
689 mfspr r10, SPRN_SPRG0
690 b InstructionStorage
691
692#ifdef CONFIG_SPE
693 /* SPE Unavailable */
694 START_EXCEPTION(SPEUnavailable)
695 NORMAL_EXCEPTION_PROLOG
696 bne load_up_spe
697 addi r3,r1,STACK_FRAME_OVERHEAD
698 EXC_XFER_EE_LITE(0x2010, KernelSPE)
699#else
700 EXCEPTION(0x2020, SPEUnavailable, unknown_exception, EXC_XFER_EE)
701#endif /* CONFIG_SPE */
702
703 /* SPE Floating Point Data */
704#ifdef CONFIG_SPE
705 EXCEPTION(0x2030, SPEFloatingPointData, SPEFloatingPointException, EXC_XFER_EE);
706#else
707 EXCEPTION(0x2040, SPEFloatingPointData, unknown_exception, EXC_XFER_EE)
708#endif /* CONFIG_SPE */
709
710 /* SPE Floating Point Round */
711 EXCEPTION(0x2050, SPEFloatingPointRound, unknown_exception, EXC_XFER_EE)
712
713 /* Performance Monitor */
714 EXCEPTION(0x2060, PerformanceMonitor, performance_monitor_exception, EXC_XFER_STD)
715
716
717 /* Debug Interrupt */
718 DEBUG_EXCEPTION
719
720/*
721 * Local functions
722 */
723
724 /*
725 * Data TLB exceptions will bail out to this point
726 * if they can't resolve the lightweight TLB fault.
727 */
728data_access:
729 NORMAL_EXCEPTION_PROLOG
730 mfspr r5,SPRN_ESR /* Grab the ESR, save it, pass arg3 */
731 stw r5,_ESR(r11)
732 mfspr r4,SPRN_DEAR /* Grab the DEAR, save it, pass arg2 */
733 andis. r10,r5,(ESR_ILK|ESR_DLK)@h
734 bne 1f
735 EXC_XFER_EE_LITE(0x0300, handle_page_fault)
7361:
737 addi r3,r1,STACK_FRAME_OVERHEAD
738 EXC_XFER_EE_LITE(0x0300, CacheLockingException)
739
740/*
741
742 * Both the instruction and data TLB miss get to this
743 * point to load the TLB.
744 * r10 - EA of fault
745 * r11 - TLB (info from Linux PTE)
746 * r12, r13 - available to use
747 * CR5 - results of addr < TASK_SIZE
748 * MAS0, MAS1 - loaded with proper value when we get here
749 * MAS2, MAS3 - will need additional info from Linux PTE
750 * Upon exit, we reload everything and RFI.
751 */
752finish_tlb_load:
753 /*
754 * We set execute, because we don't have the granularity to
755 * properly set this at the page level (Linux problem).
756 * Many of these bits are software only. Bits we don't set
757 * here we (properly should) assume have the appropriate value.
758 */
759
760 mfspr r12, SPRN_MAS2
761#ifdef CONFIG_PTE_64BIT
762 rlwimi r12, r11, 26, 24, 31 /* extract ...WIMGE from pte */
763#else
764 rlwimi r12, r11, 26, 27, 31 /* extract WIMGE from pte */
765#endif
766 mtspr SPRN_MAS2, r12
767
768 bge 5, 1f
769
770 /* is user addr */
771 andi. r12, r11, (_PAGE_USER | _PAGE_HWWRITE | _PAGE_HWEXEC)
772 andi. r10, r11, _PAGE_USER /* Test for _PAGE_USER */
773 srwi r10, r12, 1
774 or r12, r12, r10 /* Copy user perms into supervisor */
775 iseleq r12, 0, r12
776 b 2f
777
778 /* is kernel addr */
7791: rlwinm r12, r11, 31, 29, 29 /* Extract _PAGE_HWWRITE into SW */
780 ori r12, r12, (MAS3_SX | MAS3_SR)
781
782#ifdef CONFIG_PTE_64BIT
7832: rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */
784 rlwimi r12, r11, 24, 8, 19 /* grab RPN[40:51] */
785 mtspr SPRN_MAS3, r12
786BEGIN_FTR_SECTION
787 srwi r10, r13, 8 /* grab RPN[8:31] */
788 mtspr SPRN_MAS7, r10
789END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS)
790#else
7912: rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */
792 mtspr SPRN_MAS3, r11
793#endif
794#ifdef CONFIG_E200
795 /* Round robin TLB1 entries assignment */
796 mfspr r12, SPRN_MAS0
797
798 /* Extract TLB1CFG(NENTRY) */
799 mfspr r11, SPRN_TLB1CFG
800 andi. r11, r11, 0xfff
801
802 /* Extract MAS0(NV) */
803 andi. r13, r12, 0xfff
804 addi r13, r13, 1
805 cmpw 0, r13, r11
806 addi r12, r12, 1
807
808 /* check if we need to wrap */
809 blt 7f
810
811 /* wrap back to first free tlbcam entry */
812 lis r13, tlbcam_index@ha
813 lwz r13, tlbcam_index@l(r13)
814 rlwimi r12, r13, 0, 20, 31
8157:
816 mtspr SPRN_MAS0,r12
817#endif /* CONFIG_E200 */
818
819 tlbwe
820
821 /* Done...restore registers and get out of here. */
822 mfspr r11, SPRN_SPRG7R
823 mtcr r11
824 mfspr r13, SPRN_SPRG5R
825 mfspr r12, SPRN_SPRG4R
826 mfspr r11, SPRN_SPRG1
827 mfspr r10, SPRN_SPRG0
828 rfi /* Force context change */
829
830#ifdef CONFIG_SPE
831/* Note that the SPE support is closely modeled after the AltiVec
832 * support. Changes to one are likely to be applicable to the
833 * other! */
834load_up_spe:
835/*
836 * Disable SPE for the task which had SPE previously,
837 * and save its SPE registers in its thread_struct.
838 * Enables SPE for use in the kernel on return.
839 * On SMP we know the SPE units are free, since we give it up every
840 * switch. -- Kumar
841 */
842 mfmsr r5
843 oris r5,r5,MSR_SPE@h
844 mtmsr r5 /* enable use of SPE now */
845 isync
846/*
847 * For SMP, we don't do lazy SPE switching because it just gets too
848 * horrendously complex, especially when a task switches from one CPU
849 * to another. Instead we call giveup_spe in switch_to.
850 */
851#ifndef CONFIG_SMP
852 lis r3,last_task_used_spe@ha
853 lwz r4,last_task_used_spe@l(r3)
854 cmpi 0,r4,0
855 beq 1f
856 addi r4,r4,THREAD /* want THREAD of last_task_used_spe */
857 SAVE_32EVRS(0,r10,r4)
858 evxor evr10, evr10, evr10 /* clear out evr10 */
859 evmwumiaa evr10, evr10, evr10 /* evr10 <- ACC = 0 * 0 + ACC */
860 li r5,THREAD_ACC
861 evstddx evr10, r4, r5 /* save off accumulator */
862 lwz r5,PT_REGS(r4)
863 lwz r4,_MSR-STACK_FRAME_OVERHEAD(r5)
864 lis r10,MSR_SPE@h
865 andc r4,r4,r10 /* disable SPE for previous task */
866 stw r4,_MSR-STACK_FRAME_OVERHEAD(r5)
8671:
868#endif /* CONFIG_SMP */
869 /* enable use of SPE after return */
870 oris r9,r9,MSR_SPE@h
871 mfspr r5,SPRN_SPRG3 /* current task's THREAD (phys) */
872 li r4,1
873 li r10,THREAD_ACC
874 stw r4,THREAD_USED_SPE(r5)
875 evlddx evr4,r10,r5
876 evmra evr4,evr4
877 REST_32EVRS(0,r10,r5)
878#ifndef CONFIG_SMP
879 subi r4,r5,THREAD
880 stw r4,last_task_used_spe@l(r3)
881#endif /* CONFIG_SMP */
882 /* restore registers and return */
8832: REST_4GPRS(3, r11)
884 lwz r10,_CCR(r11)
885 REST_GPR(1, r11)
886 mtcr r10
887 lwz r10,_LINK(r11)
888 mtlr r10
889 REST_GPR(10, r11)
890 mtspr SPRN_SRR1,r9
891 mtspr SPRN_SRR0,r12
892 REST_GPR(9, r11)
893 REST_GPR(12, r11)
894 lwz r11,GPR11(r11)
895 rfi
896
897/*
898 * SPE unavailable trap from kernel - print a message, but let
899 * the task use SPE in the kernel until it returns to user mode.
900 */
901KernelSPE:
902 lwz r3,_MSR(r1)
903 oris r3,r3,MSR_SPE@h
904 stw r3,_MSR(r1) /* enable use of SPE after return */
905 lis r3,87f@h
906 ori r3,r3,87f@l
907 mr r4,r2 /* current */
908 lwz r5,_NIP(r1)
909 bl printk
910 b ret_from_except
91187: .string "SPE used in kernel (task=%p, pc=%x) \n"
912 .align 4,0
913
914#endif /* CONFIG_SPE */
915
916/*
917 * Global functions
918 */
919
920/*
921 * extern void loadcam_entry(unsigned int index)
922 *
923 * Load TLBCAM[index] entry in to the L2 CAM MMU
924 */
925_GLOBAL(loadcam_entry)
926 lis r4,TLBCAM@ha
927 addi r4,r4,TLBCAM@l
928 mulli r5,r3,20
929 add r3,r5,r4
930 lwz r4,0(r3)
931 mtspr SPRN_MAS0,r4
932 lwz r4,4(r3)
933 mtspr SPRN_MAS1,r4
934 lwz r4,8(r3)
935 mtspr SPRN_MAS2,r4
936 lwz r4,12(r3)
937 mtspr SPRN_MAS3,r4
938 tlbwe
939 isync
940 blr
941
942/*
943 * extern void giveup_altivec(struct task_struct *prev)
944 *
945 * The e500 core does not have an AltiVec unit.
946 */
947_GLOBAL(giveup_altivec)
948 blr
949
950#ifdef CONFIG_SPE
951/*
952 * extern void giveup_spe(struct task_struct *prev)
953 *
954 */
955_GLOBAL(giveup_spe)
956 mfmsr r5
957 oris r5,r5,MSR_SPE@h
958 mtmsr r5 /* enable use of SPE now */
959 isync
960 cmpi 0,r3,0
961 beqlr- /* if no previous owner, done */
962 addi r3,r3,THREAD /* want THREAD of task */
963 lwz r5,PT_REGS(r3)
964 cmpi 0,r5,0
965 SAVE_32EVRS(0, r4, r3)
966 evxor evr6, evr6, evr6 /* clear out evr6 */
967 evmwumiaa evr6, evr6, evr6 /* evr6 <- ACC = 0 * 0 + ACC */
968 li r4,THREAD_ACC
969 evstddx evr6, r4, r3 /* save off accumulator */
970 mfspr r6,SPRN_SPEFSCR
971 stw r6,THREAD_SPEFSCR(r3) /* save spefscr register value */
972 beq 1f
973 lwz r4,_MSR-STACK_FRAME_OVERHEAD(r5)
974 lis r3,MSR_SPE@h
975 andc r4,r4,r3 /* disable SPE for previous task */
976 stw r4,_MSR-STACK_FRAME_OVERHEAD(r5)
9771:
978#ifndef CONFIG_SMP
979 li r5,0
980 lis r4,last_task_used_spe@ha
981 stw r5,last_task_used_spe@l(r4)
982#endif /* CONFIG_SMP */
983 blr
984#endif /* CONFIG_SPE */
985
986/*
987 * extern void giveup_fpu(struct task_struct *prev)
988 *
989 * Not all FSL Book-E cores have an FPU
990 */
991#ifndef CONFIG_PPC_FPU
992_GLOBAL(giveup_fpu)
993 blr
994#endif
995
996/*
997 * extern void abort(void)
998 *
999 * At present, this routine just applies a system reset.
1000 */
1001_GLOBAL(abort)
1002 li r13,0
1003 mtspr SPRN_DBCR0,r13 /* disable all debug events */
1004 isync
1005 mfmsr r13
1006 ori r13,r13,MSR_DE@l /* Enable Debug Events */
1007 mtmsr r13
1008 isync
1009 mfspr r13,SPRN_DBCR0
1010 lis r13,(DBCR0_IDM|DBCR0_RST_CHIP)@h
1011 mtspr SPRN_DBCR0,r13
1012 isync
1013
1014_GLOBAL(set_context)
1015
1016#ifdef CONFIG_BDI_SWITCH
1017 /* Context switch the PTE pointer for the Abatron BDI2000.
1018 * The PGDIR is the second parameter.
1019 */
1020 lis r5, abatron_pteptrs@h
1021 ori r5, r5, abatron_pteptrs@l
1022 stw r4, 0x4(r5)
1023#endif
1024 mtspr SPRN_PID,r3
1025 isync /* Force context change */
1026 blr
1027
1028/*
1029 * We put a few things here that have to be page-aligned. This stuff
1030 * goes at the beginning of the data segment, which is page-aligned.
1031 */
1032 .data
1033 .align 12
1034 .globl sdata
1035sdata:
1036 .globl empty_zero_page
1037empty_zero_page:
1038 .space 4096
1039 .globl swapper_pg_dir
1040swapper_pg_dir:
1041 .space 4096
1042
1043/* Reserved 4k for the critical exception stack & 4k for the machine
1044 * check stack per CPU for kernel mode exceptions */
1045 .section .bss
1046 .align 12
1047exception_stack_bottom:
1048 .space BOOKE_EXCEPTION_STACK_SIZE * NR_CPUS
1049 .globl exception_stack_top
1050exception_stack_top:
1051
1052/*
1053 * This space gets a copy of optional info passed to us by the bootstrap
1054 * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
1055 */
1056 .globl cmd_line
1057cmd_line:
1058 .space 512
1059
1060/*
1061 * Room for two PTE pointers, usually the kernel and current user pointers
1062 * to their respective root page table.
1063 */
1064abatron_pteptrs:
1065 .space 8
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index e0c850d85c53..d5e0dfc9ffec 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -165,24 +165,7 @@ _GLOBAL(_tlbia)
165 ble 1b 165 ble 1b
166 166
167 isync 167 isync
168#elif defined(CONFIG_FSL_BOOKE) 168#else /* !(CONFIG_40x || CONFIG_44x) */
169 /* Invalidate all entries in TLB0 */
170 li r3, 0x04
171 tlbivax 0,3
172 /* Invalidate all entries in TLB1 */
173 li r3, 0x0c
174 tlbivax 0,3
175 /* Invalidate all entries in TLB2 */
176 li r3, 0x14
177 tlbivax 0,3
178 /* Invalidate all entries in TLB3 */
179 li r3, 0x1c
180 tlbivax 0,3
181 msync
182#ifdef CONFIG_SMP
183 tlbsync
184#endif /* CONFIG_SMP */
185#else /* !(CONFIG_40x || CONFIG_44x || CONFIG_FSL_BOOKE) */
186#if defined(CONFIG_SMP) 169#if defined(CONFIG_SMP)
187 rlwinm r8,r1,0,0,18 170 rlwinm r8,r1,0,0,18
188 lwz r8,TI_CPU(r8) 171 lwz r8,TI_CPU(r8)
@@ -268,20 +251,7 @@ _GLOBAL(_tlbie)
268 tlbwe r3, r3, PPC44x_TLB_PAGEID 251 tlbwe r3, r3, PPC44x_TLB_PAGEID
269 isync 252 isync
27010: 25310:
271#elif defined(CONFIG_FSL_BOOKE) 254#else /* !(CONFIG_40x || CONFIG_44x) */
272 rlwinm r4, r3, 0, 0, 19
273 ori r5, r4, 0x08 /* TLBSEL = 1 */
274 ori r6, r4, 0x10 /* TLBSEL = 2 */
275 ori r7, r4, 0x18 /* TLBSEL = 3 */
276 tlbivax 0, r4
277 tlbivax 0, r5
278 tlbivax 0, r6
279 tlbivax 0, r7
280 msync
281#if defined(CONFIG_SMP)
282 tlbsync
283#endif /* CONFIG_SMP */
284#else /* !(CONFIG_40x || CONFIG_44x || CONFIG_FSL_BOOKE) */
285#if defined(CONFIG_SMP) 255#if defined(CONFIG_SMP)
286 rlwinm r8,r1,0,0,18 256 rlwinm r8,r1,0,0,18
287 lwz r8,TI_CPU(r8) 257 lwz r8,TI_CPU(r8)
@@ -338,18 +308,6 @@ _GLOBAL(flush_instruction_cache)
338 lis r3, KERNELBASE@h 308 lis r3, KERNELBASE@h
339 iccci 0,r3 309 iccci 0,r3
340#endif 310#endif
341#elif CONFIG_FSL_BOOKE
342BEGIN_FTR_SECTION
343 mfspr r3,SPRN_L1CSR0
344 ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC
345 /* msync; isync recommended here */
346 mtspr SPRN_L1CSR0,r3
347 isync
348 blr
349END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE)
350 mfspr r3,SPRN_L1CSR1
351 ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR
352 mtspr SPRN_L1CSR1,r3
353#else 311#else
354 mfspr r3,SPRN_PVR 312 mfspr r3,SPRN_PVR
355 rlwinm r3,r3,16,16,31 313 rlwinm r3,r3,16,16,31
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 22494ec123ea..c35350250cfc 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -45,7 +45,7 @@
45#include <asm/dcr.h> 45#include <asm/dcr.h>
46 46
47#ifdef CONFIG_8xx 47#ifdef CONFIG_8xx
48#include <asm/commproc.h> 48#include <asm/cpm1.h>
49#endif 49#endif
50 50
51extern void transfer_to_handler(void); 51extern void transfer_to_handler(void);
@@ -166,12 +166,6 @@ EXPORT_SYMBOL(last_task_used_altivec);
166#endif 166#endif
167EXPORT_SYMBOL(giveup_altivec); 167EXPORT_SYMBOL(giveup_altivec);
168#endif /* CONFIG_ALTIVEC */ 168#endif /* CONFIG_ALTIVEC */
169#ifdef CONFIG_SPE
170#ifndef CONFIG_SMP
171EXPORT_SYMBOL(last_task_used_spe);
172#endif
173EXPORT_SYMBOL(giveup_spe);
174#endif /* CONFIG_SPE */
175#ifdef CONFIG_SMP 169#ifdef CONFIG_SMP
176EXPORT_SYMBOL(smp_call_function); 170EXPORT_SYMBOL(smp_call_function);
177EXPORT_SYMBOL(smp_hw_index); 171EXPORT_SYMBOL(smp_hw_index);
@@ -244,8 +238,7 @@ EXPORT_SYMBOL(debugger_fault_handler);
244EXPORT_SYMBOL(cpm_install_handler); 238EXPORT_SYMBOL(cpm_install_handler);
245EXPORT_SYMBOL(cpm_free_handler); 239EXPORT_SYMBOL(cpm_free_handler);
246#endif /* CONFIG_8xx */ 240#endif /* CONFIG_8xx */
247#if defined(CONFIG_8xx) || defined(CONFIG_40x) || defined(CONFIG_85xx) ||\ 241#if defined(CONFIG_8xx) || defined(CONFIG_40x)
248 defined(CONFIG_83xx)
249EXPORT_SYMBOL(__res); 242EXPORT_SYMBOL(__res);
250#endif 243#endif
251 244
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 3c453029f1c5..d51368d72e39 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -38,8 +38,7 @@
38#include <asm/xmon.h> 38#include <asm/xmon.h>
39#include <asm/ocp.h> 39#include <asm/ocp.h>
40 40
41#define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \ 41#define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
42 defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
43 defined(CONFIG_PPC_MPC52xx)) 42 defined(CONFIG_PPC_MPC52xx))
44 43
45#if USES_PPC_SYS 44#if USES_PPC_SYS
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 25a1085fbd01..a467a429c2fe 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -194,11 +194,7 @@ static inline int check_io_access(struct pt_regs *regs)
194/* On 4xx, the reason for the machine check or program exception 194/* On 4xx, the reason for the machine check or program exception
195 is in the ESR. */ 195 is in the ESR. */
196#define get_reason(regs) ((regs)->dsisr) 196#define get_reason(regs) ((regs)->dsisr)
197#ifndef CONFIG_FSL_BOOKE
198#define get_mc_reason(regs) ((regs)->dsisr) 197#define get_mc_reason(regs) ((regs)->dsisr)
199#else
200#define get_mc_reason(regs) (mfspr(SPRN_MCSR))
201#endif
202#define REASON_FP ESR_FP 198#define REASON_FP ESR_FP
203#define REASON_ILLEGAL (ESR_PIL | ESR_PUO) 199#define REASON_ILLEGAL (ESR_PIL | ESR_PUO)
204#define REASON_PRIVILEGED ESR_PPR 200#define REASON_PRIVILEGED ESR_PPR
@@ -281,66 +277,6 @@ int machine_check_440A(struct pt_regs *regs)
281 } 277 }
282 return 0; 278 return 0;
283} 279}
284#elif defined(CONFIG_E500)
285int machine_check_e500(struct pt_regs *regs)
286{
287 unsigned long reason = get_mc_reason(regs);
288
289 printk("Machine check in kernel mode.\n");
290 printk("Caused by (from MCSR=%lx): ", reason);
291
292 if (reason & MCSR_MCP)
293 printk("Machine Check Signal\n");
294 if (reason & MCSR_ICPERR)
295 printk("Instruction Cache Parity Error\n");
296 if (reason & MCSR_DCP_PERR)
297 printk("Data Cache Push Parity Error\n");
298 if (reason & MCSR_DCPERR)
299 printk("Data Cache Parity Error\n");
300 if (reason & MCSR_BUS_IAERR)
301 printk("Bus - Instruction Address Error\n");
302 if (reason & MCSR_BUS_RAERR)
303 printk("Bus - Read Address Error\n");
304 if (reason & MCSR_BUS_WAERR)
305 printk("Bus - Write Address Error\n");
306 if (reason & MCSR_BUS_IBERR)
307 printk("Bus - Instruction Data Error\n");
308 if (reason & MCSR_BUS_RBERR)
309 printk("Bus - Read Data Bus Error\n");
310 if (reason & MCSR_BUS_WBERR)
311 printk("Bus - Read Data Bus Error\n");
312 if (reason & MCSR_BUS_IPERR)
313 printk("Bus - Instruction Parity Error\n");
314 if (reason & MCSR_BUS_RPERR)
315 printk("Bus - Read Parity Error\n");
316
317 return 0;
318}
319#elif defined(CONFIG_E200)
320int machine_check_e200(struct pt_regs *regs)
321{
322 unsigned long reason = get_mc_reason(regs);
323
324 printk("Machine check in kernel mode.\n");
325 printk("Caused by (from MCSR=%lx): ", reason);
326
327 if (reason & MCSR_MCP)
328 printk("Machine Check Signal\n");
329 if (reason & MCSR_CP_PERR)
330 printk("Cache Push Parity Error\n");
331 if (reason & MCSR_CPERR)
332 printk("Cache Parity Error\n");
333 if (reason & MCSR_EXCP_ERR)
334 printk("ISI, ITLB, or Bus Error on first instruction fetch for an exception handler\n");
335 if (reason & MCSR_BUS_IRERR)
336 printk("Bus - Read Bus Error on instruction fetch\n");
337 if (reason & MCSR_BUS_DRERR)
338 printk("Bus - Read Bus Error on data load\n");
339 if (reason & MCSR_BUS_WRERR)
340 printk("Bus - Write Bus Error on buffered store or cache line push\n");
341
342 return 0;
343}
344#else 280#else
345int machine_check_generic(struct pt_regs *regs) 281int machine_check_generic(struct pt_regs *regs)
346{ 282{
@@ -866,63 +802,6 @@ void altivec_assist_exception(struct pt_regs *regs)
866} 802}
867#endif /* CONFIG_ALTIVEC */ 803#endif /* CONFIG_ALTIVEC */
868 804
869#ifdef CONFIG_E500
870void performance_monitor_exception(struct pt_regs *regs)
871{
872 perf_irq(regs);
873}
874#endif
875
876#ifdef CONFIG_FSL_BOOKE
877void CacheLockingException(struct pt_regs *regs, unsigned long address,
878 unsigned long error_code)
879{
880 /* We treat cache locking instructions from the user
881 * as priv ops, in the future we could try to do
882 * something smarter
883 */
884 if (error_code & (ESR_DLK|ESR_ILK))
885 _exception(SIGILL, regs, ILL_PRVOPC, regs->nip);
886 return;
887}
888#endif /* CONFIG_FSL_BOOKE */
889
890#ifdef CONFIG_SPE
891void SPEFloatingPointException(struct pt_regs *regs)
892{
893 unsigned long spefscr;
894 int fpexc_mode;
895 int code = 0;
896
897 spefscr = current->thread.spefscr;
898 fpexc_mode = current->thread.fpexc_mode;
899
900 /* Hardware does not necessarily set sticky
901 * underflow/overflow/invalid flags */
902 if ((spefscr & SPEFSCR_FOVF) && (fpexc_mode & PR_FP_EXC_OVF)) {
903 code = FPE_FLTOVF;
904 spefscr |= SPEFSCR_FOVFS;
905 }
906 else if ((spefscr & SPEFSCR_FUNF) && (fpexc_mode & PR_FP_EXC_UND)) {
907 code = FPE_FLTUND;
908 spefscr |= SPEFSCR_FUNFS;
909 }
910 else if ((spefscr & SPEFSCR_FDBZ) && (fpexc_mode & PR_FP_EXC_DIV))
911 code = FPE_FLTDIV;
912 else if ((spefscr & SPEFSCR_FINV) && (fpexc_mode & PR_FP_EXC_INV)) {
913 code = FPE_FLTINV;
914 spefscr |= SPEFSCR_FINVS;
915 }
916 else if ((spefscr & (SPEFSCR_FG | SPEFSCR_FX)) && (fpexc_mode & PR_FP_EXC_RES))
917 code = FPE_FLTRES;
918
919 current->thread.spefscr = spefscr;
920
921 _exception(SIGFPE, regs, code, regs->nip);
922 return;
923}
924#endif
925
926#ifdef CONFIG_BOOKE_WDT 805#ifdef CONFIG_BOOKE_WDT
927/* 806/*
928 * Default handler for a Watchdog exception, 807 * Default handler for a Watchdog exception,
diff --git a/arch/ppc/mm/Makefile b/arch/ppc/mm/Makefile
index cd3eae147cf8..691ba2bae05d 100644
--- a/arch/ppc/mm/Makefile
+++ b/arch/ppc/mm/Makefile
@@ -8,4 +8,3 @@ obj-y := fault.o init.o mem_pieces.o \
8obj-$(CONFIG_PPC_STD_MMU) += hashtable.o ppc_mmu.o tlb.o 8obj-$(CONFIG_PPC_STD_MMU) += hashtable.o ppc_mmu.o tlb.o
9obj-$(CONFIG_40x) += 4xx_mmu.o 9obj-$(CONFIG_40x) += 4xx_mmu.o
10obj-$(CONFIG_44x) += 44x_mmu.o 10obj-$(CONFIG_44x) += 44x_mmu.o
11obj-$(CONFIG_FSL_BOOKE) += fsl_booke_mmu.o
diff --git a/arch/ppc/mm/fsl_booke_mmu.c b/arch/ppc/mm/fsl_booke_mmu.c
deleted file mode 100644
index 123da03ab118..000000000000
--- a/arch/ppc/mm/fsl_booke_mmu.c
+++ /dev/null
@@ -1,236 +0,0 @@
1/*
2 * Modifications by Kumar Gala (galak@kernel.crashing.org) to support
3 * E500 Book E processors.
4 *
5 * Copyright 2004 Freescale Semiconductor, Inc
6 *
7 * This file contains the routines for initializing the MMU
8 * on the 4xx series of chips.
9 * -- paulus
10 *
11 * Derived from arch/ppc/mm/init.c:
12 * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
13 *
14 * Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
15 * and Cort Dougan (PReP) (cort@cs.nmt.edu)
16 * Copyright (C) 1996 Paul Mackerras
17 * Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
18 *
19 * Derived from "arch/i386/mm/init.c"
20 * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds
21 *
22 * This program is free software; you can redistribute it and/or
23 * modify it under the terms of the GNU General Public License
24 * as published by the Free Software Foundation; either version
25 * 2 of the License, or (at your option) any later version.
26 *
27 */
28
29#include <linux/signal.h>
30#include <linux/sched.h>
31#include <linux/kernel.h>
32#include <linux/errno.h>
33#include <linux/string.h>
34#include <linux/types.h>
35#include <linux/ptrace.h>
36#include <linux/mman.h>
37#include <linux/mm.h>
38#include <linux/swap.h>
39#include <linux/stddef.h>
40#include <linux/vmalloc.h>
41#include <linux/init.h>
42#include <linux/delay.h>
43#include <linux/highmem.h>
44
45#include <asm/pgalloc.h>
46#include <asm/prom.h>
47#include <asm/io.h>
48#include <asm/mmu_context.h>
49#include <asm/pgtable.h>
50#include <asm/mmu.h>
51#include <asm/uaccess.h>
52#include <asm/smp.h>
53#include <asm/bootx.h>
54#include <asm/machdep.h>
55#include <asm/setup.h>
56
57extern void loadcam_entry(unsigned int index);
58unsigned int tlbcam_index;
59unsigned int num_tlbcam_entries;
60static unsigned long __cam0, __cam1, __cam2;
61extern unsigned long total_lowmem;
62extern unsigned long __max_low_memory;
63#define MAX_LOW_MEM CONFIG_LOWMEM_SIZE
64
65#define NUM_TLBCAMS (16)
66
67struct tlbcam {
68 u32 MAS0;
69 u32 MAS1;
70 u32 MAS2;
71 u32 MAS3;
72 u32 MAS7;
73} TLBCAM[NUM_TLBCAMS];
74
75struct tlbcamrange {
76 unsigned long start;
77 unsigned long limit;
78 phys_addr_t phys;
79} tlbcam_addrs[NUM_TLBCAMS];
80
81extern unsigned int tlbcam_index;
82
83/*
84 * Return PA for this VA if it is mapped by a CAM, or 0
85 */
86unsigned long v_mapped_by_tlbcam(unsigned long va)
87{
88 int b;
89 for (b = 0; b < tlbcam_index; ++b)
90 if (va >= tlbcam_addrs[b].start && va < tlbcam_addrs[b].limit)
91 return tlbcam_addrs[b].phys + (va - tlbcam_addrs[b].start);
92 return 0;
93}
94
95/*
96 * Return VA for a given PA or 0 if not mapped
97 */
98unsigned long p_mapped_by_tlbcam(unsigned long pa)
99{
100 int b;
101 for (b = 0; b < tlbcam_index; ++b)
102 if (pa >= tlbcam_addrs[b].phys
103 && pa < (tlbcam_addrs[b].limit-tlbcam_addrs[b].start)
104 +tlbcam_addrs[b].phys)
105 return tlbcam_addrs[b].start+(pa-tlbcam_addrs[b].phys);
106 return 0;
107}
108
109/*
110 * Set up one of the I/D BAT (block address translation) register pairs.
111 * The parameters are not checked; in particular size must be a power
112 * of 4 between 4k and 256M.
113 */
114void settlbcam(int index, unsigned long virt, phys_addr_t phys,
115 unsigned int size, int flags, unsigned int pid)
116{
117 unsigned int tsize, lz;
118
119 asm ("cntlzw %0,%1" : "=r" (lz) : "r" (size));
120 tsize = (21 - lz) / 2;
121
122#ifdef CONFIG_SMP
123 if ((flags & _PAGE_NO_CACHE) == 0)
124 flags |= _PAGE_COHERENT;
125#endif
126
127 TLBCAM[index].MAS0 = MAS0_TLBSEL(1) | MAS0_ESEL(index) | MAS0_NV(index+1);
128 TLBCAM[index].MAS1 = MAS1_VALID | MAS1_IPROT | MAS1_TSIZE(tsize) | MAS1_TID(pid);
129 TLBCAM[index].MAS2 = virt & PAGE_MASK;
130
131 TLBCAM[index].MAS2 |= (flags & _PAGE_WRITETHRU) ? MAS2_W : 0;
132 TLBCAM[index].MAS2 |= (flags & _PAGE_NO_CACHE) ? MAS2_I : 0;
133 TLBCAM[index].MAS2 |= (flags & _PAGE_COHERENT) ? MAS2_M : 0;
134 TLBCAM[index].MAS2 |= (flags & _PAGE_GUARDED) ? MAS2_G : 0;
135 TLBCAM[index].MAS2 |= (flags & _PAGE_ENDIAN) ? MAS2_E : 0;
136
137 TLBCAM[index].MAS3 = (phys & PAGE_MASK) | MAS3_SX | MAS3_SR;
138 TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0);
139
140#ifndef CONFIG_KGDB /* want user access for breakpoints */
141 if (flags & _PAGE_USER) {
142 TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;
143 TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);
144 }
145#else
146 TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;
147 TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);
148#endif
149
150 tlbcam_addrs[index].start = virt;
151 tlbcam_addrs[index].limit = virt + size - 1;
152 tlbcam_addrs[index].phys = phys;
153
154 loadcam_entry(index);
155}
156
157void invalidate_tlbcam_entry(int index)
158{
159 TLBCAM[index].MAS0 = MAS0_TLBSEL(1) | MAS0_ESEL(index);
160 TLBCAM[index].MAS1 = ~MAS1_VALID;
161
162 loadcam_entry(index);
163}
164
165void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
166 unsigned long cam2)
167{
168 settlbcam(0, KERNELBASE, PPC_MEMSTART, cam0, _PAGE_KERNEL, 0);
169 tlbcam_index++;
170 if (cam1) {
171 tlbcam_index++;
172 settlbcam(1, KERNELBASE+cam0, PPC_MEMSTART+cam0, cam1, _PAGE_KERNEL, 0);
173 }
174 if (cam2) {
175 tlbcam_index++;
176 settlbcam(2, KERNELBASE+cam0+cam1, PPC_MEMSTART+cam0+cam1, cam2, _PAGE_KERNEL, 0);
177 }
178}
179
180/*
181 * MMU_init_hw does the chip-specific initialization of the MMU hardware.
182 */
183void __init MMU_init_hw(void)
184{
185 flush_instruction_cache();
186}
187
188unsigned long __init mmu_mapin_ram(void)
189{
190 cam_mapin_ram(__cam0, __cam1, __cam2);
191
192 return __cam0 + __cam1 + __cam2;
193}
194
195
196void __init
197adjust_total_lowmem(void)
198{
199 unsigned long max_low_mem = MAX_LOW_MEM;
200 unsigned long cam_max = 0x10000000;
201 unsigned long ram;
202
203 /* adjust CAM size to max_low_mem */
204 if (max_low_mem < cam_max)
205 cam_max = max_low_mem;
206
207 /* adjust lowmem size to max_low_mem */
208 if (max_low_mem < total_lowmem)
209 ram = max_low_mem;
210 else
211 ram = total_lowmem;
212
213 /* Calculate CAM values */
214 __cam0 = 1UL << 2 * (__ilog2(ram) / 2);
215 if (__cam0 > cam_max)
216 __cam0 = cam_max;
217 ram -= __cam0;
218 if (ram) {
219 __cam1 = 1UL << 2 * (__ilog2(ram) / 2);
220 if (__cam1 > cam_max)
221 __cam1 = cam_max;
222 ram -= __cam1;
223 }
224 if (ram) {
225 __cam2 = 1UL << 2 * (__ilog2(ram) / 2);
226 if (__cam2 > cam_max)
227 __cam2 = cam_max;
228 ram -= __cam2;
229 }
230
231 printk(KERN_INFO "Memory CAM mapping: CAM0=%ldMb, CAM1=%ldMb,"
232 " CAM2=%ldMb residual: %ldMb\n",
233 __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
234 (total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
235 __max_low_memory = max_low_mem = __cam0 + __cam1 + __cam2;
236}
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index dd898d32480e..7444df3889c5 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -241,12 +241,6 @@ void __init MMU_init(void)
241 if (__max_memory && total_memory > __max_memory) 241 if (__max_memory && total_memory > __max_memory)
242 total_memory = __max_memory; 242 total_memory = __max_memory;
243 total_lowmem = total_memory; 243 total_lowmem = total_memory;
244#ifdef CONFIG_FSL_BOOKE
245 /* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
246 * entries, so we need to adjust lowmem to match the amount we can map
247 * in the fixed entries */
248 adjust_total_lowmem();
249#endif /* CONFIG_FSL_BOOKE */
250 if (total_lowmem > __max_low_memory) { 244 if (total_lowmem > __max_low_memory) {
251 total_lowmem = __max_low_memory; 245 total_lowmem = __max_low_memory;
252#ifndef CONFIG_HIGHMEM 246#ifndef CONFIG_HIGHMEM
diff --git a/arch/ppc/mm/mmu_context.c b/arch/ppc/mm/mmu_context.c
index 85afa7f8aa78..dacf45ced473 100644
--- a/arch/ppc/mm/mmu_context.c
+++ b/arch/ppc/mm/mmu_context.c
@@ -2,7 +2,7 @@
2 * This file contains the routines for handling the MMU on those 2 * This file contains the routines for handling the MMU on those
3 * PowerPC implementations where the MMU substantially follows the 3 * PowerPC implementations where the MMU substantially follows the
4 * architecture specification. This includes the 6xx, 7xx, 7xxx, 4 * architecture specification. This includes the 6xx, 7xx, 7xxx,
5 * 8260, and 83xx implementations but excludes the 8xx and 4xx. 5 * and 8260 implementations but excludes the 8xx and 4xx.
6 * -- paulus 6 * -- paulus
7 * 7 *
8 * Derived from arch/ppc/mm/init.c: 8 * Derived from arch/ppc/mm/init.c:
diff --git a/arch/ppc/mm/mmu_decl.h b/arch/ppc/mm/mmu_decl.h
index b298b60c202f..5f813e386b87 100644
--- a/arch/ppc/mm/mmu_decl.h
+++ b/arch/ppc/mm/mmu_decl.h
@@ -58,12 +58,6 @@ extern unsigned int num_tlbcam_entries;
58extern void MMU_init_hw(void); 58extern void MMU_init_hw(void);
59extern unsigned long mmu_mapin_ram(void); 59extern unsigned long mmu_mapin_ram(void);
60 60
61#elif defined(CONFIG_FSL_BOOKE)
62#define flush_HPTE(pid, va, pg) _tlbie(va, pid)
63extern void MMU_init_hw(void);
64extern unsigned long mmu_mapin_ram(void);
65extern void adjust_total_lowmem(void);
66
67#else 61#else
68/* anything except 4xx or 8xx */ 62/* anything except 4xx or 8xx */
69extern void MMU_init_hw(void); 63extern void MMU_init_hw(void);
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 1f51e6c94507..fadacfd18806 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -42,10 +42,6 @@ int io_bat_index;
42#define HAVE_BATS 1 42#define HAVE_BATS 1
43#endif 43#endif
44 44
45#if defined(CONFIG_FSL_BOOKE)
46#define HAVE_TLBCAM 1
47#endif
48
49extern char etext[], _stext[]; 45extern char etext[], _stext[];
50 46
51#ifdef CONFIG_SMP 47#ifdef CONFIG_SMP
@@ -63,15 +59,6 @@ void setbat(int index, unsigned long virt, unsigned long phys,
63#define p_mapped_by_bats(x) (0UL) 59#define p_mapped_by_bats(x) (0UL)
64#endif /* HAVE_BATS */ 60#endif /* HAVE_BATS */
65 61
66#ifdef HAVE_TLBCAM
67extern unsigned int tlbcam_index;
68extern unsigned long v_mapped_by_tlbcam(unsigned long va);
69extern unsigned long p_mapped_by_tlbcam(unsigned long pa);
70#else /* !HAVE_TLBCAM */
71#define v_mapped_by_tlbcam(x) (0UL)
72#define p_mapped_by_tlbcam(x) (0UL)
73#endif /* HAVE_TLBCAM */
74
75#ifdef CONFIG_PTE_64BIT 62#ifdef CONFIG_PTE_64BIT
76/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */ 63/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */
77#define PGDIR_ORDER 1 64#define PGDIR_ORDER 1
@@ -213,9 +200,6 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
213 if ((v = p_mapped_by_bats(p)) /*&& p_mapped_by_bats(p+size-1)*/ ) 200 if ((v = p_mapped_by_bats(p)) /*&& p_mapped_by_bats(p+size-1)*/ )
214 goto out; 201 goto out;
215 202
216 if ((v = p_mapped_by_tlbcam(p)))
217 goto out;
218
219 if (mem_init_done) { 203 if (mem_init_done) {
220 struct vm_struct *area; 204 struct vm_struct *area;
221 area = get_vm_area(size, VM_IOREMAP); 205 area = get_vm_area(size, VM_IOREMAP);
@@ -341,18 +325,6 @@ void __init io_block_mapping(unsigned long virt, phys_addr_t phys,
341 } 325 }
342#endif /* HAVE_BATS */ 326#endif /* HAVE_BATS */
343 327
344#ifdef HAVE_TLBCAM
345 /*
346 * Use a CAM for this if possible...
347 */
348 if (tlbcam_index < num_tlbcam_entries && is_power_of_4(size)
349 && (virt & (size - 1)) == 0 && (phys & (size - 1)) == 0) {
350 settlbcam(tlbcam_index, virt, phys, size, flags, 0);
351 ++tlbcam_index;
352 return;
353 }
354#endif /* HAVE_TLBCAM */
355
356 /* No BATs available, put it in the page tables. */ 328 /* No BATs available, put it in the page tables. */
357 for (i = 0; i < size; i += PAGE_SIZE) 329 for (i = 0; i < size; i += PAGE_SIZE)
358 map_page(virt + i, phys + i, flags); 330 map_page(virt + i, phys + i, flags);
diff --git a/arch/ppc/mm/ppc_mmu.c b/arch/ppc/mm/ppc_mmu.c
index 973f1e6afa53..0c1dc155996a 100644
--- a/arch/ppc/mm/ppc_mmu.c
+++ b/arch/ppc/mm/ppc_mmu.c
@@ -2,7 +2,7 @@
2 * This file contains the routines for handling the MMU on those 2 * This file contains the routines for handling the MMU on those
3 * PowerPC implementations where the MMU substantially follows the 3 * PowerPC implementations where the MMU substantially follows the
4 * architecture specification. This includes the 6xx, 7xx, 7xxx, 4 * architecture specification. This includes the 6xx, 7xx, 7xxx,
5 * 8260, and 83xx implementations but excludes the 8xx and 4xx. 5 * and 8260 implementations but excludes the 8xx and 4xx.
6 * -- paulus 6 * -- paulus
7 * 7 *
8 * Derived from arch/ppc/mm/init.c: 8 * Derived from arch/ppc/mm/init.c:
diff --git a/arch/ppc/platforms/83xx/Makefile b/arch/ppc/platforms/83xx/Makefile
deleted file mode 100644
index eb55341d6a17..000000000000
--- a/arch/ppc/platforms/83xx/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
1#
2# Makefile for the PowerPC 83xx linux kernel.
3#
4obj-$(CONFIG_MPC834x_SYS) += mpc834x_sys.o
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
deleted file mode 100644
index b84f8df325c4..000000000000
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ /dev/null
@@ -1,346 +0,0 @@
1/*
2 * MPC834x SYS board specific routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/stddef.h>
15#include <linux/kernel.h>
16#include <linux/init.h>
17#include <linux/errno.h>
18#include <linux/reboot.h>
19#include <linux/pci.h>
20#include <linux/kdev_t.h>
21#include <linux/major.h>
22#include <linux/console.h>
23#include <linux/delay.h>
24#include <linux/seq_file.h>
25#include <linux/root_dev.h>
26#include <linux/serial.h>
27#include <linux/tty.h> /* for linux/serial_core.h */
28#include <linux/serial_core.h>
29#include <linux/initrd.h>
30#include <linux/module.h>
31#include <linux/fsl_devices.h>
32
33#include <asm/system.h>
34#include <asm/pgtable.h>
35#include <asm/page.h>
36#include <asm/atomic.h>
37#include <asm/time.h>
38#include <asm/io.h>
39#include <asm/machdep.h>
40#include <asm/ipic.h>
41#include <asm/bootinfo.h>
42#include <asm/pci-bridge.h>
43#include <asm/mpc83xx.h>
44#include <asm/irq.h>
45#include <asm/kgdb.h>
46#include <asm/ppc_sys.h>
47#include <mm/mmu_decl.h>
48
49#include <syslib/ppc83xx_setup.h>
50
51#ifndef CONFIG_PCI
52unsigned long isa_io_base = 0;
53unsigned long isa_mem_base = 0;
54#endif
55
56extern unsigned long total_memory; /* in mm/init */
57
58unsigned char __res[sizeof (bd_t)];
59
60#ifdef CONFIG_PCI
61int
62mpc83xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
63{
64 static char pci_irq_table[][4] =
65 /*
66 * PCI IDSEL/INTPIN->INTLINE
67 * A B C D
68 */
69 {
70 {PIRQA, PIRQB, PIRQC, PIRQD}, /* idsel 0x11 */
71 {PIRQC, PIRQD, PIRQA, PIRQB}, /* idsel 0x12 */
72 {PIRQD, PIRQA, PIRQB, PIRQC}, /* idsel 0x13 */
73 {0, 0, 0, 0},
74 {PIRQA, PIRQB, PIRQC, PIRQD}, /* idsel 0x15 */
75 {PIRQD, PIRQA, PIRQB, PIRQC}, /* idsel 0x16 */
76 {PIRQC, PIRQD, PIRQA, PIRQB}, /* idsel 0x17 */
77 {PIRQB, PIRQC, PIRQD, PIRQA}, /* idsel 0x18 */
78 {0, 0, 0, 0}, /* idsel 0x19 */
79 {0, 0, 0, 0}, /* idsel 0x20 */
80 };
81
82 const long min_idsel = 0x11, max_idsel = 0x20, irqs_per_slot = 4;
83 return PCI_IRQ_TABLE_LOOKUP;
84}
85
86int
87mpc83xx_exclude_device(u_char bus, u_char devfn)
88{
89 return PCIBIOS_SUCCESSFUL;
90}
91#endif /* CONFIG_PCI */
92
93/* ************************************************************************
94 *
95 * Setup the architecture
96 *
97 */
98static void __init
99mpc834x_sys_setup_arch(void)
100{
101 bd_t *binfo = (bd_t *) __res;
102 unsigned int freq;
103 struct gianfar_platform_data *pdata;
104 struct gianfar_mdio_data *mdata;
105
106 /* get the core frequency */
107 freq = binfo->bi_intfreq;
108
109 /* Set loops_per_jiffy to a half-way reasonable value,
110 for use until calibrate_delay gets called. */
111 loops_per_jiffy = freq / HZ;
112
113#ifdef CONFIG_PCI
114 /* setup PCI host bridges */
115 mpc83xx_setup_hose();
116#endif
117 mpc83xx_early_serial_map();
118
119 /* setup the board related info for the MDIO bus */
120 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC83xx_MDIO);
121
122 mdata->irq[0] = MPC83xx_IRQ_EXT1;
123 mdata->irq[1] = MPC83xx_IRQ_EXT2;
124 mdata->irq[2] = PHY_POLL;
125 mdata->irq[31] = PHY_POLL;
126
127 /* setup the board related information for the enet controllers */
128 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC1);
129 if (pdata) {
130 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
131 pdata->bus_id = 0;
132 pdata->phy_id = 0;
133 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
134 }
135
136 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC2);
137 if (pdata) {
138 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
139 pdata->bus_id = 0;
140 pdata->phy_id = 1;
141 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
142 }
143
144#ifdef CONFIG_BLK_DEV_INITRD
145 if (initrd_start)
146 ROOT_DEV = Root_RAM0;
147 else
148#endif
149#ifdef CONFIG_ROOT_NFS
150 ROOT_DEV = Root_NFS;
151#else
152 ROOT_DEV = Root_HDA1;
153#endif
154}
155
156static void __init
157mpc834x_sys_map_io(void)
158{
159 /* we steal the lowest ioremap addr for virt space */
160 io_block_mapping(VIRT_IMMRBAR, immrbar, 1024*1024, _PAGE_IO);
161}
162
163int
164mpc834x_sys_show_cpuinfo(struct seq_file *m)
165{
166 uint pvid, svid, phid1;
167 bd_t *binfo = (bd_t *) __res;
168 unsigned int freq;
169
170 /* get the core frequency */
171 freq = binfo->bi_intfreq;
172
173 pvid = mfspr(SPRN_PVR);
174 svid = mfspr(SPRN_SVR);
175
176 seq_printf(m, "Vendor\t\t: Freescale Inc.\n");
177 seq_printf(m, "Machine\t\t: mpc%s sys\n", cur_ppc_sys_spec->ppc_sys_name);
178 seq_printf(m, "core clock\t: %d MHz\n"
179 "bus clock\t: %d MHz\n",
180 (int)(binfo->bi_intfreq / 1000000),
181 (int)(binfo->bi_busfreq / 1000000));
182 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
183 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
184
185 /* Display cpu Pll setting */
186 phid1 = mfspr(SPRN_HID1);
187 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
188
189 /* Display the amount of memory */
190 seq_printf(m, "Memory\t\t: %d MB\n", (int)(binfo->bi_memsize / (1024 * 1024)));
191
192 return 0;
193}
194
195
196void __init
197mpc834x_sys_init_IRQ(void)
198{
199 bd_t *binfo = (bd_t *) __res;
200
201 u8 senses[8] = {
202 0, /* EXT 0 */
203 IRQ_SENSE_LEVEL, /* EXT 1 */
204 IRQ_SENSE_LEVEL, /* EXT 2 */
205 0, /* EXT 3 */
206#ifdef CONFIG_PCI
207 IRQ_SENSE_LEVEL, /* EXT 4 */
208 IRQ_SENSE_LEVEL, /* EXT 5 */
209 IRQ_SENSE_LEVEL, /* EXT 6 */
210 IRQ_SENSE_LEVEL, /* EXT 7 */
211#else
212 0, /* EXT 4 */
213 0, /* EXT 5 */
214 0, /* EXT 6 */
215 0, /* EXT 7 */
216#endif
217 };
218
219 ipic_init(binfo->bi_immr_base + 0x00700, 0, MPC83xx_IPIC_IRQ_OFFSET, senses, 8);
220
221 /* Initialize the default interrupt mapping priorities,
222 * in case the boot rom changed something on us.
223 */
224 ipic_set_default_priority();
225}
226
227#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
228extern ulong ds1374_get_rtc_time(void);
229extern int ds1374_set_rtc_time(ulong);
230
231static int __init
232mpc834x_rtc_hookup(void)
233{
234 struct timespec tv;
235
236 ppc_md.get_rtc_time = ds1374_get_rtc_time;
237 ppc_md.set_rtc_time = ds1374_set_rtc_time;
238
239 tv.tv_nsec = 0;
240 tv.tv_sec = (ppc_md.get_rtc_time)();
241 do_settimeofday(&tv);
242
243 return 0;
244}
245late_initcall(mpc834x_rtc_hookup);
246#endif
247static __inline__ void
248mpc834x_sys_set_bat(void)
249{
250 /* we steal the lowest ioremap addr for virt space */
251 mb();
252 mtspr(SPRN_DBAT1U, VIRT_IMMRBAR | 0x1e);
253 mtspr(SPRN_DBAT1L, immrbar | 0x2a);
254 mb();
255}
256
257void __init
258platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
259 unsigned long r6, unsigned long r7)
260{
261 bd_t *binfo = (bd_t *) __res;
262
263 /* parse_bootinfo must always be called first */
264 parse_bootinfo(find_bootinfo());
265
266 /*
267 * If we were passed in a board information, copy it into the
268 * residual data area.
269 */
270 if (r3) {
271 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
272 sizeof (bd_t));
273 }
274
275#if defined(CONFIG_BLK_DEV_INITRD)
276 /*
277 * If the init RAM disk has been configured in, and there's a valid
278 * starting address for it, set it up.
279 */
280 if (r4) {
281 initrd_start = r4 + KERNELBASE;
282 initrd_end = r5 + KERNELBASE;
283 }
284#endif /* CONFIG_BLK_DEV_INITRD */
285
286 /* Copy the kernel command line arguments to a safe place. */
287 if (r6) {
288 *(char *) (r7 + KERNELBASE) = 0;
289 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
290 }
291
292 immrbar = binfo->bi_immr_base;
293
294 mpc834x_sys_set_bat();
295
296#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
297 {
298 struct uart_port p;
299
300 memset(&p, 0, sizeof (p));
301 p.iotype = UPIO_MEM;
302 p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4500);
303 p.uartclk = binfo->bi_busfreq;
304
305 gen550_init(0, &p);
306
307 memset(&p, 0, sizeof (p));
308 p.iotype = UPIO_MEM;
309 p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4600);
310 p.uartclk = binfo->bi_busfreq;
311
312 gen550_init(1, &p);
313 }
314#endif
315
316 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
317
318 /* setup the PowerPC module struct */
319 ppc_md.setup_arch = mpc834x_sys_setup_arch;
320 ppc_md.show_cpuinfo = mpc834x_sys_show_cpuinfo;
321
322 ppc_md.init_IRQ = mpc834x_sys_init_IRQ;
323 ppc_md.get_irq = ipic_get_irq;
324
325 ppc_md.restart = mpc83xx_restart;
326 ppc_md.power_off = mpc83xx_power_off;
327 ppc_md.halt = mpc83xx_halt;
328
329 ppc_md.find_end_of_memory = mpc83xx_find_end_of_memory;
330 ppc_md.setup_io_mappings = mpc834x_sys_map_io;
331
332 ppc_md.time_init = mpc83xx_time_init;
333 ppc_md.set_rtc_time = NULL;
334 ppc_md.get_rtc_time = NULL;
335 ppc_md.calibrate_decr = mpc83xx_calibrate_decr;
336
337 ppc_md.early_serial_map = mpc83xx_early_serial_map;
338#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
339 ppc_md.progress = gen550_progress;
340#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
341
342 if (ppc_md.progress)
343 ppc_md.progress("mpc834x_sys_init(): exit", 0);
344
345 return;
346}
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.h b/arch/ppc/platforms/83xx/mpc834x_sys.h
deleted file mode 100644
index d2e06c95b083..000000000000
--- a/arch/ppc/platforms/83xx/mpc834x_sys.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/*
2 * MPC834X SYS common board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor, Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __MACH_MPC83XX_SYS_H__
16#define __MACH_MPC83XX_SYS_H__
17
18#include <linux/init.h>
19#include <syslib/ppc83xx_setup.h>
20#include <asm/ppcboot.h>
21
22#define VIRT_IMMRBAR ((uint)0xfe000000)
23
24#define BCSR_PHYS_ADDR ((uint)0xf8000000)
25#define BCSR_SIZE ((uint)(32 * 1024))
26
27#define BCSR_MISC_REG2_OFF 0x07
28#define BCSR_MISC_REG2_PORESET 0x01
29
30#define BCSR_MISC_REG3_OFF 0x08
31#define BCSR_MISC_REG3_CNFLOCK 0x80
32
33#define PIRQA MPC83xx_IRQ_EXT4
34#define PIRQB MPC83xx_IRQ_EXT5
35#define PIRQC MPC83xx_IRQ_EXT6
36#define PIRQD MPC83xx_IRQ_EXT7
37
38#define MPC83xx_PCI1_LOWER_IO 0x00000000
39#define MPC83xx_PCI1_UPPER_IO 0x00ffffff
40#define MPC83xx_PCI1_LOWER_MEM 0x80000000
41#define MPC83xx_PCI1_UPPER_MEM 0x9fffffff
42#define MPC83xx_PCI1_IO_BASE 0xe2000000
43#define MPC83xx_PCI1_MEM_OFFSET 0x00000000
44#define MPC83xx_PCI1_IO_SIZE 0x01000000
45
46#define MPC83xx_PCI2_LOWER_IO 0x00000000
47#define MPC83xx_PCI2_UPPER_IO 0x00ffffff
48#define MPC83xx_PCI2_LOWER_MEM 0xa0000000
49#define MPC83xx_PCI2_UPPER_MEM 0xbfffffff
50#define MPC83xx_PCI2_IO_BASE 0xe3000000
51#define MPC83xx_PCI2_MEM_OFFSET 0x00000000
52#define MPC83xx_PCI2_IO_SIZE 0x01000000
53
54#endif /* __MACH_MPC83XX_SYS_H__ */
diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig
deleted file mode 100644
index 6f2d0add7de6..000000000000
--- a/arch/ppc/platforms/85xx/Kconfig
+++ /dev/null
@@ -1,106 +0,0 @@
1config 85xx
2 bool
3 depends on E500
4 default y
5
6config PPC_INDIRECT_PCI_BE
7 bool
8 depends on 85xx
9 default y
10
11menu "Freescale 85xx options"
12 depends on E500
13
14choice
15 prompt "Machine Type"
16 depends on 85xx
17 default MPC8540_ADS
18
19config MPC8540_ADS
20 bool "Freescale MPC8540 ADS"
21 help
22 This option enables support for the MPC 8540 ADS evaluation board.
23
24config MPC8548_CDS
25 bool "Freescale MPC8548 CDS"
26 help
27 This option enables support for the MPC8548 CDS evaluation board.
28
29config MPC8555_CDS
30 bool "Freescale MPC8555 CDS"
31 help
32 This option enables support for the MPC8555 CDS evaluation board.
33
34config MPC8560_ADS
35 bool "Freescale MPC8560 ADS"
36 help
37 This option enables support for the MPC 8560 ADS evaluation board.
38
39config SBC8560
40 bool "WindRiver PowerQUICC III SBC8560"
41 help
42 This option enables support for the WindRiver PowerQUICC III
43 SBC8560 board.
44
45config STX_GP3
46 bool "Silicon Turnkey Express GP3"
47 help
48 This option enables support for the Silicon Turnkey Express GP3
49 board.
50
51config TQM8540
52 bool "TQ Components TQM8540"
53 help
54 This option enables support for the TQ Components TQM8540 board.
55
56config TQM8541
57 bool "TQ Components TQM8541"
58 help
59 This option enables support for the TQ Components TQM8541 board.
60
61config TQM8555
62 bool "TQ Components TQM8555"
63 help
64 This option enables support for the TQ Components TQM8555 board.
65
66config TQM8560
67 bool "TQ Components TQM8560"
68 help
69 This option enables support for the TQ Components TQM8560 board.
70
71endchoice
72
73# It's often necessary to know the specific 85xx processor type.
74# Fortunately, it is implied (so far) from the board type, so we
75# don't need to ask more redundant questions.
76config MPC8540
77 bool
78 depends on MPC8540_ADS || TQM8540
79 default y
80
81config MPC8548
82 bool
83 depends on MPC8548_CDS
84 default y
85
86config MPC8555
87 bool
88 depends on MPC8555_CDS || TQM8541 || TQM8555
89 default y
90
91config MPC8560
92 bool
93 depends on SBC8560 || MPC8560_ADS || STX_GP3 || TQM8560
94 default y
95
96config 85xx_PCI2
97 bool "Support for 2nd PCI host controller"
98 depends on MPC8555_CDS
99 default y
100
101config PPC_GEN550
102 bool
103 depends on MPC8540 || SBC8560 || MPC8555
104 default y
105
106endmenu
diff --git a/arch/ppc/platforms/85xx/Makefile b/arch/ppc/platforms/85xx/Makefile
deleted file mode 100644
index 6c4753c144d3..000000000000
--- a/arch/ppc/platforms/85xx/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
1#
2# Makefile for the PowerPC 85xx linux kernel.
3#
4obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads_common.o mpc8540_ads.o
5obj-$(CONFIG_MPC8548_CDS) += mpc85xx_cds_common.o
6obj-$(CONFIG_MPC8555_CDS) += mpc85xx_cds_common.o
7obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads_common.o mpc8560_ads.o
8obj-$(CONFIG_SBC8560) += sbc85xx.o sbc8560.o
9obj-$(CONFIG_STX_GP3) += stx_gp3.o
10obj-$(CONFIG_TQM8540) += tqm85xx.o
11obj-$(CONFIG_TQM8541) += tqm85xx.o
12obj-$(CONFIG_TQM8555) += tqm85xx.o
13obj-$(CONFIG_TQM8560) += tqm85xx.o
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
deleted file mode 100644
index 00a3ba57063f..000000000000
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ /dev/null
@@ -1,226 +0,0 @@
1/*
2 * MPC8540ADS board specific routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/stddef.h>
15#include <linux/kernel.h>
16#include <linux/init.h>
17#include <linux/errno.h>
18#include <linux/reboot.h>
19#include <linux/pci.h>
20#include <linux/kdev_t.h>
21#include <linux/major.h>
22#include <linux/console.h>
23#include <linux/delay.h>
24#include <linux/seq_file.h>
25#include <linux/root_dev.h>
26#include <linux/serial.h>
27#include <linux/tty.h> /* for linux/serial_core.h */
28#include <linux/serial_core.h>
29#include <linux/initrd.h>
30#include <linux/module.h>
31#include <linux/fsl_devices.h>
32
33#include <asm/system.h>
34#include <asm/pgtable.h>
35#include <asm/page.h>
36#include <asm/atomic.h>
37#include <asm/time.h>
38#include <asm/io.h>
39#include <asm/machdep.h>
40#include <asm/open_pic.h>
41#include <asm/bootinfo.h>
42#include <asm/pci-bridge.h>
43#include <asm/mpc85xx.h>
44#include <asm/irq.h>
45#include <asm/immap_85xx.h>
46#include <asm/kgdb.h>
47#include <asm/ppc_sys.h>
48#include <mm/mmu_decl.h>
49
50#include <syslib/ppc85xx_setup.h>
51
52/* ************************************************************************
53 *
54 * Setup the architecture
55 *
56 */
57static void __init
58mpc8540ads_setup_arch(void)
59{
60 bd_t *binfo = (bd_t *) __res;
61 unsigned int freq;
62 struct gianfar_platform_data *pdata;
63 struct gianfar_mdio_data *mdata;
64
65 /* get the core frequency */
66 freq = binfo->bi_intfreq;
67
68 if (ppc_md.progress)
69 ppc_md.progress("mpc8540ads_setup_arch()", 0);
70
71 /* Set loops_per_jiffy to a half-way reasonable value,
72 for use until calibrate_delay gets called. */
73 loops_per_jiffy = freq / HZ;
74
75#ifdef CONFIG_PCI
76 /* setup PCI host bridges */
77 mpc85xx_setup_hose();
78#endif
79
80#ifdef CONFIG_SERIAL_8250
81 mpc85xx_early_serial_map();
82#endif
83
84#ifdef CONFIG_SERIAL_TEXT_DEBUG
85 /* Invalidate the entry we stole earlier the serial ports
86 * should be properly mapped */
87 invalidate_tlbcam_entry(num_tlbcam_entries - 1);
88#endif
89
90 /* setup the board related info for the MDIO bus */
91 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC85xx_MDIO);
92
93 mdata->irq[0] = MPC85xx_IRQ_EXT5;
94 mdata->irq[1] = MPC85xx_IRQ_EXT5;
95 mdata->irq[2] = PHY_POLL;
96 mdata->irq[3] = MPC85xx_IRQ_EXT5;
97 mdata->irq[31] = PHY_POLL;
98
99 /* setup the board related information for the enet controllers */
100 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
101 if (pdata) {
102 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
103 pdata->bus_id = 0;
104 pdata->phy_id = 0;
105 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
106 }
107
108 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
109 if (pdata) {
110 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
111 pdata->bus_id = 0;
112 pdata->phy_id = 1;
113 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
114 }
115
116 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
117 if (pdata) {
118 pdata->board_flags = 0;
119 pdata->bus_id = 0;
120 pdata->phy_id = 3;
121 memcpy(pdata->mac_addr, binfo->bi_enet2addr, 6);
122 }
123
124#ifdef CONFIG_BLK_DEV_INITRD
125 if (initrd_start)
126 ROOT_DEV = Root_RAM0;
127 else
128#endif
129#ifdef CONFIG_ROOT_NFS
130 ROOT_DEV = Root_NFS;
131#else
132 ROOT_DEV = Root_HDA1;
133#endif
134}
135
136/* ************************************************************************ */
137void __init
138platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
139 unsigned long r6, unsigned long r7)
140{
141 /* parse_bootinfo must always be called first */
142 parse_bootinfo(find_bootinfo());
143
144 /*
145 * If we were passed in a board information, copy it into the
146 * residual data area.
147 */
148 if (r3) {
149 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
150 sizeof (bd_t));
151 }
152#ifdef CONFIG_SERIAL_TEXT_DEBUG
153 {
154 bd_t *binfo = (bd_t *) __res;
155 struct uart_port p;
156
157 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
158 settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
159 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
160
161 memset(&p, 0, sizeof (p));
162 p.iotype = UPIO_MEM;
163 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
164 p.uartclk = binfo->bi_busfreq;
165
166 gen550_init(0, &p);
167
168 memset(&p, 0, sizeof (p));
169 p.iotype = UPIO_MEM;
170 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
171 p.uartclk = binfo->bi_busfreq;
172
173 gen550_init(1, &p);
174 }
175#endif
176
177#if defined(CONFIG_BLK_DEV_INITRD)
178 /*
179 * If the init RAM disk has been configured in, and there's a valid
180 * starting address for it, set it up.
181 */
182 if (r4) {
183 initrd_start = r4 + KERNELBASE;
184 initrd_end = r5 + KERNELBASE;
185 }
186#endif /* CONFIG_BLK_DEV_INITRD */
187
188 /* Copy the kernel command line arguments to a safe place. */
189
190 if (r6) {
191 *(char *) (r7 + KERNELBASE) = 0;
192 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
193 }
194
195 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
196
197 /* setup the PowerPC module struct */
198 ppc_md.setup_arch = mpc8540ads_setup_arch;
199 ppc_md.show_cpuinfo = mpc85xx_ads_show_cpuinfo;
200
201 ppc_md.init_IRQ = mpc85xx_ads_init_IRQ;
202 ppc_md.get_irq = openpic_get_irq;
203
204 ppc_md.restart = mpc85xx_restart;
205 ppc_md.power_off = mpc85xx_power_off;
206 ppc_md.halt = mpc85xx_halt;
207
208 ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
209
210 ppc_md.time_init = NULL;
211 ppc_md.set_rtc_time = NULL;
212 ppc_md.get_rtc_time = NULL;
213 ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
214
215#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
216 ppc_md.progress = gen550_progress;
217#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
218#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
219 ppc_md.early_serial_map = mpc85xx_early_serial_map;
220#endif /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
221
222 if (ppc_md.progress)
223 ppc_md.progress("mpc8540ads_init(): exit", 0);
224
225 return;
226}
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.h b/arch/ppc/platforms/85xx/mpc8540_ads.h
deleted file mode 100644
index 7559f9e6fc28..000000000000
--- a/arch/ppc/platforms/85xx/mpc8540_ads.h
+++ /dev/null
@@ -1,22 +0,0 @@
1/*
2 * MPC8540ADS board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __MACH_MPC8540ADS_H__
16#define __MACH_MPC8540ADS_H__
17
18#include <linux/initrd.h>
19#include <syslib/ppc85xx_setup.h>
20#include <platforms/85xx/mpc85xx_ads_common.h>
21
22#endif /* __MACH_MPC8540ADS_H__ */
diff --git a/arch/ppc/platforms/85xx/mpc8555_cds.h b/arch/ppc/platforms/85xx/mpc8555_cds.h
deleted file mode 100644
index 4f79c372c4e7..000000000000
--- a/arch/ppc/platforms/85xx/mpc8555_cds.h
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2 * MPC8555CDS board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __MACH_MPC8555CDS_H__
16#define __MACH_MPC8555CDS_H__
17
18#include <syslib/ppc85xx_setup.h>
19#include <platforms/85xx/mpc85xx_cds_common.h>
20
21#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
22
23#endif /* __MACH_MPC8555CDS_H__ */
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
deleted file mode 100644
index 3a060468dd95..000000000000
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ /dev/null
@@ -1,303 +0,0 @@
1/*
2 * MPC8560ADS board specific routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/stddef.h>
15#include <linux/kernel.h>
16#include <linux/init.h>
17#include <linux/errno.h>
18#include <linux/reboot.h>
19#include <linux/pci.h>
20#include <linux/kdev_t.h>
21#include <linux/major.h>
22#include <linux/console.h>
23#include <linux/delay.h>
24#include <linux/seq_file.h>
25#include <linux/root_dev.h>
26#include <linux/serial.h>
27#include <linux/tty.h> /* for linux/serial_core.h */
28#include <linux/serial_core.h>
29#include <linux/initrd.h>
30#include <linux/module.h>
31#include <linux/fsl_devices.h>
32#include <linux/fs_enet_pd.h>
33
34#include <asm/system.h>
35#include <asm/pgtable.h>
36#include <asm/page.h>
37#include <asm/atomic.h>
38#include <asm/time.h>
39#include <asm/io.h>
40#include <asm/machdep.h>
41#include <asm/open_pic.h>
42#include <asm/bootinfo.h>
43#include <asm/pci-bridge.h>
44#include <asm/mpc85xx.h>
45#include <asm/irq.h>
46#include <asm/immap_85xx.h>
47#include <asm/kgdb.h>
48#include <asm/ppc_sys.h>
49#include <asm/cpm2.h>
50#include <mm/mmu_decl.h>
51
52#include <syslib/cpm2_pic.h>
53#include <syslib/ppc85xx_common.h>
54#include <syslib/ppc85xx_setup.h>
55
56
57/* ************************************************************************
58 *
59 * Setup the architecture
60 *
61 */
62static void init_fcc_ioports(void)
63{
64 struct immap *immap;
65 struct io_port *io;
66 u32 tempval;
67
68 immap = cpm2_immr;
69
70 io = &immap->im_ioport;
71 /* FCC2/3 are on the ports B/C. */
72 tempval = in_be32(&io->iop_pdirb);
73 tempval &= ~PB2_DIRB0;
74 tempval |= PB2_DIRB1;
75 out_be32(&io->iop_pdirb, tempval);
76
77 tempval = in_be32(&io->iop_psorb);
78 tempval &= ~PB2_PSORB0;
79 tempval |= PB2_PSORB1;
80 out_be32(&io->iop_psorb, tempval);
81
82 tempval = in_be32(&io->iop_pparb);
83 tempval |= (PB2_DIRB0 | PB2_DIRB1);
84 out_be32(&io->iop_pparb, tempval);
85
86 tempval = in_be32(&io->iop_pdirb);
87 tempval &= ~PB3_DIRB0;
88 tempval |= PB3_DIRB1;
89 out_be32(&io->iop_pdirb, tempval);
90
91 tempval = in_be32(&io->iop_psorb);
92 tempval &= ~PB3_PSORB0;
93 tempval |= PB3_PSORB1;
94 out_be32(&io->iop_psorb, tempval);
95
96 tempval = in_be32(&io->iop_pparb);
97 tempval |= (PB3_DIRB0 | PB3_DIRB1);
98 out_be32(&io->iop_pparb, tempval);
99
100 tempval = in_be32(&io->iop_pdirc);
101 tempval |= PC3_DIRC1;
102 out_be32(&io->iop_pdirc, tempval);
103
104 tempval = in_be32(&io->iop_pparc);
105 tempval |= PC3_DIRC1;
106 out_be32(&io->iop_pparc, tempval);
107
108 /* Port C has clocks...... */
109 tempval = in_be32(&io->iop_psorc);
110 tempval &= ~(CLK_TRX);
111 out_be32(&io->iop_psorc, tempval);
112
113 tempval = in_be32(&io->iop_pdirc);
114 tempval &= ~(CLK_TRX);
115 out_be32(&io->iop_pdirc, tempval);
116 tempval = in_be32(&io->iop_pparc);
117 tempval |= (CLK_TRX);
118 out_be32(&io->iop_pparc, tempval);
119
120 /* Configure Serial Interface clock routing.
121 * First, clear all FCC bits to zero,
122 * then set the ones we want.
123 */
124 immap->im_cpmux.cmx_fcr &= ~(CPMUX_CLK_MASK);
125 immap->im_cpmux.cmx_fcr |= CPMUX_CLK_ROUTE;
126}
127
128static void __init
129mpc8560ads_setup_arch(void)
130{
131 bd_t *binfo = (bd_t *) __res;
132 unsigned int freq;
133 struct gianfar_platform_data *pdata;
134 struct gianfar_mdio_data *mdata;
135 struct fs_platform_info *fpi;
136
137 cpm2_reset();
138
139 /* get the core frequency */
140 freq = binfo->bi_intfreq;
141
142 if (ppc_md.progress)
143 ppc_md.progress("mpc8560ads_setup_arch()", 0);
144
145 /* Set loops_per_jiffy to a half-way reasonable value,
146 for use until calibrate_delay gets called. */
147 loops_per_jiffy = freq / HZ;
148
149#ifdef CONFIG_PCI
150 /* setup PCI host bridges */
151 mpc85xx_setup_hose();
152#endif
153
154 /* setup the board related info for the MDIO bus */
155 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC85xx_MDIO);
156
157 mdata->irq[0] = MPC85xx_IRQ_EXT5;
158 mdata->irq[1] = MPC85xx_IRQ_EXT5;
159 mdata->irq[2] = PHY_POLL;
160 mdata->irq[3] = MPC85xx_IRQ_EXT5;
161 mdata->irq[31] = PHY_POLL;
162
163 /* setup the board related information for the enet controllers */
164 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
165 if (pdata) {
166 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
167 pdata->bus_id = 0;
168 pdata->phy_id = 0;
169 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
170 }
171
172 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
173 if (pdata) {
174 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
175 pdata->bus_id = 0;
176 pdata->phy_id = 1;
177 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
178 }
179
180 init_fcc_ioports();
181 ppc_sys_device_remove(MPC85xx_CPM_FCC1);
182
183 fpi = (struct fs_platform_info *) ppc_sys_get_pdata(MPC85xx_CPM_FCC2);
184 if (fpi) {
185 memcpy(fpi->macaddr, binfo->bi_enet2addr, 6);
186 fpi->bus_id = "0:02";
187 fpi->phy_addr = 2;
188 fpi->dpram_offset = (u32)cpm2_immr->im_dprambase;
189 fpi->fcc_regs_c = (u32)&cpm2_immr->im_fcc_c[1];
190 }
191
192 fpi = (struct fs_platform_info *) ppc_sys_get_pdata(MPC85xx_CPM_FCC3);
193 if (fpi) {
194 memcpy(fpi->macaddr, binfo->bi_enet2addr, 6);
195 fpi->macaddr[5] += 1;
196 fpi->bus_id = "0:03";
197 fpi->phy_addr = 3;
198 fpi->dpram_offset = (u32)cpm2_immr->im_dprambase;
199 fpi->fcc_regs_c = (u32)&cpm2_immr->im_fcc_c[2];
200 }
201
202#ifdef CONFIG_BLK_DEV_INITRD
203 if (initrd_start)
204 ROOT_DEV = Root_RAM0;
205 else
206#endif
207#ifdef CONFIG_ROOT_NFS
208 ROOT_DEV = Root_NFS;
209#else
210 ROOT_DEV = Root_HDA1;
211#endif
212}
213
214static irqreturn_t cpm2_cascade(int irq, void *dev_id)
215{
216 while ((irq = cpm2_get_irq()) >= 0)
217 __do_IRQ(irq);
218 return IRQ_HANDLED;
219}
220
221static struct irqaction cpm2_irqaction = {
222 .handler = cpm2_cascade,
223 .flags = IRQF_DISABLED,
224 .mask = CPU_MASK_NONE,
225 .name = "cpm2_cascade",
226};
227
228static void __init
229mpc8560_ads_init_IRQ(void)
230{
231 /* Setup OpenPIC */
232 mpc85xx_ads_init_IRQ();
233
234 /* Setup CPM2 PIC */
235 cpm2_init_IRQ();
236
237 setup_irq(MPC85xx_IRQ_CPM, &cpm2_irqaction);
238
239 return;
240}
241
242
243
244/* ************************************************************************ */
245void __init
246platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
247 unsigned long r6, unsigned long r7)
248{
249 /* parse_bootinfo must always be called first */
250 parse_bootinfo(find_bootinfo());
251
252 /*
253 * If we were passed in a board information, copy it into the
254 * residual data area.
255 */
256 if (r3) {
257 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
258 sizeof (bd_t));
259
260 }
261#if defined(CONFIG_BLK_DEV_INITRD)
262 /*
263 * If the init RAM disk has been configured in, and there's a valid
264 * starting address for it, set it up.
265 */
266 if (r4) {
267 initrd_start = r4 + KERNELBASE;
268 initrd_end = r5 + KERNELBASE;
269 }
270#endif /* CONFIG_BLK_DEV_INITRD */
271
272 /* Copy the kernel command line arguments to a safe place. */
273
274 if (r6) {
275 *(char *) (r7 + KERNELBASE) = 0;
276 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
277 }
278
279 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
280
281 /* setup the PowerPC module struct */
282 ppc_md.setup_arch = mpc8560ads_setup_arch;
283 ppc_md.show_cpuinfo = mpc85xx_ads_show_cpuinfo;
284
285 ppc_md.init_IRQ = mpc8560_ads_init_IRQ;
286 ppc_md.get_irq = openpic_get_irq;
287
288 ppc_md.restart = mpc85xx_restart;
289 ppc_md.power_off = mpc85xx_power_off;
290 ppc_md.halt = mpc85xx_halt;
291
292 ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
293
294 ppc_md.time_init = NULL;
295 ppc_md.set_rtc_time = NULL;
296 ppc_md.get_rtc_time = NULL;
297 ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
298
299 if (ppc_md.progress)
300 ppc_md.progress("mpc8560ads_init(): exit", 0);
301
302 return;
303}
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.h b/arch/ppc/platforms/85xx/mpc8560_ads.h
deleted file mode 100644
index 9f185ab2e019..000000000000
--- a/arch/ppc/platforms/85xx/mpc8560_ads.h
+++ /dev/null
@@ -1,24 +0,0 @@
1/*
2 * MPC8540ADS board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __MACH_MPC8560ADS_H
16#define __MACH_MPC8560ADS_H
17
18#include <syslib/ppc85xx_setup.h>
19#include <platforms/85xx/mpc85xx_ads_common.h>
20
21#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
22#define PHY_INTERRUPT MPC85xx_IRQ_EXT7
23
24#endif /* __MACH_MPC8560ADS_H */
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
deleted file mode 100644
index 0706dca5a8ea..000000000000
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
+++ /dev/null
@@ -1,197 +0,0 @@
1/*
2 * MPC85xx ADS board common routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/stddef.h>
15#include <linux/kernel.h>
16#include <linux/init.h>
17#include <linux/errno.h>
18#include <linux/reboot.h>
19#include <linux/pci.h>
20#include <linux/kdev_t.h>
21#include <linux/major.h>
22#include <linux/console.h>
23#include <linux/delay.h>
24#include <linux/seq_file.h>
25#include <linux/serial.h>
26#include <linux/module.h>
27
28#include <asm/system.h>
29#include <asm/pgtable.h>
30#include <asm/page.h>
31#include <asm/atomic.h>
32#include <asm/time.h>
33#include <asm/io.h>
34#include <asm/machdep.h>
35#include <asm/open_pic.h>
36#include <asm/bootinfo.h>
37#include <asm/pci-bridge.h>
38#include <asm/mpc85xx.h>
39#include <asm/irq.h>
40#include <asm/immap_85xx.h>
41#include <asm/ppc_sys.h>
42
43#include <mm/mmu_decl.h>
44
45#include <platforms/85xx/mpc85xx_ads_common.h>
46
47#ifndef CONFIG_PCI
48unsigned long isa_io_base = 0;
49unsigned long isa_mem_base = 0;
50#endif
51
52extern unsigned long total_memory; /* in mm/init */
53
54unsigned char __res[sizeof (bd_t)];
55
56/* Internal interrupts are all Level Sensitive, and Positive Polarity */
57static u_char mpc85xx_ads_openpic_initsenses[] __initdata = {
58 MPC85XX_INTERNAL_IRQ_SENSES,
59 0x0, /* External 0: */
60#if defined(CONFIG_PCI)
61 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 1: PCI slot 0 */
62 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 2: PCI slot 1 */
63 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 3: PCI slot 2 */
64 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 4: PCI slot 3 */
65#else
66 0x0, /* External 1: */
67 0x0, /* External 2: */
68 0x0, /* External 3: */
69 0x0, /* External 4: */
70#endif
71 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 5: PHY */
72 0x0, /* External 6: */
73 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 7: PHY */
74 0x0, /* External 8: */
75 0x0, /* External 9: */
76 0x0, /* External 10: */
77 0x0, /* External 11: */
78};
79
80/* ************************************************************************ */
81int
82mpc85xx_ads_show_cpuinfo(struct seq_file *m)
83{
84 uint pvid, svid, phid1;
85 uint memsize = total_memory;
86 bd_t *binfo = (bd_t *) __res;
87 unsigned int freq;
88
89 /* get the core frequency */
90 freq = binfo->bi_intfreq;
91
92 pvid = mfspr(SPRN_PVR);
93 svid = mfspr(SPRN_SVR);
94
95 seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
96 seq_printf(m, "Machine\t\t: mpc%sads\n", cur_ppc_sys_spec->ppc_sys_name);
97 seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
98 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
99 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
100
101 /* Display cpu Pll setting */
102 phid1 = mfspr(SPRN_HID1);
103 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
104
105 /* Display the amount of memory */
106 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
107
108 return 0;
109}
110
111void __init
112mpc85xx_ads_init_IRQ(void)
113{
114 bd_t *binfo = (bd_t *) __res;
115 /* Determine the Physical Address of the OpenPIC regs */
116 phys_addr_t OpenPIC_PAddr =
117 binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
118 OpenPIC_Addr = ioremap(OpenPIC_PAddr, MPC85xx_OPENPIC_SIZE);
119 OpenPIC_InitSenses = mpc85xx_ads_openpic_initsenses;
120 OpenPIC_NumInitSenses = sizeof (mpc85xx_ads_openpic_initsenses);
121
122 /* Skip reserved space and internal sources */
123 openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
124 /* Map PIC IRQs 0-11 */
125 openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
126
127 /* we let openpic interrupts starting from an offset, to
128 * leave space for cascading interrupts underneath.
129 */
130 openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
131
132 return;
133}
134
135#ifdef CONFIG_PCI
136/*
137 * interrupt routing
138 */
139
140int
141mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
142{
143 static char pci_irq_table[][4] =
144 /*
145 * This is little evil, but works around the fact
146 * that revA boards have IDSEL starting at 18
147 * and others boards (older) start at 12
148 *
149 * PCI IDSEL/INTPIN->INTLINE
150 * A B C D
151 */
152 {
153 {PIRQA, PIRQB, PIRQC, PIRQD}, /* IDSEL 2 */
154 {PIRQD, PIRQA, PIRQB, PIRQC},
155 {PIRQC, PIRQD, PIRQA, PIRQB},
156 {PIRQB, PIRQC, PIRQD, PIRQA}, /* IDSEL 5 */
157 {0, 0, 0, 0}, /* -- */
158 {0, 0, 0, 0}, /* -- */
159 {0, 0, 0, 0}, /* -- */
160 {0, 0, 0, 0}, /* -- */
161 {0, 0, 0, 0}, /* -- */
162 {0, 0, 0, 0}, /* -- */
163 {PIRQA, PIRQB, PIRQC, PIRQD}, /* IDSEL 12 */
164 {PIRQD, PIRQA, PIRQB, PIRQC},
165 {PIRQC, PIRQD, PIRQA, PIRQB},
166 {PIRQB, PIRQC, PIRQD, PIRQA}, /* IDSEL 15 */
167 {0, 0, 0, 0}, /* -- */
168 {0, 0, 0, 0}, /* -- */
169 {PIRQA, PIRQB, PIRQC, PIRQD}, /* IDSEL 18 */
170 {PIRQD, PIRQA, PIRQB, PIRQC},
171 {PIRQC, PIRQD, PIRQA, PIRQB},
172 {PIRQB, PIRQC, PIRQD, PIRQA}, /* IDSEL 21 */
173 };
174
175 const long min_idsel = 2, max_idsel = 21, irqs_per_slot = 4;
176 return PCI_IRQ_TABLE_LOOKUP;
177}
178
179int
180mpc85xx_exclude_device(u_char bus, u_char devfn)
181{
182 if (bus == 0 && PCI_SLOT(devfn) == 0)
183 return PCIBIOS_DEVICE_NOT_FOUND;
184 else
185 return PCIBIOS_SUCCESSFUL;
186}
187
188#endif /* CONFIG_PCI */
189
190#ifdef CONFIG_RAPIDIO
191extern void mpc85xx_rio_setup(int law_start, int law_size);
192void platform_rio_init(void)
193{
194 /* 512MB RIO LAW at 0xc0000000 */
195 mpc85xx_rio_setup(0xc0000000, 0x20000000);
196}
197#endif /* CONFIG_RAPIDIO */
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
deleted file mode 100644
index c8c322fe3680..000000000000
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
+++ /dev/null
@@ -1,67 +0,0 @@
1/*
2 * MPC85XX ADS common board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __MACH_MPC85XX_ADS_H__
16#define __MACH_MPC85XX_ADS_H__
17
18#include <linux/init.h>
19#include <asm/ppcboot.h>
20
21#define BOARD_CCSRBAR ((uint)0xe0000000)
22#define BCSR_ADDR ((uint)0xf8000000)
23#define BCSR_SIZE ((uint)(32 * 1024))
24
25struct seq_file;
26
27extern int mpc85xx_ads_show_cpuinfo(struct seq_file *m);
28extern void mpc85xx_ads_init_IRQ(void) __init;
29extern void mpc85xx_ads_map_io(void) __init;
30
31/* PCI interrupt controller */
32#define PIRQA MPC85xx_IRQ_EXT1
33#define PIRQB MPC85xx_IRQ_EXT2
34#define PIRQC MPC85xx_IRQ_EXT3
35#define PIRQD MPC85xx_IRQ_EXT4
36
37#define MPC85XX_PCI1_LOWER_IO 0x00000000
38#define MPC85XX_PCI1_UPPER_IO 0x00ffffff
39
40#define MPC85XX_PCI1_LOWER_MEM 0x80000000
41#define MPC85XX_PCI1_UPPER_MEM 0x9fffffff
42
43#define MPC85XX_PCI1_IO_BASE 0xe2000000
44#define MPC85XX_PCI1_MEM_OFFSET 0x00000000
45
46#define MPC85XX_PCI1_IO_SIZE 0x01000000
47
48/* FCC1 Clock Source Configuration. These can be
49 * redefined in the board specific file.
50 * Can only choose from CLK9-12 */
51#define F1_RXCLK 12
52#define F1_TXCLK 11
53
54/* FCC2 Clock Source Configuration. These can be
55 * redefined in the board specific file.
56 * Can only choose from CLK13-16 */
57#define F2_RXCLK 13
58#define F2_TXCLK 14
59
60/* FCC3 Clock Source Configuration. These can be
61 * redefined in the board specific file.
62 * Can only choose from CLK13-16 */
63#define F3_RXCLK 15
64#define F3_TXCLK 16
65
66
67#endif /* __MACH_MPC85XX_ADS_H__ */
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
deleted file mode 100644
index 2d59eb776c95..000000000000
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ /dev/null
@@ -1,601 +0,0 @@
1/*
2 * MPC85xx CDS board specific routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor, Inc
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/stddef.h>
15#include <linux/kernel.h>
16#include <linux/init.h>
17#include <linux/errno.h>
18#include <linux/reboot.h>
19#include <linux/pci.h>
20#include <linux/kdev_t.h>
21#include <linux/major.h>
22#include <linux/console.h>
23#include <linux/delay.h>
24#include <linux/seq_file.h>
25#include <linux/serial.h>
26#include <linux/module.h>
27#include <linux/root_dev.h>
28#include <linux/initrd.h>
29#include <linux/tty.h>
30#include <linux/serial_core.h>
31#include <linux/fsl_devices.h>
32
33#include <asm/system.h>
34#include <asm/pgtable.h>
35#include <asm/page.h>
36#include <asm/atomic.h>
37#include <asm/time.h>
38#include <asm/todc.h>
39#include <asm/io.h>
40#include <asm/machdep.h>
41#include <asm/open_pic.h>
42#include <asm/i8259.h>
43#include <asm/bootinfo.h>
44#include <asm/pci-bridge.h>
45#include <asm/mpc85xx.h>
46#include <asm/irq.h>
47#include <asm/immap_85xx.h>
48#include <asm/cpm2.h>
49#include <asm/ppc_sys.h>
50#include <asm/kgdb.h>
51
52#include <mm/mmu_decl.h>
53#include <syslib/cpm2_pic.h>
54#include <syslib/ppc85xx_common.h>
55#include <syslib/ppc85xx_setup.h>
56
57
58#ifndef CONFIG_PCI
59unsigned long isa_io_base = 0;
60unsigned long isa_mem_base = 0;
61#endif
62
63extern unsigned long total_memory; /* in mm/init */
64
65unsigned char __res[sizeof (bd_t)];
66
67static int cds_pci_slot = 2;
68static volatile u8 * cadmus;
69
70/* Internal interrupts are all Level Sensitive, and Positive Polarity */
71static u_char mpc85xx_cds_openpic_initsenses[] __initdata = {
72 MPC85XX_INTERNAL_IRQ_SENSES,
73#if defined(CONFIG_PCI)
74 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 0: PCI1 slot */
75 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 1: PCI1 slot */
76 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 2: PCI1 slot */
77 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 3: PCI1 slot */
78#else
79 0x0, /* External 0: */
80 0x0, /* External 1: */
81 0x0, /* External 2: */
82 0x0, /* External 3: */
83#endif
84 0x0, /* External 4: */
85 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 5: PHY */
86 0x0, /* External 6: */
87 0x0, /* External 7: */
88 0x0, /* External 8: */
89 0x0, /* External 9: */
90 0x0, /* External 10: */
91#if defined(CONFIG_85xx_PCI2) && defined(CONFIG_PCI)
92 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 11: PCI2 slot 0 */
93#else
94 0x0, /* External 11: */
95#endif
96};
97
98/* ************************************************************************ */
99int
100mpc85xx_cds_show_cpuinfo(struct seq_file *m)
101{
102 uint pvid, svid, phid1;
103 uint memsize = total_memory;
104 bd_t *binfo = (bd_t *) __res;
105 unsigned int freq;
106
107 /* get the core frequency */
108 freq = binfo->bi_intfreq;
109
110 pvid = mfspr(SPRN_PVR);
111 svid = mfspr(SPRN_SVR);
112
113 seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
114 seq_printf(m, "Machine\t\t: CDS - MPC%s (%x)\n", cur_ppc_sys_spec->ppc_sys_name, cadmus[CM_VER]);
115 seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
116 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
117 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
118
119 /* Display cpu Pll setting */
120 phid1 = mfspr(SPRN_HID1);
121 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
122
123 /* Display the amount of memory */
124 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
125
126 return 0;
127}
128
129#ifdef CONFIG_CPM2
130static irqreturn_t cpm2_cascade(int irq, void *dev_id)
131{
132 while((irq = cpm2_get_irq()) >= 0)
133 __do_IRQ(irq);
134 return IRQ_HANDLED;
135}
136
137static struct irqaction cpm2_irqaction = {
138 .handler = cpm2_cascade,
139 .flags = IRQF_DISABLED,
140 .mask = CPU_MASK_NONE,
141 .name = "cpm2_cascade",
142};
143#endif /* CONFIG_CPM2 */
144
145void __init
146mpc85xx_cds_init_IRQ(void)
147{
148 bd_t *binfo = (bd_t *) __res;
149 int i;
150
151 /* Determine the Physical Address of the OpenPIC regs */
152 phys_addr_t OpenPIC_PAddr = binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
153 OpenPIC_Addr = ioremap(OpenPIC_PAddr, MPC85xx_OPENPIC_SIZE);
154 OpenPIC_InitSenses = mpc85xx_cds_openpic_initsenses;
155 OpenPIC_NumInitSenses = sizeof (mpc85xx_cds_openpic_initsenses);
156
157 /* Skip reserved space and internal sources */
158#ifdef CONFIG_MPC8548
159 openpic_set_sources(0, 48, OpenPIC_Addr + 0x10200);
160#else
161 openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
162#endif
163 /* Map PIC IRQs 0-11 */
164 openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
165
166 /* we let openpic interrupts starting from an offset, to
167 * leave space for cascading interrupts underneath.
168 */
169 openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
170
171#ifdef CONFIG_PCI
172 openpic_hookup_cascade(PIRQ0A, "82c59 cascade", i8259_irq);
173
174 i8259_init(0, 0);
175#endif
176
177#ifdef CONFIG_CPM2
178 /* Setup CPM2 PIC */
179 cpm2_init_IRQ();
180
181 setup_irq(MPC85xx_IRQ_CPM, &cpm2_irqaction);
182#endif
183
184 return;
185}
186
187#ifdef CONFIG_PCI
188/*
189 * interrupt routing
190 */
191int
192mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
193{
194 struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
195
196 if (!hose->index)
197 {
198 /* Handle PCI1 interrupts */
199 char pci_irq_table[][4] =
200 /*
201 * PCI IDSEL/INTPIN->INTLINE
202 * A B C D
203 */
204
205 /* Note IRQ assignment for slots is based on which slot the elysium is
206 * in -- in this setup elysium is in slot #2 (this PIRQA as first
207 * interrupt on slot */
208 {
209 { 0, 1, 2, 3 }, /* 16 - PMC */
210 { 0, 1, 2, 3 }, /* 17 P2P (Tsi320) */
211 { 0, 1, 2, 3 }, /* 18 - Slot 1 */
212 { 1, 2, 3, 0 }, /* 19 - Slot 2 */
213 { 2, 3, 0, 1 }, /* 20 - Slot 3 */
214 { 3, 0, 1, 2 }, /* 21 - Slot 4 */
215 };
216
217 const long min_idsel = 16, max_idsel = 21, irqs_per_slot = 4;
218 int i, j;
219
220 for (i = 0; i < 6; i++)
221 for (j = 0; j < 4; j++)
222 pci_irq_table[i][j] =
223 ((pci_irq_table[i][j] + 5 -
224 cds_pci_slot) & 0x3) + PIRQ0A;
225
226 return PCI_IRQ_TABLE_LOOKUP;
227 } else {
228 /* Handle PCI2 interrupts (if we have one) */
229 char pci_irq_table[][4] =
230 {
231 /*
232 * We only have one slot and one interrupt
233 * going to PIRQA - PIRQD */
234 { PIRQ1A, PIRQ1A, PIRQ1A, PIRQ1A }, /* 21 - slot 0 */
235 };
236
237 const long min_idsel = 21, max_idsel = 21, irqs_per_slot = 4;
238
239 return PCI_IRQ_TABLE_LOOKUP;
240 }
241}
242
243#define ARCADIA_HOST_BRIDGE_IDSEL 17
244#define ARCADIA_2ND_BRIDGE_IDSEL 3
245
246extern int mpc85xx_pci1_last_busno;
247
248int
249mpc85xx_exclude_device(u_char bus, u_char devfn)
250{
251 if (bus == 0 && PCI_SLOT(devfn) == 0)
252 return PCIBIOS_DEVICE_NOT_FOUND;
253#ifdef CONFIG_85xx_PCI2
254 if (mpc85xx_pci1_last_busno)
255 if (bus == (mpc85xx_pci1_last_busno + 1) && PCI_SLOT(devfn) == 0)
256 return PCIBIOS_DEVICE_NOT_FOUND;
257#endif
258 /* We explicitly do not go past the Tundra 320 Bridge */
259 if ((bus == 1) && (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))
260 return PCIBIOS_DEVICE_NOT_FOUND;
261 if ((bus == 0) && (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))
262 return PCIBIOS_DEVICE_NOT_FOUND;
263 else
264 return PCIBIOS_SUCCESSFUL;
265}
266
267void __init
268mpc85xx_cds_enable_via(struct pci_controller *hose)
269{
270 u32 pci_class;
271 u16 vid, did;
272
273 early_read_config_dword(hose, 0, 0x88, PCI_CLASS_REVISION, &pci_class);
274 if ((pci_class >> 16) != PCI_CLASS_BRIDGE_PCI)
275 return;
276
277 /* Configure P2P so that we can reach bus 1 */
278 early_write_config_byte(hose, 0, 0x88, PCI_PRIMARY_BUS, 0);
279 early_write_config_byte(hose, 0, 0x88, PCI_SECONDARY_BUS, 1);
280 early_write_config_byte(hose, 0, 0x88, PCI_SUBORDINATE_BUS, 0xff);
281
282 early_read_config_word(hose, 1, 0x10, PCI_VENDOR_ID, &vid);
283 early_read_config_word(hose, 1, 0x10, PCI_DEVICE_ID, &did);
284
285 if ((vid != PCI_VENDOR_ID_VIA) ||
286 (did != PCI_DEVICE_ID_VIA_82C686))
287 return;
288
289 /* Enable USB and IDE functions */
290 early_write_config_byte(hose, 1, 0x10, 0x48, 0x08);
291}
292
293void __init
294mpc85xx_cds_fixup_via(struct pci_controller *hose)
295{
296 u32 pci_class;
297 u16 vid, did;
298
299 early_read_config_dword(hose, 0, 0x88, PCI_CLASS_REVISION, &pci_class);
300 if ((pci_class >> 16) != PCI_CLASS_BRIDGE_PCI)
301 return;
302
303 /*
304 * Force the backplane P2P bridge to have a window
305 * open from 0x00000000-0x00001fff in PCI I/O space.
306 * This allows legacy I/O (i8259, etc) on the VIA
307 * southbridge to be accessed.
308 */
309 early_write_config_byte(hose, 0, 0x88, PCI_IO_BASE, 0x00);
310 early_write_config_word(hose, 0, 0x88, PCI_IO_BASE_UPPER16, 0x0000);
311 early_write_config_byte(hose, 0, 0x88, PCI_IO_LIMIT, 0x10);
312 early_write_config_word(hose, 0, 0x88, PCI_IO_LIMIT_UPPER16, 0x0000);
313
314 early_read_config_word(hose, 1, 0x10, PCI_VENDOR_ID, &vid);
315 early_read_config_word(hose, 1, 0x10, PCI_DEVICE_ID, &did);
316 if ((vid != PCI_VENDOR_ID_VIA) ||
317 (did != PCI_DEVICE_ID_VIA_82C686))
318 return;
319
320 /*
321 * Since the P2P window was forced to cover the fixed
322 * legacy I/O addresses, it is necessary to manually
323 * place the base addresses for the IDE and USB functions
324 * within this window.
325 */
326 /* Function 1, IDE */
327 early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_0, 0x1ff8);
328 early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_1, 0x1ff4);
329 early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_2, 0x1fe8);
330 early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_3, 0x1fe4);
331 early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_4, 0x1fd0);
332
333 /* Function 2, USB ports 0-1 */
334 early_write_config_dword(hose, 1, 0x12, PCI_BASE_ADDRESS_4, 0x1fa0);
335
336 /* Function 3, USB ports 2-3 */
337 early_write_config_dword(hose, 1, 0x13, PCI_BASE_ADDRESS_4, 0x1f80);
338
339 /* Function 5, Power Management */
340 early_write_config_dword(hose, 1, 0x15, PCI_BASE_ADDRESS_0, 0x1e00);
341 early_write_config_dword(hose, 1, 0x15, PCI_BASE_ADDRESS_1, 0x1dfc);
342 early_write_config_dword(hose, 1, 0x15, PCI_BASE_ADDRESS_2, 0x1df8);
343
344 /* Function 6, AC97 Interface */
345 early_write_config_dword(hose, 1, 0x16, PCI_BASE_ADDRESS_0, 0x1c00);
346}
347
348void __init
349mpc85xx_cds_pcibios_fixup(void)
350{
351 struct pci_dev *dev;
352 u_char c;
353
354 if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
355 PCI_DEVICE_ID_VIA_82C586_1, NULL))) {
356 /*
357 * U-Boot does not set the enable bits
358 * for the IDE device. Force them on here.
359 */
360 pci_read_config_byte(dev, 0x40, &c);
361 c |= 0x03; /* IDE: Chip Enable Bits */
362 pci_write_config_byte(dev, 0x40, c);
363
364 /*
365 * Since only primary interface works, force the
366 * IDE function to standard primary IDE interrupt
367 * w/ 8259 offset
368 */
369 dev->irq = 14;
370 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
371 pci_dev_put(dev);
372 }
373
374 /*
375 * Force legacy USB interrupt routing
376 */
377 if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
378 PCI_DEVICE_ID_VIA_82C586_2, NULL))) {
379 dev->irq = 10;
380 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);
381
382 if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
383 PCI_DEVICE_ID_VIA_82C586_2, dev))) {
384 dev->irq = 11;
385 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);
386 }
387 pci_dev_put(dev);
388 }
389}
390#endif /* CONFIG_PCI */
391
392TODC_ALLOC();
393
394/* ************************************************************************
395 *
396 * Setup the architecture
397 *
398 */
399static void __init
400mpc85xx_cds_setup_arch(void)
401{
402 bd_t *binfo = (bd_t *) __res;
403 unsigned int freq;
404 struct gianfar_platform_data *pdata;
405 struct gianfar_mdio_data *mdata;
406
407 /* get the core frequency */
408 freq = binfo->bi_intfreq;
409
410 printk("mpc85xx_cds_setup_arch\n");
411
412#ifdef CONFIG_CPM2
413 cpm2_reset();
414#endif
415
416 cadmus = ioremap(CADMUS_BASE, CADMUS_SIZE);
417 cds_pci_slot = ((cadmus[CM_CSR] >> 6) & 0x3) + 1;
418 printk("CDS Version = %x in PCI slot %d\n", cadmus[CM_VER], cds_pci_slot);
419
420 /* Setup TODC access */
421 TODC_INIT(TODC_TYPE_DS1743,
422 0,
423 0,
424 ioremap(CDS_RTC_ADDR, CDS_RTC_SIZE),
425 8);
426
427 /* Set loops_per_jiffy to a half-way reasonable value,
428 for use until calibrate_delay gets called. */
429 loops_per_jiffy = freq / HZ;
430
431#ifdef CONFIG_PCI
432 /* VIA IDE configuration */
433 ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
434
435 /* setup PCI host bridges */
436 mpc85xx_setup_hose();
437#endif
438
439#ifdef CONFIG_SERIAL_8250
440 mpc85xx_early_serial_map();
441#endif
442
443#ifdef CONFIG_SERIAL_TEXT_DEBUG
444 /* Invalidate the entry we stole earlier the serial ports
445 * should be properly mapped */
446 invalidate_tlbcam_entry(num_tlbcam_entries - 1);
447#endif
448
449 /* setup the board related info for the MDIO bus */
450 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC85xx_MDIO);
451
452 mdata->irq[0] = MPC85xx_IRQ_EXT5;
453 mdata->irq[1] = MPC85xx_IRQ_EXT5;
454 mdata->irq[2] = PHY_POLL;
455 mdata->irq[3] = PHY_POLL;
456 mdata->irq[31] = PHY_POLL;
457
458 /* setup the board related information for the enet controllers */
459 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
460 if (pdata) {
461 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
462 pdata->bus_id = 0;
463 pdata->phy_id = 0;
464 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
465 }
466
467 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
468 if (pdata) {
469 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
470 pdata->bus_id = 0;
471 pdata->phy_id = 1;
472 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
473 }
474
475 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC1);
476 if (pdata) {
477 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
478 pdata->bus_id = 0;
479 pdata->phy_id = 0;
480 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
481 }
482
483 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC2);
484 if (pdata) {
485 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
486 pdata->bus_id = 0;
487 pdata->phy_id = 1;
488 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
489 }
490
491 ppc_sys_device_remove(MPC85xx_eTSEC3);
492 ppc_sys_device_remove(MPC85xx_eTSEC4);
493
494#ifdef CONFIG_BLK_DEV_INITRD
495 if (initrd_start)
496 ROOT_DEV = Root_RAM0;
497 else
498#endif
499#ifdef CONFIG_ROOT_NFS
500 ROOT_DEV = Root_NFS;
501#else
502 ROOT_DEV = Root_HDA1;
503#endif
504}
505
506/* ************************************************************************ */
507void __init
508platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
509 unsigned long r6, unsigned long r7)
510{
511 /* parse_bootinfo must always be called first */
512 parse_bootinfo(find_bootinfo());
513
514 /*
515 * If we were passed in a board information, copy it into the
516 * residual data area.
517 */
518 if (r3) {
519 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
520 sizeof (bd_t));
521
522 }
523#ifdef CONFIG_SERIAL_TEXT_DEBUG
524 {
525 bd_t *binfo = (bd_t *) __res;
526 struct uart_port p;
527
528 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
529 settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
530 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
531
532 memset(&p, 0, sizeof (p));
533 p.iotype = UPIO_MEM;
534 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
535 p.uartclk = binfo->bi_busfreq;
536
537 gen550_init(0, &p);
538
539 memset(&p, 0, sizeof (p));
540 p.iotype = UPIO_MEM;
541 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
542 p.uartclk = binfo->bi_busfreq;
543
544 gen550_init(1, &p);
545 }
546#endif
547
548#if defined(CONFIG_BLK_DEV_INITRD)
549 /*
550 * If the init RAM disk has been configured in, and there's a valid
551 * starting address for it, set it up.
552 */
553 if (r4) {
554 initrd_start = r4 + KERNELBASE;
555 initrd_end = r5 + KERNELBASE;
556 }
557#endif /* CONFIG_BLK_DEV_INITRD */
558
559 /* Copy the kernel command line arguments to a safe place. */
560
561 if (r6) {
562 *(char *) (r7 + KERNELBASE) = 0;
563 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
564 }
565
566 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
567
568 /* setup the PowerPC module struct */
569 ppc_md.setup_arch = mpc85xx_cds_setup_arch;
570 ppc_md.show_cpuinfo = mpc85xx_cds_show_cpuinfo;
571
572 ppc_md.init_IRQ = mpc85xx_cds_init_IRQ;
573 ppc_md.get_irq = openpic_get_irq;
574
575 ppc_md.restart = mpc85xx_restart;
576 ppc_md.power_off = mpc85xx_power_off;
577 ppc_md.halt = mpc85xx_halt;
578
579 ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
580
581 ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
582
583 ppc_md.time_init = todc_time_init;
584 ppc_md.set_rtc_time = todc_set_rtc_time;
585 ppc_md.get_rtc_time = todc_get_rtc_time;
586
587 ppc_md.nvram_read_val = todc_direct_read_val;
588 ppc_md.nvram_write_val = todc_direct_write_val;
589
590#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
591 ppc_md.progress = gen550_progress;
592#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
593#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
594 ppc_md.early_serial_map = mpc85xx_early_serial_map;
595#endif /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
596
597 if (ppc_md.progress)
598 ppc_md.progress("mpc85xx_cds_init(): exit", 0);
599
600 return;
601}
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
deleted file mode 100644
index 32c5455c8b82..000000000000
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ /dev/null
@@ -1,80 +0,0 @@
1/*
2 * MPC85xx CDS board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor, Inc
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __MACH_MPC85XX_CDS_H__
16#define __MACH_MPC85XX_CDS_H__
17
18#include <linux/serial.h>
19#include <asm/ppcboot.h>
20#include <linux/initrd.h>
21#include <syslib/ppc85xx_setup.h>
22
23#define BOARD_CCSRBAR ((uint)0xe0000000)
24#define CCSRBAR_SIZE ((uint)1024*1024)
25
26/* CADMUS info */
27#define CADMUS_BASE (0xf8004000)
28#define CADMUS_SIZE (256)
29#define CM_VER (0)
30#define CM_CSR (1)
31#define CM_RST (2)
32
33/* CDS NVRAM/RTC */
34#define CDS_RTC_ADDR (0xf8000000)
35#define CDS_RTC_SIZE (8 * 1024)
36
37/* PCI config */
38#define PCI1_CFG_ADDR_OFFSET (0x8000)
39#define PCI1_CFG_DATA_OFFSET (0x8004)
40
41#define PCI2_CFG_ADDR_OFFSET (0x9000)
42#define PCI2_CFG_DATA_OFFSET (0x9004)
43
44/* PCI interrupt controller */
45#define PIRQ0A MPC85xx_IRQ_EXT0
46#define PIRQ0B MPC85xx_IRQ_EXT1
47#define PIRQ0C MPC85xx_IRQ_EXT2
48#define PIRQ0D MPC85xx_IRQ_EXT3
49#define PIRQ1A MPC85xx_IRQ_EXT11
50
51/* PCI 1 memory map */
52#define MPC85XX_PCI1_LOWER_IO 0x00000000
53#define MPC85XX_PCI1_UPPER_IO 0x00ffffff
54
55#define MPC85XX_PCI1_LOWER_MEM 0x80000000
56#define MPC85XX_PCI1_UPPER_MEM 0x9fffffff
57
58#define MPC85XX_PCI1_IO_BASE 0xe2000000
59#define MPC85XX_PCI1_MEM_OFFSET 0x00000000
60
61#define MPC85XX_PCI1_IO_SIZE 0x01000000
62
63/* PCI 2 memory map */
64/* Note: the standard PPC fixups will cause IO space to get bumped by
65 * hose->io_base_virt - isa_io_base => MPC85XX_PCI1_IO_SIZE */
66#define MPC85XX_PCI2_LOWER_IO 0x00000000
67#define MPC85XX_PCI2_UPPER_IO 0x00ffffff
68
69#define MPC85XX_PCI2_LOWER_MEM 0xa0000000
70#define MPC85XX_PCI2_UPPER_MEM 0xbfffffff
71
72#define MPC85XX_PCI2_IO_BASE 0xe3000000
73#define MPC85XX_PCI2_MEM_OFFSET 0x00000000
74
75#define MPC85XX_PCI2_IO_SIZE 0x01000000
76
77#define NR_8259_INTS 16
78#define CPM_IRQ_OFFSET NR_8259_INTS
79
80#endif /* __MACH_MPC85XX_CDS_H__ */
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
deleted file mode 100644
index 3d7addbdecfd..000000000000
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ /dev/null
@@ -1,234 +0,0 @@
1/*
2 * Wind River SBC8560 board specific routines
3 *
4 * Maintainer: Kumar Gala
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/stddef.h>
15#include <linux/kernel.h>
16#include <linux/init.h>
17#include <linux/errno.h>
18#include <linux/reboot.h>
19#include <linux/pci.h>
20#include <linux/kdev_t.h>
21#include <linux/major.h>
22#include <linux/console.h>
23#include <linux/delay.h>
24#include <linux/seq_file.h>
25#include <linux/root_dev.h>
26#include <linux/serial.h>
27#include <linux/tty.h> /* for linux/serial_core.h */
28#include <linux/serial_core.h>
29#include <linux/serial_8250.h>
30#include <linux/initrd.h>
31#include <linux/module.h>
32#include <linux/fsl_devices.h>
33
34#include <asm/system.h>
35#include <asm/pgtable.h>
36#include <asm/page.h>
37#include <asm/atomic.h>
38#include <asm/time.h>
39#include <asm/io.h>
40#include <asm/machdep.h>
41#include <asm/open_pic.h>
42#include <asm/bootinfo.h>
43#include <asm/pci-bridge.h>
44#include <asm/mpc85xx.h>
45#include <asm/irq.h>
46#include <asm/immap_85xx.h>
47#include <asm/kgdb.h>
48#include <asm/ppc_sys.h>
49#include <mm/mmu_decl.h>
50
51#include <syslib/ppc85xx_common.h>
52#include <syslib/ppc85xx_setup.h>
53
54#ifdef CONFIG_SERIAL_8250
55static void __init
56sbc8560_early_serial_map(void)
57{
58 struct uart_port uart_req;
59
60 /* Setup serial port access */
61 memset(&uart_req, 0, sizeof (uart_req));
62 uart_req.irq = MPC85xx_IRQ_EXT9;
63 uart_req.flags = STD_COM_FLAGS;
64 uart_req.uartclk = BASE_BAUD * 16;
65 uart_req.iotype = UPIO_MEM;
66 uart_req.mapbase = UARTA_ADDR;
67 uart_req.membase = ioremap(uart_req.mapbase, MPC85xx_UART0_SIZE);
68 uart_req.type = PORT_16650;
69
70#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
71 gen550_init(0, &uart_req);
72#endif
73
74 if (early_serial_setup(&uart_req) != 0)
75 printk("Early serial init of port 0 failed\n");
76
77 /* Assume early_serial_setup() doesn't modify uart_req */
78 uart_req.line = 1;
79 uart_req.mapbase = UARTB_ADDR;
80 uart_req.membase = ioremap(uart_req.mapbase, MPC85xx_UART1_SIZE);
81 uart_req.irq = MPC85xx_IRQ_EXT10;
82
83#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
84 gen550_init(1, &uart_req);
85#endif
86
87 if (early_serial_setup(&uart_req) != 0)
88 printk("Early serial init of port 1 failed\n");
89}
90#endif
91
92/* ************************************************************************
93 *
94 * Setup the architecture
95 *
96 */
97static void __init
98sbc8560_setup_arch(void)
99{
100 bd_t *binfo = (bd_t *) __res;
101 unsigned int freq;
102 struct gianfar_platform_data *pdata;
103 struct gianfar_mdio_data *mdata;
104
105 /* get the core frequency */
106 freq = binfo->bi_intfreq;
107
108 if (ppc_md.progress)
109 ppc_md.progress("sbc8560_setup_arch()", 0);
110
111 /* Set loops_per_jiffy to a half-way reasonable value,
112 for use until calibrate_delay gets called. */
113 loops_per_jiffy = freq / HZ;
114
115#ifdef CONFIG_PCI
116 /* setup PCI host bridges */
117 mpc85xx_setup_hose();
118#endif
119#ifdef CONFIG_SERIAL_8250
120 sbc8560_early_serial_map();
121#endif
122#ifdef CONFIG_SERIAL_TEXT_DEBUG
123 /* Invalidate the entry we stole earlier the serial ports
124 * should be properly mapped */
125 invalidate_tlbcam_entry(num_tlbcam_entries - 1);
126#endif
127
128 /* setup the board related info for the MDIO bus */
129 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC85xx_MDIO);
130
131 mdata->irq[25] = MPC85xx_IRQ_EXT6;
132 mdata->irq[26] = MPC85xx_IRQ_EXT7;
133 mdata->irq[31] = PHY_POLL;
134
135 /* setup the board related information for the enet controllers */
136 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
137 if (pdata) {
138 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
139 pdata->bus_id = 0;
140 pdata->phy_id = 25;
141 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
142 }
143
144 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
145 if (pdata) {
146 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
147 pdata->bus_id = 0;
148 pdata->phy_id = 26;
149 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
150 }
151
152#ifdef CONFIG_BLK_DEV_INITRD
153 if (initrd_start)
154 ROOT_DEV = Root_RAM0;
155 else
156#endif
157#ifdef CONFIG_ROOT_NFS
158 ROOT_DEV = Root_NFS;
159#else
160 ROOT_DEV = Root_HDA1;
161#endif
162}
163
164/* ************************************************************************ */
165void __init
166platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
167 unsigned long r6, unsigned long r7)
168{
169 /* parse_bootinfo must always be called first */
170 parse_bootinfo(find_bootinfo());
171
172 /*
173 * If we were passed in a board information, copy it into the
174 * residual data area.
175 */
176 if (r3) {
177 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
178 sizeof (bd_t));
179 }
180
181#ifdef CONFIG_SERIAL_TEXT_DEBUG
182 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
183 settlbcam(num_tlbcam_entries - 1, UARTA_ADDR,
184 UARTA_ADDR, 0x1000, _PAGE_IO, 0);
185#endif
186
187#if defined(CONFIG_BLK_DEV_INITRD)
188 /*
189 * If the init RAM disk has been configured in, and there's a valid
190 * starting address for it, set it up.
191 */
192 if (r4) {
193 initrd_start = r4 + KERNELBASE;
194 initrd_end = r5 + KERNELBASE;
195 }
196#endif /* CONFIG_BLK_DEV_INITRD */
197
198 /* Copy the kernel command line arguments to a safe place. */
199
200 if (r6) {
201 *(char *) (r7 + KERNELBASE) = 0;
202 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
203 }
204
205 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
206
207 /* setup the PowerPC module struct */
208 ppc_md.setup_arch = sbc8560_setup_arch;
209 ppc_md.show_cpuinfo = sbc8560_show_cpuinfo;
210
211 ppc_md.init_IRQ = sbc8560_init_IRQ;
212 ppc_md.get_irq = openpic_get_irq;
213
214 ppc_md.restart = mpc85xx_restart;
215 ppc_md.power_off = mpc85xx_power_off;
216 ppc_md.halt = mpc85xx_halt;
217
218 ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
219
220 ppc_md.time_init = NULL;
221 ppc_md.set_rtc_time = NULL;
222 ppc_md.get_rtc_time = NULL;
223 ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
224
225#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
226 ppc_md.progress = gen550_progress;
227#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
228#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
229 ppc_md.early_serial_map = sbc8560_early_serial_map;
230#endif /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
231
232 if (ppc_md.progress)
233 ppc_md.progress("sbc8560_init(): exit", 0);
234}
diff --git a/arch/ppc/platforms/85xx/sbc8560.h b/arch/ppc/platforms/85xx/sbc8560.h
deleted file mode 100644
index e5e156f60100..000000000000
--- a/arch/ppc/platforms/85xx/sbc8560.h
+++ /dev/null
@@ -1,47 +0,0 @@
1/*
2 * Wind River SBC8560 board definitions
3 *
4 * Copyright 2003 Motorola Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 *
11 */
12
13#ifndef __MACH_SBC8560_H__
14#define __MACH_SBC8560_H__
15
16#include <platforms/85xx/sbc85xx.h>
17#include <asm/irq.h>
18
19#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
20
21#ifdef CONFIG_SERIAL_MANY_PORTS
22#define RS_TABLE_SIZE 64
23#else
24#define RS_TABLE_SIZE 2
25#endif
26
27/* Rate for the 1.8432 Mhz clock for the onboard serial chip */
28#define BASE_BAUD ( 1843200 / 16 )
29
30#ifdef CONFIG_SERIAL_DETECT_IRQ
31#define STD_COM_FLAGS (ASYNC_SKIP_TEST|ASYNC_AUTO_IRQ)
32#else
33#define STD_COM_FLAGS (ASYNC_SKIP_TEST)
34#endif
35
36#define STD_SERIAL_PORT_DFNS \
37 { 0, BASE_BAUD, UARTA_ADDR, MPC85xx_IRQ_EXT9, STD_COM_FLAGS, /* ttyS0 */ \
38 iomem_base: (u8 *)UARTA_ADDR, \
39 io_type: SERIAL_IO_MEM }, \
40 { 0, BASE_BAUD, UARTB_ADDR, MPC85xx_IRQ_EXT10, STD_COM_FLAGS, /* ttyS1 */ \
41 iomem_base: (u8 *)UARTB_ADDR, \
42 io_type: SERIAL_IO_MEM },
43
44#define SERIAL_PORT_DFNS \
45 STD_SERIAL_PORT_DFNS
46
47#endif /* __MACH_SBC8560_H__ */
diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c
deleted file mode 100644
index 2c587ca97bce..000000000000
--- a/arch/ppc/platforms/85xx/sbc85xx.c
+++ /dev/null
@@ -1,166 +0,0 @@
1/*
2 * WindRiver PowerQUICC III SBC85xx board common routines
3 *
4 * Copyright 2002, 2003 Motorola Inc.
5 * Copyright 2004 Red Hat, Inc.
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2 of the License, or (at your
10 * option) any later version.
11 */
12
13#include <linux/stddef.h>
14#include <linux/kernel.h>
15#include <linux/init.h>
16#include <linux/errno.h>
17#include <linux/reboot.h>
18#include <linux/pci.h>
19#include <linux/kdev_t.h>
20#include <linux/major.h>
21#include <linux/console.h>
22#include <linux/delay.h>
23#include <linux/seq_file.h>
24#include <linux/serial.h>
25#include <linux/module.h>
26
27#include <asm/system.h>
28#include <asm/pgtable.h>
29#include <asm/page.h>
30#include <asm/atomic.h>
31#include <asm/time.h>
32#include <asm/io.h>
33#include <asm/machdep.h>
34#include <asm/open_pic.h>
35#include <asm/bootinfo.h>
36#include <asm/pci-bridge.h>
37#include <asm/mpc85xx.h>
38#include <asm/irq.h>
39#include <asm/immap_85xx.h>
40#include <asm/ppc_sys.h>
41
42#include <mm/mmu_decl.h>
43
44#include <platforms/85xx/sbc85xx.h>
45
46unsigned char __res[sizeof (bd_t)];
47
48#ifndef CONFIG_PCI
49unsigned long isa_io_base = 0;
50unsigned long isa_mem_base = 0;
51unsigned long pci_dram_offset = 0;
52#endif
53
54extern unsigned long total_memory; /* in mm/init */
55
56/* Internal interrupts are all Level Sensitive, and Positive Polarity */
57static u_char sbc8560_openpic_initsenses[] __initdata = {
58 MPC85XX_INTERNAL_IRQ_SENSES,
59 0x0, /* External 0: */
60 0x0, /* External 1: */
61#if defined(CONFIG_PCI)
62 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 2: PCI slot 0 */
63 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 3: PCI slot 1 */
64 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 4: PCI slot 2 */
65 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 5: PCI slot 3 */
66#else
67 0x0, /* External 2: */
68 0x0, /* External 3: */
69 0x0, /* External 4: */
70 0x0, /* External 5: */
71#endif
72 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 6: PHY */
73 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 7: PHY */
74 0x0, /* External 8: */
75 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* External 9: PHY */
76 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* External 10: PHY */
77 0x0, /* External 11: */
78};
79
80/* ************************************************************************ */
81int
82sbc8560_show_cpuinfo(struct seq_file *m)
83{
84 uint pvid, svid, phid1;
85 uint memsize = total_memory;
86 bd_t *binfo = (bd_t *) __res;
87 unsigned int freq;
88
89 /* get the core frequency */
90 freq = binfo->bi_intfreq;
91
92 pvid = mfspr(SPRN_PVR);
93 svid = mfspr(SPRN_SVR);
94
95 seq_printf(m, "Vendor\t\t: Wind River\n");
96 seq_printf(m, "Machine\t\t: SBC%s\n", cur_ppc_sys_spec->ppc_sys_name);
97 seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
98 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
99 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
100
101 /* Display cpu Pll setting */
102 phid1 = mfspr(SPRN_HID1);
103 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
104
105 /* Display the amount of memory */
106 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
107
108 return 0;
109}
110
111void __init
112sbc8560_init_IRQ(void)
113{
114 bd_t *binfo = (bd_t *) __res;
115 /* Determine the Physical Address of the OpenPIC regs */
116 phys_addr_t OpenPIC_PAddr =
117 binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
118 OpenPIC_Addr = ioremap(OpenPIC_PAddr, MPC85xx_OPENPIC_SIZE);
119 OpenPIC_InitSenses = sbc8560_openpic_initsenses;
120 OpenPIC_NumInitSenses = sizeof (sbc8560_openpic_initsenses);
121
122 /* Skip reserved space and internal sources */
123 openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
124 /* Map PIC IRQs 0-11 */
125 openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
126
127 /* we let openpic interrupts starting from an offset, to
128 * leave space for cascading interrupts underneath.
129 */
130 openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
131
132 return;
133}
134
135/*
136 * interrupt routing
137 */
138
139#ifdef CONFIG_PCI
140int mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel,
141 unsigned char pin)
142{
143 static char pci_irq_table[][4] =
144 /*
145 * PCI IDSEL/INTPIN->INTLINE
146 * A B C D
147 */
148 {
149 {PIRQA, PIRQB, PIRQC, PIRQD},
150 {PIRQD, PIRQA, PIRQB, PIRQC},
151 {PIRQC, PIRQD, PIRQA, PIRQB},
152 {PIRQB, PIRQC, PIRQD, PIRQA},
153 };
154
155 const long min_idsel = 12, max_idsel = 15, irqs_per_slot = 4;
156 return PCI_IRQ_TABLE_LOOKUP;
157}
158
159int mpc85xx_exclude_device(u_char bus, u_char devfn)
160{
161 if (bus == 0 && PCI_SLOT(devfn) == 0)
162 return PCIBIOS_DEVICE_NOT_FOUND;
163 else
164 return PCIBIOS_SUCCESSFUL;
165}
166#endif /* CONFIG_PCI */
diff --git a/arch/ppc/platforms/85xx/sbc85xx.h b/arch/ppc/platforms/85xx/sbc85xx.h
deleted file mode 100644
index 51df4dc04e22..000000000000
--- a/arch/ppc/platforms/85xx/sbc85xx.h
+++ /dev/null
@@ -1,70 +0,0 @@
1/*
2 * WindRiver PowerQUICC III SBC85xx common board definitions
3 *
4 * Copyright 2003 Motorola Inc.
5 * Copyright 2004 Red Hat, Inc.
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2 of the License, or (at your
10 * option) any later version.
11 *
12 */
13
14#ifndef __PLATFORMS_85XX_SBC85XX_H__
15#define __PLATFORMS_85XX_SBC85XX_H__
16
17#include <linux/init.h>
18#include <linux/seq_file.h>
19#include <asm/ppcboot.h>
20
21#define BOARD_CCSRBAR ((uint)0xff700000)
22#define CCSRBAR_SIZE ((uint)1024*1024)
23
24#define BCSR_ADDR ((uint)0xfc000000)
25#define BCSR_SIZE ((uint)(16 * 1024 * 1024))
26
27#define UARTA_ADDR (BCSR_ADDR + 0x00700000)
28#define UARTB_ADDR (BCSR_ADDR + 0x00800000)
29#define RTC_DEVICE_ADDR (BCSR_ADDR + 0x00900000)
30#define EEPROM_ADDR (BCSR_ADDR + 0x00b00000)
31
32extern int sbc8560_show_cpuinfo(struct seq_file *m);
33extern void sbc8560_init_IRQ(void) __init;
34
35/* PCI interrupt controller */
36#define PIRQA MPC85xx_IRQ_EXT1
37#define PIRQB MPC85xx_IRQ_EXT2
38#define PIRQC MPC85xx_IRQ_EXT3
39#define PIRQD MPC85xx_IRQ_EXT4
40
41#define MPC85XX_PCI1_LOWER_IO 0x00000000
42#define MPC85XX_PCI1_UPPER_IO 0x00ffffff
43
44#define MPC85XX_PCI1_LOWER_MEM 0x80000000
45#define MPC85XX_PCI1_UPPER_MEM 0x9fffffff
46
47#define MPC85XX_PCI1_IO_BASE 0xe2000000
48#define MPC85XX_PCI1_MEM_OFFSET 0x00000000
49
50#define MPC85XX_PCI1_IO_SIZE 0x01000000
51
52/* FCC1 Clock Source Configuration. These can be
53 * redefined in the board specific file.
54 * Can only choose from CLK9-12 */
55#define F1_RXCLK 12
56#define F1_TXCLK 11
57
58/* FCC2 Clock Source Configuration. These can be
59 * redefined in the board specific file.
60 * Can only choose from CLK13-16 */
61#define F2_RXCLK 13
62#define F2_TXCLK 14
63
64/* FCC3 Clock Source Configuration. These can be
65 * redefined in the board specific file.
66 * Can only choose from CLK13-16 */
67#define F3_RXCLK 15
68#define F3_TXCLK 16
69
70#endif /* __PLATFORMS_85XX_SBC85XX_H__ */
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
deleted file mode 100644
index 8748da3b3e0e..000000000000
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ /dev/null
@@ -1,339 +0,0 @@
1/*
2 * STx GP3 board specific routines
3 *
4 * Dan Malek <dan@embeddededge.com>
5 * Copyright 2004 Embedded Edge, LLC
6 *
7 * Copied from mpc8560_ads.c
8 * Copyright 2002, 2003 Motorola Inc.
9 *
10 * Ported to 2.6, Matt Porter <mporter@kernel.crashing.org>
11 * Copyright 2004-2005 MontaVista Software, Inc.
12 *
13 * This program is free software; you can redistribute it and/or modify it
14 * under the terms of the GNU General Public License as published by the
15 * Free Software Foundation; either version 2 of the License, or (at your
16 * option) any later version.
17 */
18
19#include <linux/stddef.h>
20#include <linux/kernel.h>
21#include <linux/init.h>
22#include <linux/errno.h>
23#include <linux/reboot.h>
24#include <linux/pci.h>
25#include <linux/kdev_t.h>
26#include <linux/major.h>
27#include <linux/blkdev.h>
28#include <linux/console.h>
29#include <linux/delay.h>
30#include <linux/root_dev.h>
31#include <linux/seq_file.h>
32#include <linux/serial.h>
33#include <linux/initrd.h>
34#include <linux/module.h>
35#include <linux/fsl_devices.h>
36#include <linux/interrupt.h>
37#include <linux/rio.h>
38
39#include <asm/system.h>
40#include <asm/pgtable.h>
41#include <asm/page.h>
42#include <asm/atomic.h>
43#include <asm/time.h>
44#include <asm/io.h>
45#include <asm/machdep.h>
46#include <asm/open_pic.h>
47#include <asm/bootinfo.h>
48#include <asm/pci-bridge.h>
49#include <asm/mpc85xx.h>
50#include <asm/irq.h>
51#include <asm/immap_85xx.h>
52#include <asm/cpm2.h>
53#include <asm/ppc_sys.h>
54
55#include <syslib/cpm2_pic.h>
56#include <syslib/ppc85xx_common.h>
57
58
59unsigned char __res[sizeof(bd_t)];
60
61#ifndef CONFIG_PCI
62unsigned long isa_io_base = 0;
63unsigned long isa_mem_base = 0;
64unsigned long pci_dram_offset = 0;
65#endif
66
67/* Internal interrupts are all Level Sensitive, and Positive Polarity */
68static u8 gp3_openpic_initsenses[] __initdata = {
69 MPC85XX_INTERNAL_IRQ_SENSES,
70 0x0, /* External 0: */
71#if defined(CONFIG_PCI)
72 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 1: PCI slot 0 */
73 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 2: PCI slot 1 */
74 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 3: PCI slot 2 */
75 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 4: PCI slot 3 */
76#else
77 0x0, /* External 1: */
78 0x0, /* External 2: */
79 0x0, /* External 3: */
80 0x0, /* External 4: */
81#endif
82 0x0, /* External 5: */
83 0x0, /* External 6: */
84 0x0, /* External 7: */
85 0x0, /* External 8: */
86 0x0, /* External 9: */
87 0x0, /* External 10: */
88 0x0, /* External 11: */
89};
90
91/*
92 * Setup the architecture
93 */
94static void __init
95gp3_setup_arch(void)
96{
97 bd_t *binfo = (bd_t *) __res;
98 unsigned int freq;
99 struct gianfar_platform_data *pdata;
100 struct gianfar_mdio_data *mdata;
101
102 cpm2_reset();
103
104 /* get the core frequency */
105 freq = binfo->bi_intfreq;
106
107 if (ppc_md.progress)
108 ppc_md.progress("gp3_setup_arch()", 0);
109
110 /* Set loops_per_jiffy to a half-way reasonable value,
111 for use until calibrate_delay gets called. */
112 loops_per_jiffy = freq / HZ;
113
114#ifdef CONFIG_PCI
115 /* setup PCI host bridges */
116 mpc85xx_setup_hose();
117#endif
118
119 /* setup the board related info for the MDIO bus */
120 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC85xx_MDIO);
121
122 mdata->irq[2] = MPC85xx_IRQ_EXT5;
123 mdata->irq[4] = MPC85xx_IRQ_EXT5;
124 mdata->irq[31] = PHY_POLL;
125
126 /* setup the board related information for the enet controllers */
127 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
128 if (pdata) {
129 /* pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
130 pdata->bus_id = 0;
131 pdata->phy_id = 2;
132 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
133 }
134
135 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
136 if (pdata) {
137 /* pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
138 pdata->bus_id = 0;
139 pdata->phy_id = 4;
140 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
141 }
142
143#ifdef CONFIG_BLK_DEV_INITRD
144 if (initrd_start)
145 ROOT_DEV = Root_RAM0;
146 else
147#endif
148#ifdef CONFIG_ROOT_NFS
149 ROOT_DEV = Root_NFS;
150#else
151 ROOT_DEV = Root_HDA1;
152#endif
153
154 printk ("bi_immr_base = %8.8lx\n", binfo->bi_immr_base);
155}
156
157static irqreturn_t cpm2_cascade(int irq, void *dev_id)
158{
159 while ((irq = cpm2_get_irq()) >= 0)
160 __do_IRQ(irq);
161
162 return IRQ_HANDLED;
163}
164
165static struct irqaction cpm2_irqaction = {
166 .handler = cpm2_cascade,
167 .flags = IRQF_DISABLED,
168 .mask = CPU_MASK_NONE,
169 .name = "cpm2_cascade",
170};
171
172static void __init
173gp3_init_IRQ(void)
174{
175 bd_t *binfo = (bd_t *) __res;
176
177 /*
178 * Setup OpenPIC
179 */
180
181 /* Determine the Physical Address of the OpenPIC regs */
182 phys_addr_t OpenPIC_PAddr =
183 binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
184 OpenPIC_Addr = ioremap(OpenPIC_PAddr, MPC85xx_OPENPIC_SIZE);
185 OpenPIC_InitSenses = gp3_openpic_initsenses;
186 OpenPIC_NumInitSenses = sizeof (gp3_openpic_initsenses);
187
188 /* Skip reserved space and internal sources */
189 openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
190
191 /* Map PIC IRQs 0-11 */
192 openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
193
194 /*
195 * Let openpic interrupts starting from an offset, to
196 * leave space for cascading interrupts underneath.
197 */
198 openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
199
200 /* Setup CPM2 PIC */
201 cpm2_init_IRQ();
202
203 setup_irq(MPC85xx_IRQ_CPM, &cpm2_irqaction);
204
205 return;
206}
207
208static int
209gp3_show_cpuinfo(struct seq_file *m)
210{
211 uint pvid, svid, phid1;
212 bd_t *binfo = (bd_t *) __res;
213 uint memsize;
214 unsigned int freq;
215 extern unsigned long total_memory; /* in mm/init */
216
217 /* get the core frequency */
218 freq = binfo->bi_intfreq;
219
220 pvid = mfspr(SPRN_PVR);
221 svid = mfspr(SPRN_SVR);
222
223 memsize = total_memory;
224
225 seq_printf(m, "Vendor\t\t: RPC Electronics STx \n");
226 seq_printf(m, "Machine\t\t: GP3 - MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
227 seq_printf(m, "bus freq\t: %u.%.6u MHz\n", freq / 1000000,
228 freq % 1000000);
229 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
230 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
231
232 /* Display cpu Pll setting */
233 phid1 = mfspr(SPRN_HID1);
234 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
235
236 /* Display the amount of memory */
237 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
238
239 return 0;
240}
241
242#ifdef CONFIG_PCI
243int mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel,
244 unsigned char pin)
245{
246 static char pci_irq_table[][4] =
247 /*
248 * PCI IDSEL/INTPIN->INTLINE
249 * A B C D
250 */
251 {
252 {PIRQA, PIRQB, PIRQC, PIRQD},
253 {PIRQD, PIRQA, PIRQB, PIRQC},
254 {PIRQC, PIRQD, PIRQA, PIRQB},
255 {PIRQB, PIRQC, PIRQD, PIRQA},
256 };
257
258 const long min_idsel = 12, max_idsel = 15, irqs_per_slot = 4;
259 return PCI_IRQ_TABLE_LOOKUP;
260}
261
262int mpc85xx_exclude_device(u_char bus, u_char devfn)
263{
264 if (bus == 0 && PCI_SLOT(devfn) == 0)
265 return PCIBIOS_DEVICE_NOT_FOUND;
266 else
267 return PCIBIOS_SUCCESSFUL;
268}
269#endif /* CONFIG_PCI */
270
271#ifdef CONFIG_RAPIDIO
272extern void mpc85xx_rio_setup(int law_start, int law_size);
273void
274platform_rio_init(void)
275{
276 /*
277 * The STx firmware configures the RapidIO Local Access Window
278 * at 0xc0000000 with a size of 512MB.
279 */
280 mpc85xx_rio_setup(0xc0000000, 0x20000000);
281}
282#endif /* CONFIG_RAPIDIO */
283
284void __init
285platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
286 unsigned long r6, unsigned long r7)
287{
288 /* parse_bootinfo must always be called first */
289 parse_bootinfo(find_bootinfo());
290
291 /*
292 * If we were passed in a board information, copy it into the
293 * residual data area.
294 */
295 if (r3) {
296 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
297 sizeof (bd_t));
298
299 }
300#if defined(CONFIG_BLK_DEV_INITRD)
301 /*
302 * If the init RAM disk has been configured in, and there's a valid
303 * starting address for it, set it up.
304 */
305 if (r4) {
306 initrd_start = r4 + KERNELBASE;
307 initrd_end = r5 + KERNELBASE;
308 }
309#endif /* CONFIG_BLK_DEV_INITRD */
310
311 /* Copy the kernel command line arguments to a safe place. */
312
313 if (r6) {
314 *(char *) (r7 + KERNELBASE) = 0;
315 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
316 }
317
318 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
319
320 /* setup the PowerPC module struct */
321 ppc_md.setup_arch = gp3_setup_arch;
322 ppc_md.show_cpuinfo = gp3_show_cpuinfo;
323
324 ppc_md.init_IRQ = gp3_init_IRQ;
325 ppc_md.get_irq = openpic_get_irq;
326
327 ppc_md.restart = mpc85xx_restart;
328 ppc_md.power_off = mpc85xx_power_off;
329 ppc_md.halt = mpc85xx_halt;
330
331 ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
332
333 ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
334
335 if (ppc_md.progress)
336 ppc_md.progress("platform_init(): exit", 0);
337
338 return;
339}
diff --git a/arch/ppc/platforms/85xx/stx_gp3.h b/arch/ppc/platforms/85xx/stx_gp3.h
deleted file mode 100644
index c6e34c09e979..000000000000
--- a/arch/ppc/platforms/85xx/stx_gp3.h
+++ /dev/null
@@ -1,69 +0,0 @@
1/*
2 * STx GP3 board definitions
3 *
4 * Dan Malek (dan@embeddededge.com)
5 * Copyright 2004 Embedded Edge, LLC
6 *
7 * Ported to 2.6, Matt Porter <mporter@kernel.crashing.org>
8 * Copyright 2004-2005 MontaVista Software, Inc.
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 *
15 */
16
17#ifndef __MACH_STX_GP3_H
18#define __MACH_STX_GP3_H
19
20#include <linux/init.h>
21#include <asm/ppcboot.h>
22
23#define BOARD_CCSRBAR ((uint)0xe0000000)
24#define CCSRBAR_SIZE ((uint)1024*1024)
25
26#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
27
28#define BCSR_ADDR ((uint)0xfc000000)
29#define BCSR_SIZE ((uint)(16 * 1024))
30
31#define BCSR_TSEC1_RESET 0x00000080
32#define BCSR_TSEC2_RESET 0x00000040
33#define BCSR_LED1 0x00000008
34#define BCSR_LED2 0x00000004
35#define BCSR_LED3 0x00000002
36#define BCSR_LED4 0x00000001
37
38extern void mpc85xx_setup_hose(void) __init;
39extern void mpc85xx_restart(char *cmd);
40extern void mpc85xx_power_off(void);
41extern void mpc85xx_halt(void);
42extern void mpc85xx_init_IRQ(void) __init;
43extern unsigned long mpc85xx_find_end_of_memory(void) __init;
44extern void mpc85xx_calibrate_decr(void) __init;
45
46#define PCI_CFG_ADDR_OFFSET (0x8000)
47#define PCI_CFG_DATA_OFFSET (0x8004)
48
49/* PCI interrupt controller */
50#define PIRQA MPC85xx_IRQ_EXT1
51#define PIRQB MPC85xx_IRQ_EXT2
52#define PIRQC MPC85xx_IRQ_EXT3
53#define PIRQD MPC85xx_IRQ_EXT4
54#define PCI_MIN_IDSEL 16
55#define PCI_MAX_IDSEL 19
56#define PCI_IRQ_SLOT 4
57
58#define MPC85XX_PCI1_LOWER_IO 0x00000000
59#define MPC85XX_PCI1_UPPER_IO 0x00ffffff
60
61#define MPC85XX_PCI1_LOWER_MEM 0x80000000
62#define MPC85XX_PCI1_UPPER_MEM 0x9fffffff
63
64#define MPC85XX_PCI1_IO_BASE 0xe2000000
65#define MPC85XX_PCI1_MEM_OFFSET 0x00000000
66
67#define MPC85XX_PCI1_IO_SIZE 0x01000000
68
69#endif /* __MACH_STX_GP3_H */
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c
deleted file mode 100644
index 2a863a83d4c8..000000000000
--- a/arch/ppc/platforms/85xx/tqm85xx.c
+++ /dev/null
@@ -1,412 +0,0 @@
1/*
2 * TQM85xx (40/41/55/60) board specific routines
3 *
4 * Copyright (c) 2005 DENX Software Engineering
5 * Stefan Roese <sr@denx.de>
6 *
7 * Based on original work by
8 * Kumar Gala <galak@kernel.crashing.org>
9 * Copyright 2004 Freescale Semiconductor Inc.
10 *
11 * This program is free software; you can redistribute it and/or modify it
12 * under the terms of the GNU General Public License as published by the
13 * Free Software Foundation; either version 2 of the License, or (at your
14 * option) any later version.
15 */
16
17#include <linux/stddef.h>
18#include <linux/kernel.h>
19#include <linux/init.h>
20#include <linux/errno.h>
21#include <linux/reboot.h>
22#include <linux/pci.h>
23#include <linux/kdev_t.h>
24#include <linux/major.h>
25#include <linux/console.h>
26#include <linux/delay.h>
27#include <linux/seq_file.h>
28#include <linux/root_dev.h>
29#include <linux/serial.h>
30#include <linux/tty.h> /* for linux/serial_core.h */
31#include <linux/serial_core.h>
32#include <linux/initrd.h>
33#include <linux/module.h>
34#include <linux/fsl_devices.h>
35
36#include <asm/system.h>
37#include <asm/pgtable.h>
38#include <asm/page.h>
39#include <asm/atomic.h>
40#include <asm/time.h>
41#include <asm/io.h>
42#include <asm/machdep.h>
43#include <asm/open_pic.h>
44#include <asm/bootinfo.h>
45#include <asm/pci-bridge.h>
46#include <asm/mpc85xx.h>
47#include <asm/irq.h>
48#include <asm/immap_85xx.h>
49#include <asm/kgdb.h>
50#include <asm/ppc_sys.h>
51#include <asm/cpm2.h>
52#include <mm/mmu_decl.h>
53
54#include <syslib/ppc85xx_setup.h>
55#include <syslib/cpm2_pic.h>
56#include <syslib/ppc85xx_common.h>
57
58#ifndef CONFIG_PCI
59unsigned long isa_io_base = 0;
60unsigned long isa_mem_base = 0;
61#endif
62
63
64extern unsigned long total_memory; /* in mm/init */
65
66unsigned char __res[sizeof (bd_t)];
67
68/* Internal interrupts are all Level Sensitive, and Positive Polarity */
69static u_char tqm85xx_openpic_initsenses[] __initdata = {
70 MPC85XX_INTERNAL_IRQ_SENSES,
71 0x0, /* External 0: */
72 0x0, /* External 1: */
73#if defined(CONFIG_PCI)
74 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 2: PCI INTA */
75 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 3: PCI INTB */
76#else
77 0x0, /* External 2: */
78 0x0, /* External 3: */
79#endif
80 0x0, /* External 4: */
81 0x0, /* External 5: */
82 0x0, /* External 6: */
83 0x0, /* External 7: */
84 (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* External 8: PHY */
85 0x0, /* External 9: */
86 0x0, /* External 10: */
87 0x0, /* External 11: */
88};
89
90/* ************************************************************************
91 *
92 * Setup the architecture
93 *
94 */
95static void __init
96tqm85xx_setup_arch(void)
97{
98 bd_t *binfo = (bd_t *) __res;
99 unsigned int freq;
100 struct gianfar_platform_data *pdata;
101 struct gianfar_mdio_data *mdata;
102
103#ifdef CONFIG_MPC8560
104 cpm2_reset();
105#endif
106
107 /* get the core frequency */
108 freq = binfo->bi_intfreq;
109
110 if (ppc_md.progress)
111 ppc_md.progress("tqm85xx_setup_arch()", 0);
112
113 /* Set loops_per_jiffy to a half-way reasonable value,
114 for use until calibrate_delay gets called. */
115 loops_per_jiffy = freq / HZ;
116
117#ifdef CONFIG_PCI
118 /* setup PCI host bridges */
119 mpc85xx_setup_hose();
120#endif
121
122#ifndef CONFIG_MPC8560
123#if defined(CONFIG_SERIAL_8250)
124 mpc85xx_early_serial_map();
125#endif
126
127#ifdef CONFIG_SERIAL_TEXT_DEBUG
128 /* Invalidate the entry we stole earlier the serial ports
129 * should be properly mapped */
130 invalidate_tlbcam_entry(num_tlbcam_entries - 1);
131#endif
132#endif /* CONFIG_MPC8560 */
133
134 /* setup the board related info for the MDIO bus */
135 mdata = (struct gianfar_mdio_data *) ppc_sys_get_pdata(MPC85xx_MDIO);
136
137 mdata->irq[0] = MPC85xx_IRQ_EXT8;
138 mdata->irq[1] = MPC85xx_IRQ_EXT8;
139 mdata->irq[2] = PHY_POLL;
140 mdata->irq[3] = MPC85xx_IRQ_EXT8;
141 mdata->irq[31] = PHY_POLL;
142
143 /* setup the board related information for the enet controllers */
144 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
145 if (pdata) {
146 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
147 pdata->bus_id = 0;
148 pdata->phy_id = 2;
149 memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
150 }
151
152 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
153 if (pdata) {
154 pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
155 pdata->bus_id = 0;
156 pdata->phy_id = 1;
157 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
158 }
159
160#ifdef CONFIG_MPC8540
161 pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
162 if (pdata) {
163 pdata->board_flags = 0;
164 pdata->bus_id = 0;
165 pdata->phy_id = 3;
166 memcpy(pdata->mac_addr, binfo->bi_enet2addr, 6);
167 }
168#endif
169
170#ifdef CONFIG_BLK_DEV_INITRD
171 if (initrd_start)
172 ROOT_DEV = Root_RAM0;
173 else
174#endif
175#ifdef CONFIG_ROOT_NFS
176 ROOT_DEV = Root_NFS;
177#else
178 ROOT_DEV = Root_HDA1;
179#endif
180}
181
182#ifdef CONFIG_MPC8560
183static irqreturn_t cpm2_cascade(int irq, void *dev_id)
184{
185 while ((irq = cpm2_get_irq()) >= 0)
186 __do_IRQ(irq);
187 return IRQ_HANDLED;
188}
189
190static struct irqaction cpm2_irqaction = {
191 .handler = cpm2_cascade,
192 .flags = IRQF_DISABLED,
193 .mask = CPU_MASK_NONE,
194 .name = "cpm2_cascade",
195};
196#endif /* CONFIG_MPC8560 */
197
198void __init
199tqm85xx_init_IRQ(void)
200{
201 bd_t *binfo = (bd_t *) __res;
202
203 /* Determine the Physical Address of the OpenPIC regs */
204 phys_addr_t OpenPIC_PAddr =
205 binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
206 OpenPIC_Addr = ioremap(OpenPIC_PAddr, MPC85xx_OPENPIC_SIZE);
207 OpenPIC_InitSenses = tqm85xx_openpic_initsenses;
208 OpenPIC_NumInitSenses = sizeof (tqm85xx_openpic_initsenses);
209
210 /* Skip reserved space and internal sources */
211 openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
212
213 /* Map PIC IRQs 0-11 */
214 openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
215
216 /* we let openpic interrupts starting from an offset, to
217 * leave space for cascading interrupts underneath.
218 */
219 openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
220
221#ifdef CONFIG_MPC8560
222 /* Setup CPM2 PIC */
223 cpm2_init_IRQ();
224
225 setup_irq(MPC85xx_IRQ_CPM, &cpm2_irqaction);
226#endif /* CONFIG_MPC8560 */
227
228 return;
229}
230
231int tqm85xx_show_cpuinfo(struct seq_file *m)
232{
233 uint pvid, svid, phid1;
234 uint memsize = total_memory;
235 bd_t *binfo = (bd_t *) __res;
236 unsigned int freq;
237
238 /* get the core frequency */
239 freq = binfo->bi_intfreq;
240
241 pvid = mfspr(SPRN_PVR);
242 svid = mfspr(SPRN_SVR);
243
244 seq_printf(m, "Vendor\t\t: TQ Components\n");
245 seq_printf(m, "Machine\t\t: TQM%s\n", cur_ppc_sys_spec->ppc_sys_name);
246 seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
247 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
248 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
249
250 /* Display cpu Pll setting */
251 phid1 = mfspr(SPRN_HID1);
252 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
253
254 /* Display the amount of memory */
255 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
256
257 return 0;
258}
259
260#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_DS1337)
261extern ulong ds1337_get_rtc_time(void);
262extern int ds1337_set_rtc_time(unsigned long nowtime);
263
264static int __init
265tqm85xx_rtc_hookup(void)
266{
267 struct timespec tv;
268
269 ppc_md.set_rtc_time = ds1337_set_rtc_time;
270 ppc_md.get_rtc_time = ds1337_get_rtc_time;
271
272 tv.tv_nsec = 0;
273 tv.tv_sec = (ppc_md.get_rtc_time)();
274 do_settimeofday(&tv);
275
276 return 0;
277}
278late_initcall(tqm85xx_rtc_hookup);
279#endif
280
281#ifdef CONFIG_PCI
282/*
283 * interrupt routing
284 */
285int mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
286{
287 static char pci_irq_table[][4] =
288 /*
289 * PCI IDSEL/INTPIN->INTLINE
290 * A B C D
291 */
292 {
293 {PIRQA, PIRQB, 0, 0},
294 };
295
296 const long min_idsel = 0x1c, max_idsel = 0x1c, irqs_per_slot = 4;
297 return PCI_IRQ_TABLE_LOOKUP;
298}
299
300int mpc85xx_exclude_device(u_char bus, u_char devfn)
301{
302 if (bus == 0 && PCI_SLOT(devfn) == 0)
303 return PCIBIOS_DEVICE_NOT_FOUND;
304 else
305 return PCIBIOS_SUCCESSFUL;
306}
307
308#endif /* CONFIG_PCI */
309
310#ifdef CONFIG_RAPIDIO
311extern void mpc85xx_rio_setup(int law_start, int law_size);
312void platform_rio_init(void)
313{
314 /* 512MB RIO LAW at 0xc0000000 */
315 mpc85xx_rio_setup(0xc0000000, 0x20000000);
316}
317#endif /* CONFIG_RAPIDIO */
318
319/* ************************************************************************ */
320void __init
321platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
322 unsigned long r6, unsigned long r7)
323{
324 /* parse_bootinfo must always be called first */
325 parse_bootinfo(find_bootinfo());
326
327 /*
328 * If we were passed in a board information, copy it into the
329 * residual data area.
330 */
331 if (r3) {
332 memcpy((void *) __res, (void *) (r3 + KERNELBASE),
333 sizeof (bd_t));
334 }
335
336#if defined(CONFIG_SERIAL_TEXT_DEBUG) && !defined(CONFIG_MPC8560)
337 {
338 bd_t *binfo = (bd_t *) __res;
339 struct uart_port p;
340
341 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
342 settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
343 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
344
345 memset(&p, 0, sizeof (p));
346 p.iotype = UPIO_MEM;
347 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
348 p.uartclk = binfo->bi_busfreq;
349
350 gen550_init(0, &p);
351
352 memset(&p, 0, sizeof (p));
353 p.iotype = UPIO_MEM;
354 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
355 p.uartclk = binfo->bi_busfreq;
356
357 gen550_init(1, &p);
358 }
359#endif
360
361#if defined(CONFIG_BLK_DEV_INITRD)
362 /*
363 * If the init RAM disk has been configured in, and there's a valid
364 * starting address for it, set it up.
365 */
366 if (r4) {
367 initrd_start = r4 + KERNELBASE;
368 initrd_end = r5 + KERNELBASE;
369 }
370#endif /* CONFIG_BLK_DEV_INITRD */
371
372 /* Copy the kernel command line arguments to a safe place. */
373
374 if (r6) {
375 *(char *) (r7 + KERNELBASE) = 0;
376 strcpy(cmd_line, (char *) (r6 + KERNELBASE));
377 }
378
379 identify_ppc_sys_by_id(mfspr(SPRN_SVR));
380
381 /* setup the PowerPC module struct */
382 ppc_md.setup_arch = tqm85xx_setup_arch;
383 ppc_md.show_cpuinfo = tqm85xx_show_cpuinfo;
384
385 ppc_md.init_IRQ = tqm85xx_init_IRQ;
386 ppc_md.get_irq = openpic_get_irq;
387
388 ppc_md.restart = mpc85xx_restart;
389 ppc_md.power_off = mpc85xx_power_off;
390 ppc_md.halt = mpc85xx_halt;
391
392 ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
393
394 ppc_md.time_init = NULL;
395 ppc_md.set_rtc_time = NULL;
396 ppc_md.get_rtc_time = NULL;
397 ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
398
399#ifndef CONFIG_MPC8560
400#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
401 ppc_md.progress = gen550_progress;
402#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
403#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
404 ppc_md.early_serial_map = mpc85xx_early_serial_map;
405#endif /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
406#endif /* CONFIG_MPC8560 */
407
408 if (ppc_md.progress)
409 ppc_md.progress("tqm85xx_init(): exit", 0);
410
411 return;
412}
diff --git a/arch/ppc/platforms/85xx/tqm85xx.h b/arch/ppc/platforms/85xx/tqm85xx.h
deleted file mode 100644
index 57284e68f676..000000000000
--- a/arch/ppc/platforms/85xx/tqm85xx.h
+++ /dev/null
@@ -1,53 +0,0 @@
1/*
2 * TQM85xx (40/41/55/60) board definitions
3 *
4 * Copyright (c) 2005 DENX Software Engineering
5 * Stefan Roese <sr@denx.de>
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2 of the License, or (at your
10 * option) any later version.
11 *
12 */
13
14#ifndef __MACH_TQM85XX_H
15#define __MACH_TQM85XX_H
16
17#include <linux/init.h>
18#include <asm/ppcboot.h>
19
20#define BOARD_CCSRBAR ((uint)0xe0000000)
21#define CCSRBAR_SIZE ((uint)1024*1024)
22
23#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
24
25#define PCI_CFG_ADDR_OFFSET (0x8000)
26#define PCI_CFG_DATA_OFFSET (0x8004)
27
28/* PCI interrupt controller */
29#define PIRQA MPC85xx_IRQ_EXT2
30#define PIRQB MPC85xx_IRQ_EXT3
31
32#define MPC85XX_PCI1_LOWER_IO 0x00000000
33#define MPC85XX_PCI1_UPPER_IO 0x00ffffff
34
35#define MPC85XX_PCI1_LOWER_MEM 0x80000000
36#define MPC85XX_PCI1_UPPER_MEM 0x9fffffff
37
38#define MPC85XX_PCI1_IO_BASE 0xe2000000
39#define MPC85XX_PCI1_MEM_OFFSET 0x00000000
40
41#define MPC85XX_PCI1_IO_SIZE 0x01000000
42
43#define BASE_BAUD 115200
44
45extern void mpc85xx_setup_hose(void) __init;
46extern void mpc85xx_restart(char *cmd);
47extern void mpc85xx_power_off(void);
48extern void mpc85xx_halt(void);
49extern void mpc85xx_init_IRQ(void) __init;
50extern unsigned long mpc85xx_find_end_of_memory(void) __init;
51extern void mpc85xx_calibrate_decr(void) __init;
52
53#endif /* __MACH_TQM85XX_H */
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c
index bf72204125c5..62370f4a5a0f 100644
--- a/arch/ppc/platforms/mpc866ads_setup.c
+++ b/arch/ppc/platforms/mpc866ads_setup.c
@@ -32,7 +32,7 @@
32#include <asm/time.h> 32#include <asm/time.h>
33#include <asm/ppcboot.h> 33#include <asm/ppcboot.h>
34#include <asm/8xx_immap.h> 34#include <asm/8xx_immap.h>
35#include <asm/commproc.h> 35#include <asm/cpm1.h>
36#include <asm/ppc_sys.h> 36#include <asm/ppc_sys.h>
37#include <asm/mpc8xx.h> 37#include <asm/mpc8xx.h>
38 38
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c
index 87deaefd6c5b..ba06cc08cdab 100644
--- a/arch/ppc/platforms/mpc885ads_setup.c
+++ b/arch/ppc/platforms/mpc885ads_setup.c
@@ -31,7 +31,7 @@
31#include <asm/time.h> 31#include <asm/time.h>
32#include <asm/ppcboot.h> 32#include <asm/ppcboot.h>
33#include <asm/8xx_immap.h> 33#include <asm/8xx_immap.h>
34#include <asm/commproc.h> 34#include <asm/cpm1.h>
35#include <asm/ppc_sys.h> 35#include <asm/ppc_sys.h>
36 36
37extern unsigned char __res[]; 37extern unsigned char __res[];
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 5e16228f7645..52ddebe6c6d1 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -87,19 +87,6 @@ endif
87obj-$(CONFIG_BOOTX_TEXT) += btext.o 87obj-$(CONFIG_BOOTX_TEXT) += btext.o
88obj-$(CONFIG_MPC10X_BRIDGE) += mpc10x_common.o ppc_sys.o 88obj-$(CONFIG_MPC10X_BRIDGE) += mpc10x_common.o ppc_sys.o
89obj-$(CONFIG_MPC10X_OPENPIC) += open_pic.o 89obj-$(CONFIG_MPC10X_OPENPIC) += open_pic.o
90obj-$(CONFIG_85xx) += open_pic.o ppc85xx_common.o ppc85xx_setup.o \
91 ppc_sys.o mpc85xx_sys.o \
92 mpc85xx_devices.o
93ifeq ($(CONFIG_85xx),y)
94obj-$(CONFIG_PCI) += pci_auto.o
95endif
96obj-$(CONFIG_83xx) += ppc83xx_setup.o ppc_sys.o \
97 mpc83xx_sys.o mpc83xx_devices.o ipic.o
98ifeq ($(CONFIG_83xx),y)
99obj-$(CONFIG_PCI) += pci_auto.o
100endif
101obj-$(CONFIG_MPC8548_CDS) += todc_time.o
102obj-$(CONFIG_MPC8555_CDS) += todc_time.o
103obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \ 90obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \
104 mpc52xx_sys.o mpc52xx_devices.o ppc_sys.o 91 mpc52xx_sys.o mpc52xx_devices.o ppc_sys.o
105ifeq ($(CONFIG_PPC_MPC52xx),y) 92ifeq ($(CONFIG_PPC_MPC52xx),y)
diff --git a/arch/ppc/syslib/ipic.c b/arch/ppc/syslib/ipic.c
deleted file mode 100644
index 9192777d0f78..000000000000
--- a/arch/ppc/syslib/ipic.c
+++ /dev/null
@@ -1,646 +0,0 @@
1/*
2 * arch/ppc/syslib/ipic.c
3 *
4 * IPIC routines implementations.
5 *
6 * Copyright 2005 Freescale Semiconductor, Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/errno.h>
16#include <linux/reboot.h>
17#include <linux/slab.h>
18#include <linux/stddef.h>
19#include <linux/sched.h>
20#include <linux/signal.h>
21#include <linux/sysdev.h>
22#include <asm/irq.h>
23#include <asm/io.h>
24#include <asm/ipic.h>
25#include <asm/mpc83xx.h>
26
27#include "ipic.h"
28
29static struct ipic p_ipic;
30static struct ipic * primary_ipic;
31
32static struct ipic_info ipic_info[] = {
33 [9] = {
34 .pend = IPIC_SIPNR_H,
35 .mask = IPIC_SIMSR_H,
36 .prio = IPIC_SIPRR_D,
37 .force = IPIC_SIFCR_H,
38 .bit = 24,
39 .prio_mask = 0,
40 },
41 [10] = {
42 .pend = IPIC_SIPNR_H,
43 .mask = IPIC_SIMSR_H,
44 .prio = IPIC_SIPRR_D,
45 .force = IPIC_SIFCR_H,
46 .bit = 25,
47 .prio_mask = 1,
48 },
49 [11] = {
50 .pend = IPIC_SIPNR_H,
51 .mask = IPIC_SIMSR_H,
52 .prio = IPIC_SIPRR_D,
53 .force = IPIC_SIFCR_H,
54 .bit = 26,
55 .prio_mask = 2,
56 },
57 [14] = {
58 .pend = IPIC_SIPNR_H,
59 .mask = IPIC_SIMSR_H,
60 .prio = IPIC_SIPRR_D,
61 .force = IPIC_SIFCR_H,
62 .bit = 29,
63 .prio_mask = 5,
64 },
65 [15] = {
66 .pend = IPIC_SIPNR_H,
67 .mask = IPIC_SIMSR_H,
68 .prio = IPIC_SIPRR_D,
69 .force = IPIC_SIFCR_H,
70 .bit = 30,
71 .prio_mask = 6,
72 },
73 [16] = {
74 .pend = IPIC_SIPNR_H,
75 .mask = IPIC_SIMSR_H,
76 .prio = IPIC_SIPRR_D,
77 .force = IPIC_SIFCR_H,
78 .bit = 31,
79 .prio_mask = 7,
80 },
81 [17] = {
82 .pend = IPIC_SEPNR,
83 .mask = IPIC_SEMSR,
84 .prio = IPIC_SMPRR_A,
85 .force = IPIC_SEFCR,
86 .bit = 1,
87 .prio_mask = 5,
88 },
89 [18] = {
90 .pend = IPIC_SEPNR,
91 .mask = IPIC_SEMSR,
92 .prio = IPIC_SMPRR_A,
93 .force = IPIC_SEFCR,
94 .bit = 2,
95 .prio_mask = 6,
96 },
97 [19] = {
98 .pend = IPIC_SEPNR,
99 .mask = IPIC_SEMSR,
100 .prio = IPIC_SMPRR_A,
101 .force = IPIC_SEFCR,
102 .bit = 3,
103 .prio_mask = 7,
104 },
105 [20] = {
106 .pend = IPIC_SEPNR,
107 .mask = IPIC_SEMSR,
108 .prio = IPIC_SMPRR_B,
109 .force = IPIC_SEFCR,
110 .bit = 4,
111 .prio_mask = 4,
112 },
113 [21] = {
114 .pend = IPIC_SEPNR,
115 .mask = IPIC_SEMSR,
116 .prio = IPIC_SMPRR_B,
117 .force = IPIC_SEFCR,
118 .bit = 5,
119 .prio_mask = 5,
120 },
121 [22] = {
122 .pend = IPIC_SEPNR,
123 .mask = IPIC_SEMSR,
124 .prio = IPIC_SMPRR_B,
125 .force = IPIC_SEFCR,
126 .bit = 6,
127 .prio_mask = 6,
128 },
129 [23] = {
130 .pend = IPIC_SEPNR,
131 .mask = IPIC_SEMSR,
132 .prio = IPIC_SMPRR_B,
133 .force = IPIC_SEFCR,
134 .bit = 7,
135 .prio_mask = 7,
136 },
137 [32] = {
138 .pend = IPIC_SIPNR_H,
139 .mask = IPIC_SIMSR_H,
140 .prio = IPIC_SIPRR_A,
141 .force = IPIC_SIFCR_H,
142 .bit = 0,
143 .prio_mask = 0,
144 },
145 [33] = {
146 .pend = IPIC_SIPNR_H,
147 .mask = IPIC_SIMSR_H,
148 .prio = IPIC_SIPRR_A,
149 .force = IPIC_SIFCR_H,
150 .bit = 1,
151 .prio_mask = 1,
152 },
153 [34] = {
154 .pend = IPIC_SIPNR_H,
155 .mask = IPIC_SIMSR_H,
156 .prio = IPIC_SIPRR_A,
157 .force = IPIC_SIFCR_H,
158 .bit = 2,
159 .prio_mask = 2,
160 },
161 [35] = {
162 .pend = IPIC_SIPNR_H,
163 .mask = IPIC_SIMSR_H,
164 .prio = IPIC_SIPRR_A,
165 .force = IPIC_SIFCR_H,
166 .bit = 3,
167 .prio_mask = 3,
168 },
169 [36] = {
170 .pend = IPIC_SIPNR_H,
171 .mask = IPIC_SIMSR_H,
172 .prio = IPIC_SIPRR_A,
173 .force = IPIC_SIFCR_H,
174 .bit = 4,
175 .prio_mask = 4,
176 },
177 [37] = {
178 .pend = IPIC_SIPNR_H,
179 .mask = IPIC_SIMSR_H,
180 .prio = IPIC_SIPRR_A,
181 .force = IPIC_SIFCR_H,
182 .bit = 5,
183 .prio_mask = 5,
184 },
185 [38] = {
186 .pend = IPIC_SIPNR_H,
187 .mask = IPIC_SIMSR_H,
188 .prio = IPIC_SIPRR_A,
189 .force = IPIC_SIFCR_H,
190 .bit = 6,
191 .prio_mask = 6,
192 },
193 [39] = {
194 .pend = IPIC_SIPNR_H,
195 .mask = IPIC_SIMSR_H,
196 .prio = IPIC_SIPRR_A,
197 .force = IPIC_SIFCR_H,
198 .bit = 7,
199 .prio_mask = 7,
200 },
201 [48] = {
202 .pend = IPIC_SEPNR,
203 .mask = IPIC_SEMSR,
204 .prio = IPIC_SMPRR_A,
205 .force = IPIC_SEFCR,
206 .bit = 0,
207 .prio_mask = 4,
208 },
209 [64] = {
210 .pend = IPIC_SIPNR_H,
211 .mask = IPIC_SIMSR_L,
212 .prio = IPIC_SMPRR_A,
213 .force = IPIC_SIFCR_L,
214 .bit = 0,
215 .prio_mask = 0,
216 },
217 [65] = {
218 .pend = IPIC_SIPNR_H,
219 .mask = IPIC_SIMSR_L,
220 .prio = IPIC_SMPRR_A,
221 .force = IPIC_SIFCR_L,
222 .bit = 1,
223 .prio_mask = 1,
224 },
225 [66] = {
226 .pend = IPIC_SIPNR_H,
227 .mask = IPIC_SIMSR_L,
228 .prio = IPIC_SMPRR_A,
229 .force = IPIC_SIFCR_L,
230 .bit = 2,
231 .prio_mask = 2,
232 },
233 [67] = {
234 .pend = IPIC_SIPNR_H,
235 .mask = IPIC_SIMSR_L,
236 .prio = IPIC_SMPRR_A,
237 .force = IPIC_SIFCR_L,
238 .bit = 3,
239 .prio_mask = 3,
240 },
241 [68] = {
242 .pend = IPIC_SIPNR_H,
243 .mask = IPIC_SIMSR_L,
244 .prio = IPIC_SMPRR_B,
245 .force = IPIC_SIFCR_L,
246 .bit = 4,
247 .prio_mask = 0,
248 },
249 [69] = {
250 .pend = IPIC_SIPNR_H,
251 .mask = IPIC_SIMSR_L,
252 .prio = IPIC_SMPRR_B,
253 .force = IPIC_SIFCR_L,
254 .bit = 5,
255 .prio_mask = 1,
256 },
257 [70] = {
258 .pend = IPIC_SIPNR_H,
259 .mask = IPIC_SIMSR_L,
260 .prio = IPIC_SMPRR_B,
261 .force = IPIC_SIFCR_L,
262 .bit = 6,
263 .prio_mask = 2,
264 },
265 [71] = {
266 .pend = IPIC_SIPNR_H,
267 .mask = IPIC_SIMSR_L,
268 .prio = IPIC_SMPRR_B,
269 .force = IPIC_SIFCR_L,
270 .bit = 7,
271 .prio_mask = 3,
272 },
273 [72] = {
274 .pend = IPIC_SIPNR_H,
275 .mask = IPIC_SIMSR_L,
276 .prio = 0,
277 .force = IPIC_SIFCR_L,
278 .bit = 8,
279 },
280 [73] = {
281 .pend = IPIC_SIPNR_H,
282 .mask = IPIC_SIMSR_L,
283 .prio = 0,
284 .force = IPIC_SIFCR_L,
285 .bit = 9,
286 },
287 [74] = {
288 .pend = IPIC_SIPNR_H,
289 .mask = IPIC_SIMSR_L,
290 .prio = 0,
291 .force = IPIC_SIFCR_L,
292 .bit = 10,
293 },
294 [75] = {
295 .pend = IPIC_SIPNR_H,
296 .mask = IPIC_SIMSR_L,
297 .prio = 0,
298 .force = IPIC_SIFCR_L,
299 .bit = 11,
300 },
301 [76] = {
302 .pend = IPIC_SIPNR_H,
303 .mask = IPIC_SIMSR_L,
304 .prio = 0,
305 .force = IPIC_SIFCR_L,
306 .bit = 12,
307 },
308 [77] = {
309 .pend = IPIC_SIPNR_H,
310 .mask = IPIC_SIMSR_L,
311 .prio = 0,
312 .force = IPIC_SIFCR_L,
313 .bit = 13,
314 },
315 [78] = {
316 .pend = IPIC_SIPNR_H,
317 .mask = IPIC_SIMSR_L,
318 .prio = 0,
319 .force = IPIC_SIFCR_L,
320 .bit = 14,
321 },
322 [79] = {
323 .pend = IPIC_SIPNR_H,
324 .mask = IPIC_SIMSR_L,
325 .prio = 0,
326 .force = IPIC_SIFCR_L,
327 .bit = 15,
328 },
329 [80] = {
330 .pend = IPIC_SIPNR_H,
331 .mask = IPIC_SIMSR_L,
332 .prio = 0,
333 .force = IPIC_SIFCR_L,
334 .bit = 16,
335 },
336 [84] = {
337 .pend = IPIC_SIPNR_H,
338 .mask = IPIC_SIMSR_L,
339 .prio = 0,
340 .force = IPIC_SIFCR_L,
341 .bit = 20,
342 },
343 [85] = {
344 .pend = IPIC_SIPNR_H,
345 .mask = IPIC_SIMSR_L,
346 .prio = 0,
347 .force = IPIC_SIFCR_L,
348 .bit = 21,
349 },
350 [90] = {
351 .pend = IPIC_SIPNR_H,
352 .mask = IPIC_SIMSR_L,
353 .prio = 0,
354 .force = IPIC_SIFCR_L,
355 .bit = 26,
356 },
357 [91] = {
358 .pend = IPIC_SIPNR_H,
359 .mask = IPIC_SIMSR_L,
360 .prio = 0,
361 .force = IPIC_SIFCR_L,
362 .bit = 27,
363 },
364};
365
366static inline u32 ipic_read(volatile u32 __iomem *base, unsigned int reg)
367{
368 return in_be32(base + (reg >> 2));
369}
370
371static inline void ipic_write(volatile u32 __iomem *base, unsigned int reg, u32 value)
372{
373 out_be32(base + (reg >> 2), value);
374}
375
376static inline struct ipic * ipic_from_irq(unsigned int irq)
377{
378 return primary_ipic;
379}
380
381static void ipic_enable_irq(unsigned int irq)
382{
383 struct ipic *ipic = ipic_from_irq(irq);
384 unsigned int src = irq - ipic->irq_offset;
385 u32 temp;
386
387 temp = ipic_read(ipic->regs, ipic_info[src].mask);
388 temp |= (1 << (31 - ipic_info[src].bit));
389 ipic_write(ipic->regs, ipic_info[src].mask, temp);
390}
391
392static void ipic_disable_irq(unsigned int irq)
393{
394 struct ipic *ipic = ipic_from_irq(irq);
395 unsigned int src = irq - ipic->irq_offset;
396 u32 temp;
397
398 temp = ipic_read(ipic->regs, ipic_info[src].mask);
399 temp &= ~(1 << (31 - ipic_info[src].bit));
400 ipic_write(ipic->regs, ipic_info[src].mask, temp);
401}
402
403static void ipic_disable_irq_and_ack(unsigned int irq)
404{
405 struct ipic *ipic = ipic_from_irq(irq);
406 unsigned int src = irq - ipic->irq_offset;
407 u32 temp;
408
409 ipic_disable_irq(irq);
410
411 temp = ipic_read(ipic->regs, ipic_info[src].pend);
412 temp |= (1 << (31 - ipic_info[src].bit));
413 ipic_write(ipic->regs, ipic_info[src].pend, temp);
414}
415
416static void ipic_end_irq(unsigned int irq)
417{
418 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
419 ipic_enable_irq(irq);
420}
421
422struct hw_interrupt_type ipic = {
423 .typename = " IPIC ",
424 .enable = ipic_enable_irq,
425 .disable = ipic_disable_irq,
426 .ack = ipic_disable_irq_and_ack,
427 .end = ipic_end_irq,
428};
429
430void __init ipic_init(phys_addr_t phys_addr,
431 unsigned int flags,
432 unsigned int irq_offset,
433 unsigned char *senses,
434 unsigned int senses_count)
435{
436 u32 i, temp = 0;
437
438 primary_ipic = &p_ipic;
439 primary_ipic->regs = ioremap(phys_addr, MPC83xx_IPIC_SIZE);
440
441 primary_ipic->irq_offset = irq_offset;
442
443 ipic_write(primary_ipic->regs, IPIC_SICNR, 0x0);
444
445 /* default priority scheme is grouped. If spread mode is required
446 * configure SICFR accordingly */
447 if (flags & IPIC_SPREADMODE_GRP_A)
448 temp |= SICFR_IPSA;
449 if (flags & IPIC_SPREADMODE_GRP_D)
450 temp |= SICFR_IPSD;
451 if (flags & IPIC_SPREADMODE_MIX_A)
452 temp |= SICFR_MPSA;
453 if (flags & IPIC_SPREADMODE_MIX_B)
454 temp |= SICFR_MPSB;
455
456 ipic_write(primary_ipic->regs, IPIC_SICNR, temp);
457
458 /* handle MCP route */
459 temp = 0;
460 if (flags & IPIC_DISABLE_MCP_OUT)
461 temp = SERCR_MCPR;
462 ipic_write(primary_ipic->regs, IPIC_SERCR, temp);
463
464 /* handle routing of IRQ0 to MCP */
465 temp = ipic_read(primary_ipic->regs, IPIC_SEMSR);
466
467 if (flags & IPIC_IRQ0_MCP)
468 temp |= SEMSR_SIRQ0;
469 else
470 temp &= ~SEMSR_SIRQ0;
471
472 ipic_write(primary_ipic->regs, IPIC_SEMSR, temp);
473
474 for (i = 0 ; i < NR_IPIC_INTS ; i++) {
475 irq_desc[i+irq_offset].chip = &ipic;
476 irq_desc[i+irq_offset].status = IRQ_LEVEL;
477 }
478
479 temp = 0;
480 for (i = 0 ; i < senses_count ; i++) {
481 if ((senses[i] & IRQ_SENSE_MASK) == IRQ_SENSE_EDGE) {
482 temp |= 1 << (15 - i);
483 if (i != 0)
484 irq_desc[i + irq_offset + MPC83xx_IRQ_EXT1 - 1].status = 0;
485 else
486 irq_desc[irq_offset + MPC83xx_IRQ_EXT0].status = 0;
487 }
488 }
489 ipic_write(primary_ipic->regs, IPIC_SECNR, temp);
490
491 printk ("IPIC (%d IRQ sources, %d External IRQs) at %p\n", NR_IPIC_INTS,
492 senses_count, primary_ipic->regs);
493}
494
495int ipic_set_priority(unsigned int irq, unsigned int priority)
496{
497 struct ipic *ipic = ipic_from_irq(irq);
498 unsigned int src = irq - ipic->irq_offset;
499 u32 temp;
500
501 if (priority > 7)
502 return -EINVAL;
503 if (src > 127)
504 return -EINVAL;
505 if (ipic_info[src].prio == 0)
506 return -EINVAL;
507
508 temp = ipic_read(ipic->regs, ipic_info[src].prio);
509
510 if (priority < 4) {
511 temp &= ~(0x7 << (20 + (3 - priority) * 3));
512 temp |= ipic_info[src].prio_mask << (20 + (3 - priority) * 3);
513 } else {
514 temp &= ~(0x7 << (4 + (7 - priority) * 3));
515 temp |= ipic_info[src].prio_mask << (4 + (7 - priority) * 3);
516 }
517
518 ipic_write(ipic->regs, ipic_info[src].prio, temp);
519
520 return 0;
521}
522
523void ipic_set_highest_priority(unsigned int irq)
524{
525 struct ipic *ipic = ipic_from_irq(irq);
526 unsigned int src = irq - ipic->irq_offset;
527 u32 temp;
528
529 temp = ipic_read(ipic->regs, IPIC_SICFR);
530
531 /* clear and set HPI */
532 temp &= 0x7f000000;
533 temp |= (src & 0x7f) << 24;
534
535 ipic_write(ipic->regs, IPIC_SICFR, temp);
536}
537
538void ipic_set_default_priority(void)
539{
540 ipic_set_priority(MPC83xx_IRQ_TSEC1_TX, 0);
541 ipic_set_priority(MPC83xx_IRQ_TSEC1_RX, 1);
542 ipic_set_priority(MPC83xx_IRQ_TSEC1_ERROR, 2);
543 ipic_set_priority(MPC83xx_IRQ_TSEC2_TX, 3);
544 ipic_set_priority(MPC83xx_IRQ_TSEC2_RX, 4);
545 ipic_set_priority(MPC83xx_IRQ_TSEC2_ERROR, 5);
546 ipic_set_priority(MPC83xx_IRQ_USB2_DR, 6);
547 ipic_set_priority(MPC83xx_IRQ_USB2_MPH, 7);
548
549 ipic_set_priority(MPC83xx_IRQ_UART1, 0);
550 ipic_set_priority(MPC83xx_IRQ_UART2, 1);
551 ipic_set_priority(MPC83xx_IRQ_SEC2, 2);
552 ipic_set_priority(MPC83xx_IRQ_IIC1, 5);
553 ipic_set_priority(MPC83xx_IRQ_IIC2, 6);
554 ipic_set_priority(MPC83xx_IRQ_SPI, 7);
555 ipic_set_priority(MPC83xx_IRQ_RTC_SEC, 0);
556 ipic_set_priority(MPC83xx_IRQ_PIT, 1);
557 ipic_set_priority(MPC83xx_IRQ_PCI1, 2);
558 ipic_set_priority(MPC83xx_IRQ_PCI2, 3);
559 ipic_set_priority(MPC83xx_IRQ_EXT0, 4);
560 ipic_set_priority(MPC83xx_IRQ_EXT1, 5);
561 ipic_set_priority(MPC83xx_IRQ_EXT2, 6);
562 ipic_set_priority(MPC83xx_IRQ_EXT3, 7);
563 ipic_set_priority(MPC83xx_IRQ_RTC_ALR, 0);
564 ipic_set_priority(MPC83xx_IRQ_MU, 1);
565 ipic_set_priority(MPC83xx_IRQ_SBA, 2);
566 ipic_set_priority(MPC83xx_IRQ_DMA, 3);
567 ipic_set_priority(MPC83xx_IRQ_EXT4, 4);
568 ipic_set_priority(MPC83xx_IRQ_EXT5, 5);
569 ipic_set_priority(MPC83xx_IRQ_EXT6, 6);
570 ipic_set_priority(MPC83xx_IRQ_EXT7, 7);
571}
572
573void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq)
574{
575 struct ipic *ipic = primary_ipic;
576 u32 temp;
577
578 temp = ipic_read(ipic->regs, IPIC_SERMR);
579 temp |= (1 << (31 - mcp_irq));
580 ipic_write(ipic->regs, IPIC_SERMR, temp);
581}
582
583void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)
584{
585 struct ipic *ipic = primary_ipic;
586 u32 temp;
587
588 temp = ipic_read(ipic->regs, IPIC_SERMR);
589 temp &= (1 << (31 - mcp_irq));
590 ipic_write(ipic->regs, IPIC_SERMR, temp);
591}
592
593u32 ipic_get_mcp_status(void)
594{
595 return ipic_read(primary_ipic->regs, IPIC_SERMR);
596}
597
598void ipic_clear_mcp_status(u32 mask)
599{
600 ipic_write(primary_ipic->regs, IPIC_SERMR, mask);
601}
602
603/* Return an interrupt vector or -1 if no interrupt is pending. */
604int ipic_get_irq(void)
605{
606 int irq;
607
608 irq = ipic_read(primary_ipic->regs, IPIC_SIVCR) & 0x7f;
609
610 if (irq == 0) /* 0 --> no irq is pending */
611 irq = -1;
612
613 return irq;
614}
615
616static struct sysdev_class ipic_sysclass = {
617 set_kset_name("ipic"),
618};
619
620static struct sys_device device_ipic = {
621 .id = 0,
622 .cls = &ipic_sysclass,
623};
624
625static int __init init_ipic_sysfs(void)
626{
627 int rc;
628
629 if (!primary_ipic->regs)
630 return -ENODEV;
631 printk(KERN_DEBUG "Registering ipic with sysfs...\n");
632
633 rc = sysdev_class_register(&ipic_sysclass);
634 if (rc) {
635 printk(KERN_ERR "Failed registering ipic sys class\n");
636 return -ENODEV;
637 }
638 rc = sysdev_register(&device_ipic);
639 if (rc) {
640 printk(KERN_ERR "Failed registering ipic sys device\n");
641 return -ENODEV;
642 }
643 return 0;
644}
645
646subsys_initcall(init_ipic_sysfs);
diff --git a/arch/ppc/syslib/ipic.h b/arch/ppc/syslib/ipic.h
deleted file mode 100644
index a60c9d18bb7f..000000000000
--- a/arch/ppc/syslib/ipic.h
+++ /dev/null
@@ -1,47 +0,0 @@
1/*
2 * IPIC private definitions and structure.
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor, Inc
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13#ifndef __IPIC_H__
14#define __IPIC_H__
15
16#include <asm/ipic.h>
17
18#define MPC83xx_IPIC_SIZE (0x00100)
19
20/* System Global Interrupt Configuration Register */
21#define SICFR_IPSA 0x00010000
22#define SICFR_IPSD 0x00080000
23#define SICFR_MPSA 0x00200000
24#define SICFR_MPSB 0x00400000
25
26/* System External Interrupt Mask Register */
27#define SEMSR_SIRQ0 0x00008000
28
29/* System Error Control Register */
30#define SERCR_MCPR 0x00000001
31
32struct ipic {
33 volatile u32 __iomem *regs;
34 unsigned int irq_offset;
35};
36
37struct ipic_info {
38 u8 pend; /* pending register offset from base */
39 u8 mask; /* mask register offset from base */
40 u8 prio; /* priority register offset from base */
41 u8 force; /* force register offset from base */
42 u8 bit; /* register bit position (as per doc)
43 bit mask = 1 << (31 - bit) */
44 u8 prio_mask; /* priority mask value */
45};
46
47#endif /* __IPIC_H__ */
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c
deleted file mode 100644
index 5c4932ca8e9b..000000000000
--- a/arch/ppc/syslib/mpc83xx_devices.c
+++ /dev/null
@@ -1,251 +0,0 @@
1/*
2 * MPC83xx Device descriptions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/init.h>
15#include <linux/module.h>
16#include <linux/device.h>
17#include <linux/serial_8250.h>
18#include <linux/fsl_devices.h>
19#include <asm/mpc83xx.h>
20#include <asm/irq.h>
21#include <asm/ppc_sys.h>
22#include <asm/machdep.h>
23
24/* We use offsets for IORESOURCE_MEM since we do not know at compile time
25 * what IMMRBAR is, will get fixed up by mach_mpc83xx_fixup
26 */
27
28struct gianfar_mdio_data mpc83xx_mdio_pdata = {
29};
30
31static struct gianfar_platform_data mpc83xx_tsec1_pdata = {
32 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
33 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
34 FSL_GIANFAR_DEV_HAS_MULTI_INTR,
35};
36
37static struct gianfar_platform_data mpc83xx_tsec2_pdata = {
38 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
39 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
40 FSL_GIANFAR_DEV_HAS_MULTI_INTR,
41};
42
43static struct fsl_i2c_platform_data mpc83xx_fsl_i2c1_pdata = {
44 .device_flags = FSL_I2C_DEV_SEPARATE_DFSRR,
45};
46
47static struct fsl_i2c_platform_data mpc83xx_fsl_i2c2_pdata = {
48 .device_flags = FSL_I2C_DEV_SEPARATE_DFSRR,
49};
50
51static struct plat_serial8250_port serial_platform_data[] = {
52 [0] = {
53 .mapbase = 0x4500,
54 .irq = MPC83xx_IRQ_UART1,
55 .iotype = UPIO_MEM,
56 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
57 },
58 [1] = {
59 .mapbase = 0x4600,
60 .irq = MPC83xx_IRQ_UART2,
61 .iotype = UPIO_MEM,
62 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
63 },
64 { },
65};
66
67struct platform_device ppc_sys_platform_devices[] = {
68 [MPC83xx_TSEC1] = {
69 .name = "fsl-gianfar",
70 .id = 1,
71 .dev.platform_data = &mpc83xx_tsec1_pdata,
72 .num_resources = 4,
73 .resource = (struct resource[]) {
74 {
75 .start = 0x24000,
76 .end = 0x24fff,
77 .flags = IORESOURCE_MEM,
78 },
79 {
80 .name = "tx",
81 .start = MPC83xx_IRQ_TSEC1_TX,
82 .end = MPC83xx_IRQ_TSEC1_TX,
83 .flags = IORESOURCE_IRQ,
84 },
85 {
86 .name = "rx",
87 .start = MPC83xx_IRQ_TSEC1_RX,
88 .end = MPC83xx_IRQ_TSEC1_RX,
89 .flags = IORESOURCE_IRQ,
90 },
91 {
92 .name = "error",
93 .start = MPC83xx_IRQ_TSEC1_ERROR,
94 .end = MPC83xx_IRQ_TSEC1_ERROR,
95 .flags = IORESOURCE_IRQ,
96 },
97 },
98 },
99 [MPC83xx_TSEC2] = {
100 .name = "fsl-gianfar",
101 .id = 2,
102 .dev.platform_data = &mpc83xx_tsec2_pdata,
103 .num_resources = 4,
104 .resource = (struct resource[]) {
105 {
106 .start = 0x25000,
107 .end = 0x25fff,
108 .flags = IORESOURCE_MEM,
109 },
110 {
111 .name = "tx",
112 .start = MPC83xx_IRQ_TSEC2_TX,
113 .end = MPC83xx_IRQ_TSEC2_TX,
114 .flags = IORESOURCE_IRQ,
115 },
116 {
117 .name = "rx",
118 .start = MPC83xx_IRQ_TSEC2_RX,
119 .end = MPC83xx_IRQ_TSEC2_RX,
120 .flags = IORESOURCE_IRQ,
121 },
122 {
123 .name = "error",
124 .start = MPC83xx_IRQ_TSEC2_ERROR,
125 .end = MPC83xx_IRQ_TSEC2_ERROR,
126 .flags = IORESOURCE_IRQ,
127 },
128 },
129 },
130 [MPC83xx_IIC1] = {
131 .name = "fsl-i2c",
132 .id = 1,
133 .dev.platform_data = &mpc83xx_fsl_i2c1_pdata,
134 .num_resources = 2,
135 .resource = (struct resource[]) {
136 {
137 .start = 0x3000,
138 .end = 0x30ff,
139 .flags = IORESOURCE_MEM,
140 },
141 {
142 .start = MPC83xx_IRQ_IIC1,
143 .end = MPC83xx_IRQ_IIC1,
144 .flags = IORESOURCE_IRQ,
145 },
146 },
147 },
148 [MPC83xx_IIC2] = {
149 .name = "fsl-i2c",
150 .id = 2,
151 .dev.platform_data = &mpc83xx_fsl_i2c2_pdata,
152 .num_resources = 2,
153 .resource = (struct resource[]) {
154 {
155 .start = 0x3100,
156 .end = 0x31ff,
157 .flags = IORESOURCE_MEM,
158 },
159 {
160 .start = MPC83xx_IRQ_IIC2,
161 .end = MPC83xx_IRQ_IIC2,
162 .flags = IORESOURCE_IRQ,
163 },
164 },
165 },
166 [MPC83xx_DUART] = {
167 .name = "serial8250",
168 .id = PLAT8250_DEV_PLATFORM,
169 .dev.platform_data = serial_platform_data,
170 },
171 [MPC83xx_SEC2] = {
172 .name = "fsl-sec2",
173 .id = 1,
174 .num_resources = 2,
175 .resource = (struct resource[]) {
176 {
177 .start = 0x30000,
178 .end = 0x3ffff,
179 .flags = IORESOURCE_MEM,
180 },
181 {
182 .start = MPC83xx_IRQ_SEC2,
183 .end = MPC83xx_IRQ_SEC2,
184 .flags = IORESOURCE_IRQ,
185 },
186 },
187 },
188 [MPC83xx_USB2_DR] = {
189 .name = "fsl-ehci",
190 .id = 1,
191 .num_resources = 2,
192 .resource = (struct resource[]) {
193 {
194 .start = 0x23000,
195 .end = 0x23fff,
196 .flags = IORESOURCE_MEM,
197 },
198 {
199 .start = MPC83xx_IRQ_USB2_DR,
200 .end = MPC83xx_IRQ_USB2_DR,
201 .flags = IORESOURCE_IRQ,
202 },
203 },
204 },
205 [MPC83xx_USB2_MPH] = {
206 .name = "fsl-ehci",
207 .id = 2,
208 .num_resources = 2,
209 .resource = (struct resource[]) {
210 {
211 .start = 0x22000,
212 .end = 0x22fff,
213 .flags = IORESOURCE_MEM,
214 },
215 {
216 .start = MPC83xx_IRQ_USB2_MPH,
217 .end = MPC83xx_IRQ_USB2_MPH,
218 .flags = IORESOURCE_IRQ,
219 },
220 },
221 },
222 [MPC83xx_MDIO] = {
223 .name = "fsl-gianfar_mdio",
224 .id = 0,
225 .dev.platform_data = &mpc83xx_mdio_pdata,
226 .num_resources = 1,
227 .resource = (struct resource[]) {
228 {
229 .start = 0x24520,
230 .end = 0x2453f,
231 .flags = IORESOURCE_MEM,
232 },
233 },
234 },
235};
236
237static int __init mach_mpc83xx_fixup(struct platform_device *pdev)
238{
239 ppc_sys_fixup_mem_resource(pdev, immrbar);
240 return 0;
241}
242
243static int __init mach_mpc83xx_init(void)
244{
245 if (ppc_md.progress)
246 ppc_md.progress("mach_mpc83xx_init:enter", 0);
247 ppc_sys_device_fixup = mach_mpc83xx_fixup;
248 return 0;
249}
250
251postcore_initcall(mach_mpc83xx_init);
diff --git a/arch/ppc/syslib/mpc83xx_sys.c b/arch/ppc/syslib/mpc83xx_sys.c
deleted file mode 100644
index 0498ae7e01e3..000000000000
--- a/arch/ppc/syslib/mpc83xx_sys.c
+++ /dev/null
@@ -1,122 +0,0 @@
1/*
2 * MPC83xx System descriptions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/init.h>
15#include <linux/module.h>
16#include <linux/device.h>
17#include <asm/ppc_sys.h>
18
19struct ppc_sys_spec *cur_ppc_sys_spec;
20struct ppc_sys_spec ppc_sys_specs[] = {
21 {
22 .ppc_sys_name = "8349E",
23 .mask = 0xFFFF0000,
24 .value = 0x80500000,
25 .num_devices = 9,
26 .device_list = (enum ppc_sys_devices[])
27 {
28 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
29 MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
30 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
31 },
32 },
33 {
34 .ppc_sys_name = "8349",
35 .mask = 0xFFFF0000,
36 .value = 0x80510000,
37 .num_devices = 8,
38 .device_list = (enum ppc_sys_devices[])
39 {
40 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
41 MPC83xx_IIC2, MPC83xx_DUART,
42 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
43 },
44 },
45 {
46 .ppc_sys_name = "8347E",
47 .mask = 0xFFFF0000,
48 .value = 0x80520000,
49 .num_devices = 9,
50 .device_list = (enum ppc_sys_devices[])
51 {
52 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
53 MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
54 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
55 },
56 },
57 {
58 .ppc_sys_name = "8347",
59 .mask = 0xFFFF0000,
60 .value = 0x80530000,
61 .num_devices = 8,
62 .device_list = (enum ppc_sys_devices[])
63 {
64 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
65 MPC83xx_IIC2, MPC83xx_DUART,
66 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
67 },
68 },
69 {
70 .ppc_sys_name = "8347E",
71 .mask = 0xFFFF0000,
72 .value = 0x80540000,
73 .num_devices = 9,
74 .device_list = (enum ppc_sys_devices[])
75 {
76 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
77 MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
78 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
79 },
80 },
81 {
82 .ppc_sys_name = "8347",
83 .mask = 0xFFFF0000,
84 .value = 0x80550000,
85 .num_devices = 8,
86 .device_list = (enum ppc_sys_devices[])
87 {
88 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
89 MPC83xx_IIC2, MPC83xx_DUART,
90 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
91 },
92 },
93 {
94 .ppc_sys_name = "8343E",
95 .mask = 0xFFFF0000,
96 .value = 0x80560000,
97 .num_devices = 8,
98 .device_list = (enum ppc_sys_devices[])
99 {
100 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
101 MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
102 MPC83xx_USB2_DR, MPC83xx_MDIO
103 },
104 },
105 {
106 .ppc_sys_name = "8343",
107 .mask = 0xFFFF0000,
108 .value = 0x80570000,
109 .num_devices = 7,
110 .device_list = (enum ppc_sys_devices[])
111 {
112 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
113 MPC83xx_IIC2, MPC83xx_DUART,
114 MPC83xx_USB2_DR, MPC83xx_MDIO
115 },
116 },
117 { /* default match */
118 .ppc_sys_name = "",
119 .mask = 0x00000000,
120 .value = 0x00000000,
121 },
122};
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
deleted file mode 100644
index 325136e5aee0..000000000000
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ /dev/null
@@ -1,826 +0,0 @@
1/*
2 * MPC85xx Device descriptions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/init.h>
15#include <linux/module.h>
16#include <linux/device.h>
17#include <linux/serial_8250.h>
18#include <linux/fsl_devices.h>
19#include <linux/fs_enet_pd.h>
20#include <asm/mpc85xx.h>
21#include <asm/irq.h>
22#include <asm/ppc_sys.h>
23#include <asm/cpm2.h>
24
25/* We use offsets for IORESOURCE_MEM since we do not know at compile time
26 * what CCSRBAR is, will get fixed up by mach_mpc85xx_fixup
27 */
28struct gianfar_mdio_data mpc85xx_mdio_pdata = {
29};
30
31static struct gianfar_platform_data mpc85xx_tsec1_pdata = {
32 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
33 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
34 FSL_GIANFAR_DEV_HAS_MULTI_INTR,
35};
36
37static struct gianfar_platform_data mpc85xx_tsec2_pdata = {
38 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
39 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
40 FSL_GIANFAR_DEV_HAS_MULTI_INTR,
41};
42
43static struct gianfar_platform_data mpc85xx_etsec1_pdata = {
44 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
45 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
46 FSL_GIANFAR_DEV_HAS_MULTI_INTR |
47 FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
48 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
49};
50
51static struct gianfar_platform_data mpc85xx_etsec2_pdata = {
52 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
53 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
54 FSL_GIANFAR_DEV_HAS_MULTI_INTR |
55 FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
56 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
57};
58
59static struct gianfar_platform_data mpc85xx_etsec3_pdata = {
60 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
61 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
62 FSL_GIANFAR_DEV_HAS_MULTI_INTR |
63 FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
64 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
65};
66
67static struct gianfar_platform_data mpc85xx_etsec4_pdata = {
68 .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
69 FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
70 FSL_GIANFAR_DEV_HAS_MULTI_INTR |
71 FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
72 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
73};
74
75static struct gianfar_platform_data mpc85xx_fec_pdata = {
76 .device_flags = 0,
77};
78
79static struct fsl_i2c_platform_data mpc85xx_fsl_i2c_pdata = {
80 .device_flags = FSL_I2C_DEV_SEPARATE_DFSRR,
81};
82
83static struct fsl_i2c_platform_data mpc85xx_fsl_i2c2_pdata = {
84 .device_flags = FSL_I2C_DEV_SEPARATE_DFSRR,
85};
86
87static struct fs_platform_info mpc85xx_fcc1_pdata = {
88 .fs_no = fsid_fcc1,
89 .cp_page = CPM_CR_FCC1_PAGE,
90 .cp_block = CPM_CR_FCC1_SBLOCK,
91
92 .rx_ring = 32,
93 .tx_ring = 32,
94 .rx_copybreak = 240,
95 .use_napi = 0,
96 .napi_weight = 17,
97
98 .clk_mask = CMX1_CLK_MASK,
99 .clk_route = CMX1_CLK_ROUTE,
100 .clk_trx = (PC_F1RXCLK | PC_F1TXCLK),
101
102 .mem_offset = FCC1_MEM_OFFSET,
103};
104
105static struct fs_platform_info mpc85xx_fcc2_pdata = {
106 .fs_no = fsid_fcc2,
107 .cp_page = CPM_CR_FCC2_PAGE,
108 .cp_block = CPM_CR_FCC2_SBLOCK,
109
110 .rx_ring = 32,
111 .tx_ring = 32,
112 .rx_copybreak = 240,
113 .use_napi = 0,
114 .napi_weight = 17,
115
116 .clk_mask = CMX2_CLK_MASK,
117 .clk_route = CMX2_CLK_ROUTE,
118 .clk_trx = (PC_F2RXCLK | PC_F2TXCLK),
119
120 .mem_offset = FCC2_MEM_OFFSET,
121};
122
123static struct fs_platform_info mpc85xx_fcc3_pdata = {
124 .fs_no = fsid_fcc3,
125 .cp_page = CPM_CR_FCC3_PAGE,
126 .cp_block = CPM_CR_FCC3_SBLOCK,
127
128 .rx_ring = 32,
129 .tx_ring = 32,
130 .rx_copybreak = 240,
131 .use_napi = 0,
132 .napi_weight = 17,
133
134 .clk_mask = CMX3_CLK_MASK,
135 .clk_route = CMX3_CLK_ROUTE,
136 .clk_trx = (PC_F3RXCLK | PC_F3TXCLK),
137
138 .mem_offset = FCC3_MEM_OFFSET,
139};
140
141static struct plat_serial8250_port serial_platform_data[] = {
142 [0] = {
143 .mapbase = 0x4500,
144 .irq = MPC85xx_IRQ_DUART,
145 .iotype = UPIO_MEM,
146 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ,
147 },
148 [1] = {
149 .mapbase = 0x4600,
150 .irq = MPC85xx_IRQ_DUART,
151 .iotype = UPIO_MEM,
152 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ,
153 },
154 { },
155};
156
157struct platform_device ppc_sys_platform_devices[] = {
158 [MPC85xx_TSEC1] = {
159 .name = "fsl-gianfar",
160 .id = 1,
161 .dev.platform_data = &mpc85xx_tsec1_pdata,
162 .num_resources = 4,
163 .resource = (struct resource[]) {
164 {
165 .start = MPC85xx_ENET1_OFFSET,
166 .end = MPC85xx_ENET1_OFFSET +
167 MPC85xx_ENET1_SIZE - 1,
168 .flags = IORESOURCE_MEM,
169 },
170 {
171 .name = "tx",
172 .start = MPC85xx_IRQ_TSEC1_TX,
173 .end = MPC85xx_IRQ_TSEC1_TX,
174 .flags = IORESOURCE_IRQ,
175 },
176 {
177 .name = "rx",
178 .start = MPC85xx_IRQ_TSEC1_RX,
179 .end = MPC85xx_IRQ_TSEC1_RX,
180 .flags = IORESOURCE_IRQ,
181 },
182 {
183 .name = "error",
184 .start = MPC85xx_IRQ_TSEC1_ERROR,
185 .end = MPC85xx_IRQ_TSEC1_ERROR,
186 .flags = IORESOURCE_IRQ,
187 },
188 },
189 },
190 [MPC85xx_TSEC2] = {
191 .name = "fsl-gianfar",
192 .id = 2,
193 .dev.platform_data = &mpc85xx_tsec2_pdata,
194 .num_resources = 4,
195 .resource = (struct resource[]) {
196 {
197 .start = MPC85xx_ENET2_OFFSET,
198 .end = MPC85xx_ENET2_OFFSET +
199 MPC85xx_ENET2_SIZE - 1,
200 .flags = IORESOURCE_MEM,
201 },
202 {
203 .name = "tx",
204 .start = MPC85xx_IRQ_TSEC2_TX,
205 .end = MPC85xx_IRQ_TSEC2_TX,
206 .flags = IORESOURCE_IRQ,
207 },
208 {
209 .name = "rx",
210 .start = MPC85xx_IRQ_TSEC2_RX,
211 .end = MPC85xx_IRQ_TSEC2_RX,
212 .flags = IORESOURCE_IRQ,
213 },
214 {
215 .name = "error",
216 .start = MPC85xx_IRQ_TSEC2_ERROR,
217 .end = MPC85xx_IRQ_TSEC2_ERROR,
218 .flags = IORESOURCE_IRQ,
219 },
220 },
221 },
222 [MPC85xx_FEC] = {
223 .name = "fsl-gianfar",
224 .id = 3,
225 .dev.platform_data = &mpc85xx_fec_pdata,
226 .num_resources = 2,
227 .resource = (struct resource[]) {
228 {
229 .start = MPC85xx_ENET3_OFFSET,
230 .end = MPC85xx_ENET3_OFFSET +
231 MPC85xx_ENET3_SIZE - 1,
232 .flags = IORESOURCE_MEM,
233
234 },
235 {
236 .start = MPC85xx_IRQ_FEC,
237 .end = MPC85xx_IRQ_FEC,
238 .flags = IORESOURCE_IRQ,
239 },
240 },
241 },
242 [MPC85xx_IIC1] = {
243 .name = "fsl-i2c",
244 .id = 1,
245 .dev.platform_data = &mpc85xx_fsl_i2c_pdata,
246 .num_resources = 2,
247 .resource = (struct resource[]) {
248 {
249 .start = MPC85xx_IIC1_OFFSET,
250 .end = MPC85xx_IIC1_OFFSET +
251 MPC85xx_IIC1_SIZE - 1,
252 .flags = IORESOURCE_MEM,
253 },
254 {
255 .start = MPC85xx_IRQ_IIC1,
256 .end = MPC85xx_IRQ_IIC1,
257 .flags = IORESOURCE_IRQ,
258 },
259 },
260 },
261 [MPC85xx_DMA0] = {
262 .name = "fsl-dma",
263 .id = 0,
264 .num_resources = 2,
265 .resource = (struct resource[]) {
266 {
267 .start = MPC85xx_DMA0_OFFSET,
268 .end = MPC85xx_DMA0_OFFSET +
269 MPC85xx_DMA0_SIZE - 1,
270 .flags = IORESOURCE_MEM,
271 },
272 {
273 .start = MPC85xx_IRQ_DMA0,
274 .end = MPC85xx_IRQ_DMA0,
275 .flags = IORESOURCE_IRQ,
276 },
277 },
278 },
279 [MPC85xx_DMA1] = {
280 .name = "fsl-dma",
281 .id = 1,
282 .num_resources = 2,
283 .resource = (struct resource[]) {
284 {
285 .start = MPC85xx_DMA1_OFFSET,
286 .end = MPC85xx_DMA1_OFFSET +
287 MPC85xx_DMA1_SIZE - 1,
288 .flags = IORESOURCE_MEM,
289 },
290 {
291 .start = MPC85xx_IRQ_DMA1,
292 .end = MPC85xx_IRQ_DMA1,
293 .flags = IORESOURCE_IRQ,
294 },
295 },
296 },
297 [MPC85xx_DMA2] = {
298 .name = "fsl-dma",
299 .id = 2,
300 .num_resources = 2,
301 .resource = (struct resource[]) {
302 {
303 .start = MPC85xx_DMA2_OFFSET,
304 .end = MPC85xx_DMA2_OFFSET +
305 MPC85xx_DMA2_SIZE - 1,
306 .flags = IORESOURCE_MEM,
307 },
308 {
309 .start = MPC85xx_IRQ_DMA2,
310 .end = MPC85xx_IRQ_DMA2,
311 .flags = IORESOURCE_IRQ,
312 },
313 },
314 },
315 [MPC85xx_DMA3] = {
316 .name = "fsl-dma",
317 .id = 3,
318 .num_resources = 2,
319 .resource = (struct resource[]) {
320 {
321 .start = MPC85xx_DMA3_OFFSET,
322 .end = MPC85xx_DMA3_OFFSET +
323 MPC85xx_DMA3_SIZE - 1,
324 .flags = IORESOURCE_MEM,
325 },
326 {
327 .start = MPC85xx_IRQ_DMA3,
328 .end = MPC85xx_IRQ_DMA3,
329 .flags = IORESOURCE_IRQ,
330 },
331 },
332 },
333 [MPC85xx_DUART] = {
334 .name = "serial8250",
335 .id = PLAT8250_DEV_PLATFORM,
336 .dev.platform_data = serial_platform_data,
337 },
338 [MPC85xx_PERFMON] = {
339 .name = "fsl-perfmon",
340 .id = 1,
341 .num_resources = 2,
342 .resource = (struct resource[]) {
343 {
344 .start = MPC85xx_PERFMON_OFFSET,
345 .end = MPC85xx_PERFMON_OFFSET +
346 MPC85xx_PERFMON_SIZE - 1,
347 .flags = IORESOURCE_MEM,
348 },
349 {
350 .start = MPC85xx_IRQ_PERFMON,
351 .end = MPC85xx_IRQ_PERFMON,
352 .flags = IORESOURCE_IRQ,
353 },
354 },
355 },
356 [MPC85xx_SEC2] = {
357 .name = "fsl-sec2",
358 .id = 1,
359 .num_resources = 2,
360 .resource = (struct resource[]) {
361 {
362 .start = MPC85xx_SEC2_OFFSET,
363 .end = MPC85xx_SEC2_OFFSET +
364 MPC85xx_SEC2_SIZE - 1,
365 .flags = IORESOURCE_MEM,
366 },
367 {
368 .start = MPC85xx_IRQ_SEC2,
369 .end = MPC85xx_IRQ_SEC2,
370 .flags = IORESOURCE_IRQ,
371 },
372 },
373 },
374 [MPC85xx_CPM_FCC1] = {
375 .name = "fsl-cpm-fcc",
376 .id = 1,
377 .num_resources = 4,
378 .dev.platform_data = &mpc85xx_fcc1_pdata,
379 .resource = (struct resource[]) {
380 {
381 .name = "fcc_regs",
382 .start = 0x91300,
383 .end = 0x9131F,
384 .flags = IORESOURCE_MEM,
385 },
386 {
387 .name = "fcc_regs_c",
388 .start = 0x91380,
389 .end = 0x9139F,
390 .flags = IORESOURCE_MEM,
391 },
392 {
393 .name = "fcc_pram",
394 .start = 0x88400,
395 .end = 0x884ff,
396 .flags = IORESOURCE_MEM,
397 },
398 {
399 .start = SIU_INT_FCC1,
400 .end = SIU_INT_FCC1,
401 .flags = IORESOURCE_IRQ,
402 },
403 },
404 },
405 [MPC85xx_CPM_FCC2] = {
406 .name = "fsl-cpm-fcc",
407 .id = 2,
408 .num_resources = 4,
409 .dev.platform_data = &mpc85xx_fcc2_pdata,
410 .resource = (struct resource[]) {
411 {
412 .name = "fcc_regs",
413 .start = 0x91320,
414 .end = 0x9133F,
415 .flags = IORESOURCE_MEM,
416 },
417 {
418 .name = "fcc_regs_c",
419 .start = 0x913A0,
420 .end = 0x913CF,
421 .flags = IORESOURCE_MEM,
422 },
423 {
424 .name = "fcc_pram",
425 .start = 0x88500,
426 .end = 0x885ff,
427 .flags = IORESOURCE_MEM,
428 },
429 {
430 .start = SIU_INT_FCC2,
431 .end = SIU_INT_FCC2,
432 .flags = IORESOURCE_IRQ,
433 },
434 },
435 },
436 [MPC85xx_CPM_FCC3] = {
437 .name = "fsl-cpm-fcc",
438 .id = 3,
439 .num_resources = 4,
440 .dev.platform_data = &mpc85xx_fcc3_pdata,
441 .resource = (struct resource[]) {
442 {
443 .name = "fcc_regs",
444 .start = 0x91340,
445 .end = 0x9135F,
446 .flags = IORESOURCE_MEM,
447 },
448 {
449 .name = "fcc_regs_c",
450 .start = 0x913D0,
451 .end = 0x913FF,
452 .flags = IORESOURCE_MEM,
453 },
454 {
455 .name = "fcc_pram",
456 .start = 0x88600,
457 .end = 0x886ff,
458 .flags = IORESOURCE_MEM,
459 },
460 {
461 .start = SIU_INT_FCC3,
462 .end = SIU_INT_FCC3,
463 .flags = IORESOURCE_IRQ,
464 },
465 },
466 },
467 [MPC85xx_CPM_I2C] = {
468 .name = "fsl-cpm-i2c",
469 .id = 1,
470 .num_resources = 2,
471 .resource = (struct resource[]) {
472 {
473 .start = 0x91860,
474 .end = 0x918BF,
475 .flags = IORESOURCE_MEM,
476 },
477 {
478 .start = SIU_INT_I2C,
479 .end = SIU_INT_I2C,
480 .flags = IORESOURCE_IRQ,
481 },
482 },
483 },
484 [MPC85xx_CPM_SCC1] = {
485 .name = "fsl-cpm-scc",
486 .id = 1,
487 .num_resources = 2,
488 .resource = (struct resource[]) {
489 {
490 .start = 0x91A00,
491 .end = 0x91A1F,
492 .flags = IORESOURCE_MEM,
493 },
494 {
495 .start = SIU_INT_SCC1,
496 .end = SIU_INT_SCC1,
497 .flags = IORESOURCE_IRQ,
498 },
499 },
500 },
501 [MPC85xx_CPM_SCC2] = {
502 .name = "fsl-cpm-scc",
503 .id = 2,
504 .num_resources = 2,
505 .resource = (struct resource[]) {
506 {
507 .start = 0x91A20,
508 .end = 0x91A3F,
509 .flags = IORESOURCE_MEM,
510 },
511 {
512 .start = SIU_INT_SCC2,
513 .end = SIU_INT_SCC2,
514 .flags = IORESOURCE_IRQ,
515 },
516 },
517 },
518 [MPC85xx_CPM_SCC3] = {
519 .name = "fsl-cpm-scc",
520 .id = 3,
521 .num_resources = 2,
522 .resource = (struct resource[]) {
523 {
524 .start = 0x91A40,
525 .end = 0x91A5F,
526 .flags = IORESOURCE_MEM,
527 },
528 {
529 .start = SIU_INT_SCC3,
530 .end = SIU_INT_SCC3,
531 .flags = IORESOURCE_IRQ,
532 },
533 },
534 },
535 [MPC85xx_CPM_SCC4] = {
536 .name = "fsl-cpm-scc",
537 .id = 4,
538 .num_resources = 2,
539 .resource = (struct resource[]) {
540 {
541 .start = 0x91A60,
542 .end = 0x91A7F,
543 .flags = IORESOURCE_MEM,
544 },
545 {
546 .start = SIU_INT_SCC4,
547 .end = SIU_INT_SCC4,
548 .flags = IORESOURCE_IRQ,
549 },
550 },
551 },
552 [MPC85xx_CPM_SPI] = {
553 .name = "fsl-cpm-spi",
554 .id = 1,
555 .num_resources = 2,
556 .resource = (struct resource[]) {
557 {
558 .start = 0x91AA0,
559 .end = 0x91AFF,
560 .flags = IORESOURCE_MEM,
561 },
562 {
563 .start = SIU_INT_SPI,
564 .end = SIU_INT_SPI,
565 .flags = IORESOURCE_IRQ,
566 },
567 },
568 },
569 [MPC85xx_CPM_MCC1] = {
570 .name = "fsl-cpm-mcc",
571 .id = 1,
572 .num_resources = 2,
573 .resource = (struct resource[]) {
574 {
575 .start = 0x91B30,
576 .end = 0x91B3F,
577 .flags = IORESOURCE_MEM,
578 },
579 {
580 .start = SIU_INT_MCC1,
581 .end = SIU_INT_MCC1,
582 .flags = IORESOURCE_IRQ,
583 },
584 },
585 },
586 [MPC85xx_CPM_MCC2] = {
587 .name = "fsl-cpm-mcc",
588 .id = 2,
589 .num_resources = 2,
590 .resource = (struct resource[]) {
591 {
592 .start = 0x91B50,
593 .end = 0x91B5F,
594 .flags = IORESOURCE_MEM,
595 },
596 {
597 .start = SIU_INT_MCC2,
598 .end = SIU_INT_MCC2,
599 .flags = IORESOURCE_IRQ,
600 },
601 },
602 },
603 [MPC85xx_CPM_SMC1] = {
604 .name = "fsl-cpm-smc",
605 .id = 1,
606 .num_resources = 2,
607 .resource = (struct resource[]) {
608 {
609 .start = 0x91A80,
610 .end = 0x91A8F,
611 .flags = IORESOURCE_MEM,
612 },
613 {
614 .start = SIU_INT_SMC1,
615 .end = SIU_INT_SMC1,
616 .flags = IORESOURCE_IRQ,
617 },
618 },
619 },
620 [MPC85xx_CPM_SMC2] = {
621 .name = "fsl-cpm-smc",
622 .id = 2,
623 .num_resources = 2,
624 .resource = (struct resource[]) {
625 {
626 .start = 0x91A90,
627 .end = 0x91A9F,
628 .flags = IORESOURCE_MEM,
629 },
630 {
631 .start = SIU_INT_SMC2,
632 .end = SIU_INT_SMC2,
633 .flags = IORESOURCE_IRQ,
634 },
635 },
636 },
637 [MPC85xx_CPM_USB] = {
638 .name = "fsl-cpm-usb",
639 .id = 2,
640 .num_resources = 2,
641 .resource = (struct resource[]) {
642 {
643 .start = 0x91B60,
644 .end = 0x91B7F,
645 .flags = IORESOURCE_MEM,
646 },
647 {
648 .start = SIU_INT_USB,
649 .end = SIU_INT_USB,
650 .flags = IORESOURCE_IRQ,
651 },
652 },
653 },
654 [MPC85xx_eTSEC1] = {
655 .name = "fsl-gianfar",
656 .id = 1,
657 .dev.platform_data = &mpc85xx_etsec1_pdata,
658 .num_resources = 4,
659 .resource = (struct resource[]) {
660 {
661 .start = MPC85xx_ENET1_OFFSET,
662 .end = MPC85xx_ENET1_OFFSET +
663 MPC85xx_ENET1_SIZE - 1,
664 .flags = IORESOURCE_MEM,
665 },
666 {
667 .name = "tx",
668 .start = MPC85xx_IRQ_TSEC1_TX,
669 .end = MPC85xx_IRQ_TSEC1_TX,
670 .flags = IORESOURCE_IRQ,
671 },
672 {
673 .name = "rx",
674 .start = MPC85xx_IRQ_TSEC1_RX,
675 .end = MPC85xx_IRQ_TSEC1_RX,
676 .flags = IORESOURCE_IRQ,
677 },
678 {
679 .name = "error",
680 .start = MPC85xx_IRQ_TSEC1_ERROR,
681 .end = MPC85xx_IRQ_TSEC1_ERROR,
682 .flags = IORESOURCE_IRQ,
683 },
684 },
685 },
686 [MPC85xx_eTSEC2] = {
687 .name = "fsl-gianfar",
688 .id = 2,
689 .dev.platform_data = &mpc85xx_etsec2_pdata,
690 .num_resources = 4,
691 .resource = (struct resource[]) {
692 {
693 .start = MPC85xx_ENET2_OFFSET,
694 .end = MPC85xx_ENET2_OFFSET +
695 MPC85xx_ENET2_SIZE - 1,
696 .flags = IORESOURCE_MEM,
697 },
698 {
699 .name = "tx",
700 .start = MPC85xx_IRQ_TSEC2_TX,
701 .end = MPC85xx_IRQ_TSEC2_TX,
702 .flags = IORESOURCE_IRQ,
703 },
704 {
705 .name = "rx",
706 .start = MPC85xx_IRQ_TSEC2_RX,
707 .end = MPC85xx_IRQ_TSEC2_RX,
708 .flags = IORESOURCE_IRQ,
709 },
710 {
711 .name = "error",
712 .start = MPC85xx_IRQ_TSEC2_ERROR,
713 .end = MPC85xx_IRQ_TSEC2_ERROR,
714 .flags = IORESOURCE_IRQ,
715 },
716 },
717 },
718 [MPC85xx_eTSEC3] = {
719 .name = "fsl-gianfar",
720 .id = 3,
721 .dev.platform_data = &mpc85xx_etsec3_pdata,
722 .num_resources = 4,
723 .resource = (struct resource[]) {
724 {
725 .start = MPC85xx_ENET3_OFFSET,
726 .end = MPC85xx_ENET3_OFFSET +
727 MPC85xx_ENET3_SIZE - 1,
728 .flags = IORESOURCE_MEM,
729 },
730 {
731 .name = "tx",
732 .start = MPC85xx_IRQ_TSEC3_TX,
733 .end = MPC85xx_IRQ_TSEC3_TX,
734 .flags = IORESOURCE_IRQ,
735 },
736 {
737 .name = "rx",
738 .start = MPC85xx_IRQ_TSEC3_RX,
739 .end = MPC85xx_IRQ_TSEC3_RX,
740 .flags = IORESOURCE_IRQ,
741 },
742 {
743 .name = "error",
744 .start = MPC85xx_IRQ_TSEC3_ERROR,
745 .end = MPC85xx_IRQ_TSEC3_ERROR,
746 .flags = IORESOURCE_IRQ,
747 },
748 },
749 },
750 [MPC85xx_eTSEC4] = {
751 .name = "fsl-gianfar",
752 .id = 4,
753 .dev.platform_data = &mpc85xx_etsec4_pdata,
754 .num_resources = 4,
755 .resource = (struct resource[]) {
756 {
757 .start = 0x27000,
758 .end = 0x27fff,
759 .flags = IORESOURCE_MEM,
760 },
761 {
762 .name = "tx",
763 .start = MPC85xx_IRQ_TSEC4_TX,
764 .end = MPC85xx_IRQ_TSEC4_TX,
765 .flags = IORESOURCE_IRQ,
766 },
767 {
768 .name = "rx",
769 .start = MPC85xx_IRQ_TSEC4_RX,
770 .end = MPC85xx_IRQ_TSEC4_RX,
771 .flags = IORESOURCE_IRQ,
772 },
773 {
774 .name = "error",
775 .start = MPC85xx_IRQ_TSEC4_ERROR,
776 .end = MPC85xx_IRQ_TSEC4_ERROR,
777 .flags = IORESOURCE_IRQ,
778 },
779 },
780 },
781 [MPC85xx_IIC2] = {
782 .name = "fsl-i2c",
783 .id = 2,
784 .dev.platform_data = &mpc85xx_fsl_i2c2_pdata,
785 .num_resources = 2,
786 .resource = (struct resource[]) {
787 {
788 .start = 0x03100,
789 .end = 0x031ff,
790 .flags = IORESOURCE_MEM,
791 },
792 {
793 .start = MPC85xx_IRQ_IIC1,
794 .end = MPC85xx_IRQ_IIC1,
795 .flags = IORESOURCE_IRQ,
796 },
797 },
798 },
799 [MPC85xx_MDIO] = {
800 .name = "fsl-gianfar_mdio",
801 .id = 0,
802 .dev.platform_data = &mpc85xx_mdio_pdata,
803 .num_resources = 1,
804 .resource = (struct resource[]) {
805 {
806 .start = 0x24520,
807 .end = 0x2453f,
808 .flags = IORESOURCE_MEM,
809 },
810 },
811 },
812};
813
814static int __init mach_mpc85xx_fixup(struct platform_device *pdev)
815{
816 ppc_sys_fixup_mem_resource(pdev, CCSRBAR);
817 return 0;
818}
819
820static int __init mach_mpc85xx_init(void)
821{
822 ppc_sys_device_fixup = mach_mpc85xx_fixup;
823 return 0;
824}
825
826postcore_initcall(mach_mpc85xx_init);
diff --git a/arch/ppc/syslib/mpc85xx_sys.c b/arch/ppc/syslib/mpc85xx_sys.c
deleted file mode 100644
index d96a93dbcb5a..000000000000
--- a/arch/ppc/syslib/mpc85xx_sys.c
+++ /dev/null
@@ -1,233 +0,0 @@
1/*
2 * MPC85xx System descriptions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/init.h>
15#include <linux/module.h>
16#include <linux/device.h>
17#include <asm/ppc_sys.h>
18
19struct ppc_sys_spec *cur_ppc_sys_spec;
20struct ppc_sys_spec ppc_sys_specs[] = {
21 {
22 .ppc_sys_name = "8540",
23 .mask = 0xFFFF0000,
24 .value = 0x80300000,
25 .num_devices = 11,
26 .device_list = (enum ppc_sys_devices[])
27 {
28 MPC85xx_TSEC1, MPC85xx_TSEC2, MPC85xx_FEC, MPC85xx_IIC1,
29 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
30 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_MDIO,
31 },
32 },
33 {
34 .ppc_sys_name = "8560",
35 .mask = 0xFFFF0000,
36 .value = 0x80700000,
37 .num_devices = 20,
38 .device_list = (enum ppc_sys_devices[])
39 {
40 MPC85xx_TSEC1, MPC85xx_TSEC2, MPC85xx_IIC1,
41 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
42 MPC85xx_PERFMON,
43 MPC85xx_CPM_SPI, MPC85xx_CPM_I2C, MPC85xx_CPM_SCC1,
44 MPC85xx_CPM_SCC2, MPC85xx_CPM_SCC3, MPC85xx_CPM_SCC4,
45 MPC85xx_CPM_FCC1, MPC85xx_CPM_FCC2, MPC85xx_CPM_FCC3,
46 MPC85xx_CPM_MCC1, MPC85xx_CPM_MCC2, MPC85xx_MDIO,
47 },
48 },
49 {
50 .ppc_sys_name = "8541",
51 .mask = 0xFFFF0000,
52 .value = 0x80720000,
53 .num_devices = 14,
54 .device_list = (enum ppc_sys_devices[])
55 {
56 MPC85xx_TSEC1, MPC85xx_TSEC2, MPC85xx_IIC1,
57 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
58 MPC85xx_PERFMON, MPC85xx_DUART,
59 MPC85xx_CPM_SPI, MPC85xx_CPM_I2C,
60 MPC85xx_CPM_FCC1, MPC85xx_CPM_FCC2,
61 MPC85xx_MDIO,
62 },
63 },
64 {
65 .ppc_sys_name = "8541E",
66 .mask = 0xFFFF0000,
67 .value = 0x807A0000,
68 .num_devices = 15,
69 .device_list = (enum ppc_sys_devices[])
70 {
71 MPC85xx_TSEC1, MPC85xx_TSEC2, MPC85xx_IIC1,
72 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
73 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
74 MPC85xx_CPM_SPI, MPC85xx_CPM_I2C,
75 MPC85xx_CPM_FCC1, MPC85xx_CPM_FCC2,
76 MPC85xx_MDIO,
77 },
78 },
79 {
80 .ppc_sys_name = "8555",
81 .mask = 0xFFFF0000,
82 .value = 0x80710000,
83 .num_devices = 20,
84 .device_list = (enum ppc_sys_devices[])
85 {
86 MPC85xx_TSEC1, MPC85xx_TSEC2, MPC85xx_IIC1,
87 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
88 MPC85xx_PERFMON, MPC85xx_DUART,
89 MPC85xx_CPM_SPI, MPC85xx_CPM_I2C, MPC85xx_CPM_SCC1,
90 MPC85xx_CPM_SCC2, MPC85xx_CPM_SCC3,
91 MPC85xx_CPM_FCC1, MPC85xx_CPM_FCC2,
92 MPC85xx_CPM_SMC1, MPC85xx_CPM_SMC2,
93 MPC85xx_CPM_USB,
94 MPC85xx_MDIO,
95 },
96 },
97 {
98 .ppc_sys_name = "8555E",
99 .mask = 0xFFFF0000,
100 .value = 0x80790000,
101 .num_devices = 21,
102 .device_list = (enum ppc_sys_devices[])
103 {
104 MPC85xx_TSEC1, MPC85xx_TSEC2, MPC85xx_IIC1,
105 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
106 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
107 MPC85xx_CPM_SPI, MPC85xx_CPM_I2C, MPC85xx_CPM_SCC1,
108 MPC85xx_CPM_SCC2, MPC85xx_CPM_SCC3,
109 MPC85xx_CPM_FCC1, MPC85xx_CPM_FCC2,
110 MPC85xx_CPM_SMC1, MPC85xx_CPM_SMC2,
111 MPC85xx_CPM_USB,
112 MPC85xx_MDIO,
113 },
114 },
115 /* SVRs on 8548 rev1.0 matches for 8548/8547/8545 */
116 {
117 .ppc_sys_name = "8548E",
118 .mask = 0xFFFF00F0,
119 .value = 0x80390010,
120 .num_devices = 14,
121 .device_list = (enum ppc_sys_devices[])
122 {
123 MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
124 MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
125 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
126 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
127 MPC85xx_MDIO,
128 },
129 },
130 {
131 .ppc_sys_name = "8548",
132 .mask = 0xFFFF00F0,
133 .value = 0x80310010,
134 .num_devices = 13,
135 .device_list = (enum ppc_sys_devices[])
136 {
137 MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
138 MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
139 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
140 MPC85xx_PERFMON, MPC85xx_DUART,
141 MPC85xx_MDIO,
142 },
143 },
144 {
145 .ppc_sys_name = "8547E",
146 .mask = 0xFFFF00F0,
147 .value = 0x80390010,
148 .num_devices = 14,
149 .device_list = (enum ppc_sys_devices[])
150 {
151 MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
152 MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
153 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
154 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
155 MPC85xx_MDIO,
156 },
157 },
158 {
159 .ppc_sys_name = "8547",
160 .mask = 0xFFFF00F0,
161 .value = 0x80310010,
162 .num_devices = 13,
163 .device_list = (enum ppc_sys_devices[])
164 {
165 MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
166 MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
167 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
168 MPC85xx_PERFMON, MPC85xx_DUART,
169 MPC85xx_MDIO,
170 },
171 },
172 {
173 .ppc_sys_name = "8545E",
174 .mask = 0xFFFF00F0,
175 .value = 0x80390010,
176 .num_devices = 12,
177 .device_list = (enum ppc_sys_devices[])
178 {
179 MPC85xx_eTSEC1, MPC85xx_eTSEC2,
180 MPC85xx_IIC1, MPC85xx_IIC2,
181 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
182 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
183 MPC85xx_MDIO,
184 },
185 },
186 {
187 .ppc_sys_name = "8545",
188 .mask = 0xFFFF00F0,
189 .value = 0x80310010,
190 .num_devices = 11,
191 .device_list = (enum ppc_sys_devices[])
192 {
193 MPC85xx_eTSEC1, MPC85xx_eTSEC2,
194 MPC85xx_IIC1, MPC85xx_IIC2,
195 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
196 MPC85xx_PERFMON, MPC85xx_DUART,
197 MPC85xx_MDIO,
198 },
199 },
200 {
201 .ppc_sys_name = "8543E",
202 .mask = 0xFFFF00F0,
203 .value = 0x803A0010,
204 .num_devices = 12,
205 .device_list = (enum ppc_sys_devices[])
206 {
207 MPC85xx_eTSEC1, MPC85xx_eTSEC2,
208 MPC85xx_IIC1, MPC85xx_IIC2,
209 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
210 MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
211 MPC85xx_MDIO,
212 },
213 },
214 {
215 .ppc_sys_name = "8543",
216 .mask = 0xFFFF00F0,
217 .value = 0x80320010,
218 .num_devices = 11,
219 .device_list = (enum ppc_sys_devices[])
220 {
221 MPC85xx_eTSEC1, MPC85xx_eTSEC2,
222 MPC85xx_IIC1, MPC85xx_IIC2,
223 MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
224 MPC85xx_PERFMON, MPC85xx_DUART,
225 MPC85xx_MDIO,
226 },
227 },
228 { /* default match */
229 .ppc_sys_name = "",
230 .mask = 0x00000000,
231 .value = 0x00000000,
232 },
233};
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index c05ac87ece4c..80804eee5795 100644
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -16,7 +16,7 @@
16#include <linux/device.h> 16#include <linux/device.h>
17#include <linux/serial_8250.h> 17#include <linux/serial_8250.h>
18#include <linux/mii.h> 18#include <linux/mii.h>
19#include <asm/commproc.h> 19#include <asm/cpm1.h>
20#include <asm/mpc8xx.h> 20#include <asm/mpc8xx.h>
21#include <asm/irq.h> 21#include <asm/irq.h>
22#include <asm/ppc_sys.h> 22#include <asm/ppc_sys.h>
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c
index d42d4085dc81..ac80370ed2f7 100644
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
@@ -20,7 +20,7 @@
20 * of peripherals are found on embedded SoC (System On a Chip) 20 * of peripherals are found on embedded SoC (System On a Chip)
21 * processors or highly integrated system controllers that have 21 * processors or highly integrated system controllers that have
22 * a host bridge and many peripherals. Common examples where 22 * a host bridge and many peripherals. Common examples where
23 * this is already used include the PPC4xx, PPC85xx, MPC52xx, 23 * this is already used include the PPC4xx, MPC52xx,
24 * and MV64xxx parts. 24 * and MV64xxx parts.
25 * 25 *
26 * This subsystem creates a standard OCP bus type within the 26 * This subsystem creates a standard OCP bus type within the
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c
index 18ec94733293..780a3b9b4fe9 100644
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -24,7 +24,7 @@
24 24
25#include "open_pic_defs.h" 25#include "open_pic_defs.h"
26 26
27#if defined(CONFIG_PRPMC800) || defined(CONFIG_85xx) 27#if defined(CONFIG_PRPMC800)
28#define OPENPIC_BIG_ENDIAN 28#define OPENPIC_BIG_ENDIAN
29#endif 29#endif
30 30
diff --git a/arch/ppc/syslib/ppc83xx_pci.h b/arch/ppc/syslib/ppc83xx_pci.h
deleted file mode 100644
index ec691640f6be..000000000000
--- a/arch/ppc/syslib/ppc83xx_pci.h
+++ /dev/null
@@ -1,151 +0,0 @@
1/* Created by Tony Li <tony.li@freescale.com>
2 * Copyright (c) 2005 freescale semiconductor
3 *
4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License as published by the
6 * Free Software Foundation; either version 2 of the License, or (at your
7 * option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful, but
10 * WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License along
15 * with this program; if not, write to the Free Software Foundation, Inc.,
16 * 675 Mass Ave, Cambridge, MA 02139, USA.
17 */
18
19#ifndef __PPC_SYSLIB_PPC83XX_PCI_H
20#define __PPC_SYSLIB_PPC83XX_PCI_H
21
22typedef struct immr_clk {
23 u32 spmr; /* system PLL mode Register */
24 u32 occr; /* output clock control Register */
25 u32 sccr; /* system clock control Register */
26 u8 res0[0xF4];
27} immr_clk_t;
28
29/*
30 * Sequencer
31 */
32typedef struct immr_ios {
33 u32 potar0;
34 u8 res0[4];
35 u32 pobar0;
36 u8 res1[4];
37 u32 pocmr0;
38 u8 res2[4];
39 u32 potar1;
40 u8 res3[4];
41 u32 pobar1;
42 u8 res4[4];
43 u32 pocmr1;
44 u8 res5[4];
45 u32 potar2;
46 u8 res6[4];
47 u32 pobar2;
48 u8 res7[4];
49 u32 pocmr2;
50 u8 res8[4];
51 u32 potar3;
52 u8 res9[4];
53 u32 pobar3;
54 u8 res10[4];
55 u32 pocmr3;
56 u8 res11[4];
57 u32 potar4;
58 u8 res12[4];
59 u32 pobar4;
60 u8 res13[4];
61 u32 pocmr4;
62 u8 res14[4];
63 u32 potar5;
64 u8 res15[4];
65 u32 pobar5;
66 u8 res16[4];
67 u32 pocmr5;
68 u8 res17[4];
69 u8 res18[0x60];
70 u32 pmcr;
71 u8 res19[4];
72 u32 dtcr;
73 u8 res20[4];
74} immr_ios_t;
75#define POTAR_TA_MASK 0x000fffff
76#define POBAR_BA_MASK 0x000fffff
77#define POCMR_EN 0x80000000
78#define POCMR_IO 0x40000000 /* 0--memory space 1--I/O space */
79#define POCMR_SE 0x20000000 /* streaming enable */
80#define POCMR_DST 0x10000000 /* 0--PCI1 1--PCI2 */
81#define POCMR_CM_MASK 0x000fffff
82
83/*
84 * PCI Controller Control and Status Registers
85 */
86typedef struct immr_pcictrl {
87 u32 esr;
88 u32 ecdr;
89 u32 eer;
90 u32 eatcr;
91 u32 eacr;
92 u32 eeacr;
93 u32 edlcr;
94 u32 edhcr;
95 u32 gcr;
96 u32 ecr;
97 u32 gsr;
98 u8 res0[12];
99 u32 pitar2;
100 u8 res1[4];
101 u32 pibar2;
102 u32 piebar2;
103 u32 piwar2;
104 u8 res2[4];
105 u32 pitar1;
106 u8 res3[4];
107 u32 pibar1;
108 u32 piebar1;
109 u32 piwar1;
110 u8 res4[4];
111 u32 pitar0;
112 u8 res5[4];
113 u32 pibar0;
114 u8 res6[4];
115 u32 piwar0;
116 u8 res7[132];
117} immr_pcictrl_t;
118#define PITAR_TA_MASK 0x000fffff
119#define PIBAR_MASK 0xffffffff
120#define PIEBAR_EBA_MASK 0x000fffff
121#define PIWAR_EN 0x80000000
122#define PIWAR_PF 0x20000000
123#define PIWAR_RTT_MASK 0x000f0000
124#define PIWAR_RTT_NO_SNOOP 0x00040000
125#define PIWAR_RTT_SNOOP 0x00050000
126#define PIWAR_WTT_MASK 0x0000f000
127#define PIWAR_WTT_NO_SNOOP 0x00004000
128#define PIWAR_WTT_SNOOP 0x00005000
129#define PIWAR_IWS_MASK 0x0000003F
130#define PIWAR_IWS_4K 0x0000000B
131#define PIWAR_IWS_8K 0x0000000C
132#define PIWAR_IWS_16K 0x0000000D
133#define PIWAR_IWS_32K 0x0000000E
134#define PIWAR_IWS_64K 0x0000000F
135#define PIWAR_IWS_128K 0x00000010
136#define PIWAR_IWS_256K 0x00000011
137#define PIWAR_IWS_512K 0x00000012
138#define PIWAR_IWS_1M 0x00000013
139#define PIWAR_IWS_2M 0x00000014
140#define PIWAR_IWS_4M 0x00000015
141#define PIWAR_IWS_8M 0x00000016
142#define PIWAR_IWS_16M 0x00000017
143#define PIWAR_IWS_32M 0x00000018
144#define PIWAR_IWS_64M 0x00000019
145#define PIWAR_IWS_128M 0x0000001A
146#define PIWAR_IWS_256M 0x0000001B
147#define PIWAR_IWS_512M 0x0000001C
148#define PIWAR_IWS_1G 0x0000001D
149#define PIWAR_IWS_2G 0x0000001E
150
151#endif /* __PPC_SYSLIB_PPC83XX_PCI_H */
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c
deleted file mode 100644
index ea372914dd6e..000000000000
--- a/arch/ppc/syslib/ppc83xx_setup.c
+++ /dev/null
@@ -1,410 +0,0 @@
1/*
2 * MPC83XX common board code
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License along
19 * with this program; if not, write to the Free Software Foundation, Inc.,
20 * 675 Mass Ave, Cambridge, MA 02139, USA.
21 *
22 * Added PCI support -- Tony Li <tony.li@freescale.com>
23 */
24
25#include <linux/types.h>
26#include <linux/module.h>
27#include <linux/init.h>
28#include <linux/pci.h>
29#include <linux/serial.h>
30#include <linux/tty.h> /* for linux/serial_core.h */
31#include <linux/serial_core.h>
32#include <linux/serial_8250.h>
33
34#include <asm/time.h>
35#include <asm/mpc83xx.h>
36#include <asm/mmu.h>
37#include <asm/ppc_sys.h>
38#include <asm/kgdb.h>
39#include <asm/delay.h>
40#include <asm/machdep.h>
41
42#include <syslib/ppc83xx_setup.h>
43#if defined(CONFIG_PCI)
44#include <syslib/ppc83xx_pci.h>
45#endif
46
47phys_addr_t immrbar;
48
49/* Return the amount of memory */
50unsigned long __init
51mpc83xx_find_end_of_memory(void)
52{
53 bd_t *binfo;
54
55 binfo = (bd_t *) __res;
56
57 return binfo->bi_memsize;
58}
59
60long __init
61mpc83xx_time_init(void)
62{
63#define SPCR_OFFS 0x00000110
64#define SPCR_TBEN 0x00400000
65
66 bd_t *binfo = (bd_t *)__res;
67 u32 *spcr = ioremap(binfo->bi_immr_base + SPCR_OFFS, 4);
68
69 *spcr |= SPCR_TBEN;
70
71 iounmap(spcr);
72
73 return 0;
74}
75
76/* The decrementer counts at the system (internal) clock freq divided by 4 */
77void __init
78mpc83xx_calibrate_decr(void)
79{
80 bd_t *binfo = (bd_t *) __res;
81 unsigned int freq, divisor;
82
83 freq = binfo->bi_busfreq;
84 divisor = 4;
85 tb_ticks_per_jiffy = freq / HZ / divisor;
86 tb_to_us = mulhwu_scale_factor(freq / divisor, 1000000);
87}
88
89#ifdef CONFIG_SERIAL_8250
90void __init
91mpc83xx_early_serial_map(void)
92{
93#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
94 struct uart_port serial_req;
95#endif
96 struct plat_serial8250_port *pdata;
97 bd_t *binfo = (bd_t *) __res;
98 pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC83xx_DUART);
99
100 /* Setup serial port access */
101 pdata[0].uartclk = binfo->bi_busfreq;
102 pdata[0].mapbase += binfo->bi_immr_base;
103 pdata[0].membase = ioremap(pdata[0].mapbase, 0x100);
104
105#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
106 memset(&serial_req, 0, sizeof (serial_req));
107 serial_req.iotype = UPIO_MEM;
108 serial_req.mapbase = pdata[0].mapbase;
109 serial_req.membase = pdata[0].membase;
110 serial_req.regshift = 0;
111
112 gen550_init(0, &serial_req);
113#endif
114
115 pdata[1].uartclk = binfo->bi_busfreq;
116 pdata[1].mapbase += binfo->bi_immr_base;
117 pdata[1].membase = ioremap(pdata[1].mapbase, 0x100);
118
119#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
120 /* Assume gen550_init() doesn't modify serial_req */
121 serial_req.mapbase = pdata[1].mapbase;
122 serial_req.membase = pdata[1].membase;
123
124 gen550_init(1, &serial_req);
125#endif
126}
127#endif
128
129void
130mpc83xx_restart(char *cmd)
131{
132 volatile unsigned char __iomem *reg;
133 unsigned char tmp;
134
135 reg = ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
136
137 local_irq_disable();
138
139 /*
140 * Unlock the BCSR bits so a PRST will update the contents.
141 * Otherwise the reset asserts but doesn't clear.
142 */
143 tmp = in_8(reg + BCSR_MISC_REG3_OFF);
144 tmp |= BCSR_MISC_REG3_CNFLOCK; /* low true, high false */
145 out_8(reg + BCSR_MISC_REG3_OFF, tmp);
146
147 /*
148 * Trigger a reset via a low->high transition of the
149 * PORESET bit.
150 */
151 tmp = in_8(reg + BCSR_MISC_REG2_OFF);
152 tmp &= ~BCSR_MISC_REG2_PORESET;
153 out_8(reg + BCSR_MISC_REG2_OFF, tmp);
154
155 udelay(1);
156
157 tmp |= BCSR_MISC_REG2_PORESET;
158 out_8(reg + BCSR_MISC_REG2_OFF, tmp);
159
160 for(;;);
161}
162
163void
164mpc83xx_power_off(void)
165{
166 local_irq_disable();
167 for(;;);
168}
169
170void
171mpc83xx_halt(void)
172{
173 local_irq_disable();
174 for(;;);
175}
176
177#if defined(CONFIG_PCI)
178void __init
179mpc83xx_setup_pci1(struct pci_controller *hose)
180{
181 u16 reg16;
182 volatile immr_pcictrl_t * pci_ctrl;
183 volatile immr_ios_t * ios;
184 bd_t *binfo = (bd_t *) __res;
185
186 pci_ctrl = ioremap(binfo->bi_immr_base + 0x8500, sizeof(immr_pcictrl_t));
187 ios = ioremap(binfo->bi_immr_base + 0x8400, sizeof(immr_ios_t));
188
189 /*
190 * Configure PCI Outbound Translation Windows
191 */
192 ios->potar0 = (MPC83xx_PCI1_LOWER_MEM >> 12) & POTAR_TA_MASK;
193 ios->pobar0 = (MPC83xx_PCI1_LOWER_MEM >> 12) & POBAR_BA_MASK;
194 ios->pocmr0 = POCMR_EN |
195 (((0xffffffff - (MPC83xx_PCI1_UPPER_MEM -
196 MPC83xx_PCI1_LOWER_MEM)) >> 12) & POCMR_CM_MASK);
197
198 /* mapped to PCI1 IO space */
199 ios->potar1 = (MPC83xx_PCI1_LOWER_IO >> 12) & POTAR_TA_MASK;
200 ios->pobar1 = (MPC83xx_PCI1_IO_BASE >> 12) & POBAR_BA_MASK;
201 ios->pocmr1 = POCMR_EN | POCMR_IO |
202 (((0xffffffff - (MPC83xx_PCI1_UPPER_IO -
203 MPC83xx_PCI1_LOWER_IO)) >> 12) & POCMR_CM_MASK);
204
205 /*
206 * Configure PCI Inbound Translation Windows
207 */
208 pci_ctrl->pitar1 = 0x0;
209 pci_ctrl->pibar1 = 0x0;
210 pci_ctrl->piebar1 = 0x0;
211 pci_ctrl->piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | PIWAR_WTT_SNOOP | PIWAR_IWS_2G;
212
213 /*
214 * Release PCI RST signal
215 */
216 pci_ctrl->gcr = 0;
217 udelay(2000);
218 pci_ctrl->gcr = 1;
219 udelay(2000);
220
221 reg16 = 0xff;
222 early_read_config_word(hose, hose->first_busno, 0, PCI_COMMAND, &reg16);
223 reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
224 early_write_config_word(hose, hose->first_busno, 0, PCI_COMMAND, reg16);
225
226 /*
227 * Clear non-reserved bits in status register.
228 */
229 early_write_config_word(hose, hose->first_busno, 0, PCI_STATUS, 0xffff);
230 early_write_config_byte(hose, hose->first_busno, 0, PCI_LATENCY_TIMER, 0x80);
231
232 iounmap(pci_ctrl);
233 iounmap(ios);
234}
235
236void __init
237mpc83xx_setup_pci2(struct pci_controller *hose)
238{
239 u16 reg16;
240 volatile immr_pcictrl_t * pci_ctrl;
241 volatile immr_ios_t * ios;
242 bd_t *binfo = (bd_t *) __res;
243
244 pci_ctrl = ioremap(binfo->bi_immr_base + 0x8600, sizeof(immr_pcictrl_t));
245 ios = ioremap(binfo->bi_immr_base + 0x8400, sizeof(immr_ios_t));
246
247 /*
248 * Configure PCI Outbound Translation Windows
249 */
250 ios->potar3 = (MPC83xx_PCI2_LOWER_MEM >> 12) & POTAR_TA_MASK;
251 ios->pobar3 = (MPC83xx_PCI2_LOWER_MEM >> 12) & POBAR_BA_MASK;
252 ios->pocmr3 = POCMR_EN | POCMR_DST |
253 (((0xffffffff - (MPC83xx_PCI2_UPPER_MEM -
254 MPC83xx_PCI2_LOWER_MEM)) >> 12) & POCMR_CM_MASK);
255
256 /* mapped to PCI2 IO space */
257 ios->potar4 = (MPC83xx_PCI2_LOWER_IO >> 12) & POTAR_TA_MASK;
258 ios->pobar4 = (MPC83xx_PCI2_IO_BASE >> 12) & POBAR_BA_MASK;
259 ios->pocmr4 = POCMR_EN | POCMR_DST | POCMR_IO |
260 (((0xffffffff - (MPC83xx_PCI2_UPPER_IO -
261 MPC83xx_PCI2_LOWER_IO)) >> 12) & POCMR_CM_MASK);
262
263 /*
264 * Configure PCI Inbound Translation Windows
265 */
266 pci_ctrl->pitar1 = 0x0;
267 pci_ctrl->pibar1 = 0x0;
268 pci_ctrl->piebar1 = 0x0;
269 pci_ctrl->piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | PIWAR_WTT_SNOOP | PIWAR_IWS_2G;
270
271 /*
272 * Release PCI RST signal
273 */
274 pci_ctrl->gcr = 0;
275 udelay(2000);
276 pci_ctrl->gcr = 1;
277 udelay(2000);
278
279 reg16 = 0xff;
280 early_read_config_word(hose, hose->first_busno, 0, PCI_COMMAND, &reg16);
281 reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
282 early_write_config_word(hose, hose->first_busno, 0, PCI_COMMAND, reg16);
283
284 /*
285 * Clear non-reserved bits in status register.
286 */
287 early_write_config_word(hose, hose->first_busno, 0, PCI_STATUS, 0xffff);
288 early_write_config_byte(hose, hose->first_busno, 0, PCI_LATENCY_TIMER, 0x80);
289
290 iounmap(pci_ctrl);
291 iounmap(ios);
292}
293
294/*
295 * PCI buses can be enabled only if SYS board combinates with PIB
296 * (Platform IO Board) board which provide 3 PCI slots. There is 2 PCI buses
297 * and 3 PCI slots, so people must configure the routes between them before
298 * enable PCI bus. This routes are under the control of PCA9555PW device which
299 * can be accessed via I2C bus 2 and are configured by firmware. Refer to
300 * Freescale to get more information about firmware configuration.
301 */
302
303extern int mpc83xx_exclude_device(u_char bus, u_char devfn);
304extern int mpc83xx_map_irq(struct pci_dev *dev, unsigned char idsel,
305 unsigned char pin);
306void __init
307mpc83xx_setup_hose(void)
308{
309 u32 val32;
310 volatile immr_clk_t * clk;
311 struct pci_controller * hose1;
312#ifdef CONFIG_MPC83xx_PCI2
313 struct pci_controller * hose2;
314#endif
315 bd_t * binfo = (bd_t *)__res;
316
317 clk = ioremap(binfo->bi_immr_base + 0xA00,
318 sizeof(immr_clk_t));
319
320 /*
321 * Configure PCI controller and PCI_CLK_OUTPUT both in 66M mode
322 */
323 val32 = clk->occr;
324 udelay(2000);
325 clk->occr = 0xff000000;
326 udelay(2000);
327
328 iounmap(clk);
329
330 hose1 = pcibios_alloc_controller();
331 if(!hose1)
332 return;
333
334 ppc_md.pci_swizzle = common_swizzle;
335 ppc_md.pci_map_irq = mpc83xx_map_irq;
336
337 hose1->bus_offset = 0;
338 hose1->first_busno = 0;
339 hose1->last_busno = 0xff;
340
341 setup_indirect_pci(hose1, binfo->bi_immr_base + PCI1_CFG_ADDR_OFFSET,
342 binfo->bi_immr_base + PCI1_CFG_DATA_OFFSET);
343 hose1->set_cfg_type = 1;
344
345 mpc83xx_setup_pci1(hose1);
346
347 hose1->pci_mem_offset = MPC83xx_PCI1_MEM_OFFSET;
348 hose1->mem_space.start = MPC83xx_PCI1_LOWER_MEM;
349 hose1->mem_space.end = MPC83xx_PCI1_UPPER_MEM;
350
351 hose1->io_base_phys = MPC83xx_PCI1_IO_BASE;
352 hose1->io_space.start = MPC83xx_PCI1_LOWER_IO;
353 hose1->io_space.end = MPC83xx_PCI1_UPPER_IO;
354#ifdef CONFIG_MPC83xx_PCI2
355 isa_io_base = (unsigned long)ioremap(MPC83xx_PCI1_IO_BASE,
356 MPC83xx_PCI1_IO_SIZE + MPC83xx_PCI2_IO_SIZE);
357#else
358 isa_io_base = (unsigned long)ioremap(MPC83xx_PCI1_IO_BASE,
359 MPC83xx_PCI1_IO_SIZE);
360#endif /* CONFIG_MPC83xx_PCI2 */
361 hose1->io_base_virt = (void *)isa_io_base;
362 /* setup resources */
363 pci_init_resource(&hose1->io_resource,
364 MPC83xx_PCI1_LOWER_IO,
365 MPC83xx_PCI1_UPPER_IO,
366 IORESOURCE_IO, "PCI host bridge 1");
367 pci_init_resource(&hose1->mem_resources[0],
368 MPC83xx_PCI1_LOWER_MEM,
369 MPC83xx_PCI1_UPPER_MEM,
370 IORESOURCE_MEM, "PCI host bridge 1");
371
372 ppc_md.pci_exclude_device = mpc83xx_exclude_device;
373 hose1->last_busno = pciauto_bus_scan(hose1, hose1->first_busno);
374
375#ifdef CONFIG_MPC83xx_PCI2
376 hose2 = pcibios_alloc_controller();
377 if(!hose2)
378 return;
379
380 hose2->bus_offset = hose1->last_busno + 1;
381 hose2->first_busno = hose1->last_busno + 1;
382 hose2->last_busno = 0xff;
383 setup_indirect_pci(hose2, binfo->bi_immr_base + PCI2_CFG_ADDR_OFFSET,
384 binfo->bi_immr_base + PCI2_CFG_DATA_OFFSET);
385 hose2->set_cfg_type = 1;
386
387 mpc83xx_setup_pci2(hose2);
388
389 hose2->pci_mem_offset = MPC83xx_PCI2_MEM_OFFSET;
390 hose2->mem_space.start = MPC83xx_PCI2_LOWER_MEM;
391 hose2->mem_space.end = MPC83xx_PCI2_UPPER_MEM;
392
393 hose2->io_base_phys = MPC83xx_PCI2_IO_BASE;
394 hose2->io_space.start = MPC83xx_PCI2_LOWER_IO;
395 hose2->io_space.end = MPC83xx_PCI2_UPPER_IO;
396 hose2->io_base_virt = (void *)(isa_io_base + MPC83xx_PCI1_IO_SIZE);
397 /* setup resources */
398 pci_init_resource(&hose2->io_resource,
399 MPC83xx_PCI2_LOWER_IO,
400 MPC83xx_PCI2_UPPER_IO,
401 IORESOURCE_IO, "PCI host bridge 2");
402 pci_init_resource(&hose2->mem_resources[0],
403 MPC83xx_PCI2_LOWER_MEM,
404 MPC83xx_PCI2_UPPER_MEM,
405 IORESOURCE_MEM, "PCI host bridge 2");
406
407 hose2->last_busno = pciauto_bus_scan(hose2, hose2->first_busno);
408#endif /* CONFIG_MPC83xx_PCI2 */
409}
410#endif /*CONFIG_PCI*/
diff --git a/arch/ppc/syslib/ppc83xx_setup.h b/arch/ppc/syslib/ppc83xx_setup.h
deleted file mode 100644
index b918a2d245ea..000000000000
--- a/arch/ppc/syslib/ppc83xx_setup.h
+++ /dev/null
@@ -1,55 +0,0 @@
1/*
2 * MPC83XX common board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2005 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License along
19 * with this program; if not, write to the Free Software Foundation, Inc.,
20 * 675 Mass Ave, Cambridge, MA 02139, USA.
21 */
22
23#ifndef __PPC_SYSLIB_PPC83XX_SETUP_H
24#define __PPC_SYSLIB_PPC83XX_SETUP_H
25
26#include <linux/init.h>
27
28extern unsigned long mpc83xx_find_end_of_memory(void) __init;
29extern long mpc83xx_time_init(void) __init;
30extern void mpc83xx_calibrate_decr(void) __init;
31extern void mpc83xx_early_serial_map(void) __init;
32extern void mpc83xx_restart(char *cmd);
33extern void mpc83xx_power_off(void);
34extern void mpc83xx_halt(void);
35extern void mpc83xx_setup_hose(void) __init;
36
37/* PCI config */
38#define PCI1_CFG_ADDR_OFFSET (0x8300)
39#define PCI1_CFG_DATA_OFFSET (0x8304)
40
41#define PCI2_CFG_ADDR_OFFSET (0x8380)
42#define PCI2_CFG_DATA_OFFSET (0x8384)
43
44/* Serial Config */
45#ifdef CONFIG_SERIAL_MANY_PORTS
46#define RS_TABLE_SIZE 64
47#else
48#define RS_TABLE_SIZE 2
49#endif
50
51#ifndef BASE_BAUD
52#define BASE_BAUD 115200
53#endif
54
55#endif /* __PPC_SYSLIB_PPC83XX_SETUP_H */
diff --git a/arch/ppc/syslib/ppc85xx_common.c b/arch/ppc/syslib/ppc85xx_common.c
deleted file mode 100644
index e5ac699e7316..000000000000
--- a/arch/ppc/syslib/ppc85xx_common.c
+++ /dev/null
@@ -1,38 +0,0 @@
1/*
2 * MPC85xx support routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/types.h>
15#include <linux/module.h>
16#include <linux/init.h>
17
18#include <asm/mpc85xx.h>
19#include <asm/mmu.h>
20
21/* ************************************************************************ */
22/* Return the value of CCSRBAR for the current board */
23
24phys_addr_t
25get_ccsrbar(void)
26{
27 return BOARD_CCSRBAR;
28}
29
30EXPORT_SYMBOL(get_ccsrbar);
31
32/* For now this is a pass through */
33phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size)
34{
35 return addr;
36};
37EXPORT_SYMBOL(fixup_bigphys_addr);
38
diff --git a/arch/ppc/syslib/ppc85xx_common.h b/arch/ppc/syslib/ppc85xx_common.h
deleted file mode 100644
index 4fc405425113..000000000000
--- a/arch/ppc/syslib/ppc85xx_common.h
+++ /dev/null
@@ -1,22 +0,0 @@
1/*
2 * MPC85xx support routines
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#ifndef __PPC_SYSLIB_PPC85XX_COMMON_H
15#define __PPC_SYSLIB_PPC85XX_COMMON_H
16
17#include <linux/init.h>
18
19/* Provide access to ccsrbar for any modules, etc */
20phys_addr_t get_ccsrbar(void);
21
22#endif /* __PPC_SYSLIB_PPC85XX_COMMON_H */
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
deleted file mode 100644
index 2475ec6600fe..000000000000
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ /dev/null
@@ -1,367 +0,0 @@
1/*
2 * MPC85XX common board code
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/types.h>
15#include <linux/module.h>
16#include <linux/init.h>
17#include <linux/pci.h>
18#include <linux/serial.h>
19#include <linux/tty.h> /* for linux/serial_core.h */
20#include <linux/serial_core.h>
21#include <linux/serial_8250.h>
22
23#include <asm/time.h>
24#include <asm/mpc85xx.h>
25#include <asm/immap_85xx.h>
26#include <asm/mmu.h>
27#include <asm/ppc_sys.h>
28#include <asm/kgdb.h>
29#include <asm/machdep.h>
30
31#include <syslib/ppc85xx_setup.h>
32
33extern void abort(void);
34
35/* Return the amount of memory */
36unsigned long __init
37mpc85xx_find_end_of_memory(void)
38{
39 bd_t *binfo;
40
41 binfo = (bd_t *) __res;
42
43 return binfo->bi_memsize;
44}
45
46/* The decrementer counts at the system (internal) clock freq divided by 8 */
47void __init
48mpc85xx_calibrate_decr(void)
49{
50 bd_t *binfo = (bd_t *) __res;
51 unsigned int freq, divisor;
52
53 /* get the core frequency */
54 freq = binfo->bi_busfreq;
55
56 /* The timebase is updated every 8 bus clocks, HID0[SEL_TBCLK] = 0 */
57 divisor = 8;
58 tb_ticks_per_jiffy = freq / divisor / HZ;
59 tb_to_us = mulhwu_scale_factor(freq / divisor, 1000000);
60
61 /* Set the time base to zero */
62 mtspr(SPRN_TBWL, 0);
63 mtspr(SPRN_TBWU, 0);
64
65 /* Clear any pending timer interrupts */
66 mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS);
67
68 /* Enable decrementer interrupt */
69 mtspr(SPRN_TCR, TCR_DIE);
70}
71
72#ifdef CONFIG_SERIAL_8250
73void __init
74mpc85xx_early_serial_map(void)
75{
76#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
77 struct uart_port serial_req;
78#endif
79 struct plat_serial8250_port *pdata;
80 bd_t *binfo = (bd_t *) __res;
81 pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC85xx_DUART);
82
83 /* Setup serial port access */
84 pdata[0].uartclk = binfo->bi_busfreq;
85 pdata[0].mapbase += binfo->bi_immr_base;
86 pdata[0].membase = ioremap(pdata[0].mapbase, MPC85xx_UART0_SIZE);
87
88#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
89 memset(&serial_req, 0, sizeof (serial_req));
90 serial_req.iotype = UPIO_MEM;
91 serial_req.mapbase = pdata[0].mapbase;
92 serial_req.membase = pdata[0].membase;
93 serial_req.regshift = 0;
94
95 gen550_init(0, &serial_req);
96#endif
97
98 pdata[1].uartclk = binfo->bi_busfreq;
99 pdata[1].mapbase += binfo->bi_immr_base;
100 pdata[1].membase = ioremap(pdata[1].mapbase, MPC85xx_UART0_SIZE);
101
102#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
103 /* Assume gen550_init() doesn't modify serial_req */
104 serial_req.mapbase = pdata[1].mapbase;
105 serial_req.membase = pdata[1].membase;
106
107 gen550_init(1, &serial_req);
108#endif
109}
110#endif
111
112void
113mpc85xx_restart(char *cmd)
114{
115 local_irq_disable();
116 abort();
117}
118
119void
120mpc85xx_power_off(void)
121{
122 local_irq_disable();
123 for(;;);
124}
125
126void
127mpc85xx_halt(void)
128{
129 local_irq_disable();
130 for(;;);
131}
132
133#ifdef CONFIG_PCI
134
135#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
136extern void mpc85xx_cds_enable_via(struct pci_controller *hose);
137extern void mpc85xx_cds_fixup_via(struct pci_controller *hose);
138#endif
139
140static void __init
141mpc85xx_setup_pci1(struct pci_controller *hose)
142{
143 volatile struct ccsr_pci *pci;
144 volatile struct ccsr_guts *guts;
145 unsigned short temps;
146 bd_t *binfo = (bd_t *) __res;
147
148 pci = ioremap(binfo->bi_immr_base + MPC85xx_PCI1_OFFSET,
149 MPC85xx_PCI1_SIZE);
150
151 guts = ioremap(binfo->bi_immr_base + MPC85xx_GUTS_OFFSET,
152 MPC85xx_GUTS_SIZE);
153
154 early_read_config_word(hose, 0, 0, PCI_COMMAND, &temps);
155 temps |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
156 early_write_config_word(hose, 0, 0, PCI_COMMAND, temps);
157
158#define PORDEVSR_PCI (0x00800000) /* PCI Mode */
159 if (guts->pordevsr & PORDEVSR_PCI) {
160 early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0x80);
161 } else {
162 /* PCI-X init */
163 temps = PCI_X_CMD_MAX_SPLIT | PCI_X_CMD_MAX_READ
164 | PCI_X_CMD_ERO | PCI_X_CMD_DPERR_E;
165 early_write_config_word(hose, 0, 0, PCIX_COMMAND, temps);
166 }
167
168 /* Disable all windows (except powar0 since its ignored) */
169 pci->powar1 = 0;
170 pci->powar2 = 0;
171 pci->powar3 = 0;
172 pci->powar4 = 0;
173 pci->piwar1 = 0;
174 pci->piwar2 = 0;
175 pci->piwar3 = 0;
176
177 /* Setup Phys:PCI 1:1 outbound mem window @ MPC85XX_PCI1_LOWER_MEM */
178 pci->potar1 = (MPC85XX_PCI1_LOWER_MEM >> 12) & 0x000fffff;
179 pci->potear1 = 0x00000000;
180 pci->powbar1 = (MPC85XX_PCI1_LOWER_MEM >> 12) & 0x000fffff;
181 /* Enable, Mem R/W */
182 pci->powar1 = 0x80044000 |
183 (__ilog2(MPC85XX_PCI1_UPPER_MEM - MPC85XX_PCI1_LOWER_MEM + 1) - 1);
184
185 /* Setup outbound IO windows @ MPC85XX_PCI1_IO_BASE */
186 pci->potar2 = (MPC85XX_PCI1_LOWER_IO >> 12) & 0x000fffff;
187 pci->potear2 = 0x00000000;
188 pci->powbar2 = (MPC85XX_PCI1_IO_BASE >> 12) & 0x000fffff;
189 /* Enable, IO R/W */
190 pci->powar2 = 0x80088000 | (__ilog2(MPC85XX_PCI1_IO_SIZE) - 1);
191
192 /* Setup 2G inbound Memory Window @ 0 */
193 pci->pitar1 = 0x00000000;
194 pci->piwbar1 = 0x00000000;
195 pci->piwar1 = 0xa0f5501e; /* Enable, Prefetch, Local
196 Mem, Snoop R/W, 2G */
197}
198
199
200extern int mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin);
201extern int mpc85xx_exclude_device(u_char bus, u_char devfn);
202
203#ifdef CONFIG_85xx_PCI2
204static void __init
205mpc85xx_setup_pci2(struct pci_controller *hose)
206{
207 volatile struct ccsr_pci *pci;
208 unsigned short temps;
209 bd_t *binfo = (bd_t *) __res;
210
211 pci = ioremap(binfo->bi_immr_base + MPC85xx_PCI2_OFFSET,
212 MPC85xx_PCI2_SIZE);
213
214 early_read_config_word(hose, hose->bus_offset, 0, PCI_COMMAND, &temps);
215 temps |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
216 early_write_config_word(hose, hose->bus_offset, 0, PCI_COMMAND, temps);
217 early_write_config_byte(hose, hose->bus_offset, 0, PCI_LATENCY_TIMER, 0x80);
218
219 /* Disable all windows (except powar0 since its ignored) */
220 pci->powar1 = 0;
221 pci->powar2 = 0;
222 pci->powar3 = 0;
223 pci->powar4 = 0;
224 pci->piwar1 = 0;
225 pci->piwar2 = 0;
226 pci->piwar3 = 0;
227
228 /* Setup Phys:PCI 1:1 outbound mem window @ MPC85XX_PCI2_LOWER_MEM */
229 pci->potar1 = (MPC85XX_PCI2_LOWER_MEM >> 12) & 0x000fffff;
230 pci->potear1 = 0x00000000;
231 pci->powbar1 = (MPC85XX_PCI2_LOWER_MEM >> 12) & 0x000fffff;
232 /* Enable, Mem R/W */
233 pci->powar1 = 0x80044000 |
234 (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
235
236 /* Setup outbound IO windows @ MPC85XX_PCI2_IO_BASE */
237 pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;
238 pci->potear2 = 0x00000000;
239 pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
240 /* Enable, IO R/W */
241 pci->powar2 = 0x80088000 | (__ilog2(MPC85XX_PCI2_IO_SIZE) - 1);
242
243 /* Setup 2G inbound Memory Window @ 0 */
244 pci->pitar1 = 0x00000000;
245 pci->piwbar1 = 0x00000000;
246 pci->piwar1 = 0xa0f5501e; /* Enable, Prefetch, Local
247 Mem, Snoop R/W, 2G */
248}
249#endif /* CONFIG_85xx_PCI2 */
250
251int mpc85xx_pci1_last_busno = 0;
252
253void __init
254mpc85xx_setup_hose(void)
255{
256 struct pci_controller *hose_a;
257#ifdef CONFIG_85xx_PCI2
258 struct pci_controller *hose_b;
259#endif
260 bd_t *binfo = (bd_t *) __res;
261
262 hose_a = pcibios_alloc_controller();
263
264 if (!hose_a)
265 return;
266
267 ppc_md.pci_swizzle = common_swizzle;
268 ppc_md.pci_map_irq = mpc85xx_map_irq;
269
270 hose_a->first_busno = 0;
271 hose_a->bus_offset = 0;
272 hose_a->last_busno = 0xff;
273
274 setup_indirect_pci(hose_a, binfo->bi_immr_base + PCI1_CFG_ADDR_OFFSET,
275 binfo->bi_immr_base + PCI1_CFG_DATA_OFFSET);
276 hose_a->set_cfg_type = 1;
277
278 mpc85xx_setup_pci1(hose_a);
279
280 hose_a->pci_mem_offset = MPC85XX_PCI1_MEM_OFFSET;
281 hose_a->mem_space.start = MPC85XX_PCI1_LOWER_MEM;
282 hose_a->mem_space.end = MPC85XX_PCI1_UPPER_MEM;
283
284 hose_a->io_space.start = MPC85XX_PCI1_LOWER_IO;
285 hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO;
286 hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE;
287#ifdef CONFIG_85xx_PCI2
288 hose_a->io_base_virt = ioremap(MPC85XX_PCI1_IO_BASE,
289 MPC85XX_PCI1_IO_SIZE +
290 MPC85XX_PCI2_IO_SIZE);
291#else
292 hose_a->io_base_virt = ioremap(MPC85XX_PCI1_IO_BASE,
293 MPC85XX_PCI1_IO_SIZE);
294#endif
295 isa_io_base = (unsigned long)hose_a->io_base_virt;
296
297 /* setup resources */
298 pci_init_resource(&hose_a->mem_resources[0],
299 MPC85XX_PCI1_LOWER_MEM,
300 MPC85XX_PCI1_UPPER_MEM,
301 IORESOURCE_MEM, "PCI1 host bridge");
302
303 pci_init_resource(&hose_a->io_resource,
304 MPC85XX_PCI1_LOWER_IO,
305 MPC85XX_PCI1_UPPER_IO,
306 IORESOURCE_IO, "PCI1 host bridge");
307
308 ppc_md.pci_exclude_device = mpc85xx_exclude_device;
309
310#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
311 /* Pre pciauto_bus_scan VIA init */
312 mpc85xx_cds_enable_via(hose_a);
313#endif
314
315 hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno);
316
317#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
318 /* Post pciauto_bus_scan VIA fixup */
319 mpc85xx_cds_fixup_via(hose_a);
320#endif
321
322#ifdef CONFIG_85xx_PCI2
323 hose_b = pcibios_alloc_controller();
324
325 if (!hose_b)
326 return;
327
328 hose_b->bus_offset = hose_a->last_busno + 1;
329 hose_b->first_busno = hose_a->last_busno + 1;
330 hose_b->last_busno = 0xff;
331
332 setup_indirect_pci(hose_b, binfo->bi_immr_base + PCI2_CFG_ADDR_OFFSET,
333 binfo->bi_immr_base + PCI2_CFG_DATA_OFFSET);
334 hose_b->set_cfg_type = 1;
335
336 mpc85xx_setup_pci2(hose_b);
337
338 hose_b->pci_mem_offset = MPC85XX_PCI2_MEM_OFFSET;
339 hose_b->mem_space.start = MPC85XX_PCI2_LOWER_MEM;
340 hose_b->mem_space.end = MPC85XX_PCI2_UPPER_MEM;
341
342 hose_b->io_space.start = MPC85XX_PCI2_LOWER_IO;
343 hose_b->io_space.end = MPC85XX_PCI2_UPPER_IO;
344 hose_b->io_base_phys = MPC85XX_PCI2_IO_BASE;
345 hose_b->io_base_virt = hose_a->io_base_virt + MPC85XX_PCI1_IO_SIZE;
346
347 /* setup resources */
348 pci_init_resource(&hose_b->mem_resources[0],
349 MPC85XX_PCI2_LOWER_MEM,
350 MPC85XX_PCI2_UPPER_MEM,
351 IORESOURCE_MEM, "PCI2 host bridge");
352
353 pci_init_resource(&hose_b->io_resource,
354 MPC85XX_PCI2_LOWER_IO,
355 MPC85XX_PCI2_UPPER_IO,
356 IORESOURCE_IO, "PCI2 host bridge");
357
358 hose_b->last_busno = pciauto_bus_scan(hose_b, hose_b->first_busno);
359
360 /* let board code know what the last bus number was on PCI1 */
361 mpc85xx_pci1_last_busno = hose_a->last_busno;
362#endif
363 return;
364}
365#endif /* CONFIG_PCI */
366
367
diff --git a/arch/ppc/syslib/ppc85xx_setup.h b/arch/ppc/syslib/ppc85xx_setup.h
deleted file mode 100644
index 6ff79995210b..000000000000
--- a/arch/ppc/syslib/ppc85xx_setup.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/*
2 * MPC85XX common board definitions
3 *
4 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
5 *
6 * Copyright 2004 Freescale Semiconductor Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 *
13 */
14
15#ifndef __PPC_SYSLIB_PPC85XX_SETUP_H
16#define __PPC_SYSLIB_PPC85XX_SETUP_H
17
18#include <linux/init.h>
19#include <asm/ppcboot.h>
20
21extern unsigned long mpc85xx_find_end_of_memory(void) __init;
22extern void mpc85xx_calibrate_decr(void) __init;
23extern void mpc85xx_early_serial_map(void) __init;
24extern void mpc85xx_restart(char *cmd);
25extern void mpc85xx_power_off(void);
26extern void mpc85xx_halt(void);
27extern void mpc85xx_setup_hose(void) __init;
28
29/* PCI config */
30#define PCI1_CFG_ADDR_OFFSET (0x8000)
31#define PCI1_CFG_DATA_OFFSET (0x8004)
32
33#define PCI2_CFG_ADDR_OFFSET (0x9000)
34#define PCI2_CFG_DATA_OFFSET (0x9004)
35
36/* Additional register for PCI-X configuration */
37#define PCIX_NEXT_CAP 0x60
38#define PCIX_CAP_ID 0x61
39#define PCIX_COMMAND 0x62
40#define PCIX_STATUS 0x64
41
42/* Serial Config */
43#ifdef CONFIG_SERIAL_MANY_PORTS
44#define RS_TABLE_SIZE 64
45#else
46#define RS_TABLE_SIZE 2
47#endif
48
49#ifndef BASE_BAUD
50#define BASE_BAUD 115200
51#endif
52
53/* Offset of CPM register space */
54#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
55
56#endif /* __PPC_SYSLIB_PPC85XX_SETUP_H */
diff --git a/arch/ppc/syslib/ppc8xx_pic.h b/arch/ppc/syslib/ppc8xx_pic.h
index d7d9f651a91b..53bcd97ef7f5 100644
--- a/arch/ppc/syslib/ppc8xx_pic.h
+++ b/arch/ppc/syslib/ppc8xx_pic.h
@@ -6,7 +6,6 @@
6 6
7extern struct hw_interrupt_type ppc8xx_pic; 7extern struct hw_interrupt_type ppc8xx_pic;
8 8
9void m8xx_pic_init(void);
10void m8xx_do_IRQ(struct pt_regs *regs, 9void m8xx_do_IRQ(struct pt_regs *regs,
11 int cpu); 10 int cpu);
12int m8xx_get_irq(struct pt_regs *regs); 11int m8xx_get_irq(struct pt_regs *regs);
diff --git a/arch/ppc/xmon/start_8xx.c b/arch/ppc/xmon/start_8xx.c
index a48bd594cf61..30974068c223 100644
--- a/arch/ppc/xmon/start_8xx.c
+++ b/arch/ppc/xmon/start_8xx.c
@@ -14,7 +14,7 @@
14#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <asm/8xx_immap.h> 15#include <asm/8xx_immap.h>
16#include <asm/mpc8xx.h> 16#include <asm/mpc8xx.h>
17#include <asm/commproc.h> 17#include <asm/cpm1.h>
18 18
19extern void xmon_printf(const char *fmt, ...); 19extern void xmon_printf(const char *fmt, ...);
20extern int xmon_8xx_write(char *str, int nb); 20extern int xmon_8xx_write(char *str, int nb);
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 64b4964d57e7..75939dd06295 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -184,7 +184,7 @@ config PATA_ACPI
184 184
185config SATA_FSL 185config SATA_FSL
186 tristate "Freescale 3.0Gbps SATA support" 186 tristate "Freescale 3.0Gbps SATA support"
187 depends on PPC_MPC837x 187 depends on FSL_SOC
188 help 188 help
189 This option enables support for Freescale 3.0Gbps SATA controller. 189 This option enables support for Freescale 3.0Gbps SATA controller.
190 It can be found on MPC837x and MPC8315. 190 It can be found on MPC837x and MPC8315.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9af05a2f4af3..8f3f04d4f34b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2301,7 +2301,7 @@ config GELIC_NET
2301 2301
2302config GIANFAR 2302config GIANFAR
2303 tristate "Gianfar Ethernet" 2303 tristate "Gianfar Ethernet"
2304 depends on 85xx || 83xx || PPC_86xx 2304 depends on FSL_SOC
2305 select PHYLIB 2305 select PHYLIB
2306 select CRC32 2306 select CRC32
2307 help 2307 help
diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c
index e492eb84f948..79deee222e28 100644
--- a/drivers/net/fec_8xx/fec_8xx-netta.c
+++ b/drivers/net/fec_8xx/fec_8xx-netta.c
@@ -26,7 +26,7 @@
26#include <asm/mpc8xx.h> 26#include <asm/mpc8xx.h>
27#include <asm/irq.h> 27#include <asm/irq.h>
28#include <asm/uaccess.h> 28#include <asm/uaccess.h>
29#include <asm/commproc.h> 29#include <asm/cpm1.h>
30 30
31#include "fec_8xx.h" 31#include "fec_8xx.h"
32 32
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index ab9637ab3a8d..ca8d2e83ab03 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -35,7 +35,7 @@
35#include <asm/mpc8xx.h> 35#include <asm/mpc8xx.h>
36#include <asm/irq.h> 36#include <asm/irq.h>
37#include <asm/uaccess.h> 37#include <asm/uaccess.h>
38#include <asm/commproc.h> 38#include <asm/cpm1.h>
39 39
40#include "fec_8xx.h" 40#include "fec_8xx.h"
41 41
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index e8e10a02d202..3b6ca29d31f2 100644
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -34,7 +34,7 @@
34#include <asm/mpc8xx.h> 34#include <asm/mpc8xx.h>
35#include <asm/irq.h> 35#include <asm/irq.h>
36#include <asm/uaccess.h> 36#include <asm/uaccess.h>
37#include <asm/commproc.h> 37#include <asm/cpm1.h>
38 38
39/*************************************************/ 39/*************************************************/
40 40
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index c675e29aadcc..e05389c49bbb 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -12,7 +12,7 @@
12#include <asm/fs_pd.h> 12#include <asm/fs_pd.h>
13 13
14#ifdef CONFIG_CPM1 14#ifdef CONFIG_CPM1
15#include <asm/commproc.h> 15#include <asm/cpm1.h>
16 16
17struct fec_info { 17struct fec_info {
18 fec_t __iomem *fecp; 18 fec_t __iomem *fecp;
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index c1fee48517e3..8a311d1e435b 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -40,7 +40,7 @@
40#include <asm/8xx_immap.h> 40#include <asm/8xx_immap.h>
41#include <asm/pgtable.h> 41#include <asm/pgtable.h>
42#include <asm/mpc8xx.h> 42#include <asm/mpc8xx.h>
43#include <asm/commproc.h> 43#include <asm/cpm1.h>
44#endif 44#endif
45 45
46#ifdef CONFIG_PPC_CPM_NEW_BINDING 46#ifdef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index fe3d8a621c33..d7ca31945c82 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -40,7 +40,7 @@
40#include <asm/8xx_immap.h> 40#include <asm/8xx_immap.h>
41#include <asm/pgtable.h> 41#include <asm/pgtable.h>
42#include <asm/mpc8xx.h> 42#include <asm/mpc8xx.h>
43#include <asm/commproc.h> 43#include <asm/cpm1.h>
44#endif 44#endif
45 45
46#ifdef CONFIG_PPC_CPM_NEW_BINDING 46#ifdef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index df884f0ad8e5..e3ba14a19915 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -256,6 +256,9 @@ static struct of_device_id uec_mdio_match[] = {
256 .type = "mdio", 256 .type = "mdio",
257 .compatible = "ucc_geth_phy", 257 .compatible = "ucc_geth_phy",
258 }, 258 },
259 {
260 .compatible = "fsl,ucc-mdio",
261 },
259 {}, 262 {},
260}; 263};
261 264
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 555055650733..f697f3d728eb 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -32,7 +32,7 @@ obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
32obj-$(CONFIG_PARISC) += setup-bus.o 32obj-$(CONFIG_PARISC) += setup-bus.o
33obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o 33obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
34obj-$(CONFIG_PPC32) += setup-irq.o 34obj-$(CONFIG_PPC32) += setup-irq.o
35obj-$(CONFIG_PPC64) += setup-bus.o 35obj-$(CONFIG_PPC) += setup-bus.o
36obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o 36obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
37obj-$(CONFIG_X86_VISWS) += setup-irq.o 37obj-$(CONFIG_X86_VISWS) += setup-irq.o
38 38
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 9b5465fb0bbb..ddf46d3c964b 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -10,7 +10,7 @@
10#ifndef CPM_UART_CPM1_H 10#ifndef CPM_UART_CPM1_H
11#define CPM_UART_CPM1_H 11#define CPM_UART_CPM1_H
12 12
13#include <asm/commproc.h> 13#include <asm/cpm1.h>
14 14
15/* defines for IRQs */ 15/* defines for IRQs */
16#ifndef CONFIG_PPC_CPM_NEW_BINDING 16#ifndef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 4580b9cf625d..04f7cd9fc261 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -436,11 +436,7 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
436 mpc83xx_spi->qe_mode = pdata->qe_mode; 436 mpc83xx_spi->qe_mode = pdata->qe_mode;
437 mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8; 437 mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
438 mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8; 438 mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
439 439 mpc83xx_spi->spibrg = pdata->sysclk;
440 if (mpc83xx_spi->qe_mode)
441 mpc83xx_spi->spibrg = pdata->sysclk / 2;
442 else
443 mpc83xx_spi->spibrg = pdata->sysclk;
444 440
445 mpc83xx_spi->rx_shift = 0; 441 mpc83xx_spi->rx_shift = 0;
446 mpc83xx_spi->tx_shift = 0; 442 mpc83xx_spi->tx_shift = 0;
diff --git a/include/asm-powerpc/cpm.h b/include/asm-powerpc/cpm.h
index fae83b137337..77e39dad9728 100644
--- a/include/asm-powerpc/cpm.h
+++ b/include/asm-powerpc/cpm.h
@@ -4,6 +4,79 @@
4#include <linux/compiler.h> 4#include <linux/compiler.h>
5#include <linux/types.h> 5#include <linux/types.h>
6 6
7/* Buffer descriptors used by many of the CPM protocols. */
8typedef struct cpm_buf_desc {
9 ushort cbd_sc; /* Status and Control */
10 ushort cbd_datlen; /* Data length in buffer */
11 uint cbd_bufaddr; /* Buffer address in host memory */
12} cbd_t;
13
14/* Buffer descriptor control/status used by serial
15 */
16
17#define BD_SC_EMPTY (0x8000) /* Receive is empty */
18#define BD_SC_READY (0x8000) /* Transmit is ready */
19#define BD_SC_WRAP (0x2000) /* Last buffer descriptor */
20#define BD_SC_INTRPT (0x1000) /* Interrupt on change */
21#define BD_SC_LAST (0x0800) /* Last buffer in frame */
22#define BD_SC_TC (0x0400) /* Transmit CRC */
23#define BD_SC_CM (0x0200) /* Continous mode */
24#define BD_SC_ID (0x0100) /* Rec'd too many idles */
25#define BD_SC_P (0x0100) /* xmt preamble */
26#define BD_SC_BR (0x0020) /* Break received */
27#define BD_SC_FR (0x0010) /* Framing error */
28#define BD_SC_PR (0x0008) /* Parity error */
29#define BD_SC_NAK (0x0004) /* NAK - did not respond */
30#define BD_SC_OV (0x0002) /* Overrun */
31#define BD_SC_UN (0x0002) /* Underrun */
32#define BD_SC_CD (0x0001) /* */
33#define BD_SC_CL (0x0001) /* Collision */
34
35/* Buffer descriptor control/status used by Ethernet receive.
36 * Common to SCC and FCC.
37 */
38#define BD_ENET_RX_EMPTY (0x8000)
39#define BD_ENET_RX_WRAP (0x2000)
40#define BD_ENET_RX_INTR (0x1000)
41#define BD_ENET_RX_LAST (0x0800)
42#define BD_ENET_RX_FIRST (0x0400)
43#define BD_ENET_RX_MISS (0x0100)
44#define BD_ENET_RX_BC (0x0080) /* FCC Only */
45#define BD_ENET_RX_MC (0x0040) /* FCC Only */
46#define BD_ENET_RX_LG (0x0020)
47#define BD_ENET_RX_NO (0x0010)
48#define BD_ENET_RX_SH (0x0008)
49#define BD_ENET_RX_CR (0x0004)
50#define BD_ENET_RX_OV (0x0002)
51#define BD_ENET_RX_CL (0x0001)
52#define BD_ENET_RX_STATS (0x01ff) /* All status bits */
53
54/* Buffer descriptor control/status used by Ethernet transmit.
55 * Common to SCC and FCC.
56 */
57#define BD_ENET_TX_READY (0x8000)
58#define BD_ENET_TX_PAD (0x4000)
59#define BD_ENET_TX_WRAP (0x2000)
60#define BD_ENET_TX_INTR (0x1000)
61#define BD_ENET_TX_LAST (0x0800)
62#define BD_ENET_TX_TC (0x0400)
63#define BD_ENET_TX_DEF (0x0200)
64#define BD_ENET_TX_HB (0x0100)
65#define BD_ENET_TX_LC (0x0080)
66#define BD_ENET_TX_RL (0x0040)
67#define BD_ENET_TX_RCMASK (0x003c)
68#define BD_ENET_TX_UN (0x0002)
69#define BD_ENET_TX_CSL (0x0001)
70#define BD_ENET_TX_STATS (0x03ff) /* All status bits */
71
72/* Buffer descriptor control/status used by Transparent mode SCC.
73 */
74#define BD_SCC_TX_LAST (0x0800)
75
76/* Buffer descriptor control/status used by I2C.
77 */
78#define BD_I2C_START (0x0400)
79
7int cpm_muram_init(void); 80int cpm_muram_init(void);
8unsigned long cpm_muram_alloc(unsigned long size, unsigned long align); 81unsigned long cpm_muram_alloc(unsigned long size, unsigned long align);
9int cpm_muram_free(unsigned long offset); 82int cpm_muram_free(unsigned long offset);
diff --git a/include/asm-powerpc/commproc.h b/include/asm-powerpc/cpm1.h
index 9e3b8648648c..b2ebd6ac6dae 100644
--- a/include/asm-powerpc/commproc.h
+++ b/include/asm-powerpc/cpm1.h
@@ -14,8 +14,8 @@
14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors 14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors
15 * or other use. 15 * or other use.
16 */ 16 */
17#ifndef __CPM_8XX__ 17#ifndef __CPM1__
18#define __CPM_8XX__ 18#define __CPM1__
19 19
20#include <asm/8xx_immap.h> 20#include <asm/8xx_immap.h>
21#include <asm/ptrace.h> 21#include <asm/ptrace.h>
@@ -82,42 +82,14 @@ extern int cpm_dpfree(unsigned long offset);
82extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); 82extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
83extern void cpm_dpdump(void); 83extern void cpm_dpdump(void);
84extern void *cpm_dpram_addr(unsigned long offset); 84extern void *cpm_dpram_addr(unsigned long offset);
85extern uint cpm_dpram_phys(u8* addr); 85extern uint cpm_dpram_phys(u8 *addr);
86#endif 86#endif
87 87
88extern void cpm_setbrg(uint brg, uint rate); 88extern void cpm_setbrg(uint brg, uint rate);
89 89
90extern uint m8xx_cpm_hostalloc(uint size);
91extern int m8xx_cpm_hostfree(uint start);
92extern void m8xx_cpm_hostdump(void);
93
94extern void cpm_load_patch(cpm8xx_t *cp); 90extern void cpm_load_patch(cpm8xx_t *cp);
95 91
96/* Buffer descriptors used by many of the CPM protocols. 92extern void cpm_reset(void);
97*/
98typedef struct cpm_buf_desc {
99 ushort cbd_sc; /* Status and Control */
100 ushort cbd_datlen; /* Data length in buffer */
101 uint cbd_bufaddr; /* Buffer address in host memory */
102} cbd_t;
103
104#define BD_SC_EMPTY ((ushort)0x8000) /* Receive is empty */
105#define BD_SC_READY ((ushort)0x8000) /* Transmit is ready */
106#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor */
107#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */
108#define BD_SC_LAST ((ushort)0x0800) /* Last buffer in frame */
109#define BD_SC_TC ((ushort)0x0400) /* Transmit CRC */
110#define BD_SC_CM ((ushort)0x0200) /* Continous mode */
111#define BD_SC_ID ((ushort)0x0100) /* Rec'd too many idles */
112#define BD_SC_P ((ushort)0x0100) /* xmt preamble */
113#define BD_SC_BR ((ushort)0x0020) /* Break received */
114#define BD_SC_FR ((ushort)0x0010) /* Framing error */
115#define BD_SC_PR ((ushort)0x0008) /* Parity error */
116#define BD_SC_NAK ((ushort)0x0004) /* NAK - did not respond */
117#define BD_SC_OV ((ushort)0x0002) /* Overrun */
118#define BD_SC_UN ((ushort)0x0002) /* Underrun */
119#define BD_SC_CD ((ushort)0x0001) /* ?? */
120#define BD_SC_CL ((ushort)0x0001) /* Collision */
121 93
122/* Parameter RAM offsets. 94/* Parameter RAM offsets.
123*/ 95*/
@@ -448,41 +420,6 @@ typedef struct scc_enet {
448#define SCC_PSMR_NIB22 ((ushort)0x000a) /* Start frame search */ 420#define SCC_PSMR_NIB22 ((ushort)0x000a) /* Start frame search */
449#define SCC_PSMR_FDE ((ushort)0x0001) /* Full duplex enable */ 421#define SCC_PSMR_FDE ((ushort)0x0001) /* Full duplex enable */
450 422
451/* Buffer descriptor control/status used by Ethernet receive.
452*/
453#define BD_ENET_RX_EMPTY ((ushort)0x8000)
454#define BD_ENET_RX_WRAP ((ushort)0x2000)
455#define BD_ENET_RX_INTR ((ushort)0x1000)
456#define BD_ENET_RX_LAST ((ushort)0x0800)
457#define BD_ENET_RX_FIRST ((ushort)0x0400)
458#define BD_ENET_RX_MISS ((ushort)0x0100)
459#define BD_ENET_RX_LG ((ushort)0x0020)
460#define BD_ENET_RX_NO ((ushort)0x0010)
461#define BD_ENET_RX_SH ((ushort)0x0008)
462#define BD_ENET_RX_CR ((ushort)0x0004)
463#define BD_ENET_RX_OV ((ushort)0x0002)
464#define BD_ENET_RX_CL ((ushort)0x0001)
465#define BD_ENET_RX_BC ((ushort)0x0080) /* DA is Broadcast */
466#define BD_ENET_RX_MC ((ushort)0x0040) /* DA is Multicast */
467#define BD_ENET_RX_STATS ((ushort)0x013f) /* All status bits */
468
469/* Buffer descriptor control/status used by Ethernet transmit.
470*/
471#define BD_ENET_TX_READY ((ushort)0x8000)
472#define BD_ENET_TX_PAD ((ushort)0x4000)
473#define BD_ENET_TX_WRAP ((ushort)0x2000)
474#define BD_ENET_TX_INTR ((ushort)0x1000)
475#define BD_ENET_TX_LAST ((ushort)0x0800)
476#define BD_ENET_TX_TC ((ushort)0x0400)
477#define BD_ENET_TX_DEF ((ushort)0x0200)
478#define BD_ENET_TX_HB ((ushort)0x0100)
479#define BD_ENET_TX_LC ((ushort)0x0080)
480#define BD_ENET_TX_RL ((ushort)0x0040)
481#define BD_ENET_TX_RCMASK ((ushort)0x003c)
482#define BD_ENET_TX_UN ((ushort)0x0002)
483#define BD_ENET_TX_CSL ((ushort)0x0001)
484#define BD_ENET_TX_STATS ((ushort)0x03ff) /* All status bits */
485
486/* SCC as UART 423/* SCC as UART
487*/ 424*/
488typedef struct scc_uart { 425typedef struct scc_uart {
@@ -551,8 +488,6 @@ typedef struct scc_trans {
551 uint st_cmask; /* Constant mask for CRC */ 488 uint st_cmask; /* Constant mask for CRC */
552} scc_trans_t; 489} scc_trans_t;
553 490
554#define BD_SCC_TX_LAST ((ushort)0x0800)
555
556/* IIC parameter RAM. 491/* IIC parameter RAM.
557*/ 492*/
558typedef struct iic { 493typedef struct iic {
@@ -576,8 +511,6 @@ typedef struct iic {
576 char res2[2]; /* Reserved */ 511 char res2[2]; /* Reserved */
577} iic_t; 512} iic_t;
578 513
579#define BD_IIC_START ((ushort)0x0400)
580
581/* SPI parameter RAM. 514/* SPI parameter RAM.
582*/ 515*/
583typedef struct spi { 516typedef struct spi {
@@ -749,4 +682,4 @@ enum cpm_clk {
749 682
750int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode); 683int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode);
751 684
752#endif /* __CPM_8XX__ */ 685#endif /* __CPM1__ */
diff --git a/include/asm-powerpc/cpm2.h b/include/asm-powerpc/cpm2.h
index f1112c15ef96..b93a53eb55c1 100644
--- a/include/asm-powerpc/cpm2.h
+++ b/include/asm-powerpc/cpm2.h
@@ -132,29 +132,6 @@ extern void cpm_setbrg(uint brg, uint rate);
132extern void cpm2_fastbrg(uint brg, uint rate, int div16); 132extern void cpm2_fastbrg(uint brg, uint rate, int div16);
133extern void cpm2_reset(void); 133extern void cpm2_reset(void);
134 134
135
136/* Buffer descriptors used by many of the CPM protocols.
137*/
138typedef struct cpm_buf_desc {
139 ushort cbd_sc; /* Status and Control */
140 ushort cbd_datlen; /* Data length in buffer */
141 uint cbd_bufaddr; /* Buffer address in host memory */
142} cbd_t;
143
144#define BD_SC_EMPTY ((ushort)0x8000) /* Receive is empty */
145#define BD_SC_READY ((ushort)0x8000) /* Transmit is ready */
146#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor */
147#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */
148#define BD_SC_LAST ((ushort)0x0800) /* Last buffer in frame */
149#define BD_SC_CM ((ushort)0x0200) /* Continous mode */
150#define BD_SC_ID ((ushort)0x0100) /* Rec'd too many idles */
151#define BD_SC_P ((ushort)0x0100) /* xmt preamble */
152#define BD_SC_BR ((ushort)0x0020) /* Break received */
153#define BD_SC_FR ((ushort)0x0010) /* Framing error */
154#define BD_SC_PR ((ushort)0x0008) /* Parity error */
155#define BD_SC_OV ((ushort)0x0002) /* Overrun */
156#define BD_SC_CD ((ushort)0x0001) /* ?? */
157
158/* Function code bits, usually generic to devices. 135/* Function code bits, usually generic to devices.
159*/ 136*/
160#define CPMFCR_GBL ((u_char)0x20) /* Set memory snooping */ 137#define CPMFCR_GBL ((u_char)0x20) /* Set memory snooping */
@@ -456,43 +433,6 @@ typedef struct scc_enet {
456#define SCC_PSMR_NIB22 ((ushort)0x000a) /* Start frame search */ 433#define SCC_PSMR_NIB22 ((ushort)0x000a) /* Start frame search */
457#define SCC_PSMR_FDE ((ushort)0x0001) /* Full duplex enable */ 434#define SCC_PSMR_FDE ((ushort)0x0001) /* Full duplex enable */
458 435
459/* Buffer descriptor control/status used by Ethernet receive.
460 * Common to SCC and FCC.
461 */
462#define BD_ENET_RX_EMPTY ((ushort)0x8000)
463#define BD_ENET_RX_WRAP ((ushort)0x2000)
464#define BD_ENET_RX_INTR ((ushort)0x1000)
465#define BD_ENET_RX_LAST ((ushort)0x0800)
466#define BD_ENET_RX_FIRST ((ushort)0x0400)
467#define BD_ENET_RX_MISS ((ushort)0x0100)
468#define BD_ENET_RX_BC ((ushort)0x0080) /* FCC Only */
469#define BD_ENET_RX_MC ((ushort)0x0040) /* FCC Only */
470#define BD_ENET_RX_LG ((ushort)0x0020)
471#define BD_ENET_RX_NO ((ushort)0x0010)
472#define BD_ENET_RX_SH ((ushort)0x0008)
473#define BD_ENET_RX_CR ((ushort)0x0004)
474#define BD_ENET_RX_OV ((ushort)0x0002)
475#define BD_ENET_RX_CL ((ushort)0x0001)
476#define BD_ENET_RX_STATS ((ushort)0x01ff) /* All status bits */
477
478/* Buffer descriptor control/status used by Ethernet transmit.
479 * Common to SCC and FCC.
480 */
481#define BD_ENET_TX_READY ((ushort)0x8000)
482#define BD_ENET_TX_PAD ((ushort)0x4000)
483#define BD_ENET_TX_WRAP ((ushort)0x2000)
484#define BD_ENET_TX_INTR ((ushort)0x1000)
485#define BD_ENET_TX_LAST ((ushort)0x0800)
486#define BD_ENET_TX_TC ((ushort)0x0400)
487#define BD_ENET_TX_DEF ((ushort)0x0200)
488#define BD_ENET_TX_HB ((ushort)0x0100)
489#define BD_ENET_TX_LC ((ushort)0x0080)
490#define BD_ENET_TX_RL ((ushort)0x0040)
491#define BD_ENET_TX_RCMASK ((ushort)0x003c)
492#define BD_ENET_TX_UN ((ushort)0x0002)
493#define BD_ENET_TX_CSL ((ushort)0x0001)
494#define BD_ENET_TX_STATS ((ushort)0x03ff) /* All status bits */
495
496/* SCC as UART 436/* SCC as UART
497*/ 437*/
498typedef struct scc_uart { 438typedef struct scc_uart {
@@ -562,8 +502,6 @@ typedef struct scc_trans {
562 uint st_cmask; /* Constant mask for CRC */ 502 uint st_cmask; /* Constant mask for CRC */
563} scc_trans_t; 503} scc_trans_t;
564 504
565#define BD_SCC_TX_LAST ((ushort)0x0800)
566
567/* How about some FCCs..... 505/* How about some FCCs.....
568*/ 506*/
569#define FCC_GFMR_DIAG_NORM ((uint)0x00000000) 507#define FCC_GFMR_DIAG_NORM ((uint)0x00000000)
@@ -769,8 +707,6 @@ typedef struct spi {
769 707
770#define SPI_EB ((u_char)0x10) /* big endian byte order */ 708#define SPI_EB ((u_char)0x10) /* big endian byte order */
771 709
772#define BD_IIC_START ((ushort)0x0400)
773
774/* IDMA parameter RAM 710/* IDMA parameter RAM
775*/ 711*/
776typedef struct idma { 712typedef struct idma {
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index 1392db456523..b5c03127a9b9 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -483,218 +483,6 @@ static __inline__ int irq_canonicalize(int irq)
483 */ 483 */
484#define mk_int_int_mask(IL) (1 << (7 - (IL/2))) 484#define mk_int_int_mask(IL) (1 << (7 - (IL/2)))
485 485
486#elif defined(CONFIG_83xx)
487#include <asm/mpc83xx.h>
488
489#define NR_IRQS (NR_IPIC_INTS)
490
491#elif defined(CONFIG_85xx)
492/* Now include the board configuration specific associations.
493*/
494#include <asm/mpc85xx.h>
495
496/* The MPC8548 openpic has 48 internal interrupts and 12 external
497 * interrupts.
498 *
499 * We are "flattening" the interrupt vectors of the cascaded CPM
500 * so that we can uniquely identify any interrupt source with a
501 * single integer.
502 */
503#define NR_CPM_INTS 64
504#define NR_EPIC_INTS 60
505#ifndef NR_8259_INTS
506#define NR_8259_INTS 0
507#endif
508#define NUM_8259_INTERRUPTS NR_8259_INTS
509
510#ifndef CPM_IRQ_OFFSET
511#define CPM_IRQ_OFFSET 0
512#endif
513
514#define NR_IRQS (NR_EPIC_INTS + NR_CPM_INTS + NR_8259_INTS)
515
516/* Internal IRQs on MPC85xx OpenPIC */
517
518#ifndef MPC85xx_OPENPIC_IRQ_OFFSET
519#ifdef CONFIG_CPM2
520#define MPC85xx_OPENPIC_IRQ_OFFSET (CPM_IRQ_OFFSET + NR_CPM_INTS)
521#else
522#define MPC85xx_OPENPIC_IRQ_OFFSET 0
523#endif
524#endif
525
526/* Not all of these exist on all MPC85xx implementations */
527#define MPC85xx_IRQ_L2CACHE ( 0 + MPC85xx_OPENPIC_IRQ_OFFSET)
528#define MPC85xx_IRQ_ECM ( 1 + MPC85xx_OPENPIC_IRQ_OFFSET)
529#define MPC85xx_IRQ_DDR ( 2 + MPC85xx_OPENPIC_IRQ_OFFSET)
530#define MPC85xx_IRQ_LBIU ( 3 + MPC85xx_OPENPIC_IRQ_OFFSET)
531#define MPC85xx_IRQ_DMA0 ( 4 + MPC85xx_OPENPIC_IRQ_OFFSET)
532#define MPC85xx_IRQ_DMA1 ( 5 + MPC85xx_OPENPIC_IRQ_OFFSET)
533#define MPC85xx_IRQ_DMA2 ( 6 + MPC85xx_OPENPIC_IRQ_OFFSET)
534#define MPC85xx_IRQ_DMA3 ( 7 + MPC85xx_OPENPIC_IRQ_OFFSET)
535#define MPC85xx_IRQ_PCI1 ( 8 + MPC85xx_OPENPIC_IRQ_OFFSET)
536#define MPC85xx_IRQ_PCI2 ( 9 + MPC85xx_OPENPIC_IRQ_OFFSET)
537#define MPC85xx_IRQ_RIO_ERROR ( 9 + MPC85xx_OPENPIC_IRQ_OFFSET)
538#define MPC85xx_IRQ_RIO_BELL (10 + MPC85xx_OPENPIC_IRQ_OFFSET)
539#define MPC85xx_IRQ_RIO_TX (11 + MPC85xx_OPENPIC_IRQ_OFFSET)
540#define MPC85xx_IRQ_RIO_RX (12 + MPC85xx_OPENPIC_IRQ_OFFSET)
541#define MPC85xx_IRQ_TSEC1_TX (13 + MPC85xx_OPENPIC_IRQ_OFFSET)
542#define MPC85xx_IRQ_TSEC1_RX (14 + MPC85xx_OPENPIC_IRQ_OFFSET)
543#define MPC85xx_IRQ_TSEC3_TX (15 + MPC85xx_OPENPIC_IRQ_OFFSET)
544#define MPC85xx_IRQ_TSEC3_RX (16 + MPC85xx_OPENPIC_IRQ_OFFSET)
545#define MPC85xx_IRQ_TSEC3_ERROR (17 + MPC85xx_OPENPIC_IRQ_OFFSET)
546#define MPC85xx_IRQ_TSEC1_ERROR (18 + MPC85xx_OPENPIC_IRQ_OFFSET)
547#define MPC85xx_IRQ_TSEC2_TX (19 + MPC85xx_OPENPIC_IRQ_OFFSET)
548#define MPC85xx_IRQ_TSEC2_RX (20 + MPC85xx_OPENPIC_IRQ_OFFSET)
549#define MPC85xx_IRQ_TSEC4_TX (21 + MPC85xx_OPENPIC_IRQ_OFFSET)
550#define MPC85xx_IRQ_TSEC4_RX (22 + MPC85xx_OPENPIC_IRQ_OFFSET)
551#define MPC85xx_IRQ_TSEC4_ERROR (23 + MPC85xx_OPENPIC_IRQ_OFFSET)
552#define MPC85xx_IRQ_TSEC2_ERROR (24 + MPC85xx_OPENPIC_IRQ_OFFSET)
553#define MPC85xx_IRQ_FEC (25 + MPC85xx_OPENPIC_IRQ_OFFSET)
554#define MPC85xx_IRQ_DUART (26 + MPC85xx_OPENPIC_IRQ_OFFSET)
555#define MPC85xx_IRQ_IIC1 (27 + MPC85xx_OPENPIC_IRQ_OFFSET)
556#define MPC85xx_IRQ_PERFMON (28 + MPC85xx_OPENPIC_IRQ_OFFSET)
557#define MPC85xx_IRQ_SEC2 (29 + MPC85xx_OPENPIC_IRQ_OFFSET)
558#define MPC85xx_IRQ_CPM (30 + MPC85xx_OPENPIC_IRQ_OFFSET)
559
560/* The 12 external interrupt lines */
561#define MPC85xx_IRQ_EXT0 (48 + MPC85xx_OPENPIC_IRQ_OFFSET)
562#define MPC85xx_IRQ_EXT1 (49 + MPC85xx_OPENPIC_IRQ_OFFSET)
563#define MPC85xx_IRQ_EXT2 (50 + MPC85xx_OPENPIC_IRQ_OFFSET)
564#define MPC85xx_IRQ_EXT3 (51 + MPC85xx_OPENPIC_IRQ_OFFSET)
565#define MPC85xx_IRQ_EXT4 (52 + MPC85xx_OPENPIC_IRQ_OFFSET)
566#define MPC85xx_IRQ_EXT5 (53 + MPC85xx_OPENPIC_IRQ_OFFSET)
567#define MPC85xx_IRQ_EXT6 (54 + MPC85xx_OPENPIC_IRQ_OFFSET)
568#define MPC85xx_IRQ_EXT7 (55 + MPC85xx_OPENPIC_IRQ_OFFSET)
569#define MPC85xx_IRQ_EXT8 (56 + MPC85xx_OPENPIC_IRQ_OFFSET)
570#define MPC85xx_IRQ_EXT9 (57 + MPC85xx_OPENPIC_IRQ_OFFSET)
571#define MPC85xx_IRQ_EXT10 (58 + MPC85xx_OPENPIC_IRQ_OFFSET)
572#define MPC85xx_IRQ_EXT11 (59 + MPC85xx_OPENPIC_IRQ_OFFSET)
573
574/* CPM related interrupts */
575#define SIU_INT_ERROR ((uint)0x00+CPM_IRQ_OFFSET)
576#define SIU_INT_I2C ((uint)0x01+CPM_IRQ_OFFSET)
577#define SIU_INT_SPI ((uint)0x02+CPM_IRQ_OFFSET)
578#define SIU_INT_RISC ((uint)0x03+CPM_IRQ_OFFSET)
579#define SIU_INT_SMC1 ((uint)0x04+CPM_IRQ_OFFSET)
580#define SIU_INT_SMC2 ((uint)0x05+CPM_IRQ_OFFSET)
581#define SIU_INT_USB ((uint)0x0b+CPM_IRQ_OFFSET)
582#define SIU_INT_TIMER1 ((uint)0x0c+CPM_IRQ_OFFSET)
583#define SIU_INT_TIMER2 ((uint)0x0d+CPM_IRQ_OFFSET)
584#define SIU_INT_TIMER3 ((uint)0x0e+CPM_IRQ_OFFSET)
585#define SIU_INT_TIMER4 ((uint)0x0f+CPM_IRQ_OFFSET)
586#define SIU_INT_FCC1 ((uint)0x20+CPM_IRQ_OFFSET)
587#define SIU_INT_FCC2 ((uint)0x21+CPM_IRQ_OFFSET)
588#define SIU_INT_FCC3 ((uint)0x22+CPM_IRQ_OFFSET)
589#define SIU_INT_MCC1 ((uint)0x24+CPM_IRQ_OFFSET)
590#define SIU_INT_MCC2 ((uint)0x25+CPM_IRQ_OFFSET)
591#define SIU_INT_SCC1 ((uint)0x28+CPM_IRQ_OFFSET)
592#define SIU_INT_SCC2 ((uint)0x29+CPM_IRQ_OFFSET)
593#define SIU_INT_SCC3 ((uint)0x2a+CPM_IRQ_OFFSET)
594#define SIU_INT_SCC4 ((uint)0x2b+CPM_IRQ_OFFSET)
595#define SIU_INT_PC15 ((uint)0x30+CPM_IRQ_OFFSET)
596#define SIU_INT_PC14 ((uint)0x31+CPM_IRQ_OFFSET)
597#define SIU_INT_PC13 ((uint)0x32+CPM_IRQ_OFFSET)
598#define SIU_INT_PC12 ((uint)0x33+CPM_IRQ_OFFSET)
599#define SIU_INT_PC11 ((uint)0x34+CPM_IRQ_OFFSET)
600#define SIU_INT_PC10 ((uint)0x35+CPM_IRQ_OFFSET)
601#define SIU_INT_PC9 ((uint)0x36+CPM_IRQ_OFFSET)
602#define SIU_INT_PC8 ((uint)0x37+CPM_IRQ_OFFSET)
603#define SIU_INT_PC7 ((uint)0x38+CPM_IRQ_OFFSET)
604#define SIU_INT_PC6 ((uint)0x39+CPM_IRQ_OFFSET)
605#define SIU_INT_PC5 ((uint)0x3a+CPM_IRQ_OFFSET)
606#define SIU_INT_PC4 ((uint)0x3b+CPM_IRQ_OFFSET)
607#define SIU_INT_PC3 ((uint)0x3c+CPM_IRQ_OFFSET)
608#define SIU_INT_PC2 ((uint)0x3d+CPM_IRQ_OFFSET)
609#define SIU_INT_PC1 ((uint)0x3e+CPM_IRQ_OFFSET)
610#define SIU_INT_PC0 ((uint)0x3f+CPM_IRQ_OFFSET)
611
612#elif defined(CONFIG_PPC_86xx)
613#include <asm/mpc86xx.h>
614
615#define NR_EPIC_INTS 48
616#ifndef NR_8259_INTS
617#define NR_8259_INTS 16 /*ULI 1575 can route 12 interrupts */
618#endif
619#define NUM_8259_INTERRUPTS NR_8259_INTS
620
621#ifndef I8259_OFFSET
622#define I8259_OFFSET 0
623#endif
624
625#define NR_IRQS 256
626
627/* Internal IRQs on MPC86xx OpenPIC */
628
629#ifndef MPC86xx_OPENPIC_IRQ_OFFSET
630#define MPC86xx_OPENPIC_IRQ_OFFSET NR_8259_INTS
631#endif
632
633/* The 48 internal sources */
634#define MPC86xx_IRQ_NULL ( 0 + MPC86xx_OPENPIC_IRQ_OFFSET)
635#define MPC86xx_IRQ_MCM ( 1 + MPC86xx_OPENPIC_IRQ_OFFSET)
636#define MPC86xx_IRQ_DDR ( 2 + MPC86xx_OPENPIC_IRQ_OFFSET)
637#define MPC86xx_IRQ_LBC ( 3 + MPC86xx_OPENPIC_IRQ_OFFSET)
638#define MPC86xx_IRQ_DMA0 ( 4 + MPC86xx_OPENPIC_IRQ_OFFSET)
639#define MPC86xx_IRQ_DMA1 ( 5 + MPC86xx_OPENPIC_IRQ_OFFSET)
640#define MPC86xx_IRQ_DMA2 ( 6 + MPC86xx_OPENPIC_IRQ_OFFSET)
641#define MPC86xx_IRQ_DMA3 ( 7 + MPC86xx_OPENPIC_IRQ_OFFSET)
642
643/* no 10,11 */
644#define MPC86xx_IRQ_UART2 (12 + MPC86xx_OPENPIC_IRQ_OFFSET)
645#define MPC86xx_IRQ_TSEC1_TX (13 + MPC86xx_OPENPIC_IRQ_OFFSET)
646#define MPC86xx_IRQ_TSEC1_RX (14 + MPC86xx_OPENPIC_IRQ_OFFSET)
647#define MPC86xx_IRQ_TSEC3_TX (15 + MPC86xx_OPENPIC_IRQ_OFFSET)
648#define MPC86xx_IRQ_TSEC3_RX (16 + MPC86xx_OPENPIC_IRQ_OFFSET)
649#define MPC86xx_IRQ_TSEC3_ERROR (17 + MPC86xx_OPENPIC_IRQ_OFFSET)
650#define MPC86xx_IRQ_TSEC1_ERROR (18 + MPC86xx_OPENPIC_IRQ_OFFSET)
651#define MPC86xx_IRQ_TSEC2_TX (19 + MPC86xx_OPENPIC_IRQ_OFFSET)
652#define MPC86xx_IRQ_TSEC2_RX (20 + MPC86xx_OPENPIC_IRQ_OFFSET)
653#define MPC86xx_IRQ_TSEC4_TX (21 + MPC86xx_OPENPIC_IRQ_OFFSET)
654#define MPC86xx_IRQ_TSEC4_RX (22 + MPC86xx_OPENPIC_IRQ_OFFSET)
655#define MPC86xx_IRQ_TSEC4_ERROR (23 + MPC86xx_OPENPIC_IRQ_OFFSET)
656#define MPC86xx_IRQ_TSEC2_ERROR (24 + MPC86xx_OPENPIC_IRQ_OFFSET)
657/* no 25 */
658#define MPC86xx_IRQ_UART1 (26 + MPC86xx_OPENPIC_IRQ_OFFSET)
659#define MPC86xx_IRQ_IIC (27 + MPC86xx_OPENPIC_IRQ_OFFSET)
660#define MPC86xx_IRQ_PERFMON (28 + MPC86xx_OPENPIC_IRQ_OFFSET)
661/* no 29,30,31 */
662#define MPC86xx_IRQ_SRIO_ERROR (32 + MPC86xx_OPENPIC_IRQ_OFFSET)
663#define MPC86xx_IRQ_SRIO_OUT_BELL (33 + MPC86xx_OPENPIC_IRQ_OFFSET)
664#define MPC86xx_IRQ_SRIO_IN_BELL (34 + MPC86xx_OPENPIC_IRQ_OFFSET)
665/* no 35,36 */
666#define MPC86xx_IRQ_SRIO_OUT_MSG1 (37 + MPC86xx_OPENPIC_IRQ_OFFSET)
667#define MPC86xx_IRQ_SRIO_IN_MSG1 (38 + MPC86xx_OPENPIC_IRQ_OFFSET)
668#define MPC86xx_IRQ_SRIO_OUT_MSG2 (39 + MPC86xx_OPENPIC_IRQ_OFFSET)
669#define MPC86xx_IRQ_SRIO_IN_MSG2 (40 + MPC86xx_OPENPIC_IRQ_OFFSET)
670
671/* The 12 external interrupt lines */
672#define MPC86xx_IRQ_EXT_BASE 48
673#define MPC86xx_IRQ_EXT0 (0 + MPC86xx_IRQ_EXT_BASE \
674 + MPC86xx_OPENPIC_IRQ_OFFSET)
675#define MPC86xx_IRQ_EXT1 (1 + MPC86xx_IRQ_EXT_BASE \
676 + MPC86xx_OPENPIC_IRQ_OFFSET)
677#define MPC86xx_IRQ_EXT2 (2 + MPC86xx_IRQ_EXT_BASE \
678 + MPC86xx_OPENPIC_IRQ_OFFSET)
679#define MPC86xx_IRQ_EXT3 (3 + MPC86xx_IRQ_EXT_BASE \
680 + MPC86xx_OPENPIC_IRQ_OFFSET)
681#define MPC86xx_IRQ_EXT4 (4 + MPC86xx_IRQ_EXT_BASE \
682 + MPC86xx_OPENPIC_IRQ_OFFSET)
683#define MPC86xx_IRQ_EXT5 (5 + MPC86xx_IRQ_EXT_BASE \
684 + MPC86xx_OPENPIC_IRQ_OFFSET)
685#define MPC86xx_IRQ_EXT6 (6 + MPC86xx_IRQ_EXT_BASE \
686 + MPC86xx_OPENPIC_IRQ_OFFSET)
687#define MPC86xx_IRQ_EXT7 (7 + MPC86xx_IRQ_EXT_BASE \
688 + MPC86xx_OPENPIC_IRQ_OFFSET)
689#define MPC86xx_IRQ_EXT8 (8 + MPC86xx_IRQ_EXT_BASE \
690 + MPC86xx_OPENPIC_IRQ_OFFSET)
691#define MPC86xx_IRQ_EXT9 (9 + MPC86xx_IRQ_EXT_BASE \
692 + MPC86xx_OPENPIC_IRQ_OFFSET)
693#define MPC86xx_IRQ_EXT10 (10 + MPC86xx_IRQ_EXT_BASE \
694 + MPC86xx_OPENPIC_IRQ_OFFSET)
695#define MPC86xx_IRQ_EXT11 (11 + MPC86xx_IRQ_EXT_BASE \
696 + MPC86xx_OPENPIC_IRQ_OFFSET)
697
698#else /* CONFIG_40x + CONFIG_8xx */ 486#else /* CONFIG_40x + CONFIG_8xx */
699/* 487/*
700 * this is the # irq's for all ppc arch's (pmac/chrp/prep) 488 * this is the # irq's for all ppc arch's (pmac/chrp/prep)
diff --git a/include/asm-powerpc/mpc8xx.h b/include/asm-powerpc/mpc8xx.h
index 2be014b6f57c..98f3c4f17328 100644
--- a/include/asm-powerpc/mpc8xx.h
+++ b/include/asm-powerpc/mpc8xx.h
@@ -4,29 +4,9 @@
4 * file that has to include MPC8xx configuration, they all include 4 * file that has to include MPC8xx configuration, they all include
5 * this one and the configuration switching is done here. 5 * this one and the configuration switching is done here.
6 */ 6 */
7#ifdef __KERNEL__
8#ifndef __CONFIG_8xx_DEFS 7#ifndef __CONFIG_8xx_DEFS
9#define __CONFIG_8xx_DEFS 8#define __CONFIG_8xx_DEFS
10 9
11
12#ifdef CONFIG_8xx
13
14#ifdef CONFIG_FADS
15#include <platforms/fads.h>
16#endif
17
18#if defined(CONFIG_MPC86XADS)
19#include <platforms/8xx/mpc86xads.h>
20#endif
21
22#if defined(CONFIG_MPC885ADS)
23#include <platforms/8xx/mpc885ads.h>
24#endif
25
26#ifdef CONFIG_PCMCIA_M8XX
27extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; 10extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
28#endif
29 11
30#endif /* CONFIG_8xx */
31#endif /* __CONFIG_8xx_DEFS */ 12#endif /* __CONFIG_8xx_DEFS */
32#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/cpm1.h
index 462abb185f07..03035acd85c6 100644
--- a/include/asm-ppc/commproc.h
+++ b/include/asm-ppc/cpm1.h
@@ -14,8 +14,8 @@
14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors 14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors
15 * or other use. 15 * or other use.
16 */ 16 */
17#ifndef __CPM_8XX__ 17#ifndef __CPM1__
18#define __CPM_8XX__ 18#define __CPM1__
19 19
20#include <asm/8xx_immap.h> 20#include <asm/8xx_immap.h>
21#include <asm/ptrace.h> 21#include <asm/ptrace.h>
@@ -72,13 +72,9 @@ extern int cpm_dpfree(unsigned long offset);
72extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); 72extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
73extern void cpm_dpdump(void); 73extern void cpm_dpdump(void);
74extern void *cpm_dpram_addr(unsigned long offset); 74extern void *cpm_dpram_addr(unsigned long offset);
75extern uint cpm_dpram_phys(u8* addr); 75extern uint cpm_dpram_phys(u8 *addr);
76extern void cpm_setbrg(uint brg, uint rate); 76extern void cpm_setbrg(uint brg, uint rate);
77 77
78extern uint m8xx_cpm_hostalloc(uint size);
79extern int m8xx_cpm_hostfree(uint start);
80extern void m8xx_cpm_hostdump(void);
81
82extern void cpm_load_patch(volatile immap_t *immr); 78extern void cpm_load_patch(volatile immap_t *immr);
83 79
84/* Buffer descriptors used by many of the CPM protocols. 80/* Buffer descriptors used by many of the CPM protocols.
@@ -689,4 +685,4 @@ typedef struct risc_timer_pram {
689extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); 685extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
690extern void cpm_free_handler(int vec); 686extern void cpm_free_handler(int vec);
691 687
692#endif /* __CPM_8XX__ */ 688#endif /* __CPM1__ */
diff --git a/include/asm-ppc/cpm2.h b/include/asm-ppc/cpm2.h
index 12a2860f9a9c..4c538228e42f 100644
--- a/include/asm-ppc/cpm2.h
+++ b/include/asm-ppc/cpm2.h
@@ -90,7 +90,7 @@
90 */ 90 */
91#define CPM_DATAONLY_BASE ((uint)128) 91#define CPM_DATAONLY_BASE ((uint)128)
92#define CPM_DP_NOSPACE ((uint)0x7fffffff) 92#define CPM_DP_NOSPACE ((uint)0x7fffffff)
93#if defined(CONFIG_8272) || defined(CONFIG_MPC8555) 93#if defined(CONFIG_8272)
94#define CPM_DATAONLY_SIZE ((uint)(8 * 1024) - CPM_DATAONLY_BASE) 94#define CPM_DATAONLY_SIZE ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
95#define CPM_FCC_SPECIAL_BASE ((uint)0x00009000) 95#define CPM_FCC_SPECIAL_BASE ((uint)0x00009000)
96#else 96#else
diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h
deleted file mode 100644
index 9383d0c13ff8..000000000000
--- a/include/asm-ppc/immap_85xx.h
+++ /dev/null
@@ -1,126 +0,0 @@
1/*
2 * include/asm-ppc/immap_85xx.h
3 *
4 * MPC85xx Internal Memory Map
5 *
6 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
7 *
8 * Copyright 2004 Freescale Semiconductor, Inc
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 *
15 */
16
17#ifdef __KERNEL__
18#ifndef __ASM_IMMAP_85XX_H__
19#define __ASM_IMMAP_85XX_H__
20
21/* Eventually this should define all the IO block registers in 85xx */
22
23/* PCI Registers */
24typedef struct ccsr_pci {
25 uint cfg_addr; /* 0x.000 - PCI Configuration Address Register */
26 uint cfg_data; /* 0x.004 - PCI Configuration Data Register */
27 uint int_ack; /* 0x.008 - PCI Interrupt Acknowledge Register */
28 char res1[3060];
29 uint potar0; /* 0x.c00 - PCI Outbound Transaction Address Register 0 */
30 uint potear0; /* 0x.c04 - PCI Outbound Translation Extended Address Register 0 */
31 uint powbar0; /* 0x.c08 - PCI Outbound Window Base Address Register 0 */
32 char res2[4];
33 uint powar0; /* 0x.c10 - PCI Outbound Window Attributes Register 0 */
34 char res3[12];
35 uint potar1; /* 0x.c20 - PCI Outbound Transaction Address Register 1 */
36 uint potear1; /* 0x.c24 - PCI Outbound Translation Extended Address Register 1 */
37 uint powbar1; /* 0x.c28 - PCI Outbound Window Base Address Register 1 */
38 char res4[4];
39 uint powar1; /* 0x.c30 - PCI Outbound Window Attributes Register 1 */
40 char res5[12];
41 uint potar2; /* 0x.c40 - PCI Outbound Transaction Address Register 2 */
42 uint potear2; /* 0x.c44 - PCI Outbound Translation Extended Address Register 2 */
43 uint powbar2; /* 0x.c48 - PCI Outbound Window Base Address Register 2 */
44 char res6[4];
45 uint powar2; /* 0x.c50 - PCI Outbound Window Attributes Register 2 */
46 char res7[12];
47 uint potar3; /* 0x.c60 - PCI Outbound Transaction Address Register 3 */
48 uint potear3; /* 0x.c64 - PCI Outbound Translation Extended Address Register 3 */
49 uint powbar3; /* 0x.c68 - PCI Outbound Window Base Address Register 3 */
50 char res8[4];
51 uint powar3; /* 0x.c70 - PCI Outbound Window Attributes Register 3 */
52 char res9[12];
53 uint potar4; /* 0x.c80 - PCI Outbound Transaction Address Register 4 */
54 uint potear4; /* 0x.c84 - PCI Outbound Translation Extended Address Register 4 */
55 uint powbar4; /* 0x.c88 - PCI Outbound Window Base Address Register 4 */
56 char res10[4];
57 uint powar4; /* 0x.c90 - PCI Outbound Window Attributes Register 4 */
58 char res11[268];
59 uint pitar3; /* 0x.da0 - PCI Inbound Translation Address Register 3 */
60 char res12[4];
61 uint piwbar3; /* 0x.da8 - PCI Inbound Window Base Address Register 3 */
62 uint piwbear3; /* 0x.dac - PCI Inbound Window Base Extended Address Register 3 */
63 uint piwar3; /* 0x.db0 - PCI Inbound Window Attributes Register 3 */
64 char res13[12];
65 uint pitar2; /* 0x.dc0 - PCI Inbound Translation Address Register 2 */
66 char res14[4];
67 uint piwbar2; /* 0x.dc8 - PCI Inbound Window Base Address Register 2 */
68 uint piwbear2; /* 0x.dcc - PCI Inbound Window Base Extended Address Register 2 */
69 uint piwar2; /* 0x.dd0 - PCI Inbound Window Attributes Register 2 */
70 char res15[12];
71 uint pitar1; /* 0x.de0 - PCI Inbound Translation Address Register 1 */
72 char res16[4];
73 uint piwbar1; /* 0x.de8 - PCI Inbound Window Base Address Register 1 */
74 char res17[4];
75 uint piwar1; /* 0x.df0 - PCI Inbound Window Attributes Register 1 */
76 char res18[12];
77 uint err_dr; /* 0x.e00 - PCI Error Detect Register */
78 uint err_cap_dr; /* 0x.e04 - PCI Error Capture Disable Register */
79 uint err_en; /* 0x.e08 - PCI Error Enable Register */
80 uint err_attrib; /* 0x.e0c - PCI Error Attributes Capture Register */
81 uint err_addr; /* 0x.e10 - PCI Error Address Capture Register */
82 uint err_ext_addr; /* 0x.e14 - PCI Error Extended Address Capture Register */
83 uint err_dl; /* 0x.e18 - PCI Error Data Low Capture Register */
84 uint err_dh; /* 0x.e1c - PCI Error Data High Capture Register */
85 uint gas_timr; /* 0x.e20 - PCI Gasket Timer Register */
86 uint pci_timr; /* 0x.e24 - PCI Timer Register */
87 char res19[472];
88} ccsr_pci_t;
89
90/* Global Utility Registers */
91typedef struct ccsr_guts {
92 uint porpllsr; /* 0x.0000 - POR PLL Ratio Status Register */
93 uint porbmsr; /* 0x.0004 - POR Boot Mode Status Register */
94 uint porimpscr; /* 0x.0008 - POR I/O Impedance Status and Control Register */
95 uint pordevsr; /* 0x.000c - POR I/O Device Status Register */
96 uint pordbgmsr; /* 0x.0010 - POR Debug Mode Status Register */
97 char res1[12];
98 uint gpporcr; /* 0x.0020 - General-Purpose POR Configuration Register */
99 char res2[12];
100 uint gpiocr; /* 0x.0030 - GPIO Control Register */
101 char res3[12];
102 uint gpoutdr; /* 0x.0040 - General-Purpose Output Data Register */
103 char res4[12];
104 uint gpindr; /* 0x.0050 - General-Purpose Input Data Register */
105 char res5[12];
106 uint pmuxcr; /* 0x.0060 - Alternate Function Signal Multiplex Control */
107 char res6[12];
108 uint devdisr; /* 0x.0070 - Device Disable Control */
109 char res7[12];
110 uint powmgtcsr; /* 0x.0080 - Power Management Status and Control Register */
111 char res8[12];
112 uint mcpsumr; /* 0x.0090 - Machine Check Summary Register */
113 char res9[12];
114 uint pvr; /* 0x.00a0 - Processor Version Register */
115 uint svr; /* 0x.00a4 - System Version Register */
116 char res10[3416];
117 uint clkocr; /* 0x.0e00 - Clock Out Select Register */
118 char res11[12];
119 uint ddrdllcr; /* 0x.0e10 - DDR DLL Control Register */
120 char res12[12];
121 uint lbcdllcr; /* 0x.0e20 - LBC DLL Control Register */
122 char res13[61916];
123} ccsr_guts_t;
124
125#endif /* __ASM_IMMAP_85XX_H__ */
126#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h
index b2e25d8997bf..9f097e25b169 100644
--- a/include/asm-ppc/mmu_context.h
+++ b/include/asm-ppc/mmu_context.h
@@ -64,11 +64,6 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
64#define LAST_CONTEXT 255 64#define LAST_CONTEXT 255
65#define FIRST_CONTEXT 1 65#define FIRST_CONTEXT 1
66 66
67#elif defined(CONFIG_E200) || defined(CONFIG_E500)
68#define NO_CONTEXT 256
69#define LAST_CONTEXT 255
70#define FIRST_CONTEXT 1
71
72#else 67#else
73 68
74/* PPC 6xx, 7xx CPUs */ 69/* PPC 6xx, 7xx CPUs */
diff --git a/include/asm-ppc/mpc83xx.h b/include/asm-ppc/mpc83xx.h
deleted file mode 100644
index c3061972309b..000000000000
--- a/include/asm-ppc/mpc83xx.h
+++ /dev/null
@@ -1,107 +0,0 @@
1/*
2 * include/asm-ppc/mpc83xx.h
3 *
4 * MPC83xx definitions
5 *
6 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
7 *
8 * Copyright 2005 Freescale Semiconductor, Inc
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16#ifdef __KERNEL__
17#ifndef __ASM_MPC83xx_H__
18#define __ASM_MPC83xx_H__
19
20#include <asm/mmu.h>
21
22#ifdef CONFIG_83xx
23
24#ifdef CONFIG_MPC834x_SYS
25#include <platforms/83xx/mpc834x_sys.h>
26#endif
27
28/*
29 * The "residual" board information structure the boot loader passes
30 * into the kernel.
31 */
32extern unsigned char __res[];
33
34/* Internal IRQs on MPC83xx OpenPIC */
35/* Not all of these exist on all MPC83xx implementations */
36
37#ifndef MPC83xx_IPIC_IRQ_OFFSET
38#define MPC83xx_IPIC_IRQ_OFFSET 0
39#endif
40
41#define NR_IPIC_INTS 128
42
43#define MPC83xx_IRQ_UART1 ( 9 + MPC83xx_IPIC_IRQ_OFFSET)
44#define MPC83xx_IRQ_UART2 (10 + MPC83xx_IPIC_IRQ_OFFSET)
45#define MPC83xx_IRQ_SEC2 (11 + MPC83xx_IPIC_IRQ_OFFSET)
46#define MPC83xx_IRQ_IIC1 (14 + MPC83xx_IPIC_IRQ_OFFSET)
47#define MPC83xx_IRQ_IIC2 (15 + MPC83xx_IPIC_IRQ_OFFSET)
48#define MPC83xx_IRQ_SPI (16 + MPC83xx_IPIC_IRQ_OFFSET)
49#define MPC83xx_IRQ_EXT1 (17 + MPC83xx_IPIC_IRQ_OFFSET)
50#define MPC83xx_IRQ_EXT2 (18 + MPC83xx_IPIC_IRQ_OFFSET)
51#define MPC83xx_IRQ_EXT3 (19 + MPC83xx_IPIC_IRQ_OFFSET)
52#define MPC83xx_IRQ_EXT4 (20 + MPC83xx_IPIC_IRQ_OFFSET)
53#define MPC83xx_IRQ_EXT5 (21 + MPC83xx_IPIC_IRQ_OFFSET)
54#define MPC83xx_IRQ_EXT6 (22 + MPC83xx_IPIC_IRQ_OFFSET)
55#define MPC83xx_IRQ_EXT7 (23 + MPC83xx_IPIC_IRQ_OFFSET)
56#define MPC83xx_IRQ_TSEC1_TX (32 + MPC83xx_IPIC_IRQ_OFFSET)
57#define MPC83xx_IRQ_TSEC1_RX (33 + MPC83xx_IPIC_IRQ_OFFSET)
58#define MPC83xx_IRQ_TSEC1_ERROR (34 + MPC83xx_IPIC_IRQ_OFFSET)
59#define MPC83xx_IRQ_TSEC2_TX (35 + MPC83xx_IPIC_IRQ_OFFSET)
60#define MPC83xx_IRQ_TSEC2_RX (36 + MPC83xx_IPIC_IRQ_OFFSET)
61#define MPC83xx_IRQ_TSEC2_ERROR (37 + MPC83xx_IPIC_IRQ_OFFSET)
62#define MPC83xx_IRQ_USB2_DR (38 + MPC83xx_IPIC_IRQ_OFFSET)
63#define MPC83xx_IRQ_USB2_MPH (39 + MPC83xx_IPIC_IRQ_OFFSET)
64#define MPC83xx_IRQ_EXT0 (48 + MPC83xx_IPIC_IRQ_OFFSET)
65#define MPC83xx_IRQ_RTC_SEC (64 + MPC83xx_IPIC_IRQ_OFFSET)
66#define MPC83xx_IRQ_PIT (65 + MPC83xx_IPIC_IRQ_OFFSET)
67#define MPC83xx_IRQ_PCI1 (66 + MPC83xx_IPIC_IRQ_OFFSET)
68#define MPC83xx_IRQ_PCI2 (67 + MPC83xx_IPIC_IRQ_OFFSET)
69#define MPC83xx_IRQ_RTC_ALR (68 + MPC83xx_IPIC_IRQ_OFFSET)
70#define MPC83xx_IRQ_MU (69 + MPC83xx_IPIC_IRQ_OFFSET)
71#define MPC83xx_IRQ_SBA (70 + MPC83xx_IPIC_IRQ_OFFSET)
72#define MPC83xx_IRQ_DMA (71 + MPC83xx_IPIC_IRQ_OFFSET)
73#define MPC83xx_IRQ_GTM4 (72 + MPC83xx_IPIC_IRQ_OFFSET)
74#define MPC83xx_IRQ_GTM8 (73 + MPC83xx_IPIC_IRQ_OFFSET)
75#define MPC83xx_IRQ_GPIO1 (74 + MPC83xx_IPIC_IRQ_OFFSET)
76#define MPC83xx_IRQ_GPIO2 (75 + MPC83xx_IPIC_IRQ_OFFSET)
77#define MPC83xx_IRQ_DDR (76 + MPC83xx_IPIC_IRQ_OFFSET)
78#define MPC83xx_IRQ_LBC (77 + MPC83xx_IPIC_IRQ_OFFSET)
79#define MPC83xx_IRQ_GTM2 (78 + MPC83xx_IPIC_IRQ_OFFSET)
80#define MPC83xx_IRQ_GTM6 (79 + MPC83xx_IPIC_IRQ_OFFSET)
81#define MPC83xx_IRQ_PMC (80 + MPC83xx_IPIC_IRQ_OFFSET)
82#define MPC83xx_IRQ_GTM3 (84 + MPC83xx_IPIC_IRQ_OFFSET)
83#define MPC83xx_IRQ_GTM7 (85 + MPC83xx_IPIC_IRQ_OFFSET)
84#define MPC83xx_IRQ_GTM1 (90 + MPC83xx_IPIC_IRQ_OFFSET)
85#define MPC83xx_IRQ_GTM5 (91 + MPC83xx_IPIC_IRQ_OFFSET)
86
87#define MPC83xx_CCSRBAR_SIZE (1024*1024)
88
89/* Let modules/drivers get at immrbar (physical) */
90extern phys_addr_t immrbar;
91
92enum ppc_sys_devices {
93 MPC83xx_TSEC1,
94 MPC83xx_TSEC2,
95 MPC83xx_IIC1,
96 MPC83xx_IIC2,
97 MPC83xx_DUART,
98 MPC83xx_SEC2,
99 MPC83xx_USB2_DR,
100 MPC83xx_USB2_MPH,
101 MPC83xx_MDIO,
102 NUM_PPC_SYS_DEVS,
103};
104
105#endif /* CONFIG_83xx */
106#endif /* __ASM_MPC83xx_H__ */
107#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h
deleted file mode 100644
index d7e4a79d77fb..000000000000
--- a/include/asm-ppc/mpc85xx.h
+++ /dev/null
@@ -1,192 +0,0 @@
1/*
2 * include/asm-ppc/mpc85xx.h
3 *
4 * MPC85xx definitions
5 *
6 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
7 *
8 * Copyright 2004 Freescale Semiconductor, Inc
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16#ifdef __KERNEL__
17#ifndef __ASM_MPC85xx_H__
18#define __ASM_MPC85xx_H__
19
20#include <asm/mmu.h>
21
22#ifdef CONFIG_85xx
23
24#ifdef CONFIG_MPC8540_ADS
25#include <platforms/85xx/mpc8540_ads.h>
26#endif
27#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
28#include <platforms/85xx/mpc8555_cds.h>
29#endif
30#ifdef CONFIG_MPC85xx_CDS
31#include <platforms/85xx/mpc85xx_cds.h>
32#endif
33#ifdef CONFIG_MPC8560_ADS
34#include <platforms/85xx/mpc8560_ads.h>
35#endif
36#ifdef CONFIG_SBC8560
37#include <platforms/85xx/sbc8560.h>
38#endif
39#ifdef CONFIG_STX_GP3
40#include <platforms/85xx/stx_gp3.h>
41#endif
42#if defined(CONFIG_TQM8540) || defined(CONFIG_TQM8541) || \
43 defined(CONFIG_TQM8555) || defined(CONFIG_TQM8560)
44#include <platforms/85xx/tqm85xx.h>
45#endif
46
47/*
48 * The "residual" board information structure the boot loader passes
49 * into the kernel.
50 */
51extern unsigned char __res[];
52
53/* Offset from CCSRBAR */
54#define MPC85xx_CPM_OFFSET (0x80000)
55#define MPC85xx_CPM_SIZE (0x40000)
56#define MPC85xx_DMA_OFFSET (0x21000)
57#define MPC85xx_DMA_SIZE (0x01000)
58#define MPC85xx_DMA0_OFFSET (0x21100)
59#define MPC85xx_DMA0_SIZE (0x00080)
60#define MPC85xx_DMA1_OFFSET (0x21180)
61#define MPC85xx_DMA1_SIZE (0x00080)
62#define MPC85xx_DMA2_OFFSET (0x21200)
63#define MPC85xx_DMA2_SIZE (0x00080)
64#define MPC85xx_DMA3_OFFSET (0x21280)
65#define MPC85xx_DMA3_SIZE (0x00080)
66#define MPC85xx_ENET1_OFFSET (0x24000)
67#define MPC85xx_ENET1_SIZE (0x01000)
68#define MPC85xx_MIIM_OFFSET (0x24520)
69#define MPC85xx_MIIM_SIZE (0x00018)
70#define MPC85xx_ENET2_OFFSET (0x25000)
71#define MPC85xx_ENET2_SIZE (0x01000)
72#define MPC85xx_ENET3_OFFSET (0x26000)
73#define MPC85xx_ENET3_SIZE (0x01000)
74#define MPC85xx_GUTS_OFFSET (0xe0000)
75#define MPC85xx_GUTS_SIZE (0x01000)
76#define MPC85xx_IIC1_OFFSET (0x03000)
77#define MPC85xx_IIC1_SIZE (0x00100)
78#define MPC85xx_OPENPIC_OFFSET (0x40000)
79#define MPC85xx_OPENPIC_SIZE (0x40000)
80#define MPC85xx_PCI1_OFFSET (0x08000)
81#define MPC85xx_PCI1_SIZE (0x01000)
82#define MPC85xx_PCI2_OFFSET (0x09000)
83#define MPC85xx_PCI2_SIZE (0x01000)
84#define MPC85xx_PERFMON_OFFSET (0xe1000)
85#define MPC85xx_PERFMON_SIZE (0x01000)
86#define MPC85xx_SEC2_OFFSET (0x30000)
87#define MPC85xx_SEC2_SIZE (0x10000)
88#define MPC85xx_UART0_OFFSET (0x04500)
89#define MPC85xx_UART0_SIZE (0x00100)
90#define MPC85xx_UART1_OFFSET (0x04600)
91#define MPC85xx_UART1_SIZE (0x00100)
92
93#define MPC85xx_CCSRBAR_SIZE (1024*1024)
94
95/* Let modules/drivers get at CCSRBAR */
96extern phys_addr_t get_ccsrbar(void);
97
98#ifdef MODULE
99#define CCSRBAR get_ccsrbar()
100#else
101#define CCSRBAR BOARD_CCSRBAR
102#endif
103
104enum ppc_sys_devices {
105 MPC85xx_TSEC1,
106 MPC85xx_TSEC2,
107 MPC85xx_FEC,
108 MPC85xx_IIC1,
109 MPC85xx_DMA0,
110 MPC85xx_DMA1,
111 MPC85xx_DMA2,
112 MPC85xx_DMA3,
113 MPC85xx_DUART,
114 MPC85xx_PERFMON,
115 MPC85xx_SEC2,
116 MPC85xx_CPM_SPI,
117 MPC85xx_CPM_I2C,
118 MPC85xx_CPM_USB,
119 MPC85xx_CPM_SCC1,
120 MPC85xx_CPM_SCC2,
121 MPC85xx_CPM_SCC3,
122 MPC85xx_CPM_SCC4,
123 MPC85xx_CPM_FCC1,
124 MPC85xx_CPM_FCC2,
125 MPC85xx_CPM_FCC3,
126 MPC85xx_CPM_MCC1,
127 MPC85xx_CPM_MCC2,
128 MPC85xx_CPM_SMC1,
129 MPC85xx_CPM_SMC2,
130 MPC85xx_eTSEC1,
131 MPC85xx_eTSEC2,
132 MPC85xx_eTSEC3,
133 MPC85xx_eTSEC4,
134 MPC85xx_IIC2,
135 MPC85xx_MDIO,
136 NUM_PPC_SYS_DEVS,
137};
138
139/* Internal interrupts are all Level Sensitive, and Positive Polarity */
140#define MPC85XX_INTERNAL_IRQ_SENSES \
141 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 0 */ \
142 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 1 */ \
143 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 2 */ \
144 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 3 */ \
145 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 4 */ \
146 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 5 */ \
147 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 6 */ \
148 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 7 */ \
149 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 8 */ \
150 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 9 */ \
151 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 10 */ \
152 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 11 */ \
153 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 12 */ \
154 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 13 */ \
155 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 14 */ \
156 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 15 */ \
157 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 16 */ \
158 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 17 */ \
159 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 18 */ \
160 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 19 */ \
161 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 20 */ \
162 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 21 */ \
163 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 22 */ \
164 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 23 */ \
165 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 24 */ \
166 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 25 */ \
167 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 26 */ \
168 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 27 */ \
169 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 28 */ \
170 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 29 */ \
171 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 30 */ \
172 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 31 */ \
173 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 32 */ \
174 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 33 */ \
175 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 34 */ \
176 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 35 */ \
177 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 36 */ \
178 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 37 */ \
179 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 38 */ \
180 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 39 */ \
181 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 40 */ \
182 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 41 */ \
183 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 42 */ \
184 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 43 */ \
185 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 44 */ \
186 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 45 */ \
187 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* Internal 46 */ \
188 (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE) /* Internal 47 */
189
190#endif /* CONFIG_85xx */
191#endif /* __ASM_MPC85xx_H__ */
192#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h
index 063ad91cbbcc..69347bdbb401 100644
--- a/include/asm-ppc/pgtable.h
+++ b/include/asm-ppc/pgtable.h
@@ -271,48 +271,6 @@ extern unsigned long ioremap_bot, ioremap_base;
271/* ERPN in a PTE never gets cleared, ignore it */ 271/* ERPN in a PTE never gets cleared, ignore it */
272#define _PTE_NONE_MASK 0xffffffff00000000ULL 272#define _PTE_NONE_MASK 0xffffffff00000000ULL
273 273
274#elif defined(CONFIG_FSL_BOOKE)
275/*
276 MMU Assist Register 3:
277
278 32 33 34 35 36 ... 50 51 52 53 54 55 56 57 58 59 60 61 62 63
279 RPN...................... 0 0 U0 U1 U2 U3 UX SX UW SW UR SR
280
281 - PRESENT *must* be in the bottom three bits because swap cache
282 entries use the top 29 bits.
283
284 - FILE *must* be in the bottom three bits because swap cache
285 entries use the top 29 bits.
286*/
287
288/* Definitions for FSL Book-E Cores */
289#define _PAGE_PRESENT 0x00001 /* S: PTE contains a translation */
290#define _PAGE_USER 0x00002 /* S: User page (maps to UR) */
291#define _PAGE_FILE 0x00002 /* S: when !present: nonlinear file mapping */
292#define _PAGE_ACCESSED 0x00004 /* S: Page referenced */
293#define _PAGE_HWWRITE 0x00008 /* H: Dirty & RW, set in exception */
294#define _PAGE_RW 0x00010 /* S: Write permission */
295#define _PAGE_HWEXEC 0x00020 /* H: UX permission */
296
297#define _PAGE_ENDIAN 0x00040 /* H: E bit */
298#define _PAGE_GUARDED 0x00080 /* H: G bit */
299#define _PAGE_COHERENT 0x00100 /* H: M bit */
300#define _PAGE_NO_CACHE 0x00200 /* H: I bit */
301#define _PAGE_WRITETHRU 0x00400 /* H: W bit */
302
303#ifdef CONFIG_PTE_64BIT
304#define _PAGE_DIRTY 0x08000 /* S: Page dirty */
305
306/* ERPN in a PTE never gets cleared, ignore it */
307#define _PTE_NONE_MASK 0xffffffffffff0000ULL
308#else
309#define _PAGE_DIRTY 0x00800 /* S: Page dirty */
310#endif
311
312#define _PMD_PRESENT 0
313#define _PMD_PRESENT_MASK (PAGE_MASK)
314#define _PMD_BAD (~PAGE_MASK)
315
316#elif defined(CONFIG_8xx) 274#elif defined(CONFIG_8xx)
317/* Definitions for 8xx embedded chips. */ 275/* Definitions for 8xx embedded chips. */
318#define _PAGE_PRESENT 0x0001 /* Page is valid */ 276#define _PAGE_PRESENT 0x0001 /* Page is valid */
@@ -484,11 +442,7 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);
484 442
485/* in some case we want to additionaly adjust where the pfn is in the pte to 443/* in some case we want to additionaly adjust where the pfn is in the pte to
486 * allow room for more flags */ 444 * allow room for more flags */
487#if defined(CONFIG_FSL_BOOKE) && defined(CONFIG_PTE_64BIT)
488#define PFN_SHIFT_OFFSET (PAGE_SHIFT + 8)
489#else
490#define PFN_SHIFT_OFFSET (PAGE_SHIFT) 445#define PFN_SHIFT_OFFSET (PAGE_SHIFT)
491#endif
492 446
493#define pte_pfn(x) (pte_val(x) >> PFN_SHIFT_OFFSET) 447#define pte_pfn(x) (pte_val(x) >> PFN_SHIFT_OFFSET)
494#define pte_page(x) pfn_to_page(pte_pfn(x)) 448#define pte_page(x) pfn_to_page(pte_pfn(x))
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
index de99e92d627b..d2fee41d600b 100644
--- a/include/asm-ppc/ppc_sys.h
+++ b/include/asm-ppc/ppc_sys.h
@@ -23,10 +23,6 @@
23 23
24#if defined(CONFIG_8260) 24#if defined(CONFIG_8260)
25#include <asm/mpc8260.h> 25#include <asm/mpc8260.h>
26#elif defined(CONFIG_83xx)
27#include <asm/mpc83xx.h>
28#elif defined(CONFIG_85xx)
29#include <asm/mpc85xx.h>
30#elif defined(CONFIG_8xx) 26#elif defined(CONFIG_8xx)
31#include <asm/mpc8xx.h> 27#include <asm/mpc8xx.h>
32#elif defined(CONFIG_PPC_MPC52xx) 28#elif defined(CONFIG_PPC_MPC52xx)
diff --git a/include/asm-ppc/ppcboot.h b/include/asm-ppc/ppcboot.h
index 6b7b63f71daa..3819e17cd7b0 100644
--- a/include/asm-ppc/ppcboot.h
+++ b/include/asm-ppc/ppcboot.h
@@ -38,8 +38,7 @@ typedef struct bd_info {
38 unsigned long bi_flashoffset; /* reserved area for startup monitor */ 38 unsigned long bi_flashoffset; /* reserved area for startup monitor */
39 unsigned long bi_sramstart; /* start of SRAM memory */ 39 unsigned long bi_sramstart; /* start of SRAM memory */
40 unsigned long bi_sramsize; /* size of SRAM memory */ 40 unsigned long bi_sramsize; /* size of SRAM memory */
41#if defined(CONFIG_8xx) || defined(CONFIG_CPM2) || defined(CONFIG_85xx) ||\ 41#if defined(CONFIG_8xx) || defined(CONFIG_CPM2)
42 defined(CONFIG_83xx)
43 unsigned long bi_immr_base; /* base of IMMR register */ 42 unsigned long bi_immr_base; /* base of IMMR register */
44#endif 43#endif
45#if defined(CONFIG_PPC_MPC52xx) 44#if defined(CONFIG_PPC_MPC52xx)
@@ -73,12 +72,11 @@ typedef struct bd_info {
73#if defined(CONFIG_HYMOD) 72#if defined(CONFIG_HYMOD)
74 hymod_conf_t bi_hymod_conf; /* hymod configuration information */ 73 hymod_conf_t bi_hymod_conf; /* hymod configuration information */
75#endif 74#endif
76#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \ 75#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x)
77 defined(CONFIG_85xx) || defined(CONFIG_83xx)
78 /* second onboard ethernet port */ 76 /* second onboard ethernet port */
79 unsigned char bi_enet1addr[6]; 77 unsigned char bi_enet1addr[6];
80#endif 78#endif
81#if defined(CONFIG_EVB64260) || defined(CONFIG_440GX) || defined(CONFIG_85xx) 79#if defined(CONFIG_EVB64260) || defined(CONFIG_440GX)
82 /* third onboard ethernet ports */ 80 /* third onboard ethernet ports */
83 unsigned char bi_enet2addr[6]; 81 unsigned char bi_enet2addr[6];
84#endif 82#endif
diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h
index 2f1a2afcfc28..91e96af88bd8 100644
--- a/include/asm-ppc/reg_booke.h
+++ b/include/asm-ppc/reg_booke.h
@@ -218,32 +218,6 @@
218#define MCSR_DCFP 0x01000000 /* D-Cache Flush Parity Error */ 218#define MCSR_DCFP 0x01000000 /* D-Cache Flush Parity Error */
219#define MCSR_IMPE 0x00800000 /* Imprecise Machine Check Exception */ 219#define MCSR_IMPE 0x00800000 /* Imprecise Machine Check Exception */
220#endif 220#endif
221#ifdef CONFIG_E500
222#define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */
223#define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */
224#define MCSR_DCP_PERR 0x20000000UL /* D-Cache Push Parity Error */
225#define MCSR_DCPERR 0x10000000UL /* D-Cache Parity Error */
226#define MCSR_GL_CI 0x00010000UL /* Guarded Load or Cache-Inhibited stwcx. */
227#define MCSR_BUS_IAERR 0x00000080UL /* Instruction Address Error */
228#define MCSR_BUS_RAERR 0x00000040UL /* Read Address Error */
229#define MCSR_BUS_WAERR 0x00000020UL /* Write Address Error */
230#define MCSR_BUS_IBERR 0x00000010UL /* Instruction Data Error */
231#define MCSR_BUS_RBERR 0x00000008UL /* Read Data Bus Error */
232#define MCSR_BUS_WBERR 0x00000004UL /* Write Data Bus Error */
233#define MCSR_BUS_IPERR 0x00000002UL /* Instruction parity Error */
234#define MCSR_BUS_RPERR 0x00000001UL /* Read parity Error */
235#endif
236#ifdef CONFIG_E200
237#define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */
238#define MCSR_CP_PERR 0x20000000UL /* Cache Push Parity Error */
239#define MCSR_CPERR 0x10000000UL /* Cache Parity Error */
240#define MCSR_EXCP_ERR 0x08000000UL /* ISI, ITLB, or Bus Error on 1st insn
241 fetch for an exception handler */
242#define MCSR_BUS_IRERR 0x00000010UL /* Read Bus Error on instruction fetch*/
243#define MCSR_BUS_DRERR 0x00000008UL /* Read Bus Error on data load */
244#define MCSR_BUS_WRERR 0x00000004UL /* Write Bus Error on buffered
245 store or cache line push */
246#endif
247 221
248/* Bit definitions for the DBSR. */ 222/* Bit definitions for the DBSR. */
249/* 223/*
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h
index 8fc1b546613d..d35ed10315b1 100644
--- a/include/asm-ppc/serial.h
+++ b/include/asm-ppc/serial.h
@@ -29,10 +29,6 @@
29#include <platforms/spruce.h> 29#include <platforms/spruce.h>
30#elif defined(CONFIG_4xx) 30#elif defined(CONFIG_4xx)
31#include <asm/ibm4xx.h> 31#include <asm/ibm4xx.h>
32#elif defined(CONFIG_83xx)
33#include <asm/mpc83xx.h>
34#elif defined(CONFIG_85xx)
35#include <asm/mpc85xx.h>
36#elif defined(CONFIG_RADSTONE_PPC7D) 32#elif defined(CONFIG_RADSTONE_PPC7D)
37#include <platforms/radstone_ppc7d.h> 33#include <platforms/radstone_ppc7d.h>
38#else 34#else