aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/powerpc/Makefile3
-rw-r--r--arch/powerpc/boot/Makefile15
-rw-r--r--arch/powerpc/boot/dts/ebony.dts37
-rw-r--r--arch/powerpc/boot/dts/kuroboxHD.dts44
-rw-r--r--arch/powerpc/boot/dts/kuroboxHG.dts45
-rw-r--r--arch/powerpc/boot/dts/lite5200.dts69
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts77
-rw-r--r--arch/powerpc/boot/dts/mpc7448hpc2.dts72
-rw-r--r--arch/powerpc/boot/dts/mpc8540ads.dts16
-rw-r--r--arch/powerpc/boot/dts/mpc8541cds.dts16
-rw-r--r--arch/powerpc/boot/dts/mpc8544ds.dts16
-rw-r--r--arch/powerpc/boot/dts/mpc8548cds.dts16
-rw-r--r--arch/powerpc/boot/dts/mpc8555cds.dts16
-rw-r--r--arch/powerpc/boot/dts/mpc8560ads.dts18
-rw-r--r--arch/powerpc/boot/dts/mpc8568mds.dts16
-rw-r--r--arch/powerpc/boot/flatdevtree.c17
-rw-r--r--arch/powerpc/configs/cell_defconfig15
-rw-r--r--arch/powerpc/configs/iseries_defconfig209
-rw-r--r--arch/powerpc/configs/pasemi_defconfig383
-rw-r--r--arch/powerpc/kernel/cputable.c2
-rw-r--r--arch/powerpc/kernel/entry_32.S18
-rw-r--r--arch/powerpc/kernel/of_platform.c10
-rw-r--r--arch/powerpc/kernel/pci_64.c23
-rw-r--r--arch/powerpc/kernel/prom.c5
-rw-r--r--arch/powerpc/kernel/rtas-proc.c2
-rw-r--r--arch/powerpc/lib/rheap.c22
-rw-r--r--arch/powerpc/mm/hash_low_32.S18
-rw-r--r--arch/powerpc/mm/hash_utils_64.c4
-rw-r--r--arch/powerpc/mm/pgtable_64.c4
-rw-r--r--arch/powerpc/platforms/44x/Kconfig3
-rw-r--r--arch/powerpc/platforms/44x/ebony.c6
-rw-r--r--arch/powerpc/platforms/iseries/viopath.c21
-rw-r--r--arch/powerpc/platforms/pasemi/Kconfig1
-rw-r--r--arch/powerpc/platforms/pseries/pseries.h4
-rw-r--r--arch/powerpc/sysdev/mpic.c12
-rw-r--r--arch/ppc/syslib/pq2_sys.c36
-rw-r--r--drivers/char/watchdog/booke_wdt.c2
-rw-r--r--drivers/macintosh/windfarm_core.c10
-rw-r--r--include/asm-powerpc/cputable.h6
-rw-r--r--include/asm-powerpc/mmu-44x.h2
-rw-r--r--include/asm-powerpc/mpc8260.h6
-rw-r--r--include/asm-powerpc/pgtable-ppc32.h15
-rw-r--r--include/asm-powerpc/pmac_feature.h6
-rw-r--r--include/asm-powerpc/systbl.h3
-rw-r--r--include/asm-powerpc/tsi108_irq.h6
-rw-r--r--include/asm-powerpc/tsi108_pci.h6
-rw-r--r--include/asm-powerpc/unistd.h11
47 files changed, 782 insertions, 582 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index d6014a67694b..6238b5875fd1 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -29,7 +29,7 @@ CROSS32CC := $(CC) -m32
29CROSS32AS := $(AS) -a32 29CROSS32AS := $(AS) -a32
30CROSS32LD := $(LD) -m elf32ppc 30CROSS32LD := $(LD) -m elf32ppc
31CROSS32OBJCOPY := $(OBJCOPY) 31CROSS32OBJCOPY := $(OBJCOPY)
32CROSS32AR := $(AR) 32CROSS32AR := GNUTARGET=elf32-powerpc $(AR)
33endif 33endif
34endif 34endif
35 35
@@ -58,6 +58,7 @@ ifeq ($(HAS_BIARCH),y)
58override AS += -a$(SZ) 58override AS += -a$(SZ)
59override LD += -m elf$(SZ)ppc 59override LD += -m elf$(SZ)ppc
60override CC += -m$(SZ) 60override CC += -m$(SZ)
61override AR := GNUTARGET=elf$(SZ)-powerpc $(AR)
61endif 62endif
62 63
63LDFLAGS_vmlinux := -Bstatic 64LDFLAGS_vmlinux := -Bstatic
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d4f9fef7f9e9..83788986b93b 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -33,6 +33,9 @@ endif
33 33
34BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) 34BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
35 35
36$(obj)/44x.o: BOOTCFLAGS += -Wa,-mbooke
37$(obj)/ebony.o: BOOTCFLAGS += -Wa,-mbooke
38
36zlib := inffast.c inflate.c inftrees.c 39zlib := inffast.c inflate.c inftrees.c
37zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h 40zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
38zliblinuxheader := zlib.h zconf.h zutil.h 41zliblinuxheader := zlib.h zconf.h zutil.h
@@ -54,13 +57,13 @@ obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
54obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat)))) 57obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
55 58
56quiet_cmd_copy_zlib = COPY $@ 59quiet_cmd_copy_zlib = COPY $@
57 cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@ 60 cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
58 61
59quiet_cmd_copy_zlibheader = COPY $@ 62quiet_cmd_copy_zlibheader = COPY $@
60 cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@ 63 cmd_copy_zlibheader = sed "s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
61# stddef.h for NULL 64# stddef.h for NULL
62quiet_cmd_copy_zliblinuxheader = COPY $@ 65quiet_cmd_copy_zliblinuxheader = COPY $@
63 cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@ 66 cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
64 67
65$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/% 68$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
66 $(call cmd,copy_zlib) 69 $(call cmd,copy_zlib)
@@ -204,12 +207,12 @@ dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\
204$(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits) 207$(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits)
205 $(call if_changed,wrap,cuboot-$*,$(dts)) 208 $(call if_changed,wrap,cuboot-$*,$(dts))
206 209
207$(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits)
208 $(call if_changed,wrap,treeboot-$*,$(dts))
209
210$(obj)/treeImage.initrd.%: vmlinux $(dts) $(wrapperbits) 210$(obj)/treeImage.initrd.%: vmlinux $(dts) $(wrapperbits)
211 $(call if_changed,wrap,treeboot-$*,$(dts),,$(obj)/ramdisk.image.gz) 211 $(call if_changed,wrap,treeboot-$*,$(dts),,$(obj)/ramdisk.image.gz)
212 212
213$(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits)
214 $(call if_changed,wrap,treeboot-$*,$(dts))
215
213$(obj)/zImage: $(addprefix $(obj)/, $(image-y)) 216$(obj)/zImage: $(addprefix $(obj)/, $(image-y))
214 @rm -f $@; ln $< $@ 217 @rm -f $@; ln $< $@
215$(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) 218$(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y))
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index b67918651c48..0ec02f4726b5 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -33,8 +33,8 @@
33 timebase-frequency = <0>; // Filled in by zImage 33 timebase-frequency = <0>; // Filled in by zImage
34 i-cache-line-size = <32>; 34 i-cache-line-size = <32>;
35 d-cache-line-size = <32>; 35 d-cache-line-size = <32>;
36 i-cache-size = <0>; 36 i-cache-size = <8000>; /* 32 kB */
37 d-cache-size = <0>; 37 d-cache-size = <8000>; /* 32 kB */
38 dcr-controller; 38 dcr-controller;
39 dcr-access-method = "native"; 39 dcr-access-method = "native";
40 }; 40 };
@@ -46,7 +46,6 @@
46 }; 46 };
47 47
48 UIC0: interrupt-controller0 { 48 UIC0: interrupt-controller0 {
49 device_type = "ibm,uic";
50 compatible = "ibm,uic-440gp", "ibm,uic"; 49 compatible = "ibm,uic-440gp", "ibm,uic";
51 interrupt-controller; 50 interrupt-controller;
52 cell-index = <0>; 51 cell-index = <0>;
@@ -58,7 +57,6 @@
58 }; 57 };
59 58
60 UIC1: interrupt-controller1 { 59 UIC1: interrupt-controller1 {
61 device_type = "ibm,uic";
62 compatible = "ibm,uic-440gp", "ibm,uic"; 60 compatible = "ibm,uic-440gp", "ibm,uic";
63 interrupt-controller; 61 interrupt-controller;
64 cell-index = <1>; 62 cell-index = <1>;
@@ -71,36 +69,36 @@
71 }; 69 };
72 70
73 CPC0: cpc { 71 CPC0: cpc {
74 device_type = "ibm,cpc";
75 compatible = "ibm,cpc-440gp"; 72 compatible = "ibm,cpc-440gp";
76 dcr-reg = <0b0 003 0e0 010>; 73 dcr-reg = <0b0 003 0e0 010>;
77 // FIXME: anything else? 74 // FIXME: anything else?
78 }; 75 };
79 76
80 plb { 77 plb {
81 device_type = "ibm,plb";
82 compatible = "ibm,plb-440gp", "ibm,plb4"; 78 compatible = "ibm,plb-440gp", "ibm,plb4";
83 #address-cells = <2>; 79 #address-cells = <2>;
84 #size-cells = <1>; 80 #size-cells = <1>;
85 ranges; 81 ranges;
86 clock-frequency = <0>; // Filled in by zImage 82 clock-frequency = <0>; // Filled in by zImage
87 83
88 SDRAM0: sdram { 84 SDRAM0: memory-controller {
89 device_type = "memory-controller"; 85 compatible = "ibm,sdram-440gp";
90 compatible = "ibm,sdram-440gp", "ibm,sdram";
91 dcr-reg = <010 2>; 86 dcr-reg = <010 2>;
92 // FIXME: anything else? 87 // FIXME: anything else?
93 }; 88 };
94 89
90 SRAM0: sram {
91 compatible = "ibm,sram-440gp";
92 dcr-reg = <020 8 00a 1>;
93 };
94
95 DMA0: dma { 95 DMA0: dma {
96 // FIXME: ??? 96 // FIXME: ???
97 device_type = "ibm,dma-4xx"; 97 compatible = "ibm,dma-440gp";
98 compatible = "ibm,dma-440gp", "ibm,dma-4xx";
99 dcr-reg = <100 027>; 98 dcr-reg = <100 027>;
100 }; 99 };
101 100
102 MAL0: mcmal { 101 MAL0: mcmal {
103 device_type = "mcmal-dma";
104 compatible = "ibm,mcmal-440gp", "ibm,mcmal"; 102 compatible = "ibm,mcmal-440gp", "ibm,mcmal";
105 dcr-reg = <180 62>; 103 dcr-reg = <180 62>;
106 num-tx-chans = <4>; 104 num-tx-chans = <4>;
@@ -119,7 +117,6 @@
119 }; 117 };
120 118
121 POB0: opb { 119 POB0: opb {
122 device_type = "ibm,opb";
123 compatible = "ibm,opb-440gp", "ibm,opb"; 120 compatible = "ibm,opb-440gp", "ibm,opb";
124 #address-cells = <1>; 121 #address-cells = <1>;
125 #size-cells = <1>; 122 #size-cells = <1>;
@@ -133,8 +130,7 @@
133 clock-frequency = <0>; // Filled in by zImage 130 clock-frequency = <0>; // Filled in by zImage
134 131
135 EBC0: ebc { 132 EBC0: ebc {
136 device_type = "ibm,ebc"; 133 compatible = "ibm,ebc-440gp", "ibm,ebc";
137 compatible = "ibm,ebc-440gp";
138 dcr-reg = <012 2>; 134 dcr-reg = <012 2>;
139 #address-cells = <2>; 135 #address-cells = <2>;
140 #size-cells = <1>; 136 #size-cells = <1>;
@@ -147,7 +143,7 @@
147 interrupts = <5 4>; 143 interrupts = <5 4>;
148 interrupt-parent = <&UIC1>; 144 interrupt-parent = <&UIC1>;
149 145
150 small-flash@0,0 { 146 small-flash@0,80000 {
151 device_type = "rom"; 147 device_type = "rom";
152 compatible = "direct-mapped"; 148 compatible = "direct-mapped";
153 probe-type = "JEDEC"; 149 probe-type = "JEDEC";
@@ -159,7 +155,6 @@
159 155
160 ds1743@1,0 { 156 ds1743@1,0 {
161 /* NVRAM & RTC */ 157 /* NVRAM & RTC */
162 device_type = "nvram";
163 compatible = "ds1743"; 158 compatible = "ds1743";
164 reg = <1 0 2000>; 159 reg = <1 0 2000>;
165 }; 160 };
@@ -170,7 +165,7 @@
170 probe-type = "JEDEC"; 165 probe-type = "JEDEC";
171 bank-width = <1>; 166 bank-width = <1>;
172 partitions = <0 380000 167 partitions = <0 380000
173 280000 80000>; 168 380000 80000>;
174 partition-names = "fs", "firmware"; 169 partition-names = "fs", "firmware";
175 reg = <2 0 400000>; 170 reg = <2 0 400000>;
176 }; 171 };
@@ -226,13 +221,11 @@
226 221
227 GPIO0: gpio@40000700 { 222 GPIO0: gpio@40000700 {
228 /* FIXME */ 223 /* FIXME */
229 device_type = "gpio";
230 compatible = "ibm,gpio-440gp"; 224 compatible = "ibm,gpio-440gp";
231 reg = <40000700 20>; 225 reg = <40000700 20>;
232 }; 226 };
233 227
234 ZMII0: emac-zmii@40000780 { 228 ZMII0: emac-zmii@40000780 {
235 device_type = "emac-zmii";
236 compatible = "ibm,zmii-440gp", "ibm,zmii"; 229 compatible = "ibm,zmii-440gp", "ibm,zmii";
237 reg = <40000780 c>; 230 reg = <40000780 c>;
238 }; 231 };
@@ -299,9 +292,5 @@
299 292
300 chosen { 293 chosen {
301 linux,stdout-path = "/plb/opb/serial@40000200"; 294 linux,stdout-path = "/plb/opb/serial@40000200";
302// linux,initrd-start = <0>; /* FIXME */
303// linux,initrd-end = <0>;
304// bootargs = "";
305 }; 295 };
306}; 296};
307
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts
index 157dc98d3988..a983680c3263 100644
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
21 */ 21 */
22 22
23/ { 23/ {
24 linux,phandle = <1000>;
25 model = "KuroboxHD"; 24 model = "KuroboxHD";
26 compatible = "linkstation"; 25 compatible = "linkstation";
27 #address-cells = <1>; 26 #address-cells = <1>;
28 #size-cells = <1>; 27 #size-cells = <1>;
29 28
30 cpus { 29 cpus {
31 linux,phandle = <2000>;
32 #address-cells = <1>; 30 #address-cells = <1>;
33 #size-cells = <0>; 31 #size-cells = <0>;
34 32
35 PowerPC,603e { /* Really 8241 */ 33 PowerPC,603e { /* Really 8241 */
36 linux,phandle = <2100>;
37 device_type = "cpu"; 34 device_type = "cpu";
38 reg = <0>; 35 reg = <0>;
39 clock-frequency = <bebc200>; /* Fixed by bootwrapper */ 36 clock-frequency = <bebc200>; /* Fixed by bootwrapper */
@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
48 }; 45 };
49 46
50 memory { 47 memory {
51 linux,phandle = <3000>;
52 device_type = "memory"; 48 device_type = "memory";
53 reg = <00000000 04000000>; 49 reg = <00000000 04000000>;
54 }; 50 };
55 51
56 soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */ 52 soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
57 linux,phandle = <4000>;
58 #address-cells = <1>; 53 #address-cells = <1>;
59 #size-cells = <1>; 54 #size-cells = <1>;
60 #interrupt-cells = <2>; 55 #interrupt-cells = <2>;
@@ -69,38 +64,34 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
69 fef00000 fef00000 00100000>; /* pci iack */ 64 fef00000 fef00000 00100000>; /* pci iack */
70 65
71 i2c@80003000 { 66 i2c@80003000 {
72 linux,phandle = <4300>;
73 device_type = "i2c"; 67 device_type = "i2c";
74 compatible = "fsl-i2c"; 68 compatible = "fsl-i2c";
75 reg = <80003000 1000>; 69 reg = <80003000 1000>;
76 interrupts = <5 2>; 70 interrupts = <5 2>;
77 interrupt-parent = <4400>; 71 interrupt-parent = <&mpic>;
78 }; 72 };
79 73
80 serial@80004500 { 74 serial@80004500 {
81 linux,phandle = <4511>;
82 device_type = "serial"; 75 device_type = "serial";
83 compatible = "ns16550"; 76 compatible = "ns16550";
84 reg = <80004500 8>; 77 reg = <80004500 8>;
85 clock-frequency = <5d08d88>; 78 clock-frequency = <5d08d88>;
86 current-speed = <2580>; 79 current-speed = <2580>;
87 interrupts = <9 2>; 80 interrupts = <9 2>;
88 interrupt-parent = <4400>; 81 interrupt-parent = <&mpic>;
89 }; 82 };
90 83
91 serial@80004600 { 84 serial@80004600 {
92 linux,phandle = <4512>;
93 device_type = "serial"; 85 device_type = "serial";
94 compatible = "ns16550"; 86 compatible = "ns16550";
95 reg = <80004600 8>; 87 reg = <80004600 8>;
96 clock-frequency = <5d08d88>; 88 clock-frequency = <5d08d88>;
97 current-speed = <e100>; 89 current-speed = <e100>;
98 interrupts = <a 0>; 90 interrupts = <a 0>;
99 interrupt-parent = <4400>; 91 interrupt-parent = <&mpic>;
100 }; 92 };
101 93
102 pic@80040000 { 94 mpic: pic@80040000 {
103 linux,phandle = <4400>;
104 #interrupt-cells = <2>; 95 #interrupt-cells = <2>;
105 #address-cells = <0>; 96 #address-cells = <0>;
106 device_type = "open-pic"; 97 device_type = "open-pic";
@@ -111,7 +102,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
111 }; 102 };
112 103
113 pci@fec00000 { 104 pci@fec00000 {
114 linux,phandle = <4500>;
115 #address-cells = <3>; 105 #address-cells = <3>;
116 #size-cells = <2>; 106 #size-cells = <2>;
117 #interrupt-cells = <1>; 107 #interrupt-cells = <1>;
@@ -122,24 +112,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
122 02000000 0 80000000 80000000 0 70000000>; 112 02000000 0 80000000 80000000 0 70000000>;
123 bus-range = <0 ff>; 113 bus-range = <0 ff>;
124 clock-frequency = <7f28155>; 114 clock-frequency = <7f28155>;
125 interrupt-parent = <4400>; 115 interrupt-parent = <&mpic>;
126 interrupt-map-mask = <f800 0 0 7>; 116 interrupt-map-mask = <f800 0 0 7>;
127 interrupt-map = < 117 interrupt-map = <
128 /* IDSEL 11 - IRQ0 ETH */ 118 /* IDSEL 11 - IRQ0 ETH */
129 5800 0 0 1 4400 0 1 119 5800 0 0 1 &mpic 0 1
130 5800 0 0 2 4400 1 1 120 5800 0 0 2 &mpic 1 1
131 5800 0 0 3 4400 2 1 121 5800 0 0 3 &mpic 2 1
132 5800 0 0 4 4400 3 1 122 5800 0 0 4 &mpic 3 1
133 /* IDSEL 12 - IRQ1 IDE0 */ 123 /* IDSEL 12 - IRQ1 IDE0 */
134 6000 0 0 1 4400 1 1 124 6000 0 0 1 &mpic 1 1
135 6000 0 0 2 4400 2 1 125 6000 0 0 2 &mpic 2 1
136 6000 0 0 3 4400 3 1 126 6000 0 0 3 &mpic 3 1
137 6000 0 0 4 4400 0 1 127 6000 0 0 4 &mpic 0 1
138 /* IDSEL 14 - IRQ3 USB2.0 */ 128 /* IDSEL 14 - IRQ3 USB2.0 */
139 7000 0 0 1 4400 3 1 129 7000 0 0 1 &mpic 3 1
140 7000 0 0 2 4400 3 1 130 7000 0 0 2 &mpic 3 1
141 7000 0 0 3 4400 3 1 131 7000 0 0 3 &mpic 3 1
142 7000 0 0 4 4400 3 1 132 7000 0 0 4 &mpic 3 1
143 >; 133 >;
144 }; 134 };
145 }; 135 };
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
index 919eb29097db..5cf42dc022df 100644
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
21 */ 21 */
22 22
23/ { 23/ {
24 linux,phandle = <1000>;
25 model = "KuroboxHG"; 24 model = "KuroboxHG";
26 compatible = "linkstation"; 25 compatible = "linkstation";
27 #address-cells = <1>; 26 #address-cells = <1>;
28 #size-cells = <1>; 27 #size-cells = <1>;
29 28
30 cpus { 29 cpus {
31 linux,phandle = <2000>;
32 #address-cells = <1>; 30 #address-cells = <1>;
33 #size-cells = <0>; 31 #size-cells = <0>;
34 32
35 PowerPC,603e { /* Really 8241 */ 33 PowerPC,603e { /* Really 8241 */
36 linux,phandle = <2100>;
37 device_type = "cpu"; 34 device_type = "cpu";
38 reg = <0>; 35 reg = <0>;
39 clock-frequency = <fdad680>; /* Fixed by bootwrapper */ 36 clock-frequency = <fdad680>; /* Fixed by bootwrapper */
@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
48 }; 45 };
49 46
50 memory { 47 memory {
51 linux,phandle = <3000>;
52 device_type = "memory"; 48 device_type = "memory";
53 reg = <00000000 08000000>; 49 reg = <00000000 08000000>;
54 }; 50 };
55 51
56 soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */ 52 soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
57 linux,phandle = <4000>;
58 #address-cells = <1>; 53 #address-cells = <1>;
59 #size-cells = <1>; 54 #size-cells = <1>;
60 #interrupt-cells = <2>; 55 #interrupt-cells = <2>;
@@ -69,38 +64,35 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
69 fef00000 fef00000 00100000>; /* pci iack */ 64 fef00000 fef00000 00100000>; /* pci iack */
70 65
71 i2c@80003000 { 66 i2c@80003000 {
72 linux,phandle = <4300>;
73 device_type = "i2c"; 67 device_type = "i2c";
74 compatible = "fsl-i2c"; 68 compatible = "fsl-i2c";
75 reg = <80003000 1000>; 69 reg = <80003000 1000>;
76 interrupts = <5 2>; 70 interrupts = <5 2>;
77 interrupt-parent = <4400>; 71 interrupt-parent = <&mpic>;
78 }; 72 };
79 73
80 serial@80004500 { 74 serial@80004500 {
81 linux,phandle = <4511>;
82 device_type = "serial"; 75 device_type = "serial";
83 compatible = "ns16550"; 76 compatible = "ns16550";
84 reg = <80004500 8>; 77 reg = <80004500 8>;
85 clock-frequency = <7c044a8>; 78 clock-frequency = <7c044a8>;
86 current-speed = <2580>; 79 current-speed = <2580>;
87 interrupts = <9 2>; 80 interrupts = <9 2>;
88 interrupt-parent = <4400>; 81 interrupt-parent = <&mpic>;
89 }; 82 };
90 83
91 serial@80004600 { 84 serial@80004600 {
92 linux,phandle = <4512>;
93 device_type = "serial"; 85 device_type = "serial";
94 compatible = "ns16550"; 86 compatible = "ns16550";
95 reg = <80004600 8>; 87 reg = <80004600 8>;
96 clock-frequency = <7c044a8>; 88 clock-frequency = <7c044a8>;
97 current-speed = <e100>; 89 current-speed = <e100>;
98 interrupts = <a 0>; 90 interrupts = <a 0>;
99 interrupt-parent = <4400>; 91 interrupt-parent = <&mpic>;
100 }; 92 };
101 93
102 pic@80040000 { 94 mpic: pic@80040000 {
103 linux,phandle = <4400>; 95 interrupt-parent = <&mpic>;
104 #interrupt-cells = <2>; 96 #interrupt-cells = <2>;
105 #address-cells = <0>; 97 #address-cells = <0>;
106 device_type = "open-pic"; 98 device_type = "open-pic";
@@ -111,7 +103,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
111 }; 103 };
112 104
113 pci@fec00000 { 105 pci@fec00000 {
114 linux,phandle = <4500>;
115 #address-cells = <3>; 106 #address-cells = <3>;
116 #size-cells = <2>; 107 #size-cells = <2>;
117 #interrupt-cells = <1>; 108 #interrupt-cells = <1>;
@@ -122,24 +113,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
122 02000000 0 80000000 80000000 0 70000000>; 113 02000000 0 80000000 80000000 0 70000000>;
123 bus-range = <0 ff>; 114 bus-range = <0 ff>;
124 clock-frequency = <7f28155>; 115 clock-frequency = <7f28155>;
125 interrupt-parent = <4400>; 116 interrupt-parent = <&mpic>;
126 interrupt-map-mask = <f800 0 0 7>; 117 interrupt-map-mask = <f800 0 0 7>;
127 interrupt-map = < 118 interrupt-map = <
128 /* IDSEL 11 - IRQ0 ETH */ 119 /* IDSEL 11 - IRQ0 ETH */
129 5800 0 0 1 4400 0 1 120 5800 0 0 1 &mpic 0 1
130 5800 0 0 2 4400 1 1 121 5800 0 0 2 &mpic 1 1
131 5800 0 0 3 4400 2 1 122 5800 0 0 3 &mpic 2 1
132 5800 0 0 4 4400 3 1 123 5800 0 0 4 &mpic 3 1
133 /* IDSEL 12 - IRQ1 IDE0 */ 124 /* IDSEL 12 - IRQ1 IDE0 */
134 6000 0 0 1 4400 1 1 125 6000 0 0 1 &mpic 1 1
135 6000 0 0 2 4400 2 1 126 6000 0 0 2 &mpic 2 1
136 6000 0 0 3 4400 3 1 127 6000 0 0 3 &mpic 3 1
137 6000 0 0 4 4400 0 1 128 6000 0 0 4 &mpic 0 1
138 /* IDSEL 14 - IRQ3 USB2.0 */ 129 /* IDSEL 14 - IRQ3 USB2.0 */
139 7000 0 0 1 4400 3 1 130 7000 0 0 1 &mpic 3 1
140 7000 0 0 2 4400 3 1 131 7000 0 0 2 &mpic 3 1
141 7000 0 0 3 4400 3 1 132 7000 0 0 3 &mpic 3 1
142 7000 0 0 4 4400 3 1 133 7000 0 0 4 &mpic 3 1
143 >; 134 >;
144 }; 135 };
145 }; 136 };
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index e13ac6ef05a9..eae68ab1177f 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -49,7 +49,7 @@
49 soc5200@f0000000 { 49 soc5200@f0000000 {
50 model = "fsl,mpc5200"; 50 model = "fsl,mpc5200";
51 compatible = "mpc5200"; 51 compatible = "mpc5200";
52 revision = "" // from bootloader 52 revision = ""; // from bootloader
53 #interrupt-cells = <3>; 53 #interrupt-cells = <3>;
54 device_type = "soc"; 54 device_type = "soc";
55 ranges = <0 f0000000 f0010000>; 55 ranges = <0 f0000000 f0010000>;
@@ -62,13 +62,12 @@
62 reg = <200 38>; 62 reg = <200 38>;
63 }; 63 };
64 64
65 pic@500 { 65 mpc5200_pic: pic@500 {
66 // 5200 interrupts are encoded into two levels; 66 // 5200 interrupts are encoded into two levels;
67 linux,phandle = <500>;
68 interrupt-controller; 67 interrupt-controller;
69 #interrupt-cells = <3>; 68 #interrupt-cells = <3>;
70 device_type = "interrupt-controller"; 69 device_type = "interrupt-controller";
71 compatible = "mpc5200-pic"; 70 compatible = "mpc5200_pic";
72 reg = <500 80>; 71 reg = <500 80>;
73 built-in; 72 built-in;
74 }; 73 };
@@ -79,7 +78,7 @@
79 cell-index = <0>; 78 cell-index = <0>;
80 reg = <600 10>; 79 reg = <600 10>;
81 interrupts = <1 9 0>; 80 interrupts = <1 9 0>;
82 interrupt-parent = <500>; 81 interrupt-parent = <&mpc5200_pic>;
83 has-wdt; 82 has-wdt;
84 }; 83 };
85 84
@@ -89,7 +88,7 @@
89 cell-index = <1>; 88 cell-index = <1>;
90 reg = <610 10>; 89 reg = <610 10>;
91 interrupts = <1 a 0>; 90 interrupts = <1 a 0>;
92 interrupt-parent = <500>; 91 interrupt-parent = <&mpc5200_pic>;
93 }; 92 };
94 93
95 gpt@620 { // General Purpose Timer 94 gpt@620 { // General Purpose Timer
@@ -98,7 +97,7 @@
98 cell-index = <2>; 97 cell-index = <2>;
99 reg = <620 10>; 98 reg = <620 10>;
100 interrupts = <1 b 0>; 99 interrupts = <1 b 0>;
101 interrupt-parent = <500>; 100 interrupt-parent = <&mpc5200_pic>;
102 }; 101 };
103 102
104 gpt@630 { // General Purpose Timer 103 gpt@630 { // General Purpose Timer
@@ -107,7 +106,7 @@
107 cell-index = <3>; 106 cell-index = <3>;
108 reg = <630 10>; 107 reg = <630 10>;
109 interrupts = <1 c 0>; 108 interrupts = <1 c 0>;
110 interrupt-parent = <500>; 109 interrupt-parent = <&mpc5200_pic>;
111 }; 110 };
112 111
113 gpt@640 { // General Purpose Timer 112 gpt@640 { // General Purpose Timer
@@ -116,7 +115,7 @@
116 cell-index = <4>; 115 cell-index = <4>;
117 reg = <640 10>; 116 reg = <640 10>;
118 interrupts = <1 d 0>; 117 interrupts = <1 d 0>;
119 interrupt-parent = <500>; 118 interrupt-parent = <&mpc5200_pic>;
120 }; 119 };
121 120
122 gpt@650 { // General Purpose Timer 121 gpt@650 { // General Purpose Timer
@@ -125,7 +124,7 @@
125 cell-index = <5>; 124 cell-index = <5>;
126 reg = <650 10>; 125 reg = <650 10>;
127 interrupts = <1 e 0>; 126 interrupts = <1 e 0>;
128 interrupt-parent = <500>; 127 interrupt-parent = <&mpc5200_pic>;
129 }; 128 };
130 129
131 gpt@660 { // General Purpose Timer 130 gpt@660 { // General Purpose Timer
@@ -134,7 +133,7 @@
134 cell-index = <6>; 133 cell-index = <6>;
135 reg = <660 10>; 134 reg = <660 10>;
136 interrupts = <1 f 0>; 135 interrupts = <1 f 0>;
137 interrupt-parent = <500>; 136 interrupt-parent = <&mpc5200_pic>;
138 }; 137 };
139 138
140 gpt@670 { // General Purpose Timer 139 gpt@670 { // General Purpose Timer
@@ -143,7 +142,7 @@
143 cell-index = <7>; 142 cell-index = <7>;
144 reg = <670 10>; 143 reg = <670 10>;
145 interrupts = <1 10 0>; 144 interrupts = <1 10 0>;
146 interrupt-parent = <500>; 145 interrupt-parent = <&mpc5200_pic>;
147 }; 146 };
148 147
149 rtc@800 { // Real time clock 148 rtc@800 { // Real time clock
@@ -151,7 +150,7 @@
151 device_type = "rtc"; 150 device_type = "rtc";
152 reg = <800 100>; 151 reg = <800 100>;
153 interrupts = <1 5 0 1 6 0>; 152 interrupts = <1 5 0 1 6 0>;
154 interrupt-parent = <500>; 153 interrupt-parent = <&mpc5200_pic>;
155 }; 154 };
156 155
157 mscan@900 { 156 mscan@900 {
@@ -159,7 +158,7 @@
159 compatible = "mpc5200-mscan"; 158 compatible = "mpc5200-mscan";
160 cell-index = <0>; 159 cell-index = <0>;
161 interrupts = <2 11 0>; 160 interrupts = <2 11 0>;
162 interrupt-parent = <500>; 161 interrupt-parent = <&mpc5200_pic>;
163 reg = <900 80>; 162 reg = <900 80>;
164 }; 163 };
165 164
@@ -168,7 +167,7 @@
168 compatible = "mpc5200-mscan"; 167 compatible = "mpc5200-mscan";
169 cell-index = <1>; 168 cell-index = <1>;
170 interrupts = <2 12 0>; 169 interrupts = <2 12 0>;
171 interrupt-parent = <500>; 170 interrupt-parent = <&mpc5200_pic>;
172 reg = <980 80>; 171 reg = <980 80>;
173 }; 172 };
174 173
@@ -176,14 +175,14 @@
176 compatible = "mpc5200-gpio"; 175 compatible = "mpc5200-gpio";
177 reg = <b00 40>; 176 reg = <b00 40>;
178 interrupts = <1 7 0>; 177 interrupts = <1 7 0>;
179 interrupt-parent = <500>; 178 interrupt-parent = <&mpc5200_pic>;
180 }; 179 };
181 180
182 gpio-wkup@c00 { 181 gpio-wkup@c00 {
183 compatible = "mpc5200-gpio-wkup"; 182 compatible = "mpc5200-gpio-wkup";
184 reg = <c00 40>; 183 reg = <c00 40>;
185 interrupts = <1 8 0 0 3 0>; 184 interrupts = <1 8 0 0 3 0>;
186 interrupt-parent = <500>; 185 interrupt-parent = <&mpc5200_pic>;
187 }; 186 };
188 187
189 pci@0d00 { 188 pci@0d00 {
@@ -194,13 +193,13 @@
194 compatible = "mpc5200-pci"; 193 compatible = "mpc5200-pci";
195 reg = <d00 100>; 194 reg = <d00 100>;
196 interrupt-map-mask = <f800 0 0 7>; 195 interrupt-map-mask = <f800 0 0 7>;
197 interrupt-map = <c000 0 0 1 500 0 0 3 196 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
198 c000 0 0 2 500 0 0 3 197 c000 0 0 2 &mpc5200_pic 0 0 3
199 c000 0 0 3 500 0 0 3 198 c000 0 0 3 &mpc5200_pic 0 0 3
200 c000 0 0 4 500 0 0 3>; 199 c000 0 0 4 &mpc5200_pic 0 0 3>;
201 clock-frequency = <0>; // From boot loader 200 clock-frequency = <0>; // From boot loader
202 interrupts = <2 8 0 2 9 0 2 a 0>; 201 interrupts = <2 8 0 2 9 0 2 a 0>;
203 interrupt-parent = <500>; 202 interrupt-parent = <&mpc5200_pic>;
204 bus-range = <0 0>; 203 bus-range = <0 0>;
205 ranges = <42000000 0 80000000 80000000 0 20000000 204 ranges = <42000000 0 80000000 80000000 0 20000000
206 02000000 0 a0000000 a0000000 0 10000000 205 02000000 0 a0000000 a0000000 0 10000000
@@ -212,7 +211,7 @@
212 compatible = "mpc5200-spi"; 211 compatible = "mpc5200-spi";
213 reg = <f00 20>; 212 reg = <f00 20>;
214 interrupts = <2 d 0 2 e 0>; 213 interrupts = <2 d 0 2 e 0>;
215 interrupt-parent = <500>; 214 interrupt-parent = <&mpc5200_pic>;
216 }; 215 };
217 216
218 usb@1000 { 217 usb@1000 {
@@ -220,7 +219,7 @@
220 compatible = "mpc5200-ohci\0ohci-be"; 219 compatible = "mpc5200-ohci\0ohci-be";
221 reg = <1000 ff>; 220 reg = <1000 ff>;
222 interrupts = <2 6 0>; 221 interrupts = <2 6 0>;
223 interrupt-parent = <500>; 222 interrupt-parent = <&mpc5200_pic>;
224 }; 223 };
225 224
226 bestcomm@1200 { 225 bestcomm@1200 {
@@ -231,7 +230,7 @@
231 3 4 0 3 5 0 3 6 0 3 7 0 230 3 4 0 3 5 0 3 6 0 3 7 0
232 3 8 0 3 9 0 3 a 0 3 b 0 231 3 8 0 3 9 0 3 a 0 3 b 0
233 3 c 0 3 d 0 3 e 0 3 f 0>; 232 3 c 0 3 d 0 3 e 0 3 f 0>;
234 interrupt-parent = <500>; 233 interrupt-parent = <&mpc5200_pic>;
235 }; 234 };
236 235
237 xlb@1f00 { 236 xlb@1f00 {
@@ -246,7 +245,7 @@
246 cell-index = <0>; 245 cell-index = <0>;
247 reg = <2000 100>; 246 reg = <2000 100>;
248 interrupts = <2 1 0>; 247 interrupts = <2 1 0>;
249 interrupt-parent = <500>; 248 interrupt-parent = <&mpc5200_pic>;
250 }; 249 };
251 250
252 // PSC2 in ac97 mode example 251 // PSC2 in ac97 mode example
@@ -256,7 +255,7 @@
256 // cell-index = <1>; 255 // cell-index = <1>;
257 // reg = <2200 100>; 256 // reg = <2200 100>;
258 // interrupts = <2 2 0>; 257 // interrupts = <2 2 0>;
259 // interrupt-parent = <500>; 258 // interrupt-parent = <&mpc5200_pic>;
260 //}; 259 //};
261 260
262 // PSC3 in CODEC mode example 261 // PSC3 in CODEC mode example
@@ -266,7 +265,7 @@
266 // cell-index = <2>; 265 // cell-index = <2>;
267 // reg = <2400 100>; 266 // reg = <2400 100>;
268 // interrupts = <2 3 0>; 267 // interrupts = <2 3 0>;
269 // interrupt-parent = <500>; 268 // interrupt-parent = <&mpc5200_pic>;
270 //}; 269 //};
271 270
272 // PSC4 in uart mode example 271 // PSC4 in uart mode example
@@ -276,7 +275,7 @@
276 // cell-index = <3>; 275 // cell-index = <3>;
277 // reg = <2600 100>; 276 // reg = <2600 100>;
278 // interrupts = <2 b 0>; 277 // interrupts = <2 b 0>;
279 // interrupt-parent = <500>; 278 // interrupt-parent = <&mpc5200_pic>;
280 //}; 279 //};
281 280
282 // PSC5 in uart mode example 281 // PSC5 in uart mode example
@@ -286,7 +285,7 @@
286 // cell-index = <4>; 285 // cell-index = <4>;
287 // reg = <2800 100>; 286 // reg = <2800 100>;
288 // interrupts = <2 c 0>; 287 // interrupts = <2 c 0>;
289 // interrupt-parent = <500>; 288 // interrupt-parent = <&mpc5200_pic>;
290 //}; 289 //};
291 290
292 // PSC6 in spi mode example 291 // PSC6 in spi mode example
@@ -296,7 +295,7 @@
296 // cell-index = <5>; 295 // cell-index = <5>;
297 // reg = <2c00 100>; 296 // reg = <2c00 100>;
298 // interrupts = <2 4 0>; 297 // interrupts = <2 4 0>;
299 // interrupt-parent = <500>; 298 // interrupt-parent = <&mpc5200_pic>;
300 //}; 299 //};
301 300
302 ethernet@3000 { 301 ethernet@3000 {
@@ -305,7 +304,7 @@
305 reg = <3000 800>; 304 reg = <3000 800>;
306 mac-address = [ 02 03 04 05 06 07 ]; // Bad! 305 mac-address = [ 02 03 04 05 06 07 ]; // Bad!
307 interrupts = <2 5 0>; 306 interrupts = <2 5 0>;
308 interrupt-parent = <500>; 307 interrupt-parent = <&mpc5200_pic>;
309 }; 308 };
310 309
311 ata@3a00 { 310 ata@3a00 {
@@ -313,7 +312,7 @@
313 compatible = "mpc5200-ata"; 312 compatible = "mpc5200-ata";
314 reg = <3a00 100>; 313 reg = <3a00 100>;
315 interrupts = <2 7 0>; 314 interrupts = <2 7 0>;
316 interrupt-parent = <500>; 315 interrupt-parent = <&mpc5200_pic>;
317 }; 316 };
318 317
319 i2c@3d00 { 318 i2c@3d00 {
@@ -322,7 +321,7 @@
322 cell-index = <0>; 321 cell-index = <0>;
323 reg = <3d00 40>; 322 reg = <3d00 40>;
324 interrupts = <2 f 0>; 323 interrupts = <2 f 0>;
325 interrupt-parent = <500>; 324 interrupt-parent = <&mpc5200_pic>;
326 fsl5200-clocking; 325 fsl5200-clocking;
327 }; 326 };
328 327
@@ -332,7 +331,7 @@
332 cell-index = <1>; 331 cell-index = <1>;
333 reg = <3d40 40>; 332 reg = <3d40 40>;
334 interrupts = <2 10 0>; 333 interrupts = <2 10 0>;
335 interrupt-parent = <500>; 334 interrupt-parent = <&mpc5200_pic>;
336 fsl5200-clocking; 335 fsl5200-clocking;
337 }; 336 };
338 sram@8000 { 337 sram@8000 {
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 00211b39a342..5185625a9419 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -62,13 +62,12 @@
62 reg = <200 38>; 62 reg = <200 38>;
63 }; 63 };
64 64
65 pic@500 { 65 mpc5200_pic: pic@500 {
66 // 5200 interrupts are encoded into two levels; 66 // 5200 interrupts are encoded into two levels;
67 linux,phandle = <500>;
68 interrupt-controller; 67 interrupt-controller;
69 #interrupt-cells = <3>; 68 #interrupt-cells = <3>;
70 device_type = "interrupt-controller"; 69 device_type = "interrupt-controller";
71 compatible = "mpc5200b-pic\0mpc5200-pic"; 70 compatible = "mpc5200b-pic\0mpc5200_pic";
72 reg = <500 80>; 71 reg = <500 80>;
73 built-in; 72 built-in;
74 }; 73 };
@@ -79,7 +78,7 @@
79 cell-index = <0>; 78 cell-index = <0>;
80 reg = <600 10>; 79 reg = <600 10>;
81 interrupts = <1 9 0>; 80 interrupts = <1 9 0>;
82 interrupt-parent = <500>; 81 interrupt-parent = <&mpc5200_pic>;
83 has-wdt; 82 has-wdt;
84 }; 83 };
85 84
@@ -89,7 +88,7 @@
89 cell-index = <1>; 88 cell-index = <1>;
90 reg = <610 10>; 89 reg = <610 10>;
91 interrupts = <1 a 0>; 90 interrupts = <1 a 0>;
92 interrupt-parent = <500>; 91 interrupt-parent = <&mpc5200_pic>;
93 }; 92 };
94 93
95 gpt@620 { // General Purpose Timer 94 gpt@620 { // General Purpose Timer
@@ -98,7 +97,7 @@
98 cell-index = <2>; 97 cell-index = <2>;
99 reg = <620 10>; 98 reg = <620 10>;
100 interrupts = <1 b 0>; 99 interrupts = <1 b 0>;
101 interrupt-parent = <500>; 100 interrupt-parent = <&mpc5200_pic>;
102 }; 101 };
103 102
104 gpt@630 { // General Purpose Timer 103 gpt@630 { // General Purpose Timer
@@ -107,7 +106,7 @@
107 cell-index = <3>; 106 cell-index = <3>;
108 reg = <630 10>; 107 reg = <630 10>;
109 interrupts = <1 c 0>; 108 interrupts = <1 c 0>;
110 interrupt-parent = <500>; 109 interrupt-parent = <&mpc5200_pic>;
111 }; 110 };
112 111
113 gpt@640 { // General Purpose Timer 112 gpt@640 { // General Purpose Timer
@@ -116,7 +115,7 @@
116 cell-index = <4>; 115 cell-index = <4>;
117 reg = <640 10>; 116 reg = <640 10>;
118 interrupts = <1 d 0>; 117 interrupts = <1 d 0>;
119 interrupt-parent = <500>; 118 interrupt-parent = <&mpc5200_pic>;
120 }; 119 };
121 120
122 gpt@650 { // General Purpose Timer 121 gpt@650 { // General Purpose Timer
@@ -125,7 +124,7 @@
125 cell-index = <5>; 124 cell-index = <5>;
126 reg = <650 10>; 125 reg = <650 10>;
127 interrupts = <1 e 0>; 126 interrupts = <1 e 0>;
128 interrupt-parent = <500>; 127 interrupt-parent = <&mpc5200_pic>;
129 }; 128 };
130 129
131 gpt@660 { // General Purpose Timer 130 gpt@660 { // General Purpose Timer
@@ -134,7 +133,7 @@
134 cell-index = <6>; 133 cell-index = <6>;
135 reg = <660 10>; 134 reg = <660 10>;
136 interrupts = <1 f 0>; 135 interrupts = <1 f 0>;
137 interrupt-parent = <500>; 136 interrupt-parent = <&mpc5200_pic>;
138 }; 137 };
139 138
140 gpt@670 { // General Purpose Timer 139 gpt@670 { // General Purpose Timer
@@ -143,7 +142,7 @@
143 cell-index = <7>; 142 cell-index = <7>;
144 reg = <670 10>; 143 reg = <670 10>;
145 interrupts = <1 10 0>; 144 interrupts = <1 10 0>;
146 interrupt-parent = <500>; 145 interrupt-parent = <&mpc5200_pic>;
147 }; 146 };
148 147
149 rtc@800 { // Real time clock 148 rtc@800 { // Real time clock
@@ -151,7 +150,7 @@
151 device_type = "rtc"; 150 device_type = "rtc";
152 reg = <800 100>; 151 reg = <800 100>;
153 interrupts = <1 5 0 1 6 0>; 152 interrupts = <1 5 0 1 6 0>;
154 interrupt-parent = <500>; 153 interrupt-parent = <&mpc5200_pic>;
155 }; 154 };
156 155
157 mscan@900 { 156 mscan@900 {
@@ -159,7 +158,7 @@
159 compatible = "mpc5200b-mscan\0mpc5200-mscan"; 158 compatible = "mpc5200b-mscan\0mpc5200-mscan";
160 cell-index = <0>; 159 cell-index = <0>;
161 interrupts = <2 11 0>; 160 interrupts = <2 11 0>;
162 interrupt-parent = <500>; 161 interrupt-parent = <&mpc5200_pic>;
163 reg = <900 80>; 162 reg = <900 80>;
164 }; 163 };
165 164
@@ -168,7 +167,7 @@
168 compatible = "mpc5200b-mscan\0mpc5200-mscan"; 167 compatible = "mpc5200b-mscan\0mpc5200-mscan";
169 cell-index = <1>; 168 cell-index = <1>;
170 interrupts = <2 12 0>; 169 interrupts = <2 12 0>;
171 interrupt-parent = <500>; 170 interrupt-parent = <&mpc5200_pic>;
172 reg = <980 80>; 171 reg = <980 80>;
173 }; 172 };
174 173
@@ -176,14 +175,14 @@
176 compatible = "mpc5200b-gpio\0mpc5200-gpio"; 175 compatible = "mpc5200b-gpio\0mpc5200-gpio";
177 reg = <b00 40>; 176 reg = <b00 40>;
178 interrupts = <1 7 0>; 177 interrupts = <1 7 0>;
179 interrupt-parent = <500>; 178 interrupt-parent = <&mpc5200_pic>;
180 }; 179 };
181 180
182 gpio-wkup@c00 { 181 gpio-wkup@c00 {
183 compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup"; 182 compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup";
184 reg = <c00 40>; 183 reg = <c00 40>;
185 interrupts = <1 8 0 0 3 0>; 184 interrupts = <1 8 0 0 3 0>;
186 interrupt-parent = <500>; 185 interrupt-parent = <&mpc5200_pic>;
187 }; 186 };
188 187
189 pci@0d00 { 188 pci@0d00 {
@@ -194,18 +193,18 @@
194 compatible = "mpc5200b-pci\0mpc5200-pci"; 193 compatible = "mpc5200b-pci\0mpc5200-pci";
195 reg = <d00 100>; 194 reg = <d00 100>;
196 interrupt-map-mask = <f800 0 0 7>; 195 interrupt-map-mask = <f800 0 0 7>;
197 interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot 196 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
198 c000 0 0 2 500 1 1 3 197 c000 0 0 2 &mpc5200_pic 1 1 3
199 c000 0 0 3 500 1 2 3 198 c000 0 0 3 &mpc5200_pic 1 2 3
200 c000 0 0 4 500 1 3 3 199 c000 0 0 4 &mpc5200_pic 1 3 3
201 200
202 c800 0 0 1 500 1 1 3 // 2nd slot 201 c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
203 c800 0 0 2 500 1 2 3 202 c800 0 0 2 &mpc5200_pic 1 2 3
204 c800 0 0 3 500 1 3 3 203 c800 0 0 3 &mpc5200_pic 1 3 3
205 c800 0 0 4 500 0 0 3>; 204 c800 0 0 4 &mpc5200_pic 0 0 3>;
206 clock-frequency = <0>; // From boot loader 205 clock-frequency = <0>; // From boot loader
207 interrupts = <2 8 0 2 9 0 2 a 0>; 206 interrupts = <2 8 0 2 9 0 2 a 0>;
208 interrupt-parent = <500>; 207 interrupt-parent = <&mpc5200_pic>;
209 bus-range = <0 0>; 208 bus-range = <0 0>;
210 ranges = <42000000 0 80000000 80000000 0 20000000 209 ranges = <42000000 0 80000000 80000000 0 20000000
211 02000000 0 a0000000 a0000000 0 10000000 210 02000000 0 a0000000 a0000000 0 10000000
@@ -217,7 +216,7 @@
217 compatible = "mpc5200b-spi\0mpc5200-spi"; 216 compatible = "mpc5200b-spi\0mpc5200-spi";
218 reg = <f00 20>; 217 reg = <f00 20>;
219 interrupts = <2 d 0 2 e 0>; 218 interrupts = <2 d 0 2 e 0>;
220 interrupt-parent = <500>; 219 interrupt-parent = <&mpc5200_pic>;
221 }; 220 };
222 221
223 usb@1000 { 222 usb@1000 {
@@ -225,7 +224,7 @@
225 compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be"; 224 compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be";
226 reg = <1000 ff>; 225 reg = <1000 ff>;
227 interrupts = <2 6 0>; 226 interrupts = <2 6 0>;
228 interrupt-parent = <500>; 227 interrupt-parent = <&mpc5200_pic>;
229 }; 228 };
230 229
231 bestcomm@1200 { 230 bestcomm@1200 {
@@ -236,7 +235,7 @@
236 3 4 0 3 5 0 3 6 0 3 7 0 235 3 4 0 3 5 0 3 6 0 3 7 0
237 3 8 0 3 9 0 3 a 0 3 b 0 236 3 8 0 3 9 0 3 a 0 3 b 0
238 3 c 0 3 d 0 3 e 0 3 f 0>; 237 3 c 0 3 d 0 3 e 0 3 f 0>;
239 interrupt-parent = <500>; 238 interrupt-parent = <&mpc5200_pic>;
240 }; 239 };
241 240
242 xlb@1f00 { 241 xlb@1f00 {
@@ -251,7 +250,7 @@
251 cell-index = <0>; 250 cell-index = <0>;
252 reg = <2000 100>; 251 reg = <2000 100>;
253 interrupts = <2 1 0>; 252 interrupts = <2 1 0>;
254 interrupt-parent = <500>; 253 interrupt-parent = <&mpc5200_pic>;
255 }; 254 };
256 255
257 // PSC2 in ac97 mode example 256 // PSC2 in ac97 mode example
@@ -261,7 +260,7 @@
261 // cell-index = <1>; 260 // cell-index = <1>;
262 // reg = <2200 100>; 261 // reg = <2200 100>;
263 // interrupts = <2 2 0>; 262 // interrupts = <2 2 0>;
264 // interrupt-parent = <500>; 263 // interrupt-parent = <&mpc5200_pic>;
265 //}; 264 //};
266 265
267 // PSC3 in CODEC mode example 266 // PSC3 in CODEC mode example
@@ -271,7 +270,7 @@
271 // cell-index = <2>; 270 // cell-index = <2>;
272 // reg = <2400 100>; 271 // reg = <2400 100>;
273 // interrupts = <2 3 0>; 272 // interrupts = <2 3 0>;
274 // interrupt-parent = <500>; 273 // interrupt-parent = <&mpc5200_pic>;
275 //}; 274 //};
276 275
277 // PSC4 in uart mode example 276 // PSC4 in uart mode example
@@ -281,7 +280,7 @@
281 // cell-index = <3>; 280 // cell-index = <3>;
282 // reg = <2600 100>; 281 // reg = <2600 100>;
283 // interrupts = <2 b 0>; 282 // interrupts = <2 b 0>;
284 // interrupt-parent = <500>; 283 // interrupt-parent = <&mpc5200_pic>;
285 //}; 284 //};
286 285
287 // PSC5 in uart mode example 286 // PSC5 in uart mode example
@@ -291,7 +290,7 @@
291 // cell-index = <4>; 290 // cell-index = <4>;
292 // reg = <2800 100>; 291 // reg = <2800 100>;
293 // interrupts = <2 c 0>; 292 // interrupts = <2 c 0>;
294 // interrupt-parent = <500>; 293 // interrupt-parent = <&mpc5200_pic>;
295 //}; 294 //};
296 295
297 // PSC6 in spi mode example 296 // PSC6 in spi mode example
@@ -301,7 +300,7 @@
301 // cell-index = <5>; 300 // cell-index = <5>;
302 // reg = <2c00 100>; 301 // reg = <2c00 100>;
303 // interrupts = <2 4 0>; 302 // interrupts = <2 4 0>;
304 // interrupt-parent = <500>; 303 // interrupt-parent = <&mpc5200_pic>;
305 //}; 304 //};
306 305
307 ethernet@3000 { 306 ethernet@3000 {
@@ -310,7 +309,7 @@
310 reg = <3000 800>; 309 reg = <3000 800>;
311 mac-address = [ 02 03 04 05 06 07 ]; // Bad! 310 mac-address = [ 02 03 04 05 06 07 ]; // Bad!
312 interrupts = <2 5 0>; 311 interrupts = <2 5 0>;
313 interrupt-parent = <500>; 312 interrupt-parent = <&mpc5200_pic>;
314 }; 313 };
315 314
316 ata@3a00 { 315 ata@3a00 {
@@ -318,7 +317,7 @@
318 compatible = "mpc5200b-ata\0mpc5200-ata"; 317 compatible = "mpc5200b-ata\0mpc5200-ata";
319 reg = <3a00 100>; 318 reg = <3a00 100>;
320 interrupts = <2 7 0>; 319 interrupts = <2 7 0>;
321 interrupt-parent = <500>; 320 interrupt-parent = <&mpc5200_pic>;
322 }; 321 };
323 322
324 i2c@3d00 { 323 i2c@3d00 {
@@ -327,7 +326,7 @@
327 cell-index = <0>; 326 cell-index = <0>;
328 reg = <3d00 40>; 327 reg = <3d00 40>;
329 interrupts = <2 f 0>; 328 interrupts = <2 f 0>;
330 interrupt-parent = <500>; 329 interrupt-parent = <&mpc5200_pic>;
331 fsl5200-clocking; 330 fsl5200-clocking;
332 }; 331 };
333 332
@@ -337,7 +336,7 @@
337 cell-index = <1>; 336 cell-index = <1>;
338 reg = <3d40 40>; 337 reg = <3d40 40>;
339 interrupts = <2 10 0>; 338 interrupts = <2 10 0>;
340 interrupt-parent = <500>; 339 interrupt-parent = <&mpc5200_pic>;
341 fsl5200-clocking; 340 fsl5200-clocking;
342 }; 341 };
343 sram@8000 { 342 sram@8000 {
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index 6fa3754f293a..765c306ecf80 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -16,12 +16,10 @@
16 compatible = "mpc74xx"; 16 compatible = "mpc74xx";
17 #address-cells = <1>; 17 #address-cells = <1>;
18 #size-cells = <1>; 18 #size-cells = <1>;
19 linux,phandle = <100>;
20 19
21 cpus { 20 cpus {
22 #address-cells = <1>; 21 #address-cells = <1>;
23 #size-cells =<0>; 22 #size-cells =<0>;
24 linux,phandle = <200>;
25 23
26 PowerPC,7448@0 { 24 PowerPC,7448@0 {
27 device_type = "cpu"; 25 device_type = "cpu";
@@ -34,13 +32,11 @@
34 clock-frequency = <0>; // From U-Boot 32 clock-frequency = <0>; // From U-Boot
35 bus-frequency = <0>; // From U-Boot 33 bus-frequency = <0>; // From U-Boot
36 32-bit; 34 32-bit;
37 linux,phandle = <201>;
38 }; 35 };
39 }; 36 };
40 37
41 memory { 38 memory {
42 device_type = "memory"; 39 device_type = "memory";
43 linux,phandle = <300>;
44 reg = <00000000 20000000 // DDR2 512M at 0 40 reg = <00000000 20000000 // DDR2 512M at 0
45 >; 41 >;
46 }; 42 };
@@ -55,7 +51,7 @@
55 bus-frequency = <0>; 51 bus-frequency = <0>;
56 52
57 i2c@7000 { 53 i2c@7000 {
58 interrupt-parent = <7400>; 54 interrupt-parent = <&mpic>;
59 interrupts = <E 0>; 55 interrupts = <E 0>;
60 reg = <7000 400>; 56 reg = <7000 400>;
61 device_type = "i2c"; 57 device_type = "i2c";
@@ -66,18 +62,16 @@
66 device_type = "mdio"; 62 device_type = "mdio";
67 compatible = "tsi-ethernet"; 63 compatible = "tsi-ethernet";
68 64
69 ethernet-phy@6000 { 65 phy8: ethernet-phy@6000 {
70 linux,phandle = <6000>; 66 interrupt-parent = <&mpic>;
71 interrupt-parent = <7400>;
72 interrupts = <2 1>; 67 interrupts = <2 1>;
73 reg = <6000 50>; 68 reg = <6000 50>;
74 phy-id = <8>; 69 phy-id = <8>;
75 device_type = "ethernet-phy"; 70 device_type = "ethernet-phy";
76 }; 71 };
77 72
78 ethernet-phy@6400 { 73 phy9: ethernet-phy@6400 {
79 linux,phandle = <6400>; 74 interrupt-parent = <&mpic>;
80 interrupt-parent = <7400>;
81 interrupts = <2 1>; 75 interrupts = <2 1>;
82 reg = <6000 50>; 76 reg = <6000 50>;
83 phy-id = <9>; 77 phy-id = <9>;
@@ -94,8 +88,8 @@
94 reg = <6000 200>; 88 reg = <6000 200>;
95 address = [ 00 06 D2 00 00 01 ]; 89 address = [ 00 06 D2 00 00 01 ];
96 interrupts = <10 2>; 90 interrupts = <10 2>;
97 interrupt-parent = <7400>; 91 interrupt-parent = <&mpic>;
98 phy-handle = <6000>; 92 phy-handle = <&phy8>;
99 }; 93 };
100 94
101 ethernet@6600 { 95 ethernet@6600 {
@@ -107,8 +101,8 @@
107 reg = <6400 200>; 101 reg = <6400 200>;
108 address = [ 00 06 D2 00 00 02 ]; 102 address = [ 00 06 D2 00 00 02 ];
109 interrupts = <11 2>; 103 interrupts = <11 2>;
110 interrupt-parent = <7400>; 104 interrupt-parent = <&mpic>;
111 phy-handle = <6400>; 105 phy-handle = <&phy9>;
112 }; 106 };
113 107
114 serial@7808 { 108 serial@7808 {
@@ -117,7 +111,7 @@
117 reg = <7808 200>; 111 reg = <7808 200>;
118 clock-frequency = <3f6b5a00>; 112 clock-frequency = <3f6b5a00>;
119 interrupts = <c 0>; 113 interrupts = <c 0>;
120 interrupt-parent = <7400>; 114 interrupt-parent = <&mpic>;
121 }; 115 };
122 116
123 serial@7c08 { 117 serial@7c08 {
@@ -126,11 +120,10 @@
126 reg = <7c08 200>; 120 reg = <7c08 200>;
127 clock-frequency = <3f6b5a00>; 121 clock-frequency = <3f6b5a00>;
128 interrupts = <d 0>; 122 interrupts = <d 0>;
129 interrupt-parent = <7400>; 123 interrupt-parent = <&mpic>;
130 }; 124 };
131 125
132 pic@7400 { 126 mpic: pic@7400 {
133 linux,phandle = <7400>;
134 clock-frequency = <0>; 127 clock-frequency = <0>;
135 interrupt-controller; 128 interrupt-controller;
136 #address-cells = <0>; 129 #address-cells = <0>;
@@ -144,7 +137,6 @@
144 pci@1000 { 137 pci@1000 {
145 compatible = "tsi10x"; 138 compatible = "tsi10x";
146 device_type = "pci"; 139 device_type = "pci";
147 linux,phandle = <1000>;
148 #interrupt-cells = <1>; 140 #interrupt-cells = <1>;
149 #size-cells = <2>; 141 #size-cells = <2>;
150 #address-cells = <3>; 142 #address-cells = <3>;
@@ -153,37 +145,37 @@
153 ranges = <02000000 0 e0000000 e0000000 0 1A000000 145 ranges = <02000000 0 e0000000 e0000000 0 1A000000
154 01000000 0 00000000 fa000000 0 00010000>; 146 01000000 0 00000000 fa000000 0 00010000>;
155 clock-frequency = <7f28154>; 147 clock-frequency = <7f28154>;
156 interrupt-parent = <7400>; 148 interrupt-parent = <&mpic>;
157 interrupts = <17 2>; 149 interrupts = <17 2>;
158 interrupt-map-mask = <f800 0 0 7>; 150 interrupt-map-mask = <f800 0 0 7>;
159 interrupt-map = < 151 interrupt-map = <
160 152
161 /* IDSEL 0x11 */ 153 /* IDSEL 0x11 */
162 0800 0 0 1 1180 24 0 154 0800 0 0 1 &RT0 24 0
163 0800 0 0 2 1180 25 0 155 0800 0 0 2 &RT0 25 0
164 0800 0 0 3 1180 26 0 156 0800 0 0 3 &RT0 26 0
165 0800 0 0 4 1180 27 0 157 0800 0 0 4 &RT0 27 0
166 158
167 /* IDSEL 0x12 */ 159 /* IDSEL 0x12 */
168 1000 0 0 1 1180 25 0 160 1000 0 0 1 &RT0 25 0
169 1000 0 0 2 1180 26 0 161 1000 0 0 2 &RT0 26 0
170 1000 0 0 3 1180 27 0 162 1000 0 0 3 &RT0 27 0
171 1000 0 0 4 1180 24 0 163 1000 0 0 4 &RT0 24 0
172 164
173 /* IDSEL 0x13 */ 165 /* IDSEL 0x13 */
174 1800 0 0 1 1180 26 0 166 1800 0 0 1 &RT0 26 0
175 1800 0 0 2 1180 27 0 167 1800 0 0 2 &RT0 27 0
176 1800 0 0 3 1180 24 0 168 1800 0 0 3 &RT0 24 0
177 1800 0 0 4 1180 25 0 169 1800 0 0 4 &RT0 25 0
178 170
179 /* IDSEL 0x14 */ 171 /* IDSEL 0x14 */
180 2000 0 0 1 1180 27 0 172 2000 0 0 1 &RT0 27 0
181 2000 0 0 2 1180 24 0 173 2000 0 0 2 &RT0 24 0
182 2000 0 0 3 1180 25 0 174 2000 0 0 3 &RT0 25 0
183 2000 0 0 4 1180 26 0 175 2000 0 0 4 &RT0 26 0
184 >; 176 >;
185 router@1180 { 177
186 linux,phandle = <1180>; 178 RT0: router@1180 {
187 clock-frequency = <0>; 179 clock-frequency = <0>;
188 interrupt-controller; 180 interrupt-controller;
189 device_type = "pic-router"; 181 device_type = "pic-router";
@@ -192,7 +184,7 @@
192 built-in; 184 built-in;
193 big-endian; 185 big-endian;
194 interrupts = <17 2>; 186 interrupts = <17 2>;
195 interrupt-parent = <7400>; 187 interrupt-parent = <&mpic>;
196 }; 188 };
197 }; 189 };
198 }; 190 };
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index f261d647ac85..d91e81c009f5 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -48,6 +48,22 @@
48 reg = <e0000000 00100000>; // CCSRBAR 1M 48 reg = <e0000000 00100000>; // CCSRBAR 1M
49 bus-frequency = <0>; 49 bus-frequency = <0>;
50 50
51 memory-controller@2000 {
52 compatible = "fsl,8540-memory-controller";
53 reg = <2000 1000>;
54 interrupt-parent = <&mpic>;
55 interrupts = <2 2>;
56 };
57
58 l2-cache-controller@20000 {
59 compatible = "fsl,8540-l2-cache-controller";
60 reg = <20000 1000>;
61 cache-line-size = <20>; // 32 bytes
62 cache-size = <40000>; // L2, 256K
63 interrupt-parent = <&mpic>;
64 interrupts = <0 2>;
65 };
66
51 i2c@3000 { 67 i2c@3000 {
52 device_type = "i2c"; 68 device_type = "i2c";
53 compatible = "fsl-i2c"; 69 compatible = "fsl-i2c";
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 5fdcb69554f2..4f2c3af2e052 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -48,6 +48,22 @@
48 reg = <e0000000 00100000>; // CCSRBAR 1M 48 reg = <e0000000 00100000>; // CCSRBAR 1M
49 bus-frequency = <0>; 49 bus-frequency = <0>;
50 50
51 memory-controller@2000 {
52 compatible = "fsl,8541-memory-controller";
53 reg = <2000 1000>;
54 interrupt-parent = <&mpic>;
55 interrupts = <2 2>;
56 };
57
58 l2-cache-controller@20000 {
59 compatible = "fsl,8541-l2-cache-controller";
60 reg = <20000 1000>;
61 cache-line-size = <20>; // 32 bytes
62 cache-size = <40000>; // L2, 256K
63 interrupt-parent = <&mpic>;
64 interrupts = <0 2>;
65 };
66
51 i2c@3000 { 67 i2c@3000 {
52 device_type = "i2c"; 68 device_type = "i2c";
53 compatible = "fsl-i2c"; 69 compatible = "fsl-i2c";
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 6b084605bb4b..3033599e74e8 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -48,6 +48,22 @@
48 reg = <e0000000 00100000>; // CCSRBAR 1M 48 reg = <e0000000 00100000>; // CCSRBAR 1M
49 bus-frequency = <0>; // Filled out by uboot. 49 bus-frequency = <0>; // Filled out by uboot.
50 50
51 memory-controller@2000 {
52 compatible = "fsl,8544-memory-controller";
53 reg = <2000 1000>;
54 interrupt-parent = <&mpic>;
55 interrupts = <2 2>;
56 };
57
58 l2-cache-controller@20000 {
59 compatible = "fsl,8544-l2-cache-controller";
60 reg = <20000 1000>;
61 cache-line-size = <20>; // 32 bytes
62 cache-size = <40000>; // L2, 256K
63 interrupt-parent = <&mpic>;
64 interrupts = <0 2>;
65 };
66
51 i2c@3000 { 67 i2c@3000 {
52 device_type = "i2c"; 68 device_type = "i2c";
53 compatible = "fsl-i2c"; 69 compatible = "fsl-i2c";
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index b2b2200d0425..ad96381033c0 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -48,6 +48,22 @@
48 reg = <e0000000 00100000>; // CCSRBAR 1M 48 reg = <e0000000 00100000>; // CCSRBAR 1M
49 bus-frequency = <0>; 49 bus-frequency = <0>;
50 50
51 memory-controller@2000 {
52 compatible = "fsl,8548-memory-controller";
53 reg = <2000 1000>;
54 interrupt-parent = <&mpic>;
55 interrupts = <2 2>;
56 };
57
58 l2-cache-controller@20000 {
59 compatible = "fsl,8548-l2-cache-controller";
60 reg = <20000 1000>;
61 cache-line-size = <20>; // 32 bytes
62 cache-size = <80000>; // L2, 512K
63 interrupt-parent = <&mpic>;
64 interrupts = <0 2>;
65 };
66
51 i2c@3000 { 67 i2c@3000 {
52 device_type = "i2c"; 68 device_type = "i2c";
53 compatible = "fsl-i2c"; 69 compatible = "fsl-i2c";
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 68a4795720dc..951ed92f1154 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -48,6 +48,22 @@
48 reg = <e0000000 00100000>; // CCSRBAR 1M 48 reg = <e0000000 00100000>; // CCSRBAR 1M
49 bus-frequency = <0>; 49 bus-frequency = <0>;
50 50
51 memory-controller@2000 {
52 compatible = "fsl,8555-memory-controller";
53 reg = <2000 1000>;
54 interrupt-parent = <&mpic>;
55 interrupts = <2 2>;
56 };
57
58 l2-cache-controller@20000 {
59 compatible = "fsl,8555-l2-cache-controller";
60 reg = <20000 1000>;
61 cache-line-size = <20>; // 32 bytes
62 cache-size = <40000>; // L2, 256K
63 interrupt-parent = <&mpic>;
64 interrupts = <0 2>;
65 };
66
51 i2c@3000 { 67 i2c@3000 {
52 device_type = "i2c"; 68 device_type = "i2c";
53 compatible = "fsl-i2c"; 69 compatible = "fsl-i2c";
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 1f2afe9291d2..80682152b0cf 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -48,6 +48,22 @@
48 reg = <e0000000 00000200>; 48 reg = <e0000000 00000200>;
49 bus-frequency = <13ab6680>; 49 bus-frequency = <13ab6680>;
50 50
51 memory-controller@2000 {
52 compatible = "fsl,8540-memory-controller";
53 reg = <2000 1000>;
54 interrupt-parent = <&mpic>;
55 interrupts = <2 2>;
56 };
57
58 l2-cache-controller@20000 {
59 compatible = "fsl,8540-l2-cache-controller";
60 reg = <20000 1000>;
61 cache-line-size = <20>; // 32 bytes
62 cache-size = <40000>; // L2, 256K
63 interrupt-parent = <&mpic>;
64 interrupts = <0 2>;
65 };
66
51 mdio@24520 { 67 mdio@24520 {
52 device_type = "mdio"; 68 device_type = "mdio";
53 compatible = "gianfar"; 69 compatible = "gianfar";
@@ -110,7 +126,7 @@
110 #address-cells = <3>; 126 #address-cells = <3>;
111 compatible = "85xx"; 127 compatible = "85xx";
112 device_type = "pci"; 128 device_type = "pci";
113 reg = <8000 400>; 129 reg = <8000 1000>;
114 clock-frequency = <3f940aa>; 130 clock-frequency = <3f940aa>;
115 interrupt-map-mask = <f800 0 0 7>; 131 interrupt-map-mask = <f800 0 0 7>;
116 interrupt-map = < 132 interrupt-map = <
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 948a3b61bd4a..a123ec9456bc 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -57,6 +57,22 @@
57 reg = <e0000000 00100000>; 57 reg = <e0000000 00100000>;
58 bus-frequency = <0>; 58 bus-frequency = <0>;
59 59
60 memory-controller@2000 {
61 compatible = "fsl,8568-memory-controller";
62 reg = <2000 1000>;
63 interrupt-parent = <&mpic>;
64 interrupts = <2 2>;
65 };
66
67 l2-cache-controller@20000 {
68 compatible = "fsl,8568-l2-cache-controller";
69 reg = <20000 1000>;
70 cache-line-size = <20>; // 32 bytes
71 cache-size = <80000>; // L2, 512K
72 interrupt-parent = <&mpic>;
73 interrupts = <0 2>;
74 };
75
60 i2c@3000 { 76 i2c@3000 {
61 device_type = "i2c"; 77 device_type = "i2c";
62 compatible = "fsl-i2c"; 78 compatible = "fsl-i2c";
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
index d00fbd92a458..b732644788db 100644
--- a/arch/powerpc/boot/flatdevtree.c
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -891,28 +891,27 @@ int ft_set_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
891 struct ft_atom atom; 891 struct ft_atom atom;
892 void *node; 892 void *node;
893 char *p, *next; 893 char *p, *next;
894 int nextra, depth; 894 int nextra;
895 895
896 node = ft_node_ph2node(cxt, phandle); 896 node = ft_node_ph2node(cxt, phandle);
897 if (node == NULL) 897 if (node == NULL)
898 return -1; 898 return -1;
899 899
900 depth = 0; 900 next = ft_next(cxt, node, &atom);
901 p = node; 901 if (atom.tag != OF_DT_BEGIN_NODE)
902 /* phandle didn't point to a node */
903 return -1;
904 p = next;
902 905
903 while ((next = ft_next(cxt, p, &atom)) != NULL) { 906 while ((next = ft_next(cxt, p, &atom)) != NULL) {
904 switch (atom.tag) { 907 switch (atom.tag) {
905 case OF_DT_BEGIN_NODE: 908 case OF_DT_BEGIN_NODE: /* properties must go before subnodes */
906 ++depth;
907 break;
908 case OF_DT_END_NODE: 909 case OF_DT_END_NODE:
909 if (--depth > 0)
910 break;
911 /* haven't found the property, insert here */ 910 /* haven't found the property, insert here */
912 cxt->p = p; 911 cxt->p = p;
913 return ft_prop(cxt, propname, buf, buflen); 912 return ft_prop(cxt, propname, buf, buflen);
914 case OF_DT_PROP: 913 case OF_DT_PROP:
915 if ((depth != 1) || strcmp(atom.name, propname)) 914 if (strcmp(atom.name, propname))
916 break; 915 break;
917 /* found an existing property, overwrite it */ 916 /* found an existing property, overwrite it */
918 nextra = _ALIGN(buflen, 4) - _ALIGN(atom.size, 4); 917 nextra = _ALIGN(buflen, 4) - _ALIGN(atom.size, 4);
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 6061e5f7696e..02c428affc8f 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -163,7 +163,6 @@ CONFIG_SPU_FS=m
163CONFIG_SPU_BASE=y 163CONFIG_SPU_BASE=y
164CONFIG_CBE_RAS=y 164CONFIG_CBE_RAS=y
165CONFIG_CBE_THERM=m 165CONFIG_CBE_THERM=m
166CONFIG_CBE_CPUFREQ=m
167CONFIG_PPC_NATIVE=y 166CONFIG_PPC_NATIVE=y
168CONFIG_UDBG_RTAS_CONSOLE=y 167CONFIG_UDBG_RTAS_CONSOLE=y
169CONFIG_PPC_UDBG_BEAT=y 168CONFIG_PPC_UDBG_BEAT=y
@@ -172,24 +171,12 @@ CONFIG_PPC_RTAS=y
172# CONFIG_RTAS_ERROR_LOGGING is not set 171# CONFIG_RTAS_ERROR_LOGGING is not set
173CONFIG_RTAS_PROC=y 172CONFIG_RTAS_PROC=y
174CONFIG_RTAS_FLASH=y 173CONFIG_RTAS_FLASH=y
175CONFIG_PPC_PMI=m 174# CONFIG_PPC_PMI is not set
176CONFIG_MMIO_NVRAM=y 175CONFIG_MMIO_NVRAM=y
177# CONFIG_PPC_MPC106 is not set 176# CONFIG_PPC_MPC106 is not set
178# CONFIG_PPC_970_NAP is not set 177# CONFIG_PPC_970_NAP is not set
179CONFIG_PPC_INDIRECT_IO=y 178CONFIG_PPC_INDIRECT_IO=y
180CONFIG_GENERIC_IOMAP=y 179CONFIG_GENERIC_IOMAP=y
181CONFIG_CPU_FREQ=y
182CONFIG_CPU_FREQ_TABLE=y
183CONFIG_CPU_FREQ_DEBUG=y
184CONFIG_CPU_FREQ_STAT=y
185# CONFIG_CPU_FREQ_STAT_DETAILS is not set
186CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
187# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
188CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
189CONFIG_CPU_FREQ_GOV_POWERSAVE=y
190CONFIG_CPU_FREQ_GOV_USERSPACE=y
191CONFIG_CPU_FREQ_GOV_ONDEMAND=y
192CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
193# CONFIG_CPU_FREQ_PMAC64 is not set 180# CONFIG_CPU_FREQ_PMAC64 is not set
194# CONFIG_WANT_EARLY_SERIAL is not set 181# CONFIG_WANT_EARLY_SERIAL is not set
195CONFIG_MPIC=y 182CONFIG_MPIC=y
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 5fc87448704c..af25118c8f24 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc1
4# Mon Jan 22 22:16:44 2007 4# Mon May 14 14:27:46 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -40,6 +40,7 @@ CONFIG_PPC_FPU=y
40# CONFIG_PPC_OF_PLATFORM_PCI is not set 40# CONFIG_PPC_OF_PLATFORM_PCI is not set
41# CONFIG_ALTIVEC is not set 41# CONFIG_ALTIVEC is not set
42CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
43# CONFIG_PPC_MM_SLICES is not set
43CONFIG_VIRT_CPU_ACCOUNTING=y 44CONFIG_VIRT_CPU_ACCOUNTING=y
44CONFIG_SMP=y 45CONFIG_SMP=y
45CONFIG_NR_CPUS=32 46CONFIG_NR_CPUS=32
@@ -60,6 +61,7 @@ CONFIG_LOCALVERSION_AUTO=y
60CONFIG_SWAP=y 61CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 62CONFIG_SYSVIPC=y
62# CONFIG_IPC_NS is not set 63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y
63CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
64# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
@@ -68,9 +70,11 @@ CONFIG_AUDIT=y
68CONFIG_AUDITSYSCALL=y 70CONFIG_AUDITSYSCALL=y
69CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=17
71# CONFIG_CPUSETS is not set 74# CONFIG_CPUSETS is not set
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75CONFIG_CC_OPTIMIZE_FOR_SIZE=y 79CONFIG_CC_OPTIMIZE_FOR_SIZE=y
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 97CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 105
97# 106#
98# Loadable module support 107# Loadable module support
@@ -131,15 +140,30 @@ CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_EMBEDDED6xx is not set 140# CONFIG_EMBEDDED6xx is not set
132# CONFIG_APUS is not set 141# CONFIG_APUS is not set
133# CONFIG_PPC_PSERIES is not set 142# CONFIG_PPC_PSERIES is not set
143CONFIG_LPARCFG=y
134CONFIG_PPC_ISERIES=y 144CONFIG_PPC_ISERIES=y
145
146#
147# iSeries device drivers
148#
149CONFIG_VIODASD=y
150CONFIG_VIOCD=m
151CONFIG_VIOTAPE=m
152CONFIG_VIOPATH=y
135# CONFIG_PPC_MPC52xx is not set 153# CONFIG_PPC_MPC52xx is not set
154# CONFIG_PPC_MPC5200 is not set
136# CONFIG_PPC_PMAC is not set 155# CONFIG_PPC_PMAC is not set
137# CONFIG_PPC_MAPLE is not set 156# CONFIG_PPC_MAPLE is not set
138# CONFIG_PPC_PASEMI is not set 157# CONFIG_PPC_PASEMI is not set
158# CONFIG_PPC_CELLEB is not set
159# CONFIG_PPC_PS3 is not set
139# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
140# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PPC_IBM_CELL_BLADE is not set 162# CONFIG_PPC_IBM_CELL_BLADE is not set
142# CONFIG_PPC_PS3 is not set 163# CONFIG_PQ2ADS is not set
164# CONFIG_MPIC is not set
165# CONFIG_MPIC_WEIRD is not set
166# CONFIG_PPC_I8259 is not set
143# CONFIG_U3_DART is not set 167# CONFIG_U3_DART is not set
144# CONFIG_PPC_RTAS is not set 168# CONFIG_PPC_RTAS is not set
145# CONFIG_MMIO_NVRAM is not set 169# CONFIG_MMIO_NVRAM is not set
@@ -149,8 +173,7 @@ CONFIG_IBMVIO=y
149CONFIG_PPC_INDIRECT_IO=y 173CONFIG_PPC_INDIRECT_IO=y
150CONFIG_GENERIC_IOMAP=y 174CONFIG_GENERIC_IOMAP=y
151# CONFIG_CPU_FREQ is not set 175# CONFIG_CPU_FREQ is not set
152# CONFIG_WANT_EARLY_SERIAL is not set 176# CONFIG_CPM2 is not set
153# CONFIG_MPIC is not set
154 177
155# 178#
156# Kernel options 179# Kernel options
@@ -172,7 +195,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
172# CONFIG_KEXEC is not set 195# CONFIG_KEXEC is not set
173# CONFIG_CRASH_DUMP is not set 196# CONFIG_CRASH_DUMP is not set
174CONFIG_IRQ_ALL_CPUS=y 197CONFIG_IRQ_ALL_CPUS=y
175CONFIG_LPARCFG=y
176# CONFIG_NUMA is not set 198# CONFIG_NUMA is not set
177CONFIG_ARCH_SELECT_MEMORY_MODEL=y 199CONFIG_ARCH_SELECT_MEMORY_MODEL=y
178CONFIG_ARCH_FLATMEM_ENABLE=y 200CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -187,34 +209,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
187# CONFIG_SPARSEMEM_STATIC is not set 209# CONFIG_SPARSEMEM_STATIC is not set
188CONFIG_SPLIT_PTLOCK_CPUS=4 210CONFIG_SPLIT_PTLOCK_CPUS=4
189CONFIG_RESOURCES_64BIT=y 211CONFIG_RESOURCES_64BIT=y
212CONFIG_ZONE_DMA_FLAG=1
213# CONFIG_PPC_HAS_HASH_64K is not set
190# CONFIG_PPC_64K_PAGES is not set 214# CONFIG_PPC_64K_PAGES is not set
191# CONFIG_SCHED_SMT is not set 215# CONFIG_SCHED_SMT is not set
192CONFIG_PROC_DEVICETREE=y 216CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set 217# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set 218# CONFIG_PM is not set
195CONFIG_SECCOMP=y 219CONFIG_SECCOMP=y
220# CONFIG_WANT_DEVICE_TREE is not set
196CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
197 222
198# 223#
199# Bus options 224# Bus options
200# 225#
226CONFIG_ZONE_DMA=y
201CONFIG_GENERIC_ISA_DMA=y 227CONFIG_GENERIC_ISA_DMA=y
202# CONFIG_MPIC_WEIRD is not set
203# CONFIG_PPC_I8259 is not set
204# CONFIG_PPC_INDIRECT_PCI is not set 228# CONFIG_PPC_INDIRECT_PCI is not set
205CONFIG_PCI=y 229CONFIG_PCI=y
206CONFIG_PCI_DOMAINS=y 230CONFIG_PCI_DOMAINS=y
207# CONFIG_PCIEPORTBUS is not set 231# CONFIG_PCIEPORTBUS is not set
232CONFIG_ARCH_SUPPORTS_MSI=y
233# CONFIG_PCI_MSI is not set
208# CONFIG_PCI_DEBUG is not set 234# CONFIG_PCI_DEBUG is not set
209 235
210# 236#
211# PCCARD (PCMCIA/CardBus) support 237# PCCARD (PCMCIA/CardBus) support
212# 238#
213# CONFIG_PCCARD is not set 239# CONFIG_PCCARD is not set
214
215#
216# PCI Hotplug Support
217#
218# CONFIG_HOTPLUG_PCI is not set 240# CONFIG_HOTPLUG_PCI is not set
219CONFIG_KERNEL_START=0xc000000000000000 241CONFIG_KERNEL_START=0xc000000000000000
220 242
@@ -226,14 +248,15 @@ CONFIG_NET=y
226# 248#
227# Networking options 249# Networking options
228# 250#
229# CONFIG_NETDEBUG is not set
230CONFIG_PACKET=y 251CONFIG_PACKET=y
231# CONFIG_PACKET_MMAP is not set 252# CONFIG_PACKET_MMAP is not set
232CONFIG_UNIX=y 253CONFIG_UNIX=y
233CONFIG_XFRM=y 254CONFIG_XFRM=y
234CONFIG_XFRM_USER=m 255CONFIG_XFRM_USER=m
235CONFIG_XFRM_SUB_POLICY=y 256CONFIG_XFRM_SUB_POLICY=y
257# CONFIG_XFRM_MIGRATE is not set
236CONFIG_NET_KEY=m 258CONFIG_NET_KEY=m
259# CONFIG_NET_KEY_MIGRATE is not set
237CONFIG_INET=y 260CONFIG_INET=y
238CONFIG_IP_MULTICAST=y 261CONFIG_IP_MULTICAST=y
239# CONFIG_IP_ADVANCED_ROUTER is not set 262# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -275,8 +298,6 @@ CONFIG_NETFILTER=y
275# 298#
276# CONFIG_NETFILTER_NETLINK is not set 299# CONFIG_NETFILTER_NETLINK is not set
277CONFIG_NF_CONNTRACK_ENABLED=m 300CONFIG_NF_CONNTRACK_ENABLED=m
278CONFIG_NF_CONNTRACK_SUPPORT=y
279# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
280CONFIG_NF_CONNTRACK=m 301CONFIG_NF_CONNTRACK=m
281# CONFIG_NF_CT_ACCT is not set 302# CONFIG_NF_CT_ACCT is not set
282CONFIG_NF_CONNTRACK_MARK=y 303CONFIG_NF_CONNTRACK_MARK=y
@@ -288,6 +309,7 @@ CONFIG_NF_CONNTRACK_FTP=m
288CONFIG_NF_CONNTRACK_IRC=m 309CONFIG_NF_CONNTRACK_IRC=m
289# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set 310# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
290# CONFIG_NF_CONNTRACK_PPTP is not set 311# CONFIG_NF_CONNTRACK_PPTP is not set
312# CONFIG_NF_CONNTRACK_SANE is not set
291# CONFIG_NF_CONNTRACK_SIP is not set 313# CONFIG_NF_CONNTRACK_SIP is not set
292CONFIG_NF_CONNTRACK_TFTP=m 314CONFIG_NF_CONNTRACK_TFTP=m
293CONFIG_NETFILTER_XTABLES=m 315CONFIG_NETFILTER_XTABLES=m
@@ -298,7 +320,9 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
298CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 320CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
299# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 321# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
300# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 322# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
323# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
301CONFIG_NETFILTER_XT_MATCH_COMMENT=m 324CONFIG_NETFILTER_XT_MATCH_COMMENT=m
325# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
302CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 326CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
303CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 327CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
304# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 328# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -340,7 +364,6 @@ CONFIG_IP_NF_FILTER=m
340CONFIG_IP_NF_TARGET_REJECT=m 364CONFIG_IP_NF_TARGET_REJECT=m
341CONFIG_IP_NF_TARGET_LOG=m 365CONFIG_IP_NF_TARGET_LOG=m
342CONFIG_IP_NF_TARGET_ULOG=m 366CONFIG_IP_NF_TARGET_ULOG=m
343CONFIG_IP_NF_TARGET_TCPMSS=m
344CONFIG_NF_NAT=m 367CONFIG_NF_NAT=m
345CONFIG_NF_NAT_NEEDED=y 368CONFIG_NF_NAT_NEEDED=y
346CONFIG_IP_NF_TARGET_MASQUERADE=m 369CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -373,7 +396,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
373# 396#
374# SCTP Configuration (EXPERIMENTAL) 397# SCTP Configuration (EXPERIMENTAL)
375# 398#
376# CONFIG_IP_SCTP is not set 399CONFIG_IP_SCTP=m
400# CONFIG_SCTP_DBG_MSG is not set
401# CONFIG_SCTP_DBG_OBJCNT is not set
402# CONFIG_SCTP_HMAC_NONE is not set
403# CONFIG_SCTP_HMAC_SHA1 is not set
404CONFIG_SCTP_HMAC_MD5=y
377 405
378# 406#
379# TIPC Configuration (EXPERIMENTAL) 407# TIPC Configuration (EXPERIMENTAL)
@@ -405,7 +433,16 @@ CONFIG_NET_CLS_ROUTE=y
405# CONFIG_HAMRADIO is not set 433# CONFIG_HAMRADIO is not set
406# CONFIG_IRDA is not set 434# CONFIG_IRDA is not set
407# CONFIG_BT is not set 435# CONFIG_BT is not set
436# CONFIG_AF_RXRPC is not set
437
438#
439# Wireless
440#
441# CONFIG_CFG80211 is not set
442# CONFIG_WIRELESS_EXT is not set
443# CONFIG_MAC80211 is not set
408# CONFIG_IEEE80211 is not set 444# CONFIG_IEEE80211 is not set
445# CONFIG_RFKILL is not set
409 446
410# 447#
411# Device Drivers 448# Device Drivers
@@ -418,16 +455,13 @@ CONFIG_STANDALONE=y
418CONFIG_PREVENT_FIRMWARE_BUILD=y 455CONFIG_PREVENT_FIRMWARE_BUILD=y
419CONFIG_FW_LOADER=m 456CONFIG_FW_LOADER=m
420# CONFIG_DEBUG_DRIVER is not set 457# CONFIG_DEBUG_DRIVER is not set
458# CONFIG_DEBUG_DEVRES is not set
421# CONFIG_SYS_HYPERVISOR is not set 459# CONFIG_SYS_HYPERVISOR is not set
422 460
423# 461#
424# Connector - unified userspace <-> kernelspace linker 462# Connector - unified userspace <-> kernelspace linker
425# 463#
426# CONFIG_CONNECTOR is not set 464# CONFIG_CONNECTOR is not set
427
428#
429# Memory Technology Devices (MTD)
430#
431# CONFIG_MTD is not set 465# CONFIG_MTD is not set
432 466
433# 467#
@@ -438,6 +472,7 @@ CONFIG_FW_LOADER=m
438# 472#
439# Plug and Play support 473# Plug and Play support
440# 474#
475# CONFIG_PNPACPI is not set
441 476
442# 477#
443# Block devices 478# Block devices
@@ -456,15 +491,16 @@ CONFIG_BLK_DEV_RAM=y
456CONFIG_BLK_DEV_RAM_COUNT=16 491CONFIG_BLK_DEV_RAM_COUNT=16
457CONFIG_BLK_DEV_RAM_SIZE=65536 492CONFIG_BLK_DEV_RAM_SIZE=65536
458CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 493CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
459CONFIG_BLK_DEV_INITRD=y
460# CONFIG_CDROM_PKTCDVD is not set 494# CONFIG_CDROM_PKTCDVD is not set
461# CONFIG_ATA_OVER_ETH is not set 495# CONFIG_ATA_OVER_ETH is not set
462 496
463# 497#
464# Misc devices 498# Misc devices
465# 499#
500# CONFIG_PHANTOM is not set
466# CONFIG_SGI_IOC4 is not set 501# CONFIG_SGI_IOC4 is not set
467# CONFIG_TIFM_CORE is not set 502# CONFIG_TIFM_CORE is not set
503# CONFIG_BLINK is not set
468 504
469# 505#
470# ATA/ATAPI/MFM/RLL support 506# ATA/ATAPI/MFM/RLL support
@@ -498,6 +534,7 @@ CONFIG_SCSI_MULTI_LUN=y
498CONFIG_SCSI_CONSTANTS=y 534CONFIG_SCSI_CONSTANTS=y
499# CONFIG_SCSI_LOGGING is not set 535# CONFIG_SCSI_LOGGING is not set
500# CONFIG_SCSI_SCAN_ASYNC is not set 536# CONFIG_SCSI_SCAN_ASYNC is not set
537CONFIG_SCSI_WAIT_SCAN=m
501 538
502# 539#
503# SCSI Transports 540# SCSI Transports
@@ -544,11 +581,8 @@ CONFIG_SCSI_IBMVSCSI=m
544# CONFIG_SCSI_DC395x is not set 581# CONFIG_SCSI_DC395x is not set
545# CONFIG_SCSI_DC390T is not set 582# CONFIG_SCSI_DC390T is not set
546# CONFIG_SCSI_DEBUG is not set 583# CONFIG_SCSI_DEBUG is not set
584# CONFIG_SCSI_ESP_CORE is not set
547# CONFIG_SCSI_SRP is not set 585# CONFIG_SCSI_SRP is not set
548
549#
550# Serial ATA (prod) and Parallel ATA (experimental) drivers
551#
552# CONFIG_ATA is not set 586# CONFIG_ATA is not set
553 587
554# 588#
@@ -570,6 +604,7 @@ CONFIG_DM_SNAPSHOT=m
570CONFIG_DM_MIRROR=m 604CONFIG_DM_MIRROR=m
571CONFIG_DM_ZERO=m 605CONFIG_DM_ZERO=m
572# CONFIG_DM_MULTIPATH is not set 606# CONFIG_DM_MULTIPATH is not set
607# CONFIG_DM_DELAY is not set
573 608
574# 609#
575# Fusion MPT device support 610# Fusion MPT device support
@@ -582,18 +617,14 @@ CONFIG_DM_ZERO=m
582# 617#
583# IEEE 1394 (FireWire) support 618# IEEE 1394 (FireWire) support
584# 619#
620# CONFIG_FIREWIRE is not set
585# CONFIG_IEEE1394 is not set 621# CONFIG_IEEE1394 is not set
586 622
587# 623#
588# I2O device support 624# I2O device support
589# 625#
590# CONFIG_I2O is not set 626# CONFIG_I2O is not set
591 627# CONFIG_MACINTOSH_DRIVERS is not set
592#
593# Macintosh device drivers
594#
595# CONFIG_MAC_EMUMOUSEBTN is not set
596# CONFIG_WINDFARM is not set
597 628
598# 629#
599# Network device support 630# Network device support
@@ -608,10 +639,6 @@ CONFIG_TUN=m
608# ARCnet devices 639# ARCnet devices
609# 640#
610# CONFIG_ARCNET is not set 641# CONFIG_ARCNET is not set
611
612#
613# PHY device support
614#
615# CONFIG_PHYLIB is not set 642# CONFIG_PHYLIB is not set
616 643
617# 644#
@@ -648,10 +675,8 @@ CONFIG_E100=y
648# CONFIG_EPIC100 is not set 675# CONFIG_EPIC100 is not set
649# CONFIG_SUNDANCE is not set 676# CONFIG_SUNDANCE is not set
650# CONFIG_VIA_RHINE is not set 677# CONFIG_VIA_RHINE is not set
651 678# CONFIG_SC92031 is not set
652# 679CONFIG_NETDEV_1000=y
653# Ethernet (1000 Mbit)
654#
655CONFIG_ACENIC=m 680CONFIG_ACENIC=m
656# CONFIG_ACENIC_OMIT_TIGON_I is not set 681# CONFIG_ACENIC_OMIT_TIGON_I is not set
657# CONFIG_DL2K is not set 682# CONFIG_DL2K is not set
@@ -670,15 +695,17 @@ CONFIG_E1000=m
670# CONFIG_TIGON3 is not set 695# CONFIG_TIGON3 is not set
671# CONFIG_BNX2 is not set 696# CONFIG_BNX2 is not set
672# CONFIG_QLA3XXX is not set 697# CONFIG_QLA3XXX is not set
673 698# CONFIG_ATL1 is not set
674# 699CONFIG_NETDEV_10000=y
675# Ethernet (10000 Mbit)
676#
677# CONFIG_CHELSIO_T1 is not set 700# CONFIG_CHELSIO_T1 is not set
701# CONFIG_CHELSIO_T3 is not set
678# CONFIG_IXGB is not set 702# CONFIG_IXGB is not set
679# CONFIG_S2IO is not set 703# CONFIG_S2IO is not set
680# CONFIG_MYRI10GE is not set 704# CONFIG_MYRI10GE is not set
681# CONFIG_NETXEN_NIC is not set 705# CONFIG_NETXEN_NIC is not set
706# CONFIG_PASEMI_MAC is not set
707# CONFIG_MLX4_CORE is not set
708CONFIG_MLX4_DEBUG=y
682 709
683# 710#
684# Token Ring devices 711# Token Ring devices
@@ -689,13 +716,10 @@ CONFIG_IBMOL=y
689# CONFIG_TMS380TR is not set 716# CONFIG_TMS380TR is not set
690 717
691# 718#
692# Wireless LAN (non-hamradio) 719# Wireless LAN
693#
694# CONFIG_NET_RADIO is not set
695
696#
697# Wan interfaces
698# 720#
721# CONFIG_WLAN_PRE80211 is not set
722# CONFIG_WLAN_80211 is not set
699# CONFIG_WAN is not set 723# CONFIG_WAN is not set
700CONFIG_ISERIES_VETH=y 724CONFIG_ISERIES_VETH=y
701# CONFIG_FDDI is not set 725# CONFIG_FDDI is not set
@@ -715,7 +739,6 @@ CONFIG_SLHC=m
715# CONFIG_SHAPER is not set 739# CONFIG_SHAPER is not set
716CONFIG_NETCONSOLE=y 740CONFIG_NETCONSOLE=y
717CONFIG_NETPOLL=y 741CONFIG_NETPOLL=y
718CONFIG_NETPOLL_RX=y
719CONFIG_NETPOLL_TRAP=y 742CONFIG_NETPOLL_TRAP=y
720CONFIG_NET_POLL_CONTROLLER=y 743CONFIG_NET_POLL_CONTROLLER=y
721 744
@@ -753,6 +776,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
753# CONFIG_INPUT_KEYBOARD is not set 776# CONFIG_INPUT_KEYBOARD is not set
754# CONFIG_INPUT_MOUSE is not set 777# CONFIG_INPUT_MOUSE is not set
755# CONFIG_INPUT_JOYSTICK is not set 778# CONFIG_INPUT_JOYSTICK is not set
779# CONFIG_INPUT_TABLET is not set
756# CONFIG_INPUT_TOUCHSCREEN is not set 780# CONFIG_INPUT_TOUCHSCREEN is not set
757# CONFIG_INPUT_MISC is not set 781# CONFIG_INPUT_MISC is not set
758 782
@@ -765,6 +789,10 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
765# 789#
766# Character devices 790# Character devices
767# 791#
792CONFIG_VT=y
793CONFIG_VT_CONSOLE=y
794CONFIG_HW_CONSOLE=y
795# CONFIG_VT_HW_CONSOLE_BINDING is not set
768# CONFIG_SERIAL_NONSTANDARD is not set 796# CONFIG_SERIAL_NONSTANDARD is not set
769 797
770# 798#
@@ -781,20 +809,17 @@ CONFIG_SERIAL_ICOM=m
781CONFIG_UNIX98_PTYS=y 809CONFIG_UNIX98_PTYS=y
782CONFIG_LEGACY_PTYS=y 810CONFIG_LEGACY_PTYS=y
783CONFIG_LEGACY_PTY_COUNT=256 811CONFIG_LEGACY_PTY_COUNT=256
812CONFIG_HVC_DRIVER=y
813CONFIG_HVC_ISERIES=y
784 814
785# 815#
786# IPMI 816# IPMI
787# 817#
788# CONFIG_IPMI_HANDLER is not set 818# CONFIG_IPMI_HANDLER is not set
789
790#
791# Watchdog Cards
792#
793# CONFIG_WATCHDOG is not set 819# CONFIG_WATCHDOG is not set
794# CONFIG_HW_RANDOM is not set 820# CONFIG_HW_RANDOM is not set
795CONFIG_GEN_RTC=y 821CONFIG_GEN_RTC=y
796# CONFIG_GEN_RTC_X is not set 822# CONFIG_GEN_RTC_X is not set
797# CONFIG_DTLK is not set
798# CONFIG_R3964 is not set 823# CONFIG_R3964 is not set
799# CONFIG_APPLICOM is not set 824# CONFIG_APPLICOM is not set
800# CONFIG_AGP is not set 825# CONFIG_AGP is not set
@@ -807,10 +832,7 @@ CONFIG_MAX_RAW_DEVS=256
807# TPM devices 832# TPM devices
808# 833#
809# CONFIG_TCG_TPM is not set 834# CONFIG_TCG_TPM is not set
810 835CONFIG_DEVPORT=y
811#
812# I2C support
813#
814# CONFIG_I2C is not set 836# CONFIG_I2C is not set
815 837
816# 838#
@@ -823,30 +845,39 @@ CONFIG_MAX_RAW_DEVS=256
823# Dallas's 1-wire bus 845# Dallas's 1-wire bus
824# 846#
825# CONFIG_W1 is not set 847# CONFIG_W1 is not set
848# CONFIG_HWMON is not set
826 849
827# 850#
828# Hardware Monitoring support 851# Multifunction device drivers
829# 852#
830# CONFIG_HWMON is not set 853# CONFIG_MFD_SM501 is not set
831# CONFIG_HWMON_VID is not set
832 854
833# 855#
834# Multimedia devices 856# Multimedia devices
835# 857#
836# CONFIG_VIDEO_DEV is not set 858# CONFIG_VIDEO_DEV is not set
859# CONFIG_DVB_CORE is not set
860# CONFIG_DAB is not set
837 861
838# 862#
839# Digital Video Broadcasting Devices 863# Graphics support
840# 864#
841# CONFIG_DVB is not set 865# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
842 866
843# 867#
844# Graphics support 868# Display device support
845# 869#
846CONFIG_FIRMWARE_EDID=y 870# CONFIG_DISPLAY_SUPPORT is not set
871# CONFIG_VGASTATE is not set
847# CONFIG_FB is not set 872# CONFIG_FB is not set
848# CONFIG_FB_IBM_GXT4500 is not set 873# CONFIG_FB_IBM_GXT4500 is not set
849# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 874
875#
876# Console display driver support
877#
878CONFIG_VGA_CONSOLE=y
879# CONFIG_VGACON_SOFT_SCROLLBACK is not set
880CONFIG_DUMMY_CONSOLE=y
850 881
851# 882#
852# Sound 883# Sound
@@ -874,10 +905,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
874# USB Gadget Support 905# USB Gadget Support
875# 906#
876# CONFIG_USB_GADGET is not set 907# CONFIG_USB_GADGET is not set
877
878#
879# MMC/SD Card support
880#
881# CONFIG_MMC is not set 908# CONFIG_MMC is not set
882 909
883# 910#
@@ -921,10 +948,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
921# 948#
922 949
923# 950#
924# Virtualization
925#
926
927#
928# File systems 951# File systems
929# 952#
930CONFIG_EXT2_FS=y 953CONFIG_EXT2_FS=y
@@ -979,7 +1002,6 @@ CONFIG_GENERIC_ACL=y
979CONFIG_ISO9660_FS=y 1002CONFIG_ISO9660_FS=y
980CONFIG_JOLIET=y 1003CONFIG_JOLIET=y
981CONFIG_ZISOFS=y 1004CONFIG_ZISOFS=y
982CONFIG_ZISOFS_FS=y
983CONFIG_UDF_FS=m 1005CONFIG_UDF_FS=m
984CONFIG_UDF_NLS=y 1006CONFIG_UDF_NLS=y
985 1007
@@ -1045,6 +1067,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1045CONFIG_NFS_COMMON=y 1067CONFIG_NFS_COMMON=y
1046CONFIG_SUNRPC=y 1068CONFIG_SUNRPC=y
1047CONFIG_SUNRPC_GSS=y 1069CONFIG_SUNRPC_GSS=y
1070# CONFIG_SUNRPC_BIND34 is not set
1048CONFIG_RPCSEC_GSS_KRB5=y 1071CONFIG_RPCSEC_GSS_KRB5=y
1049CONFIG_RPCSEC_GSS_SPKM3=m 1072CONFIG_RPCSEC_GSS_SPKM3=m
1050# CONFIG_SMB_FS is not set 1073# CONFIG_SMB_FS is not set
@@ -1114,18 +1137,9 @@ CONFIG_NLS_ISO8859_1=y
1114# Distributed Lock Manager 1137# Distributed Lock Manager
1115# 1138#
1116CONFIG_DLM=m 1139CONFIG_DLM=m
1117CONFIG_DLM_TCP=y
1118# CONFIG_DLM_SCTP is not set
1119# CONFIG_DLM_DEBUG is not set 1140# CONFIG_DLM_DEBUG is not set
1120 1141# CONFIG_UCC_SLOW is not set
1121# 1142# CONFIG_UCC_FAST is not set
1122# iSeries device drivers
1123#
1124CONFIG_VIOCONS=y
1125CONFIG_VIODASD=y
1126CONFIG_VIOCD=m
1127CONFIG_VIOTAPE=m
1128CONFIG_VIOPATH=y
1129 1143
1130# 1144#
1131# Library routines 1145# Library routines
@@ -1133,6 +1147,7 @@ CONFIG_VIOPATH=y
1133CONFIG_BITREVERSE=y 1147CONFIG_BITREVERSE=y
1134CONFIG_CRC_CCITT=m 1148CONFIG_CRC_CCITT=m
1135# CONFIG_CRC16 is not set 1149# CONFIG_CRC16 is not set
1150# CONFIG_CRC_ITU_T is not set
1136CONFIG_CRC32=y 1151CONFIG_CRC32=y
1137CONFIG_LIBCRC32C=m 1152CONFIG_LIBCRC32C=m
1138CONFIG_ZLIB_INFLATE=y 1153CONFIG_ZLIB_INFLATE=y
@@ -1142,7 +1157,9 @@ CONFIG_TEXTSEARCH_KMP=m
1142CONFIG_TEXTSEARCH_BM=m 1157CONFIG_TEXTSEARCH_BM=m
1143CONFIG_TEXTSEARCH_FSM=m 1158CONFIG_TEXTSEARCH_FSM=m
1144CONFIG_PLIST=y 1159CONFIG_PLIST=y
1145CONFIG_IOMAP_COPY=y 1160CONFIG_HAS_IOMEM=y
1161CONFIG_HAS_IOPORT=y
1162CONFIG_HAS_DMA=y
1146 1163
1147# 1164#
1148# Instrumentation Support 1165# Instrumentation Support
@@ -1160,15 +1177,15 @@ CONFIG_MAGIC_SYSRQ=y
1160CONFIG_DEBUG_FS=y 1177CONFIG_DEBUG_FS=y
1161# CONFIG_HEADERS_CHECK is not set 1178# CONFIG_HEADERS_CHECK is not set
1162CONFIG_DEBUG_KERNEL=y 1179CONFIG_DEBUG_KERNEL=y
1163CONFIG_LOG_BUF_SHIFT=17 1180# CONFIG_DEBUG_SHIRQ is not set
1164CONFIG_DETECT_SOFTLOCKUP=y 1181CONFIG_DETECT_SOFTLOCKUP=y
1165# CONFIG_SCHEDSTATS is not set 1182# CONFIG_SCHEDSTATS is not set
1183# CONFIG_TIMER_STATS is not set
1166# CONFIG_DEBUG_SLAB is not set 1184# CONFIG_DEBUG_SLAB is not set
1167# CONFIG_DEBUG_RT_MUTEXES is not set 1185# CONFIG_DEBUG_RT_MUTEXES is not set
1168# CONFIG_RT_MUTEX_TESTER is not set 1186# CONFIG_RT_MUTEX_TESTER is not set
1169# CONFIG_DEBUG_SPINLOCK is not set 1187# CONFIG_DEBUG_SPINLOCK is not set
1170# CONFIG_DEBUG_MUTEXES is not set 1188# CONFIG_DEBUG_MUTEXES is not set
1171# CONFIG_DEBUG_RWSEMS is not set
1172# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1189# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1173# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1190# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1174# CONFIG_DEBUG_KOBJECT is not set 1191# CONFIG_DEBUG_KOBJECT is not set
@@ -1178,8 +1195,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1178# CONFIG_DEBUG_LIST is not set 1195# CONFIG_DEBUG_LIST is not set
1179# CONFIG_FORCED_INLINING is not set 1196# CONFIG_FORCED_INLINING is not set
1180# CONFIG_RCU_TORTURE_TEST is not set 1197# CONFIG_RCU_TORTURE_TEST is not set
1198# CONFIG_FAULT_INJECTION is not set
1181CONFIG_DEBUG_STACKOVERFLOW=y 1199CONFIG_DEBUG_STACKOVERFLOW=y
1182CONFIG_DEBUG_STACK_USAGE=y 1200CONFIG_DEBUG_STACK_USAGE=y
1201# CONFIG_DEBUG_PAGEALLOC is not set
1183# CONFIG_DEBUGGER is not set 1202# CONFIG_DEBUGGER is not set
1184CONFIG_IRQSTACKS=y 1203CONFIG_IRQSTACKS=y
1185# CONFIG_BOOTX_TEXT is not set 1204# CONFIG_BOOTX_TEXT is not set
@@ -1212,8 +1231,11 @@ CONFIG_CRYPTO_TGR192=m
1212# CONFIG_CRYPTO_GF128MUL is not set 1231# CONFIG_CRYPTO_GF128MUL is not set
1213CONFIG_CRYPTO_ECB=m 1232CONFIG_CRYPTO_ECB=m
1214CONFIG_CRYPTO_CBC=y 1233CONFIG_CRYPTO_CBC=y
1234CONFIG_CRYPTO_PCBC=m
1215# CONFIG_CRYPTO_LRW is not set 1235# CONFIG_CRYPTO_LRW is not set
1236# CONFIG_CRYPTO_CRYPTD is not set
1216CONFIG_CRYPTO_DES=y 1237CONFIG_CRYPTO_DES=y
1238# CONFIG_CRYPTO_FCRYPT is not set
1217CONFIG_CRYPTO_BLOWFISH=m 1239CONFIG_CRYPTO_BLOWFISH=m
1218CONFIG_CRYPTO_TWOFISH=m 1240CONFIG_CRYPTO_TWOFISH=m
1219CONFIG_CRYPTO_TWOFISH_COMMON=m 1241CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1228,6 +1250,7 @@ CONFIG_CRYPTO_ANUBIS=m
1228CONFIG_CRYPTO_DEFLATE=m 1250CONFIG_CRYPTO_DEFLATE=m
1229CONFIG_CRYPTO_MICHAEL_MIC=m 1251CONFIG_CRYPTO_MICHAEL_MIC=m
1230CONFIG_CRYPTO_CRC32C=m 1252CONFIG_CRYPTO_CRC32C=m
1253# CONFIG_CRYPTO_CAMELLIA is not set
1231CONFIG_CRYPTO_TEST=m 1254CONFIG_CRYPTO_TEST=m
1232 1255
1233# 1256#
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 97a57e996663..0507c8f7bfbc 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc6 3# Linux kernel version: 2.6.21
4# Thu Feb 1 22:54:15 2007 4# Mon May 14 12:55:04 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -23,7 +23,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 23CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 24CONFIG_PPC_OF=y
25CONFIG_PPC_UDBG_16550=y 25CONFIG_PPC_UDBG_16550=y
26CONFIG_GENERIC_TBSYNC=y 26# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y 27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 28CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
@@ -39,6 +39,7 @@ CONFIG_PPC_FPU=y
39# CONFIG_PPC_OF_PLATFORM_PCI is not set 39# CONFIG_PPC_OF_PLATFORM_PCI is not set
40CONFIG_ALTIVEC=y 40CONFIG_ALTIVEC=y
41CONFIG_PPC_STD_MMU=y 41CONFIG_PPC_STD_MMU=y
42CONFIG_PPC_MM_SLICES=y
42# CONFIG_VIRT_CPU_ACCOUNTING is not set 43# CONFIG_VIRT_CPU_ACCOUNTING is not set
43CONFIG_SMP=y 44CONFIG_SMP=y
44CONFIG_NR_CPUS=2 45CONFIG_NR_CPUS=2
@@ -59,15 +60,18 @@ CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 60CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
61# CONFIG_IPC_NS is not set 62# CONFIG_IPC_NS is not set
63CONFIG_SYSVIPC_SYSCTL=y
62# CONFIG_POSIX_MQUEUE is not set 64# CONFIG_POSIX_MQUEUE is not set
63# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
65# CONFIG_UTS_NS is not set 67# CONFIG_UTS_NS is not set
66# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=17
68# CONFIG_CPUSETS is not set 71# CONFIG_CPUSETS is not set
69CONFIG_SYSFS_DEPRECATED=y 72CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
74CONFIG_BLK_DEV_INITRD=y
71CONFIG_INITRAMFS_SOURCE="" 75CONFIG_INITRAMFS_SOURCE=""
72# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
73CONFIG_SYSCTL=y 77CONFIG_SYSCTL=y
@@ -82,14 +86,19 @@ CONFIG_BUG=y
82CONFIG_ELF_CORE=y 86CONFIG_ELF_CORE=y
83CONFIG_BASE_FULL=y 87CONFIG_BASE_FULL=y
84CONFIG_FUTEX=y 88CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y
85CONFIG_EPOLL=y 90CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y
86CONFIG_SHMEM=y 94CONFIG_SHMEM=y
87CONFIG_SLAB=y
88CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_SLAB=y
97# CONFIG_SLUB is not set
98# CONFIG_SLOB is not set
89CONFIG_RT_MUTEXES=y 99CONFIG_RT_MUTEXES=y
90# CONFIG_TINY_SHMEM is not set 100# CONFIG_TINY_SHMEM is not set
91CONFIG_BASE_SMALL=0 101CONFIG_BASE_SMALL=0
92# CONFIG_SLOB is not set
93 102
94# 103#
95# Loadable module support 104# Loadable module support
@@ -127,39 +136,38 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
127CONFIG_PPC_MULTIPLATFORM=y 136CONFIG_PPC_MULTIPLATFORM=y
128# CONFIG_EMBEDDED6xx is not set 137# CONFIG_EMBEDDED6xx is not set
129# CONFIG_APUS is not set 138# CONFIG_APUS is not set
130CONFIG_PPC_PSERIES=y 139# CONFIG_PPC_PSERIES is not set
131# CONFIG_PPC_ISERIES is not set 140# CONFIG_PPC_ISERIES is not set
132# CONFIG_PPC_MPC52xx is not set 141# CONFIG_PPC_MPC52xx is not set
142# CONFIG_PPC_MPC5200 is not set
133# CONFIG_PPC_PMAC is not set 143# CONFIG_PPC_PMAC is not set
134# CONFIG_PPC_MAPLE is not set 144# CONFIG_PPC_MAPLE is not set
135CONFIG_PPC_PASEMI=y 145CONFIG_PPC_PASEMI=y
146
147#
148# PA Semi PWRficient options
149#
150CONFIG_PPC_PASEMI_IOMMU=y
151CONFIG_PPC_PASEMI_MDIO=y
152# CONFIG_PPC_CELLEB is not set
153# CONFIG_PPC_PS3 is not set
136# CONFIG_PPC_CELL is not set 154# CONFIG_PPC_CELL is not set
137# CONFIG_PPC_CELL_NATIVE is not set 155# CONFIG_PPC_CELL_NATIVE is not set
138# CONFIG_PPC_IBM_CELL_BLADE is not set 156# CONFIG_PPC_IBM_CELL_BLADE is not set
139# CONFIG_PPC_PS3 is not set 157# CONFIG_PQ2ADS is not set
140CONFIG_PPC_NATIVE=y 158CONFIG_PPC_NATIVE=y
141# CONFIG_UDBG_RTAS_CONSOLE is not set 159CONFIG_MPIC=y
142CONFIG_XICS=y 160# CONFIG_MPIC_WEIRD is not set
161# CONFIG_PPC_I8259 is not set
143# CONFIG_U3_DART is not set 162# CONFIG_U3_DART is not set
144CONFIG_PPC_RTAS=y 163# CONFIG_PPC_RTAS is not set
145CONFIG_RTAS_ERROR_LOGGING=y
146CONFIG_RTAS_PROC=y
147# CONFIG_RTAS_FLASH is not set
148# CONFIG_MMIO_NVRAM is not set 164# CONFIG_MMIO_NVRAM is not set
149CONFIG_IBMVIO=y
150# CONFIG_IBMEBUS is not set
151# CONFIG_PPC_MPC106 is not set 165# CONFIG_PPC_MPC106 is not set
152# CONFIG_PPC_970_NAP is not set 166# CONFIG_PPC_970_NAP is not set
153# CONFIG_PPC_INDIRECT_IO is not set 167# CONFIG_PPC_INDIRECT_IO is not set
154# CONFIG_GENERIC_IOMAP is not set 168# CONFIG_GENERIC_IOMAP is not set
155# CONFIG_CPU_FREQ is not set 169# CONFIG_CPU_FREQ is not set
156# CONFIG_WANT_EARLY_SERIAL is not set 170# CONFIG_CPM2 is not set
157CONFIG_MPIC=y
158
159#
160# PA Semi PWRficient options
161#
162CONFIG_PPC_PASEMI_IOMMU=y
163 171
164# 172#
165# Kernel options 173# Kernel options
@@ -177,20 +185,14 @@ CONFIG_BINFMT_ELF=y
177# CONFIG_BINFMT_MISC is not set 185# CONFIG_BINFMT_MISC is not set
178CONFIG_FORCE_MAX_ZONEORDER=13 186CONFIG_FORCE_MAX_ZONEORDER=13
179CONFIG_IOMMU_VMERGE=y 187CONFIG_IOMMU_VMERGE=y
180# CONFIG_HOTPLUG_CPU is not set
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 188CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
182# CONFIG_KEXEC is not set 189# CONFIG_KEXEC is not set
183# CONFIG_CRASH_DUMP is not set 190# CONFIG_CRASH_DUMP is not set
184# CONFIG_IRQ_ALL_CPUS is not set 191# CONFIG_IRQ_ALL_CPUS is not set
185# CONFIG_PPC_SPLPAR is not set
186CONFIG_EEH=y
187# CONFIG_SCANLOG is not set
188# CONFIG_LPARCFG is not set
189# CONFIG_NUMA is not set 192# CONFIG_NUMA is not set
190CONFIG_ARCH_SELECT_MEMORY_MODEL=y 193CONFIG_ARCH_SELECT_MEMORY_MODEL=y
191CONFIG_ARCH_FLATMEM_ENABLE=y 194CONFIG_ARCH_FLATMEM_ENABLE=y
192CONFIG_ARCH_SPARSEMEM_ENABLE=y 195CONFIG_ARCH_SPARSEMEM_ENABLE=y
193CONFIG_ARCH_SPARSEMEM_DEFAULT=y
194CONFIG_ARCH_POPULATES_NODE_MAP=y 196CONFIG_ARCH_POPULATES_NODE_MAP=y
195CONFIG_SELECT_MEMORY_MODEL=y 197CONFIG_SELECT_MEMORY_MODEL=y
196CONFIG_FLATMEM_MANUAL=y 198CONFIG_FLATMEM_MANUAL=y
@@ -201,24 +203,28 @@ CONFIG_FLAT_NODE_MEM_MAP=y
201# CONFIG_SPARSEMEM_STATIC is not set 203# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4 204CONFIG_SPLIT_PTLOCK_CPUS=4
203CONFIG_RESOURCES_64BIT=y 205CONFIG_RESOURCES_64BIT=y
206CONFIG_ZONE_DMA_FLAG=1
207# CONFIG_PPC_HAS_HASH_64K is not set
204# CONFIG_PPC_64K_PAGES is not set 208# CONFIG_PPC_64K_PAGES is not set
205# CONFIG_SCHED_SMT is not set 209# CONFIG_SCHED_SMT is not set
206CONFIG_PROC_DEVICETREE=y 210CONFIG_PROC_DEVICETREE=y
207# CONFIG_CMDLINE_BOOL is not set 211# CONFIG_CMDLINE_BOOL is not set
208# CONFIG_PM is not set 212# CONFIG_PM is not set
209# CONFIG_SECCOMP is not set 213# CONFIG_SECCOMP is not set
214# CONFIG_WANT_DEVICE_TREE is not set
210CONFIG_ISA_DMA_API=y 215CONFIG_ISA_DMA_API=y
211 216
212# 217#
213# Bus options 218# Bus options
214# 219#
220CONFIG_ZONE_DMA=y
215CONFIG_GENERIC_ISA_DMA=y 221CONFIG_GENERIC_ISA_DMA=y
216# CONFIG_MPIC_WEIRD is not set
217CONFIG_PPC_I8259=y
218# CONFIG_PPC_INDIRECT_PCI is not set 222# CONFIG_PPC_INDIRECT_PCI is not set
219CONFIG_PCI=y 223CONFIG_PCI=y
220CONFIG_PCI_DOMAINS=y 224CONFIG_PCI_DOMAINS=y
221# CONFIG_PCIEPORTBUS is not set 225# CONFIG_PCIEPORTBUS is not set
226CONFIG_ARCH_SUPPORTS_MSI=y
227# CONFIG_PCI_MSI is not set
222# CONFIG_PCI_DEBUG is not set 228# CONFIG_PCI_DEBUG is not set
223 229
224# 230#
@@ -237,10 +243,6 @@ CONFIG_CARDBUS=y
237# CONFIG_YENTA is not set 243# CONFIG_YENTA is not set
238# CONFIG_PD6729 is not set 244# CONFIG_PD6729 is not set
239# CONFIG_I82092 is not set 245# CONFIG_I82092 is not set
240
241#
242# PCI Hotplug Support
243#
244# CONFIG_HOTPLUG_PCI is not set 246# CONFIG_HOTPLUG_PCI is not set
245CONFIG_KERNEL_START=0xc000000000000000 247CONFIG_KERNEL_START=0xc000000000000000
246 248
@@ -252,14 +254,15 @@ CONFIG_NET=y
252# 254#
253# Networking options 255# Networking options
254# 256#
255# CONFIG_NETDEBUG is not set
256CONFIG_PACKET=y 257CONFIG_PACKET=y
257# CONFIG_PACKET_MMAP is not set 258# CONFIG_PACKET_MMAP is not set
258CONFIG_UNIX=y 259CONFIG_UNIX=y
259CONFIG_XFRM=y 260CONFIG_XFRM=y
260# CONFIG_XFRM_USER is not set 261# CONFIG_XFRM_USER is not set
261# CONFIG_XFRM_SUB_POLICY is not set 262# CONFIG_XFRM_SUB_POLICY is not set
263# CONFIG_XFRM_MIGRATE is not set
262CONFIG_NET_KEY=y 264CONFIG_NET_KEY=y
265# CONFIG_NET_KEY_MIGRATE is not set
263CONFIG_INET=y 266CONFIG_INET=y
264CONFIG_IP_MULTICAST=y 267CONFIG_IP_MULTICAST=y
265# CONFIG_IP_ADVANCED_ROUTER is not set 268# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -331,7 +334,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_HAMRADIO is not set 334# CONFIG_HAMRADIO is not set
332# CONFIG_IRDA is not set 335# CONFIG_IRDA is not set
333# CONFIG_BT is not set 336# CONFIG_BT is not set
337# CONFIG_AF_RXRPC is not set
338
339#
340# Wireless
341#
342# CONFIG_CFG80211 is not set
343# CONFIG_WIRELESS_EXT is not set
344# CONFIG_MAC80211 is not set
334# CONFIG_IEEE80211 is not set 345# CONFIG_IEEE80211 is not set
346# CONFIG_RFKILL is not set
335 347
336# 348#
337# Device Drivers 349# Device Drivers
@@ -344,16 +356,13 @@ CONFIG_STANDALONE=y
344CONFIG_PREVENT_FIRMWARE_BUILD=y 356CONFIG_PREVENT_FIRMWARE_BUILD=y
345CONFIG_FW_LOADER=y 357CONFIG_FW_LOADER=y
346# CONFIG_DEBUG_DRIVER is not set 358# CONFIG_DEBUG_DRIVER is not set
359# CONFIG_DEBUG_DEVRES is not set
347# CONFIG_SYS_HYPERVISOR is not set 360# CONFIG_SYS_HYPERVISOR is not set
348 361
349# 362#
350# Connector - unified userspace <-> kernelspace linker 363# Connector - unified userspace <-> kernelspace linker
351# 364#
352# CONFIG_CONNECTOR is not set 365# CONFIG_CONNECTOR is not set
353
354#
355# Memory Technology Devices (MTD)
356#
357CONFIG_MTD=y 366CONFIG_MTD=y
358# CONFIG_MTD_DEBUG is not set 367# CONFIG_MTD_DEBUG is not set
359CONFIG_MTD_CONCAT=y 368CONFIG_MTD_CONCAT=y
@@ -389,7 +398,6 @@ CONFIG_MTD_CFI_I2=y
389# CONFIG_MTD_RAM is not set 398# CONFIG_MTD_RAM is not set
390# CONFIG_MTD_ROM is not set 399# CONFIG_MTD_ROM is not set
391# CONFIG_MTD_ABSENT is not set 400# CONFIG_MTD_ABSENT is not set
392# CONFIG_MTD_OBSOLETE_CHIPS is not set
393 401
394# 402#
395# Mapping drivers for chip access 403# Mapping drivers for chip access
@@ -412,17 +420,13 @@ CONFIG_MTD_PHRAM=y
412# CONFIG_MTD_DOC2000 is not set 420# CONFIG_MTD_DOC2000 is not set
413# CONFIG_MTD_DOC2001 is not set 421# CONFIG_MTD_DOC2001 is not set
414# CONFIG_MTD_DOC2001PLUS is not set 422# CONFIG_MTD_DOC2001PLUS is not set
415
416#
417# NAND Flash Device Drivers
418#
419# CONFIG_MTD_NAND is not set 423# CONFIG_MTD_NAND is not set
420# CONFIG_MTD_NAND_CAFE is not set 424# CONFIG_MTD_ONENAND is not set
421 425
422# 426#
423# OneNAND Flash Device Drivers 427# UBI - Unsorted block images
424# 428#
425# CONFIG_MTD_ONENAND is not set 429# CONFIG_MTD_UBI is not set
426 430
427# 431#
428# Parallel port support 432# Parallel port support
@@ -432,6 +436,7 @@ CONFIG_MTD_PHRAM=y
432# 436#
433# Plug and Play support 437# Plug and Play support
434# 438#
439# CONFIG_PNPACPI is not set
435 440
436# 441#
437# Block devices 442# Block devices
@@ -451,15 +456,16 @@ CONFIG_BLK_DEV_RAM=y
451CONFIG_BLK_DEV_RAM_COUNT=16 456CONFIG_BLK_DEV_RAM_COUNT=16
452CONFIG_BLK_DEV_RAM_SIZE=16384 457CONFIG_BLK_DEV_RAM_SIZE=16384
453CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 458CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
454CONFIG_BLK_DEV_INITRD=y
455# CONFIG_CDROM_PKTCDVD is not set 459# CONFIG_CDROM_PKTCDVD is not set
456# CONFIG_ATA_OVER_ETH is not set 460# CONFIG_ATA_OVER_ETH is not set
457 461
458# 462#
459# Misc devices 463# Misc devices
460# 464#
465# CONFIG_PHANTOM is not set
461# CONFIG_SGI_IOC4 is not set 466# CONFIG_SGI_IOC4 is not set
462# CONFIG_TIFM_CORE is not set 467# CONFIG_TIFM_CORE is not set
468# CONFIG_BLINK is not set
463 469
464# 470#
465# ATA/ATAPI/MFM/RLL support 471# ATA/ATAPI/MFM/RLL support
@@ -474,20 +480,22 @@ CONFIG_BLK_DEV_IDE=y
474CONFIG_BLK_DEV_IDEDISK=y 480CONFIG_BLK_DEV_IDEDISK=y
475CONFIG_IDEDISK_MULTI_MODE=y 481CONFIG_IDEDISK_MULTI_MODE=y
476# CONFIG_BLK_DEV_IDECS is not set 482# CONFIG_BLK_DEV_IDECS is not set
483# CONFIG_BLK_DEV_DELKIN is not set
477CONFIG_BLK_DEV_IDECD=y 484CONFIG_BLK_DEV_IDECD=y
478# CONFIG_BLK_DEV_IDETAPE is not set 485# CONFIG_BLK_DEV_IDETAPE is not set
479# CONFIG_BLK_DEV_IDEFLOPPY is not set 486# CONFIG_BLK_DEV_IDEFLOPPY is not set
480CONFIG_BLK_DEV_IDESCSI=y 487CONFIG_BLK_DEV_IDESCSI=y
481CONFIG_IDE_TASK_IOCTL=y 488CONFIG_IDE_TASK_IOCTL=y
489CONFIG_IDE_PROC_FS=y
482 490
483# 491#
484# IDE chipset support/bugfixes 492# IDE chipset support/bugfixes
485# 493#
486# CONFIG_IDE_GENERIC is not set 494# CONFIG_IDE_GENERIC is not set
487# CONFIG_BLK_DEV_IDEPCI is not set 495# CONFIG_BLK_DEV_IDEPCI is not set
496# CONFIG_IDEPCI_PCIBUS_ORDER is not set
488# CONFIG_IDE_ARM is not set 497# CONFIG_IDE_ARM is not set
489# CONFIG_BLK_DEV_IDEDMA is not set 498# CONFIG_BLK_DEV_IDEDMA is not set
490# CONFIG_IDEDMA_AUTO is not set
491# CONFIG_BLK_DEV_HD is not set 499# CONFIG_BLK_DEV_HD is not set
492 500
493# 501#
@@ -517,6 +525,7 @@ CONFIG_SCSI_MULTI_LUN=y
517CONFIG_SCSI_CONSTANTS=y 525CONFIG_SCSI_CONSTANTS=y
518CONFIG_SCSI_LOGGING=y 526CONFIG_SCSI_LOGGING=y
519# CONFIG_SCSI_SCAN_ASYNC is not set 527# CONFIG_SCSI_SCAN_ASYNC is not set
528CONFIG_SCSI_WAIT_SCAN=m
520 529
521# 530#
522# SCSI Transports 531# SCSI Transports
@@ -550,7 +559,6 @@ CONFIG_SCSI_3W_9XXX=y
550# CONFIG_SCSI_FUTURE_DOMAIN is not set 559# CONFIG_SCSI_FUTURE_DOMAIN is not set
551# CONFIG_SCSI_GDTH is not set 560# CONFIG_SCSI_GDTH is not set
552# CONFIG_SCSI_IPS is not set 561# CONFIG_SCSI_IPS is not set
553# CONFIG_SCSI_IBMVSCSI is not set
554# CONFIG_SCSI_INITIO is not set 562# CONFIG_SCSI_INITIO is not set
555# CONFIG_SCSI_INIA100 is not set 563# CONFIG_SCSI_INIA100 is not set
556# CONFIG_SCSI_STEX is not set 564# CONFIG_SCSI_STEX is not set
@@ -563,6 +571,7 @@ CONFIG_SCSI_3W_9XXX=y
563# CONFIG_SCSI_DC395x is not set 571# CONFIG_SCSI_DC395x is not set
564# CONFIG_SCSI_DC390T is not set 572# CONFIG_SCSI_DC390T is not set
565# CONFIG_SCSI_DEBUG is not set 573# CONFIG_SCSI_DEBUG is not set
574# CONFIG_SCSI_ESP_CORE is not set
566# CONFIG_SCSI_SRP is not set 575# CONFIG_SCSI_SRP is not set
567 576
568# 577#
@@ -578,7 +587,7 @@ CONFIG_SCSI_3W_9XXX=y
578CONFIG_ATA=y 587CONFIG_ATA=y
579# CONFIG_ATA_NONSTANDARD is not set 588# CONFIG_ATA_NONSTANDARD is not set
580# CONFIG_SATA_AHCI is not set 589# CONFIG_SATA_AHCI is not set
581CONFIG_SATA_SVW=y 590# CONFIG_SATA_SVW is not set
582# CONFIG_ATA_PIIX is not set 591# CONFIG_ATA_PIIX is not set
583CONFIG_SATA_MV=y 592CONFIG_SATA_MV=y
584# CONFIG_SATA_NV is not set 593# CONFIG_SATA_NV is not set
@@ -586,16 +595,18 @@ CONFIG_SATA_MV=y
586# CONFIG_SATA_QSTOR is not set 595# CONFIG_SATA_QSTOR is not set
587# CONFIG_SATA_PROMISE is not set 596# CONFIG_SATA_PROMISE is not set
588# CONFIG_SATA_SX4 is not set 597# CONFIG_SATA_SX4 is not set
589CONFIG_SATA_SIL=y 598# CONFIG_SATA_SIL is not set
590CONFIG_SATA_SIL24=y 599CONFIG_SATA_SIL24=y
591# CONFIG_SATA_SIS is not set 600# CONFIG_SATA_SIS is not set
592# CONFIG_SATA_ULI is not set 601# CONFIG_SATA_ULI is not set
593# CONFIG_SATA_VIA is not set 602# CONFIG_SATA_VIA is not set
594# CONFIG_SATA_VITESSE is not set 603# CONFIG_SATA_VITESSE is not set
604# CONFIG_SATA_INIC162X is not set
595# CONFIG_PATA_ALI is not set 605# CONFIG_PATA_ALI is not set
596# CONFIG_PATA_AMD is not set 606# CONFIG_PATA_AMD is not set
597# CONFIG_PATA_ARTOP is not set 607# CONFIG_PATA_ARTOP is not set
598# CONFIG_PATA_ATIIXP is not set 608# CONFIG_PATA_ATIIXP is not set
609# CONFIG_PATA_CMD640_PCI is not set
599# CONFIG_PATA_CMD64X is not set 610# CONFIG_PATA_CMD64X is not set
600# CONFIG_PATA_CS5520 is not set 611# CONFIG_PATA_CS5520 is not set
601# CONFIG_PATA_CS5530 is not set 612# CONFIG_PATA_CS5530 is not set
@@ -607,6 +618,7 @@ CONFIG_ATA_GENERIC=y
607# CONFIG_PATA_HPT3X2N is not set 618# CONFIG_PATA_HPT3X2N is not set
608# CONFIG_PATA_HPT3X3 is not set 619# CONFIG_PATA_HPT3X3 is not set
609# CONFIG_PATA_IT821X is not set 620# CONFIG_PATA_IT821X is not set
621# CONFIG_PATA_IT8213 is not set
610# CONFIG_PATA_JMICRON is not set 622# CONFIG_PATA_JMICRON is not set
611# CONFIG_PATA_TRIFLEX is not set 623# CONFIG_PATA_TRIFLEX is not set
612# CONFIG_PATA_MARVELL is not set 624# CONFIG_PATA_MARVELL is not set
@@ -644,27 +656,26 @@ CONFIG_ATA_GENERIC=y
644# 656#
645# IEEE 1394 (FireWire) support 657# IEEE 1394 (FireWire) support
646# 658#
659# CONFIG_FIREWIRE is not set
647CONFIG_IEEE1394=y 660CONFIG_IEEE1394=y
648 661
649# 662#
650# Subsystem Options 663# Subsystem Options
651# 664#
652# CONFIG_IEEE1394_VERBOSEDEBUG is not set 665# CONFIG_IEEE1394_VERBOSEDEBUG is not set
653# CONFIG_IEEE1394_OUI_DB is not set
654# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
655# CONFIG_IEEE1394_EXPORT_FULL_API is not set
656 666
657# 667#
658# Device Drivers 668# Controllers
659# 669#
660CONFIG_IEEE1394_PCILYNX=y 670CONFIG_IEEE1394_PCILYNX=y
661CONFIG_IEEE1394_OHCI1394=y 671CONFIG_IEEE1394_OHCI1394=y
662 672
663# 673#
664# Protocol Drivers 674# Protocols
665# 675#
666# CONFIG_IEEE1394_VIDEO1394 is not set 676# CONFIG_IEEE1394_VIDEO1394 is not set
667CONFIG_IEEE1394_SBP2=y 677CONFIG_IEEE1394_SBP2=y
678# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
668# CONFIG_IEEE1394_ETH1394 is not set 679# CONFIG_IEEE1394_ETH1394 is not set
669# CONFIG_IEEE1394_DV1394 is not set 680# CONFIG_IEEE1394_DV1394 is not set
670CONFIG_IEEE1394_RAWIO=y 681CONFIG_IEEE1394_RAWIO=y
@@ -673,12 +684,7 @@ CONFIG_IEEE1394_RAWIO=y
673# I2O device support 684# I2O device support
674# 685#
675# CONFIG_I2O is not set 686# CONFIG_I2O is not set
676 687# CONFIG_MACINTOSH_DRIVERS is not set
677#
678# Macintosh device drivers
679#
680# CONFIG_MAC_EMUMOUSEBTN is not set
681# CONFIG_WINDFARM is not set
682 688
683# 689#
684# Network device support 690# Network device support
@@ -697,7 +703,20 @@ CONFIG_DUMMY=y
697# 703#
698# PHY device support 704# PHY device support
699# 705#
700# CONFIG_PHYLIB is not set 706CONFIG_PHYLIB=y
707
708#
709# MII PHY device drivers
710#
711CONFIG_MARVELL_PHY=y
712# CONFIG_DAVICOM_PHY is not set
713# CONFIG_QSEMI_PHY is not set
714# CONFIG_LXT_PHY is not set
715# CONFIG_CICADA_PHY is not set
716# CONFIG_VITESSE_PHY is not set
717# CONFIG_SMSC_PHY is not set
718# CONFIG_BROADCOM_PHY is not set
719# CONFIG_FIXED_PHY is not set
701 720
702# 721#
703# Ethernet (10 or 100Mbit) 722# Ethernet (10 or 100Mbit)
@@ -714,7 +733,6 @@ CONFIG_MII=y
714# 733#
715# CONFIG_NET_TULIP is not set 734# CONFIG_NET_TULIP is not set
716# CONFIG_HP100 is not set 735# CONFIG_HP100 is not set
717CONFIG_IBMVETH=y
718CONFIG_NET_PCI=y 736CONFIG_NET_PCI=y
719# CONFIG_PCNET32 is not set 737# CONFIG_PCNET32 is not set
720# CONFIG_AMD8111_ETH is not set 738# CONFIG_AMD8111_ETH is not set
@@ -722,7 +740,7 @@ CONFIG_NET_PCI=y
722# CONFIG_B44 is not set 740# CONFIG_B44 is not set
723# CONFIG_FORCEDETH is not set 741# CONFIG_FORCEDETH is not set
724# CONFIG_DGRS is not set 742# CONFIG_DGRS is not set
725CONFIG_EEPRO100=y 743# CONFIG_EEPRO100 is not set
726# CONFIG_E100 is not set 744# CONFIG_E100 is not set
727# CONFIG_FEALNX is not set 745# CONFIG_FEALNX is not set
728# CONFIG_NATSEMI is not set 746# CONFIG_NATSEMI is not set
@@ -733,6 +751,7 @@ CONFIG_EEPRO100=y
733# CONFIG_EPIC100 is not set 751# CONFIG_EPIC100 is not set
734# CONFIG_SUNDANCE is not set 752# CONFIG_SUNDANCE is not set
735# CONFIG_VIA_RHINE is not set 753# CONFIG_VIA_RHINE is not set
754# CONFIG_SC92031 is not set
736 755
737# 756#
738# Ethernet (1000 Mbit) 757# Ethernet (1000 Mbit)
@@ -754,15 +773,20 @@ CONFIG_E1000_NAPI=y
754CONFIG_TIGON3=y 773CONFIG_TIGON3=y
755# CONFIG_BNX2 is not set 774# CONFIG_BNX2 is not set
756# CONFIG_QLA3XXX is not set 775# CONFIG_QLA3XXX is not set
776# CONFIG_ATL1 is not set
757 777
758# 778#
759# Ethernet (10000 Mbit) 779# Ethernet (10000 Mbit)
760# 780#
761# CONFIG_CHELSIO_T1 is not set 781# CONFIG_CHELSIO_T1 is not set
782# CONFIG_CHELSIO_T3 is not set
762# CONFIG_IXGB is not set 783# CONFIG_IXGB is not set
763# CONFIG_S2IO is not set 784# CONFIG_S2IO is not set
764# CONFIG_MYRI10GE is not set 785# CONFIG_MYRI10GE is not set
765# CONFIG_NETXEN_NIC is not set 786# CONFIG_NETXEN_NIC is not set
787CONFIG_PASEMI_MAC=y
788# CONFIG_MLX4_CORE is not set
789CONFIG_MLX4_DEBUG=y
766 790
767# 791#
768# Token Ring devices 792# Token Ring devices
@@ -770,9 +794,20 @@ CONFIG_TIGON3=y
770# CONFIG_TR is not set 794# CONFIG_TR is not set
771 795
772# 796#
773# Wireless LAN (non-hamradio) 797# Wireless LAN
798#
799# CONFIG_WLAN_PRE80211 is not set
800# CONFIG_WLAN_80211 is not set
801
802#
803# USB Network Adapters
774# 804#
775# CONFIG_NET_RADIO is not set 805# CONFIG_USB_CATC is not set
806# CONFIG_USB_KAWETH is not set
807# CONFIG_USB_PEGASUS is not set
808# CONFIG_USB_RTL8150 is not set
809# CONFIG_USB_USBNET_MII is not set
810# CONFIG_USB_USBNET is not set
776 811
777# 812#
778# PCMCIA network device support 813# PCMCIA network device support
@@ -834,8 +869,10 @@ CONFIG_INPUT_KEYBOARD=y
834CONFIG_INPUT_MOUSE=y 869CONFIG_INPUT_MOUSE=y
835# CONFIG_MOUSE_PS2 is not set 870# CONFIG_MOUSE_PS2 is not set
836# CONFIG_MOUSE_SERIAL is not set 871# CONFIG_MOUSE_SERIAL is not set
872# CONFIG_MOUSE_APPLETOUCH is not set
837# CONFIG_MOUSE_VSXXXAA is not set 873# CONFIG_MOUSE_VSXXXAA is not set
838# CONFIG_INPUT_JOYSTICK is not set 874# CONFIG_INPUT_JOYSTICK is not set
875# CONFIG_INPUT_TABLET is not set
839# CONFIG_INPUT_TOUCHSCREEN is not set 876# CONFIG_INPUT_TOUCHSCREEN is not set
840# CONFIG_INPUT_MISC is not set 877# CONFIG_INPUT_MISC is not set
841 878
@@ -870,29 +907,21 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
870# 907#
871CONFIG_SERIAL_CORE=y 908CONFIG_SERIAL_CORE=y
872CONFIG_SERIAL_CORE_CONSOLE=y 909CONFIG_SERIAL_CORE_CONSOLE=y
873# CONFIG_SERIAL_ICOM is not set
874# CONFIG_SERIAL_JSM is not set 910# CONFIG_SERIAL_JSM is not set
911# CONFIG_SERIAL_OF_PLATFORM is not set
875CONFIG_UNIX98_PTYS=y 912CONFIG_UNIX98_PTYS=y
876CONFIG_LEGACY_PTYS=y 913CONFIG_LEGACY_PTYS=y
877CONFIG_LEGACY_PTY_COUNT=4 914CONFIG_LEGACY_PTY_COUNT=4
878CONFIG_HVC_DRIVER=y
879CONFIG_HVC_CONSOLE=y
880CONFIG_HVC_RTAS=y
881# CONFIG_HVCS is not set
882 915
883# 916#
884# IPMI 917# IPMI
885# 918#
886# CONFIG_IPMI_HANDLER is not set 919# CONFIG_IPMI_HANDLER is not set
887
888#
889# Watchdog Cards
890#
891# CONFIG_WATCHDOG is not set 920# CONFIG_WATCHDOG is not set
892CONFIG_HW_RANDOM=y 921CONFIG_HW_RANDOM=y
922CONFIG_HW_RANDOM_PASEMI=y
893CONFIG_GEN_RTC=y 923CONFIG_GEN_RTC=y
894CONFIG_GEN_RTC_X=y 924CONFIG_GEN_RTC_X=y
895# CONFIG_DTLK is not set
896# CONFIG_R3964 is not set 925# CONFIG_R3964 is not set
897# CONFIG_APPLICOM is not set 926# CONFIG_APPLICOM is not set
898# CONFIG_AGP is not set 927# CONFIG_AGP is not set
@@ -912,11 +941,9 @@ CONFIG_MAX_RAW_DEVS=256
912# TPM devices 941# TPM devices
913# 942#
914# CONFIG_TCG_TPM is not set 943# CONFIG_TCG_TPM is not set
915 944CONFIG_DEVPORT=y
916#
917# I2C support
918#
919CONFIG_I2C=y 945CONFIG_I2C=y
946CONFIG_I2C_BOARDINFO=y
920CONFIG_I2C_CHARDEV=y 947CONFIG_I2C_CHARDEV=y
921 948
922# 949#
@@ -940,16 +967,18 @@ CONFIG_I2C_ALGOPCA=y
940# CONFIG_I2C_NFORCE2 is not set 967# CONFIG_I2C_NFORCE2 is not set
941# CONFIG_I2C_OCORES is not set 968# CONFIG_I2C_OCORES is not set
942# CONFIG_I2C_PARPORT_LIGHT is not set 969# CONFIG_I2C_PARPORT_LIGHT is not set
970CONFIG_I2C_PASEMI=y
943# CONFIG_I2C_PROSAVAGE is not set 971# CONFIG_I2C_PROSAVAGE is not set
944# CONFIG_I2C_SAVAGE4 is not set 972# CONFIG_I2C_SAVAGE4 is not set
973# CONFIG_I2C_SIMTEC is not set
945# CONFIG_I2C_SIS5595 is not set 974# CONFIG_I2C_SIS5595 is not set
946# CONFIG_I2C_SIS630 is not set 975# CONFIG_I2C_SIS630 is not set
947# CONFIG_I2C_SIS96X is not set 976# CONFIG_I2C_SIS96X is not set
948# CONFIG_I2C_STUB is not set 977# CONFIG_I2C_STUB is not set
978# CONFIG_I2C_TINY_USB is not set
949# CONFIG_I2C_VIA is not set 979# CONFIG_I2C_VIA is not set
950# CONFIG_I2C_VIAPRO is not set 980# CONFIG_I2C_VIAPRO is not set
951# CONFIG_I2C_VOODOO3 is not set 981# CONFIG_I2C_VOODOO3 is not set
952# CONFIG_I2C_PCA_ISA is not set
953 982
954# 983#
955# Miscellaneous I2C Chip support 984# Miscellaneous I2C Chip support
@@ -963,7 +992,7 @@ CONFIG_SENSORS_EEPROM=y
963# CONFIG_SENSORS_MAX6875 is not set 992# CONFIG_SENSORS_MAX6875 is not set
964# CONFIG_I2C_DEBUG_CORE is not set 993# CONFIG_I2C_DEBUG_CORE is not set
965# CONFIG_I2C_DEBUG_ALGO is not set 994# CONFIG_I2C_DEBUG_ALGO is not set
966CONFIG_I2C_DEBUG_BUS=y 995# CONFIG_I2C_DEBUG_BUS is not set
967# CONFIG_I2C_DEBUG_CHIP is not set 996# CONFIG_I2C_DEBUG_CHIP is not set
968 997
969# 998#
@@ -976,16 +1005,14 @@ CONFIG_I2C_DEBUG_BUS=y
976# Dallas's 1-wire bus 1005# Dallas's 1-wire bus
977# 1006#
978# CONFIG_W1 is not set 1007# CONFIG_W1 is not set
979
980#
981# Hardware Monitoring support
982#
983CONFIG_HWMON=y 1008CONFIG_HWMON=y
984CONFIG_HWMON_VID=y 1009CONFIG_HWMON_VID=y
985# CONFIG_SENSORS_ABITUGURU is not set 1010# CONFIG_SENSORS_ABITUGURU is not set
1011# CONFIG_SENSORS_AD7418 is not set
986# CONFIG_SENSORS_ADM1021 is not set 1012# CONFIG_SENSORS_ADM1021 is not set
987# CONFIG_SENSORS_ADM1025 is not set 1013# CONFIG_SENSORS_ADM1025 is not set
988# CONFIG_SENSORS_ADM1026 is not set 1014# CONFIG_SENSORS_ADM1026 is not set
1015# CONFIG_SENSORS_ADM1029 is not set
989# CONFIG_SENSORS_ADM1031 is not set 1016# CONFIG_SENSORS_ADM1031 is not set
990# CONFIG_SENSORS_ADM9240 is not set 1017# CONFIG_SENSORS_ADM9240 is not set
991# CONFIG_SENSORS_ASB100 is not set 1018# CONFIG_SENSORS_ASB100 is not set
@@ -1008,6 +1035,7 @@ CONFIG_SENSORS_LM85=y
1008CONFIG_SENSORS_LM90=y 1035CONFIG_SENSORS_LM90=y
1009# CONFIG_SENSORS_LM92 is not set 1036# CONFIG_SENSORS_LM92 is not set
1010# CONFIG_SENSORS_MAX1619 is not set 1037# CONFIG_SENSORS_MAX1619 is not set
1038# CONFIG_SENSORS_MAX6650 is not set
1011# CONFIG_SENSORS_PC87360 is not set 1039# CONFIG_SENSORS_PC87360 is not set
1012# CONFIG_SENSORS_PC87427 is not set 1040# CONFIG_SENSORS_PC87427 is not set
1013# CONFIG_SENSORS_SIS5595 is not set 1041# CONFIG_SENSORS_SIS5595 is not set
@@ -1027,29 +1055,50 @@ CONFIG_SENSORS_LM90=y
1027# CONFIG_HWMON_DEBUG_CHIP is not set 1055# CONFIG_HWMON_DEBUG_CHIP is not set
1028 1056
1029# 1057#
1030# Multimedia devices 1058# Multifunction device drivers
1031# 1059#
1032# CONFIG_VIDEO_DEV is not set 1060# CONFIG_MFD_SM501 is not set
1033 1061
1034# 1062#
1035# Digital Video Broadcasting Devices 1063# Multimedia devices
1036# 1064#
1037# CONFIG_DVB is not set 1065# CONFIG_VIDEO_DEV is not set
1066# CONFIG_DVB_CORE is not set
1067CONFIG_DAB=y
1038# CONFIG_USB_DABUSB is not set 1068# CONFIG_USB_DABUSB is not set
1039 1069
1040# 1070#
1041# Graphics support 1071# Graphics support
1042# 1072#
1043CONFIG_FIRMWARE_EDID=y 1073CONFIG_BACKLIGHT_LCD_SUPPORT=y
1074CONFIG_BACKLIGHT_CLASS_DEVICE=y
1075CONFIG_LCD_CLASS_DEVICE=m
1076
1077#
1078# Display device support
1079#
1080# CONFIG_DISPLAY_SUPPORT is not set
1081CONFIG_VGASTATE=y
1044CONFIG_FB=y 1082CONFIG_FB=y
1083CONFIG_FIRMWARE_EDID=y
1045CONFIG_FB_DDC=y 1084CONFIG_FB_DDC=y
1046CONFIG_FB_CFB_FILLRECT=y 1085CONFIG_FB_CFB_FILLRECT=y
1047CONFIG_FB_CFB_COPYAREA=y 1086CONFIG_FB_CFB_COPYAREA=y
1048CONFIG_FB_CFB_IMAGEBLIT=y 1087CONFIG_FB_CFB_IMAGEBLIT=y
1088# CONFIG_FB_SYS_FILLRECT is not set
1089# CONFIG_FB_SYS_COPYAREA is not set
1090# CONFIG_FB_SYS_IMAGEBLIT is not set
1091# CONFIG_FB_SYS_FOPS is not set
1092CONFIG_FB_DEFERRED_IO=y
1093# CONFIG_FB_SVGALIB is not set
1049CONFIG_FB_MACMODES=y 1094CONFIG_FB_MACMODES=y
1050# CONFIG_FB_BACKLIGHT is not set 1095CONFIG_FB_BACKLIGHT=y
1051CONFIG_FB_MODE_HELPERS=y 1096CONFIG_FB_MODE_HELPERS=y
1052CONFIG_FB_TILEBLITTING=y 1097CONFIG_FB_TILEBLITTING=y
1098
1099#
1100# Frame buffer hardware drivers
1101#
1053# CONFIG_FB_CIRRUS is not set 1102# CONFIG_FB_CIRRUS is not set
1054# CONFIG_FB_PM2 is not set 1103# CONFIG_FB_PM2 is not set
1055# CONFIG_FB_CYBER2000 is not set 1104# CONFIG_FB_CYBER2000 is not set
@@ -1060,28 +1109,27 @@ CONFIG_FB_VGA16=y
1060# CONFIG_FB_S1D13XXX is not set 1109# CONFIG_FB_S1D13XXX is not set
1061CONFIG_FB_NVIDIA=y 1110CONFIG_FB_NVIDIA=y
1062CONFIG_FB_NVIDIA_I2C=y 1111CONFIG_FB_NVIDIA_I2C=y
1063CONFIG_FB_RIVA=y 1112# CONFIG_FB_NVIDIA_DEBUG is not set
1064CONFIG_FB_RIVA_I2C=y 1113CONFIG_FB_NVIDIA_BACKLIGHT=y
1065# CONFIG_FB_RIVA_DEBUG is not set 1114# CONFIG_FB_RIVA is not set
1066CONFIG_FB_MATROX=y 1115# CONFIG_FB_MATROX is not set
1067CONFIG_FB_MATROX_MILLENIUM=y
1068CONFIG_FB_MATROX_MYSTIQUE=y
1069CONFIG_FB_MATROX_G=y
1070CONFIG_FB_MATROX_I2C=y
1071CONFIG_FB_MATROX_MAVEN=y
1072CONFIG_FB_MATROX_MULTIHEAD=y
1073CONFIG_FB_RADEON=y 1116CONFIG_FB_RADEON=y
1074CONFIG_FB_RADEON_I2C=y 1117CONFIG_FB_RADEON_I2C=y
1118CONFIG_FB_RADEON_BACKLIGHT=y
1075# CONFIG_FB_RADEON_DEBUG is not set 1119# CONFIG_FB_RADEON_DEBUG is not set
1076# CONFIG_FB_ATY128 is not set 1120# CONFIG_FB_ATY128 is not set
1077# CONFIG_FB_ATY is not set 1121# CONFIG_FB_ATY is not set
1122# CONFIG_FB_S3 is not set
1078# CONFIG_FB_SAVAGE is not set 1123# CONFIG_FB_SAVAGE is not set
1079# CONFIG_FB_SIS is not set 1124# CONFIG_FB_SIS is not set
1080# CONFIG_FB_NEOMAGIC is not set 1125# CONFIG_FB_NEOMAGIC is not set
1081# CONFIG_FB_KYRO is not set 1126# CONFIG_FB_KYRO is not set
1082# CONFIG_FB_3DFX is not set 1127# CONFIG_FB_3DFX is not set
1083# CONFIG_FB_VOODOO1 is not set 1128# CONFIG_FB_VOODOO1 is not set
1129# CONFIG_FB_VT8623 is not set
1084# CONFIG_FB_TRIDENT is not set 1130# CONFIG_FB_TRIDENT is not set
1131# CONFIG_FB_ARK is not set
1132# CONFIG_FB_PM3 is not set
1085# CONFIG_FB_IBM_GXT4500 is not set 1133# CONFIG_FB_IBM_GXT4500 is not set
1086# CONFIG_FB_VIRTUAL is not set 1134# CONFIG_FB_VIRTUAL is not set
1087 1135
@@ -1097,15 +1145,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
1097# CONFIG_FONTS is not set 1145# CONFIG_FONTS is not set
1098CONFIG_FONT_8x8=y 1146CONFIG_FONT_8x8=y
1099CONFIG_FONT_8x16=y 1147CONFIG_FONT_8x16=y
1100
1101#
1102# Logo configuration
1103#
1104CONFIG_LOGO=y 1148CONFIG_LOGO=y
1105CONFIG_LOGO_LINUX_MONO=y 1149CONFIG_LOGO_LINUX_MONO=y
1106CONFIG_LOGO_LINUX_VGA16=y 1150CONFIG_LOGO_LINUX_VGA16=y
1107CONFIG_LOGO_LINUX_CLUT224=y 1151CONFIG_LOGO_LINUX_CLUT224=y
1108# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1109 1152
1110# 1153#
1111# Sound 1154# Sound
@@ -1211,6 +1254,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1211# 1254#
1212CONFIG_SND_USB_AUDIO=y 1255CONFIG_SND_USB_AUDIO=y
1213CONFIG_SND_USB_USX2Y=y 1256CONFIG_SND_USB_USX2Y=y
1257# CONFIG_SND_USB_CAIAQ is not set
1214 1258
1215# 1259#
1216# PCMCIA devices 1260# PCMCIA devices
@@ -1219,6 +1263,11 @@ CONFIG_SND_USB_USX2Y=y
1219# CONFIG_SND_PDAUDIOCF is not set 1263# CONFIG_SND_PDAUDIOCF is not set
1220 1264
1221# 1265#
1266# System on Chip audio support
1267#
1268# CONFIG_SND_SOC is not set
1269
1270#
1222# Open Sound System 1271# Open Sound System
1223# 1272#
1224# CONFIG_SOUND_PRIME is not set 1273# CONFIG_SOUND_PRIME is not set
@@ -1227,6 +1276,15 @@ CONFIG_SND_USB_USX2Y=y
1227# HID Devices 1276# HID Devices
1228# 1277#
1229CONFIG_HID=y 1278CONFIG_HID=y
1279# CONFIG_HID_DEBUG is not set
1280
1281#
1282# USB Input Devices
1283#
1284CONFIG_USB_HID=y
1285# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1286# CONFIG_HID_FF is not set
1287# CONFIG_USB_HIDDEV is not set
1230 1288
1231# 1289#
1232# USB support 1290# USB support
@@ -1241,7 +1299,7 @@ CONFIG_USB=y
1241# Miscellaneous USB options 1299# Miscellaneous USB options
1242# 1300#
1243CONFIG_USB_DEVICEFS=y 1301CONFIG_USB_DEVICEFS=y
1244# CONFIG_USB_BANDWIDTH is not set 1302# CONFIG_USB_DEVICE_CLASS is not set
1245# CONFIG_USB_DYNAMIC_MINORS is not set 1303# CONFIG_USB_DYNAMIC_MINORS is not set
1246# CONFIG_USB_OTG is not set 1304# CONFIG_USB_OTG is not set
1247 1305
@@ -1252,9 +1310,15 @@ CONFIG_USB_EHCI_HCD=y
1252# CONFIG_USB_EHCI_SPLIT_ISO is not set 1310# CONFIG_USB_EHCI_SPLIT_ISO is not set
1253# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1311# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1254# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1312# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1313# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1255# CONFIG_USB_ISP116X_HCD is not set 1314# CONFIG_USB_ISP116X_HCD is not set
1256CONFIG_USB_OHCI_HCD=y 1315CONFIG_USB_OHCI_HCD=y
1257# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1316CONFIG_USB_OHCI_HCD_PPC_OF=y
1317CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1318# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
1319CONFIG_USB_OHCI_HCD_PCI=y
1320CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1321CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1258CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1322CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1259CONFIG_USB_UHCI_HCD=y 1323CONFIG_USB_UHCI_HCD=y
1260CONFIG_USB_SL811_HCD=y 1324CONFIG_USB_SL811_HCD=y
@@ -1289,41 +1353,11 @@ CONFIG_USB_STORAGE=y
1289CONFIG_USB_LIBUSUAL=y 1353CONFIG_USB_LIBUSUAL=y
1290 1354
1291# 1355#
1292# USB Input Devices
1293#
1294CONFIG_USB_HID=y
1295# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1296# CONFIG_HID_FF is not set
1297# CONFIG_USB_HIDDEV is not set
1298# CONFIG_USB_AIPTEK is not set
1299# CONFIG_USB_WACOM is not set
1300# CONFIG_USB_ACECAD is not set
1301# CONFIG_USB_KBTAB is not set
1302# CONFIG_USB_POWERMATE is not set
1303# CONFIG_USB_TOUCHSCREEN is not set
1304# CONFIG_USB_YEALINK is not set
1305# CONFIG_USB_XPAD is not set
1306# CONFIG_USB_ATI_REMOTE is not set
1307# CONFIG_USB_ATI_REMOTE2 is not set
1308# CONFIG_USB_KEYSPAN_REMOTE is not set
1309# CONFIG_USB_APPLETOUCH is not set
1310
1311#
1312# USB Imaging devices 1356# USB Imaging devices
1313# 1357#
1314# CONFIG_USB_MDC800 is not set 1358# CONFIG_USB_MDC800 is not set
1315# CONFIG_USB_MICROTEK is not set 1359# CONFIG_USB_MICROTEK is not set
1316 1360# CONFIG_USB_MON is not set
1317#
1318# USB Network Adapters
1319#
1320# CONFIG_USB_CATC is not set
1321# CONFIG_USB_KAWETH is not set
1322# CONFIG_USB_PEGASUS is not set
1323# CONFIG_USB_RTL8150 is not set
1324# CONFIG_USB_USBNET_MII is not set
1325# CONFIG_USB_USBNET is not set
1326CONFIG_USB_MON=y
1327 1361
1328# 1362#
1329# USB port drivers 1363# USB port drivers
@@ -1344,6 +1378,7 @@ CONFIG_USB_MON=y
1344# CONFIG_USB_RIO500 is not set 1378# CONFIG_USB_RIO500 is not set
1345# CONFIG_USB_LEGOTOWER is not set 1379# CONFIG_USB_LEGOTOWER is not set
1346# CONFIG_USB_LCD is not set 1380# CONFIG_USB_LCD is not set
1381# CONFIG_USB_BERRY_CHARGE is not set
1347# CONFIG_USB_LED is not set 1382# CONFIG_USB_LED is not set
1348# CONFIG_USB_CYPRESS_CY7C63 is not set 1383# CONFIG_USB_CYPRESS_CY7C63 is not set
1349# CONFIG_USB_CYTHERM is not set 1384# CONFIG_USB_CYTHERM is not set
@@ -1354,6 +1389,7 @@ CONFIG_USB_MON=y
1354# CONFIG_USB_SISUSBVGA is not set 1389# CONFIG_USB_SISUSBVGA is not set
1355# CONFIG_USB_LD is not set 1390# CONFIG_USB_LD is not set
1356# CONFIG_USB_TRANCEVIBRATOR is not set 1391# CONFIG_USB_TRANCEVIBRATOR is not set
1392# CONFIG_USB_IOWARRIOR is not set
1357# CONFIG_USB_TEST is not set 1393# CONFIG_USB_TEST is not set
1358 1394
1359# 1395#
@@ -1364,10 +1400,6 @@ CONFIG_USB_MON=y
1364# USB Gadget Support 1400# USB Gadget Support
1365# 1401#
1366# CONFIG_USB_GADGET is not set 1402# CONFIG_USB_GADGET is not set
1367
1368#
1369# MMC/SD Card support
1370#
1371# CONFIG_MMC is not set 1403# CONFIG_MMC is not set
1372 1404
1373# 1405#
@@ -1408,24 +1440,37 @@ CONFIG_RTC_INTF_SYSFS=y
1408CONFIG_RTC_INTF_PROC=y 1440CONFIG_RTC_INTF_PROC=y
1409CONFIG_RTC_INTF_DEV=y 1441CONFIG_RTC_INTF_DEV=y
1410# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 1442# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1443# CONFIG_RTC_DRV_TEST is not set
1411 1444
1412# 1445#
1413# RTC drivers 1446# I2C RTC drivers
1414# 1447#
1415# CONFIG_RTC_DRV_X1205 is not set
1416CONFIG_RTC_DRV_DS1307=y 1448CONFIG_RTC_DRV_DS1307=y
1417# CONFIG_RTC_DRV_DS1553 is not set
1418# CONFIG_RTC_DRV_ISL1208 is not set
1419# CONFIG_RTC_DRV_DS1672 is not set 1449# CONFIG_RTC_DRV_DS1672 is not set
1420# CONFIG_RTC_DRV_DS1742 is not set 1450# CONFIG_RTC_DRV_MAX6900 is not set
1451# CONFIG_RTC_DRV_RS5C372 is not set
1452# CONFIG_RTC_DRV_ISL1208 is not set
1453# CONFIG_RTC_DRV_X1205 is not set
1421# CONFIG_RTC_DRV_PCF8563 is not set 1454# CONFIG_RTC_DRV_PCF8563 is not set
1422# CONFIG_RTC_DRV_PCF8583 is not set 1455# CONFIG_RTC_DRV_PCF8583 is not set
1423# CONFIG_RTC_DRV_RS5C372 is not set 1456
1457#
1458# SPI RTC drivers
1459#
1460
1461#
1462# Platform RTC drivers
1463#
1464# CONFIG_RTC_DRV_DS1553 is not set
1465# CONFIG_RTC_DRV_DS1742 is not set
1424# CONFIG_RTC_DRV_M48T86 is not set 1466# CONFIG_RTC_DRV_M48T86 is not set
1425# CONFIG_RTC_DRV_TEST is not set
1426# CONFIG_RTC_DRV_V3020 is not set 1467# CONFIG_RTC_DRV_V3020 is not set
1427 1468
1428# 1469#
1470# on-CPU RTC drivers
1471#
1472
1473#
1429# DMA Engine support 1474# DMA Engine support
1430# 1475#
1431# CONFIG_DMA_ENGINE is not set 1476# CONFIG_DMA_ENGINE is not set
@@ -1439,10 +1484,6 @@ CONFIG_RTC_DRV_DS1307=y
1439# 1484#
1440 1485
1441# 1486#
1442# Virtualization
1443#
1444
1445#
1446# File systems 1487# File systems
1447# 1488#
1448CONFIG_EXT2_FS=y 1489CONFIG_EXT2_FS=y
@@ -1466,7 +1507,8 @@ CONFIG_FS_POSIX_ACL=y
1466# CONFIG_OCFS2_FS is not set 1507# CONFIG_OCFS2_FS is not set
1467# CONFIG_MINIX_FS is not set 1508# CONFIG_MINIX_FS is not set
1468# CONFIG_ROMFS_FS is not set 1509# CONFIG_ROMFS_FS is not set
1469# CONFIG_INOTIFY is not set 1510CONFIG_INOTIFY=y
1511CONFIG_INOTIFY_USER=y
1470# CONFIG_QUOTA is not set 1512# CONFIG_QUOTA is not set
1471CONFIG_DNOTIFY=y 1513CONFIG_DNOTIFY=y
1472CONFIG_AUTOFS_FS=y 1514CONFIG_AUTOFS_FS=y
@@ -1538,6 +1580,7 @@ CONFIG_LOCKD=y
1538CONFIG_LOCKD_V4=y 1580CONFIG_LOCKD_V4=y
1539CONFIG_NFS_COMMON=y 1581CONFIG_NFS_COMMON=y
1540CONFIG_SUNRPC=y 1582CONFIG_SUNRPC=y
1583# CONFIG_SUNRPC_BIND34 is not set
1541# CONFIG_RPCSEC_GSS_KRB5 is not set 1584# CONFIG_RPCSEC_GSS_KRB5 is not set
1542# CONFIG_RPCSEC_GSS_SPKM3 is not set 1585# CONFIG_RPCSEC_GSS_SPKM3 is not set
1543# CONFIG_SMB_FS is not set 1586# CONFIG_SMB_FS is not set
@@ -1567,6 +1610,7 @@ CONFIG_MSDOS_PARTITION=y
1567# CONFIG_SUN_PARTITION is not set 1610# CONFIG_SUN_PARTITION is not set
1568# CONFIG_KARMA_PARTITION is not set 1611# CONFIG_KARMA_PARTITION is not set
1569# CONFIG_EFI_PARTITION is not set 1612# CONFIG_EFI_PARTITION is not set
1613# CONFIG_SYSV68_PARTITION is not set
1570 1614
1571# 1615#
1572# Native Language Support 1616# Native Language Support
@@ -1616,6 +1660,8 @@ CONFIG_NLS_ISO8859_1=y
1616# Distributed Lock Manager 1660# Distributed Lock Manager
1617# 1661#
1618# CONFIG_DLM is not set 1662# CONFIG_DLM is not set
1663# CONFIG_UCC_SLOW is not set
1664# CONFIG_UCC_FAST is not set
1619 1665
1620# 1666#
1621# Library routines 1667# Library routines
@@ -1623,10 +1669,13 @@ CONFIG_NLS_ISO8859_1=y
1623CONFIG_BITREVERSE=y 1669CONFIG_BITREVERSE=y
1624CONFIG_CRC_CCITT=y 1670CONFIG_CRC_CCITT=y
1625# CONFIG_CRC16 is not set 1671# CONFIG_CRC16 is not set
1672# CONFIG_CRC_ITU_T is not set
1626CONFIG_CRC32=y 1673CONFIG_CRC32=y
1627# CONFIG_LIBCRC32C is not set 1674# CONFIG_LIBCRC32C is not set
1628CONFIG_PLIST=y 1675CONFIG_PLIST=y
1629CONFIG_IOMAP_COPY=y 1676CONFIG_HAS_IOMEM=y
1677CONFIG_HAS_IOPORT=y
1678CONFIG_HAS_DMA=y
1630 1679
1631# 1680#
1632# Instrumentation Support 1681# Instrumentation Support
@@ -1645,32 +1694,34 @@ CONFIG_MAGIC_SYSRQ=y
1645# CONFIG_DEBUG_FS is not set 1694# CONFIG_DEBUG_FS is not set
1646# CONFIG_HEADERS_CHECK is not set 1695# CONFIG_HEADERS_CHECK is not set
1647CONFIG_DEBUG_KERNEL=y 1696CONFIG_DEBUG_KERNEL=y
1648CONFIG_LOG_BUF_SHIFT=17 1697# CONFIG_DEBUG_SHIRQ is not set
1649CONFIG_DETECT_SOFTLOCKUP=y 1698CONFIG_DETECT_SOFTLOCKUP=y
1650# CONFIG_SCHEDSTATS is not set 1699# CONFIG_SCHEDSTATS is not set
1700# CONFIG_TIMER_STATS is not set
1651# CONFIG_DEBUG_SLAB is not set 1701# CONFIG_DEBUG_SLAB is not set
1652# CONFIG_DEBUG_RT_MUTEXES is not set 1702# CONFIG_DEBUG_RT_MUTEXES is not set
1653# CONFIG_RT_MUTEX_TESTER is not set 1703# CONFIG_RT_MUTEX_TESTER is not set
1654# CONFIG_DEBUG_SPINLOCK is not set 1704# CONFIG_DEBUG_SPINLOCK is not set
1655# CONFIG_DEBUG_MUTEXES is not set 1705# CONFIG_DEBUG_MUTEXES is not set
1656# CONFIG_DEBUG_RWSEMS is not set
1657# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1706# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1658# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1707# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1659# CONFIG_DEBUG_KOBJECT is not set 1708# CONFIG_DEBUG_KOBJECT is not set
1660CONFIG_DEBUG_BUGVERBOSE=y 1709CONFIG_DEBUG_BUGVERBOSE=y
1661CONFIG_DEBUG_INFO=y 1710# CONFIG_DEBUG_INFO is not set
1662# CONFIG_DEBUG_VM is not set 1711# CONFIG_DEBUG_VM is not set
1663# CONFIG_DEBUG_LIST is not set 1712# CONFIG_DEBUG_LIST is not set
1664CONFIG_FORCED_INLINING=y 1713# CONFIG_FORCED_INLINING is not set
1665# CONFIG_RCU_TORTURE_TEST is not set 1714# CONFIG_RCU_TORTURE_TEST is not set
1715# CONFIG_FAULT_INJECTION is not set
1666# CONFIG_DEBUG_STACKOVERFLOW is not set 1716# CONFIG_DEBUG_STACKOVERFLOW is not set
1667# CONFIG_DEBUG_STACK_USAGE is not set 1717# CONFIG_DEBUG_STACK_USAGE is not set
1718# CONFIG_DEBUG_PAGEALLOC is not set
1668CONFIG_DEBUGGER=y 1719CONFIG_DEBUGGER=y
1669CONFIG_XMON=y 1720CONFIG_XMON=y
1670CONFIG_XMON_DEFAULT=y 1721CONFIG_XMON_DEFAULT=y
1671CONFIG_XMON_DISASSEMBLY=y 1722CONFIG_XMON_DISASSEMBLY=y
1672# CONFIG_IRQSTACKS is not set 1723# CONFIG_IRQSTACKS is not set
1673CONFIG_BOOTX_TEXT=y 1724# CONFIG_BOOTX_TEXT is not set
1674# CONFIG_PPC_EARLY_DEBUG is not set 1725# CONFIG_PPC_EARLY_DEBUG is not set
1675 1726
1676# 1727#
@@ -1700,8 +1751,11 @@ CONFIG_CRYPTO_SHA1=y
1700# CONFIG_CRYPTO_GF128MUL is not set 1751# CONFIG_CRYPTO_GF128MUL is not set
1701CONFIG_CRYPTO_ECB=m 1752CONFIG_CRYPTO_ECB=m
1702CONFIG_CRYPTO_CBC=y 1753CONFIG_CRYPTO_CBC=y
1754CONFIG_CRYPTO_PCBC=m
1703# CONFIG_CRYPTO_LRW is not set 1755# CONFIG_CRYPTO_LRW is not set
1756# CONFIG_CRYPTO_CRYPTD is not set
1704CONFIG_CRYPTO_DES=y 1757CONFIG_CRYPTO_DES=y
1758# CONFIG_CRYPTO_FCRYPT is not set
1705# CONFIG_CRYPTO_BLOWFISH is not set 1759# CONFIG_CRYPTO_BLOWFISH is not set
1706# CONFIG_CRYPTO_TWOFISH is not set 1760# CONFIG_CRYPTO_TWOFISH is not set
1707# CONFIG_CRYPTO_SERPENT is not set 1761# CONFIG_CRYPTO_SERPENT is not set
@@ -1715,6 +1769,7 @@ CONFIG_CRYPTO_DES=y
1715# CONFIG_CRYPTO_DEFLATE is not set 1769# CONFIG_CRYPTO_DEFLATE is not set
1716# CONFIG_CRYPTO_MICHAEL_MIC is not set 1770# CONFIG_CRYPTO_MICHAEL_MIC is not set
1717# CONFIG_CRYPTO_CRC32C is not set 1771# CONFIG_CRYPTO_CRC32C is not set
1772# CONFIG_CRYPTO_CAMELLIA is not set
1718# CONFIG_CRYPTO_TEST is not set 1773# CONFIG_CRYPTO_TEST is not set
1719 1774
1720# 1775#
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 9cb24d20f0f9..6ef87fb90b8e 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -836,7 +836,7 @@ static struct cpu_spec cpu_specs[] = {
836 .pvr_mask = 0xffff0000, 836 .pvr_mask = 0xffff0000,
837 .pvr_value = 0x80040000, 837 .pvr_value = 0x80040000,
838 .cpu_name = "7448", 838 .cpu_name = "7448",
839 .cpu_features = CPU_FTRS_7447A, 839 .cpu_features = CPU_FTRS_7448,
840 .cpu_user_features = COMMON_USER | 840 .cpu_user_features = COMMON_USER |
841 PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, 841 PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,
842 .icache_bsize = 32, 842 .icache_bsize = 32,
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index c29d1652a421..4074c0b31453 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -596,7 +596,11 @@ fast_exception_return:
596 mr r12,r4 /* restart at exc_exit_restart */ 596 mr r12,r4 /* restart at exc_exit_restart */
597 b 2b 597 b 2b
598 598
599 .comm fee_restarts,4 599 .section .bss
600 .align 2
601fee_restarts:
602 .space 4
603 .previous
600 604
601/* aargh, a nonrecoverable interrupt, panic */ 605/* aargh, a nonrecoverable interrupt, panic */
602/* aargh, we don't know which trap this is */ 606/* aargh, we don't know which trap this is */
@@ -851,7 +855,11 @@ load_dbcr0:
851 mtspr SPRN_DBSR,r11 /* clear all pending debug events */ 855 mtspr SPRN_DBSR,r11 /* clear all pending debug events */
852 blr 856 blr
853 857
854 .comm global_dbcr0,8 858 .section .bss
859 .align 4
860global_dbcr0:
861 .space 8
862 .previous
855#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ 863#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
856 864
857do_work: /* r10 contains MSR_KERNEL here */ 865do_work: /* r10 contains MSR_KERNEL here */
@@ -926,7 +934,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
926 /* shouldn't return */ 934 /* shouldn't return */
927 b 4b 935 b 4b
928 936
929 .comm ee_restarts,4 937 .section .bss
938 .align 2
939ee_restarts:
940 .space 4
941 .previous
930 942
931/* 943/*
932 * PROM code for specific machines follows. Put it 944 * PROM code for specific machines follows. Put it
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 84c34d979a88..d501c23e5159 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -427,11 +427,13 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
427 /* Process "ranges" property */ 427 /* Process "ranges" property */
428 pci_process_bridge_OF_ranges(phb, dev->node, 0); 428 pci_process_bridge_OF_ranges(phb, dev->node, 0);
429 429
430 /* Setup IO space. 430 /* Setup IO space. We use the non-dynamic version of that code here,
431 * This will not work properly for ISA IOs, something needs to be done 431 * which doesn't quite support unplugging. Next kernel release will
432 * about it if we ever generalize that way of probing PCI brigdes 432 * have a better fix for this.
433 * Note also that we don't do ISA, this will also be fixed with a
434 * more massive rework.
433 */ 435 */
434 pci_setup_phb_io_dynamic(phb, 0); 436 pci_setup_phb_io(phb, 0);
435 437
436 /* Init pci_dn data structures */ 438 /* Init pci_dn data structures */
437 pci_devs_phb_init_dynamic(phb); 439 pci_devs_phb_init_dynamic(phb);
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index b0409e19b1c1..249cca27a9b8 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -41,6 +41,7 @@
41 41
42unsigned long pci_probe_only = 1; 42unsigned long pci_probe_only = 1;
43int pci_assign_all_buses = 0; 43int pci_assign_all_buses = 0;
44static int pci_initial_scan_done;
44 45
45static void fixup_resource(struct resource *res, struct pci_dev *dev); 46static void fixup_resource(struct resource *res, struct pci_dev *dev);
46static void do_bus_setup(struct pci_bus *bus); 47static void do_bus_setup(struct pci_bus *bus);
@@ -604,6 +605,8 @@ static int __init pcibios_init(void)
604 /* map in PCI I/O space */ 605 /* map in PCI I/O space */
605 phbs_remap_io(); 606 phbs_remap_io();
606 607
608 pci_initial_scan_done = 1;
609
607 printk(KERN_DEBUG "PCI: Probing PCI hardware done\n"); 610 printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
608 611
609 return 0; 612 return 0;
@@ -1042,13 +1045,16 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
1042 } 1045 }
1043} 1046}
1044 1047
1045void __init pci_setup_phb_io(struct pci_controller *hose, int primary) 1048void __devinit pci_setup_phb_io(struct pci_controller *hose, int primary)
1046{ 1049{
1047 unsigned long size = hose->pci_io_size; 1050 unsigned long size = hose->pci_io_size;
1048 unsigned long io_virt_offset; 1051 unsigned long io_virt_offset;
1049 struct resource *res; 1052 struct resource *res;
1050 struct device_node *isa_dn; 1053 struct device_node *isa_dn;
1051 1054
1055 if (size == 0)
1056 return;
1057
1052 hose->io_base_virt = reserve_phb_iospace(size); 1058 hose->io_base_virt = reserve_phb_iospace(size);
1053 DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n", 1059 DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
1054 hose->global_number, hose->io_base_phys, 1060 hose->global_number, hose->io_base_phys,
@@ -1069,6 +1075,15 @@ void __init pci_setup_phb_io(struct pci_controller *hose, int primary)
1069 res = &hose->io_resource; 1075 res = &hose->io_resource;
1070 res->start += io_virt_offset; 1076 res->start += io_virt_offset;
1071 res->end += io_virt_offset; 1077 res->end += io_virt_offset;
1078
1079 /* If this is called after the initial PCI scan, then we need to
1080 * proceed to IO mappings now
1081 */
1082 if (pci_initial_scan_done)
1083 __ioremap_explicit(hose->io_base_phys,
1084 (unsigned long)hose->io_base_virt,
1085 hose->pci_io_size,
1086 _PAGE_NO_CACHE | _PAGE_GUARDED);
1072} 1087}
1073 1088
1074void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose, 1089void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
@@ -1078,6 +1093,9 @@ void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
1078 unsigned long io_virt_offset; 1093 unsigned long io_virt_offset;
1079 struct resource *res; 1094 struct resource *res;
1080 1095
1096 if (size == 0)
1097 return;
1098
1081 hose->io_base_virt = __ioremap(hose->io_base_phys, size, 1099 hose->io_base_virt = __ioremap(hose->io_base_phys, size,
1082 _PAGE_NO_CACHE | _PAGE_GUARDED); 1100 _PAGE_NO_CACHE | _PAGE_GUARDED);
1083 DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n", 1101 DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
@@ -1106,6 +1124,9 @@ static int get_bus_io_range(struct pci_bus *bus, unsigned long *start_phys,
1106 /* Root Bus */ 1124 /* Root Bus */
1107 res = &hose->io_resource; 1125 res = &hose->io_resource;
1108 1126
1127 if (res->end == 0 && res->start == 0)
1128 return 1;
1129
1109 *start_virt = pci_io_base + res->start; 1130 *start_virt = pci_io_base + res->start;
1110 *start_phys = *start_virt + hose->io_base_phys 1131 *start_phys = *start_virt + hose->io_base_phys
1111 - (unsigned long) hose->io_base_virt; 1132 - (unsigned long) hose->io_base_virt;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index c065b5550368..066a6a7a25b8 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1472,6 +1472,11 @@ static int of_finish_dynamic_node(struct device_node *node)
1472 node->name = of_get_property(node, "name", NULL); 1472 node->name = of_get_property(node, "name", NULL);
1473 node->type = of_get_property(node, "device_type", NULL); 1473 node->type = of_get_property(node, "device_type", NULL);
1474 1474
1475 if (!node->name)
1476 node->name = "<NULL>";
1477 if (!node->type)
1478 node->type = "<NULL>";
1479
1475 if (!parent) { 1480 if (!parent) {
1476 err = -ENODEV; 1481 err = -ENODEV;
1477 goto out; 1482 goto out;
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 190b7ed1dbfb..f2e3bc714d76 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -379,7 +379,7 @@ static ssize_t ppc_rtas_progress_write(struct file *file,
379/* ****************************************************************** */ 379/* ****************************************************************** */
380static int ppc_rtas_progress_show(struct seq_file *m, void *v) 380static int ppc_rtas_progress_show(struct seq_file *m, void *v)
381{ 381{
382 if (progress_led) 382 if (progress_led[0])
383 seq_printf(m, "%s\n", progress_led); 383 seq_printf(m, "%s\n", progress_led);
384 return 0; 384 return 0;
385} 385}
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index b2f6dcc59600..180ee2933ab9 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -468,25 +468,19 @@ unsigned long rh_alloc_align(rh_info_t * info, int size, int alignment, const ch
468 if (blk->size == size) { 468 if (blk->size == size) {
469 /* Move from free list to taken list */ 469 /* Move from free list to taken list */
470 list_del(&blk->list); 470 list_del(&blk->list);
471 blk->owner = owner; 471 newblk = blk;
472 start = blk->start; 472 } else {
473 473 newblk = get_slot(info);
474 attach_taken_block(info, blk); 474 newblk->start = blk->start;
475 newblk->size = size;
475 476
476 return start; 477 /* blk still in free list, with updated start, size */
478 blk->start += size;
479 blk->size -= size;
477 } 480 }
478 481
479 newblk = get_slot(info);
480 newblk->start = blk->start;
481 newblk->size = size;
482 newblk->owner = owner; 482 newblk->owner = owner;
483
484 /* blk still in free list, with updated start, size */
485 blk->start += size;
486 blk->size -= size;
487
488 start = newblk->start; 483 start = newblk->start;
489
490 attach_taken_block(info, newblk); 484 attach_taken_block(info, newblk);
491 485
492 /* for larger alignment return fixed up pointer */ 486 /* for larger alignment return fixed up pointer */
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S
index ddceefc06ecc..7f830a4888d6 100644
--- a/arch/powerpc/mm/hash_low_32.S
+++ b/arch/powerpc/mm/hash_low_32.S
@@ -30,7 +30,11 @@
30#include <asm/asm-offsets.h> 30#include <asm/asm-offsets.h>
31 31
32#ifdef CONFIG_SMP 32#ifdef CONFIG_SMP
33 .comm mmu_hash_lock,4 33 .section .bss
34 .align 2
35 .globl mmu_hash_lock
36mmu_hash_lock:
37 .space 4
34#endif /* CONFIG_SMP */ 38#endif /* CONFIG_SMP */
35 39
36/* 40/*
@@ -455,9 +459,15 @@ found_slot:
455 sync /* make sure pte updates get to memory */ 459 sync /* make sure pte updates get to memory */
456 blr 460 blr
457 461
458 .comm next_slot,4 462 .section .bss
459 .comm primary_pteg_full,4 463 .align 2
460 .comm htab_hash_searches,4 464next_slot:
465 .space 4
466primary_pteg_full:
467 .space 4
468htab_hash_searches:
469 .space 4
470 .previous
461 471
462/* 472/*
463 * Flush the entry for a particular page from the hash table. 473 * Flush the entry for a particular page from the hash table.
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 028ba4ed03d2..4f2f4534a9d8 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -430,7 +430,7 @@ static void __init htab_finish_init(void)
430 make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert); 430 make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert);
431 make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove); 431 make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove);
432 make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp); 432 make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp);
433#endif /* CONFIG_PPC_64K_PAGES */ 433#endif /* CONFIG_PPC_HAS_HASH_64K */
434 434
435 make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert); 435 make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert);
436 make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert); 436 make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert);
@@ -837,7 +837,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
837 if (mm->context.user_psize == MMU_PAGE_64K) 837 if (mm->context.user_psize == MMU_PAGE_64K)
838 __hash_page_64K(ea, access, vsid, ptep, trap, local); 838 __hash_page_64K(ea, access, vsid, ptep, trap, local);
839 else 839 else
840#endif /* CONFIG_PPC_64K_PAGES */ 840#endif /* CONFIG_PPC_HAS_HASH_64K */
841 __hash_page_4K(ea, access, vsid, ptep, trap, local); 841 __hash_page_4K(ea, access, vsid, ptep, trap, local);
842 842
843 local_irq_restore(flags); 843 local_irq_restore(flags);
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 1d443407423c..ad6e135bf212 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -322,6 +322,8 @@ EXPORT_SYMBOL(__ioremap);
322EXPORT_SYMBOL(iounmap); 322EXPORT_SYMBOL(iounmap);
323EXPORT_SYMBOL(__iounmap); 323EXPORT_SYMBOL(__iounmap);
324 324
325static DEFINE_SPINLOCK(phb_io_lock);
326
325void __iomem * reserve_phb_iospace(unsigned long size) 327void __iomem * reserve_phb_iospace(unsigned long size)
326{ 328{
327 void __iomem *virt_addr; 329 void __iomem *virt_addr;
@@ -329,8 +331,10 @@ void __iomem * reserve_phb_iospace(unsigned long size)
329 if (phbs_io_bot >= IMALLOC_BASE) 331 if (phbs_io_bot >= IMALLOC_BASE)
330 panic("reserve_phb_iospace(): phb io space overflow\n"); 332 panic("reserve_phb_iospace(): phb io space overflow\n");
331 333
334 spin_lock(&phb_io_lock);
332 virt_addr = (void __iomem *) phbs_io_bot; 335 virt_addr = (void __iomem *) phbs_io_bot;
333 phbs_io_bot += size; 336 phbs_io_bot += size;
337 spin_unlock(&phb_io_lock);
334 338
335 return virt_addr; 339 return virt_addr;
336} 340}
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 8e66949e7c67..1b3e008fd148 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -38,7 +38,8 @@ config 440EP
38 38
39config 440GP 39config 440GP
40 bool 40 bool
41 select IBM_NEW_EMAC_ZMII 41# Disabled until the new EMAC Driver is merged.
42# select IBM_NEW_EMAC_ZMII
42 43
43config 440GX 44config 440GX
44 bool 45 bool
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index ad526eafc90b..5a7fec8d10d3 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -27,9 +27,9 @@
27#include "44x.h" 27#include "44x.h"
28 28
29static struct of_device_id ebony_of_bus[] = { 29static struct of_device_id ebony_of_bus[] = {
30 { .type = "ibm,plb", }, 30 { .compatible = "ibm,plb4", },
31 { .type = "ibm,opb", }, 31 { .compatible = "ibm,opb", },
32 { .type = "ibm,ebc", }, 32 { .compatible = "ibm,ebc", },
33 {}, 33 {},
34}; 34};
35 35
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 354b8dd2a2c1..6a0060a5f2ec 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -37,6 +37,7 @@
37#include <linux/wait.h> 37#include <linux/wait.h>
38#include <linux/seq_file.h> 38#include <linux/seq_file.h>
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/completion.h>
40 41
41#include <asm/system.h> 42#include <asm/system.h>
42#include <asm/uaccess.h> 43#include <asm/uaccess.h>
@@ -81,7 +82,7 @@ static void handleMonitorEvent(struct HvLpEvent *event);
81 * if system_state is not SYSTEM_RUNNING, then wait_atomic is used ... 82 * if system_state is not SYSTEM_RUNNING, then wait_atomic is used ...
82 */ 83 */
83struct alloc_parms { 84struct alloc_parms {
84 struct semaphore sem; 85 struct completion done;
85 int number; 86 int number;
86 atomic_t wait_atomic; 87 atomic_t wait_atomic;
87 int used_wait_atomic; 88 int used_wait_atomic;
@@ -115,7 +116,7 @@ static int proc_viopath_show(struct seq_file *m, void *v)
115 u16 vlanMap; 116 u16 vlanMap;
116 dma_addr_t handle; 117 dma_addr_t handle;
117 HvLpEvent_Rc hvrc; 118 HvLpEvent_Rc hvrc;
118 DECLARE_MUTEX_LOCKED(Semaphore); 119 DECLARE_COMPLETION(done);
119 struct device_node *node; 120 struct device_node *node;
120 const char *sysid; 121 const char *sysid;
121 122
@@ -132,13 +133,13 @@ static int proc_viopath_show(struct seq_file *m, void *v)
132 HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck, 133 HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
133 viopath_sourceinst(viopath_hostLp), 134 viopath_sourceinst(viopath_hostLp),
134 viopath_targetinst(viopath_hostLp), 135 viopath_targetinst(viopath_hostLp),
135 (u64)(unsigned long)&Semaphore, VIOVERSION << 16, 136 (u64)(unsigned long)&done, VIOVERSION << 16,
136 ((u64)handle) << 32, HW_PAGE_SIZE, 0, 0); 137 ((u64)handle) << 32, HW_PAGE_SIZE, 0, 0);
137 138
138 if (hvrc != HvLpEvent_Rc_Good) 139 if (hvrc != HvLpEvent_Rc_Good)
139 printk(VIOPATH_KERN_WARN "hv error on op %d\n", (int)hvrc); 140 printk(VIOPATH_KERN_WARN "hv error on op %d\n", (int)hvrc);
140 141
141 down(&Semaphore); 142 wait_for_completion(&done);
142 143
143 vlanMap = HvLpConfig_getVirtualLanIndexMap(); 144 vlanMap = HvLpConfig_getVirtualLanIndexMap();
144 145
@@ -353,7 +354,7 @@ static void handleConfig(struct HvLpEvent *event)
353 return; 354 return;
354 } 355 }
355 356
356 up((struct semaphore *)event->xCorrelationToken); 357 complete((struct completion *)event->xCorrelationToken);
357} 358}
358 359
359/* 360/*
@@ -464,7 +465,7 @@ static void viopath_donealloc(void *parm, int number)
464 if (parmsp->used_wait_atomic) 465 if (parmsp->used_wait_atomic)
465 atomic_set(&parmsp->wait_atomic, 0); 466 atomic_set(&parmsp->wait_atomic, 0);
466 else 467 else
467 up(&parmsp->sem); 468 complete(&parmsp->done);
468} 469}
469 470
470static int allocateEvents(HvLpIndex remoteLp, int numEvents) 471static int allocateEvents(HvLpIndex remoteLp, int numEvents)
@@ -476,7 +477,7 @@ static int allocateEvents(HvLpIndex remoteLp, int numEvents)
476 atomic_set(&parms.wait_atomic, 1); 477 atomic_set(&parms.wait_atomic, 1);
477 } else { 478 } else {
478 parms.used_wait_atomic = 0; 479 parms.used_wait_atomic = 0;
479 init_MUTEX_LOCKED(&parms.sem); 480 init_completion(&parms.done);
480 } 481 }
481 mf_allocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo, 250, /* It would be nice to put a real number here! */ 482 mf_allocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo, 250, /* It would be nice to put a real number here! */
482 numEvents, &viopath_donealloc, &parms); 483 numEvents, &viopath_donealloc, &parms);
@@ -484,7 +485,7 @@ static int allocateEvents(HvLpIndex remoteLp, int numEvents)
484 while (atomic_read(&parms.wait_atomic)) 485 while (atomic_read(&parms.wait_atomic))
485 mb(); 486 mb();
486 } else 487 } else
487 down(&parms.sem); 488 wait_for_completion(&parms.done);
488 return parms.number; 489 return parms.number;
489} 490}
490 491
@@ -585,10 +586,10 @@ int viopath_close(HvLpIndex remoteLp, int subtype, int numReq)
585 spin_unlock_irqrestore(&statuslock, flags); 586 spin_unlock_irqrestore(&statuslock, flags);
586 587
587 parms.used_wait_atomic = 0; 588 parms.used_wait_atomic = 0;
588 init_MUTEX_LOCKED(&parms.sem); 589 init_completion(&parms.done);
589 mf_deallocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo, 590 mf_deallocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo,
590 numReq, &viopath_donealloc, &parms); 591 numReq, &viopath_donealloc, &parms);
591 down(&parms.sem); 592 wait_for_completion(&parms.done);
592 593
593 spin_lock_irqsave(&statuslock, flags); 594 spin_lock_irqsave(&statuslock, flags);
594 for (i = 0, numOpen = 0; i < VIO_MAX_SUBTYPES; i++) 595 for (i = 0, numOpen = 0; i < VIO_MAX_SUBTYPES; i++)
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index eb4dbc705b06..7c5076e38ea1 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -4,7 +4,6 @@ config PPC_PASEMI
4 default n 4 default n
5 select MPIC 5 select MPIC
6 select PPC_UDBG_16550 6 select PPC_UDBG_16550
7 select GENERIC_TBSYNC
8 select PPC_NATIVE 7 select PPC_NATIVE
9 help 8 help
10 This option enables support for PA Semi's PWRficient line 9 This option enables support for PA Semi's PWRficient line
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 22bc01989749..2729d559fd91 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -21,8 +21,8 @@ extern int pSeries_machine_check_exception(struct pt_regs *regs);
21extern void smp_init_pseries_mpic(void); 21extern void smp_init_pseries_mpic(void);
22extern void smp_init_pseries_xics(void); 22extern void smp_init_pseries_xics(void);
23#else 23#else
24static inline smp_init_pseries_mpic(void) { }; 24static inline void smp_init_pseries_mpic(void) { };
25static inline smp_init_pseries_xics(void) { }; 25static inline void smp_init_pseries_xics(void) { };
26#endif 26#endif
27 27
28#ifdef CONFIG_KEXEC 28#ifdef CONFIG_KEXEC
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 4fd2bec89916..75aad38179f0 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1424,7 +1424,7 @@ unsigned int mpic_get_irq(void)
1424void mpic_request_ipis(void) 1424void mpic_request_ipis(void)
1425{ 1425{
1426 struct mpic *mpic = mpic_primary; 1426 struct mpic *mpic = mpic_primary;
1427 int i; 1427 int i, err;
1428 static char *ipi_names[] = { 1428 static char *ipi_names[] = {
1429 "IPI0 (call function)", 1429 "IPI0 (call function)",
1430 "IPI1 (reschedule)", 1430 "IPI1 (reschedule)",
@@ -1442,8 +1442,14 @@ void mpic_request_ipis(void)
1442 printk(KERN_ERR "Failed to map IPI %d\n", i); 1442 printk(KERN_ERR "Failed to map IPI %d\n", i);
1443 break; 1443 break;
1444 } 1444 }
1445 request_irq(vipi, mpic_ipi_action, IRQF_DISABLED|IRQF_PERCPU, 1445 err = request_irq(vipi, mpic_ipi_action,
1446 ipi_names[i], mpic); 1446 IRQF_DISABLED|IRQF_PERCPU,
1447 ipi_names[i], mpic);
1448 if (err) {
1449 printk(KERN_ERR "Request of irq %d for IPI %d failed\n",
1450 vipi, i);
1451 break;
1452 }
1447 } 1453 }
1448} 1454}
1449 1455
diff --git a/arch/ppc/syslib/pq2_sys.c b/arch/ppc/syslib/pq2_sys.c
index f52600c0db20..9c85300846c7 100644
--- a/arch/ppc/syslib/pq2_sys.c
+++ b/arch/ppc/syslib/pq2_sys.c
@@ -26,7 +26,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
26 { 26 {
27 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 27 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
28 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 28 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
29 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 29 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1,
30 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 30 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
31 } 31 }
32 }, 32 },
@@ -39,7 +39,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
39 { 39 {
40 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1, 40 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1,
41 MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4, 41 MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4,
42 MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, 42 MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2,
43 MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 43 MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
44 } 44 }
45 }, 45 },
@@ -47,52 +47,56 @@ struct ppc_sys_spec ppc_sys_specs[] = {
47 .ppc_sys_name = "8260", 47 .ppc_sys_name = "8260",
48 .mask = 0x0000ff00, 48 .mask = 0x0000ff00,
49 .value = 0x00000000, 49 .value = 0x00000000,
50 .num_devices = 12, 50 .num_devices = 13,
51 .device_list = (enum ppc_sys_devices[]) 51 .device_list = (enum ppc_sys_devices[])
52 { 52 {
53 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 53 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
54 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 54 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
55 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 55 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,
56 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 56 MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
57 MPC82xx_CPM_I2C,
57 } 58 }
58 }, 59 },
59 { 60 {
60 .ppc_sys_name = "8264", 61 .ppc_sys_name = "8264",
61 .mask = 0x0000ff00, 62 .mask = 0x0000ff00,
62 .value = 0x00000000, 63 .value = 0x00000000,
63 .num_devices = 12, 64 .num_devices = 13,
64 .device_list = (enum ppc_sys_devices[]) 65 .device_list = (enum ppc_sys_devices[])
65 { 66 {
66 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 67 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
67 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 68 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
68 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 69 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,
69 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 70 MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
71 MPC82xx_CPM_I2C,
70 } 72 }
71 }, 73 },
72 { 74 {
73 .ppc_sys_name = "8265", 75 .ppc_sys_name = "8265",
74 .mask = 0x0000ff00, 76 .mask = 0x0000ff00,
75 .value = 0x00000000, 77 .value = 0x00000000,
76 .num_devices = 12, 78 .num_devices = 13,
77 .device_list = (enum ppc_sys_devices[]) 79 .device_list = (enum ppc_sys_devices[])
78 { 80 {
79 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 81 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
80 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 82 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
81 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 83 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,
82 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 84 MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
85 MPC82xx_CPM_I2C,
83 } 86 }
84 }, 87 },
85 { 88 {
86 .ppc_sys_name = "8266", 89 .ppc_sys_name = "8266",
87 .mask = 0x0000ff00, 90 .mask = 0x0000ff00,
88 .value = 0x00000000, 91 .value = 0x00000000,
89 .num_devices = 12, 92 .num_devices = 13,
90 .device_list = (enum ppc_sys_devices[]) 93 .device_list = (enum ppc_sys_devices[])
91 { 94 {
92 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 95 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
93 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 96 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
94 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 97 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_MCC2,
95 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 98 MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI,
99 MPC82xx_CPM_I2C,
96 } 100 }
97 }, 101 },
98 /* below is a list of the 8272 family of processors */ 102 /* below is a list of the 8272 family of processors */
@@ -159,7 +163,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
159 { 163 {
160 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 164 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
161 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 165 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
162 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 166 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1,
163 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 167 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
164 }, 168 },
165 }, 169 },
@@ -172,7 +176,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
172 { 176 {
173 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3, 177 MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_FCC3,
174 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, 178 MPC82xx_CPM_SCC1, MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3,
175 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC1, MPC82xx_CPM_SMC1, 179 MPC82xx_CPM_SCC4, MPC82xx_CPM_MCC2, MPC82xx_CPM_SMC1,
176 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, 180 MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C,
177 }, 181 },
178 }, 182 },
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index 0e23f29f71ab..0f5c77ddd39d 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -24,7 +24,7 @@
24#include <asm/uaccess.h> 24#include <asm/uaccess.h>
25#include <asm/system.h> 25#include <asm/system.h>
26 26
27/* If the kernel parameter wdt_enable=1, the watchdog will be enabled at boot. 27/* If the kernel parameter wdt=1, the watchdog will be enabled at boot.
28 * Also, the wdt_period sets the watchdog timer period timeout. 28 * Also, the wdt_period sets the watchdog timer period timeout.
29 * For E500 cpus the wdt_period sets which bit changing from 0->1 will 29 * For E500 cpus the wdt_period sets which bit changing from 0->1 will
30 * trigger a watchog timeout. This watchdog timeout will occur 3 times, the 30 * trigger a watchog timeout. This watchdog timeout will occur 3 times, the
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 192b26e97777..11ced17f438a 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -216,7 +216,10 @@ int wf_register_control(struct wf_control *new_ct)
216 new_ct->attr.attr.mode = 0644; 216 new_ct->attr.attr.mode = 0644;
217 new_ct->attr.show = wf_show_control; 217 new_ct->attr.show = wf_show_control;
218 new_ct->attr.store = wf_store_control; 218 new_ct->attr.store = wf_store_control;
219 device_create_file(&wf_platform_device.dev, &new_ct->attr); 219 if (device_create_file(&wf_platform_device.dev, &new_ct->attr))
220 printk(KERN_WARNING "windfarm: device_create_file failed"
221 " for %s\n", new_ct->name);
222 /* the subsystem still does useful work without the file */
220 223
221 DBG("wf: Registered control %s\n", new_ct->name); 224 DBG("wf: Registered control %s\n", new_ct->name);
222 225
@@ -326,7 +329,10 @@ int wf_register_sensor(struct wf_sensor *new_sr)
326 new_sr->attr.attr.mode = 0444; 329 new_sr->attr.attr.mode = 0444;
327 new_sr->attr.show = wf_show_sensor; 330 new_sr->attr.show = wf_show_sensor;
328 new_sr->attr.store = NULL; 331 new_sr->attr.store = NULL;
329 device_create_file(&wf_platform_device.dev, &new_sr->attr); 332 if (device_create_file(&wf_platform_device.dev, &new_sr->attr))
333 printk(KERN_WARNING "windfarm: device_create_file failed"
334 " for %s\n", new_sr->name);
335 /* the subsystem still does useful work without the file */
330 336
331 DBG("wf: Registered sensor %s\n", new_sr->name); 337 DBG("wf: Registered sensor %s\n", new_sr->name);
332 338
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 434524931ef3..82d595a52109 100644
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -302,6 +302,12 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start,
302 CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | \ 302 CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | \
303 CPU_FTR_NAP_DISABLE_L2_PR | CPU_FTR_HAS_HIGH_BATS | \ 303 CPU_FTR_NAP_DISABLE_L2_PR | CPU_FTR_HAS_HIGH_BATS | \
304 CPU_FTR_NEED_COHERENT | CPU_FTR_PPC_LE) 304 CPU_FTR_NEED_COHERENT | CPU_FTR_PPC_LE)
305#define CPU_FTRS_7448 (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \
306 CPU_FTR_USE_TB | \
307 CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | \
308 CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | \
309 CPU_FTR_NAP_DISABLE_L2_PR | CPU_FTR_HAS_HIGH_BATS | \
310 CPU_FTR_PPC_LE)
305#define CPU_FTRS_82XX (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \ 311#define CPU_FTRS_82XX (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \
306 CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB) 312 CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB)
307#define CPU_FTRS_G2_LE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \ 313#define CPU_FTRS_G2_LE (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \
diff --git a/include/asm-powerpc/mmu-44x.h b/include/asm-powerpc/mmu-44x.h
index d5ce7a8dfe9f..62772ae839ca 100644
--- a/include/asm-powerpc/mmu-44x.h
+++ b/include/asm-powerpc/mmu-44x.h
@@ -55,8 +55,6 @@
55 55
56typedef unsigned long long phys_addr_t; 56typedef unsigned long long phys_addr_t;
57 57
58extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t);
59
60typedef struct { 58typedef struct {
61 unsigned long id; 59 unsigned long id;
62 unsigned long vdso_base; 60 unsigned long vdso_base;
diff --git a/include/asm-powerpc/mpc8260.h b/include/asm-powerpc/mpc8260.h
index f1b83b09ab2e..e0d480790e12 100644
--- a/include/asm-powerpc/mpc8260.h
+++ b/include/asm-powerpc/mpc8260.h
@@ -5,8 +5,8 @@
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__ 7#ifdef __KERNEL__
8#ifndef __ASM_PPC_MPC8260_H__ 8#ifndef __ASM_POWERPC_MPC8260_H__
9#define __ASM_PPC_MPC8260_H__ 9#define __ASM_POWERPC_MPC8260_H__
10 10
11 11
12#ifdef CONFIG_8260 12#ifdef CONFIG_8260
@@ -20,5 +20,5 @@
20#endif 20#endif
21 21
22#endif /* CONFIG_8260 */ 22#endif /* CONFIG_8260 */
23#endif /* !__ASM_PPC_MPC8260_H__ */ 23#endif /* !__ASM_POWERPC_MPC8260_H__ */
24#endif /* __KERNEL__ */ 24#endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h
index 09662a24f226..c863bdb2889c 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -782,23 +782,8 @@ extern void kernel_set_cachemode (unsigned long address, unsigned long size,
782/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ 782/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
783#define kern_addr_valid(addr) (1) 783#define kern_addr_valid(addr) (1)
784 784
785#ifdef CONFIG_PHYS_64BIT
786extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
787 unsigned long paddr, unsigned long size, pgprot_t prot);
788
789static inline int io_remap_pfn_range(struct vm_area_struct *vma,
790 unsigned long vaddr,
791 unsigned long pfn,
792 unsigned long size,
793 pgprot_t prot)
794{
795 phys_addr_t paddr64 = fixup_bigphys_addr(pfn << PAGE_SHIFT, size);
796 return remap_pfn_range(vma, vaddr, paddr64 >> PAGE_SHIFT, size, prot);
797}
798#else
799#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 785#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
800 remap_pfn_range(vma, vaddr, pfn, size, prot) 786 remap_pfn_range(vma, vaddr, pfn, size, prot)
801#endif
802 787
803/* 788/*
804 * No page table caches to initialise 789 * No page table caches to initialise
diff --git a/include/asm-powerpc/pmac_feature.h b/include/asm-powerpc/pmac_feature.h
index d43d91beba9b..26bcb0aa164a 100644
--- a/include/asm-powerpc/pmac_feature.h
+++ b/include/asm-powerpc/pmac_feature.h
@@ -28,8 +28,8 @@
28 */ 28 */
29 29
30#ifdef __KERNEL__ 30#ifdef __KERNEL__
31#ifndef __PPC_ASM_PMAC_FEATURE_H 31#ifndef __ASM_POWERPC_PMAC_FEATURE_H
32#define __PPC_ASM_PMAC_FEATURE_H 32#define __ASM_POWERPC_PMAC_FEATURE_H
33 33
34#include <asm/macio.h> 34#include <asm/macio.h>
35#include <asm/machdep.h> 35#include <asm/machdep.h>
@@ -393,5 +393,5 @@ extern u32 __iomem *uninorth_base;
393#define UN_BIC(r,v) (UN_OUT((r), UN_IN(r) & ~(v))) 393#define UN_BIC(r,v) (UN_OUT((r), UN_IN(r) & ~(v)))
394 394
395 395
396#endif /* __PPC_ASM_PMAC_FEATURE_H */ 396#endif /* __ASM_POWERPC_PMAC_FEATURE_H */
397#endif /* __KERNEL__ */ 397#endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/systbl.h b/include/asm-powerpc/systbl.h
index 3d44446fb74f..700ca5928741 100644
--- a/include/asm-powerpc/systbl.h
+++ b/include/asm-powerpc/systbl.h
@@ -308,3 +308,6 @@ COMPAT_SYS_SPU(move_pages)
308SYSCALL_SPU(getcpu) 308SYSCALL_SPU(getcpu)
309COMPAT_SYS(epoll_pwait) 309COMPAT_SYS(epoll_pwait)
310COMPAT_SYS_SPU(utimensat) 310COMPAT_SYS_SPU(utimensat)
311COMPAT_SYS_SPU(signalfd)
312COMPAT_SYS_SPU(timerfd)
313SYSCALL_SPU(eventfd)
diff --git a/include/asm-powerpc/tsi108_irq.h b/include/asm-powerpc/tsi108_irq.h
index 3e4d04effa57..6ed93979fbe4 100644
--- a/include/asm-powerpc/tsi108_irq.h
+++ b/include/asm-powerpc/tsi108_irq.h
@@ -26,8 +26,8 @@
26 * demultiplexing on TSI108EMU/SVB boards. 26 * demultiplexing on TSI108EMU/SVB boards.
27 */ 27 */
28 28
29#ifndef _ASM_PPC_TSI108_IRQ_H 29#ifndef _ASM_POWERPC_TSI108_IRQ_H
30#define _ASM_PPC_TSI108_IRQ_H 30#define _ASM_POWERPC_TSI108_IRQ_H
31 31
32/* 32/*
33 * Tsi108 interrupts 33 * Tsi108 interrupts
@@ -121,4 +121,4 @@ typedef enum {
121 TSI108_IRQ_DIRECTED, 121 TSI108_IRQ_DIRECTED,
122 TSI108_IRQ_DISTRIBUTED, 122 TSI108_IRQ_DISTRIBUTED,
123} TSI108_IRQ_MODE; 123} TSI108_IRQ_MODE;
124#endif /* _ASM_PPC_TSI108_IRQ_H */ 124#endif /* _ASM_POWERPC_TSI108_IRQ_H */
diff --git a/include/asm-powerpc/tsi108_pci.h b/include/asm-powerpc/tsi108_pci.h
index a9f92f73232c..5653d7cc3e24 100644
--- a/include/asm-powerpc/tsi108_pci.h
+++ b/include/asm-powerpc/tsi108_pci.h
@@ -18,8 +18,8 @@
18 * MA 02111-1307 USA 18 * MA 02111-1307 USA
19 */ 19 */
20 20
21#ifndef _ASM_PPC_TSI108_PCI_H 21#ifndef _ASM_POWERPC_TSI108_PCI_H
22#define _ASM_PPC_TSI108_PCI_H 22#define _ASM_POWERPC_TSI108_PCI_H
23 23
24#include <asm/tsi108.h> 24#include <asm/tsi108.h>
25 25
@@ -42,4 +42,4 @@ extern void tsi108_pci_int_init(struct device_node *node);
42extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc); 42extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc);
43extern void tsi108_clear_pci_cfg_error(void); 43extern void tsi108_clear_pci_cfg_error(void);
44 44
45#endif /* _ASM_PPC_TSI108_PCI_H */ 45#endif /* _ASM_POWERPC_TSI108_PCI_H */
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index 21f004aef508..e3c28dc31abf 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_PPC_UNISTD_H_ 1#ifndef _ASM_POWERPC_UNISTD_H_
2#define _ASM_PPC_UNISTD_H_ 2#define _ASM_POWERPC_UNISTD_H_
3 3
4/* 4/*
5 * This file contains the system call numbers. 5 * This file contains the system call numbers.
@@ -327,10 +327,13 @@
327#define __NR_getcpu 302 327#define __NR_getcpu 302
328#define __NR_epoll_pwait 303 328#define __NR_epoll_pwait 303
329#define __NR_utimensat 304 329#define __NR_utimensat 304
330#define __NR_signalfd 305
331#define __NR_timerfd 306
332#define __NR_eventfd 307
330 333
331#ifdef __KERNEL__ 334#ifdef __KERNEL__
332 335
333#define __NR_syscalls 305 336#define __NR_syscalls 308
334 337
335#define __NR__exit __NR_exit 338#define __NR__exit __NR_exit
336#define NR_syscalls __NR_syscalls 339#define NR_syscalls __NR_syscalls
@@ -381,4 +384,4 @@
381#endif /* __ASSEMBLY__ */ 384#endif /* __ASSEMBLY__ */
382#endif /* __KERNEL__ */ 385#endif /* __KERNEL__ */
383 386
384#endif /* _ASM_PPC_UNISTD_H_ */ 387#endif /* _ASM_POWERPC_UNISTD_H_ */
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-21 22:29:02 -0400