Merge branch 'ioat' into fixes

4 files changed, 14 insertions, 15 deletions

diff --git a/arch/powerpc/boot/addRamDisk.c b/arch/powerpc/boot/addRamDisk.c
index c02a99952be7..893f446cbd22 100644
--- a/arch/powerpc/boot/addRamDisk.c
+++ b/arch/powerpc/boot/addRamDisk.c
@@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r)
 
         return 64;
 }
-void get4k(FILE *file, char *buf )
+static void get4k(FILE *file, char *buf )
 {
         unsigned j;
         unsigned num = fread(buf, 1, 4096, file);
@@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf )
                 buf[j] = 0;
 }
 
-void put4k(FILE *file, char *buf )
+static void put4k(FILE *file, char *buf )
 {
         fwrite(buf, 1, 4096, file);
 }
 
-void death(const char *msg, FILE *fdesc, const char *fname) 
+static void death(const char *msg, FILE *fdesc, const char *fname)
 {
         fprintf(stderr, msg);
         fclose(fdesc);
diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts
index 9a603695723b..9ea783056969 100644
--- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
@@ -67,7 +67,7 @@
                         device-width = <1>;
 
                         partition@0 {
-                                reg = <0 0x8000>;
+                                reg = <0 0x80000>;
                                 label = "u-boot";
                                 read-only;
                         };
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
index 06332d61830a..1e3ec8f059bf 100644
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -487,8 +487,8 @@
                                  &qe_pio_f 5 0   /* USBTN */
                                  &qe_pio_f 6 0   /* USBRP */
                                  &qe_pio_f 8 0   /* USBRN */
-                                 &bcsr17   6 0   /* SPEED */
-                                 &bcsr17   5 1>; /* POWER */
+                                 &bcsr17   1 0   /* SPEED */
+                                 &bcsr17   2 0>; /* POWER */
                 };
 
                 enet0: ucc@2000 {
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index 9eefe00ed253..94a332251710 100644
--- a/arch/powerpc/boot/dts/sbc8548.dts
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -26,8 +26,7 @@
                 serial0 = &serial0;
                 serial1 = &serial1;
                 pci0 = &pci0;
-                /* pci1 doesn't have a corresponding physical connector */
-                pci2 = &pci2;
+                pci1 = &pci1;
         };
 
         cpus {
@@ -381,7 +380,7 @@
                 bus-range = <0 0>;
                 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
                           0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>;
-                clock-frequency = <66666666>;
+                clock-frequency = <66000000>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
@@ -390,7 +389,7 @@
                 device_type = "pci";
         };
 
-        pci2: pcie@e000a000 {
+        pci1: pcie@e000a000 {
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -403,9 +402,9 @@
                 interrupt-parent = <&mpic>;
                 interrupts = <0x1a 0x2>;
                 bus-range = <0x0 0xff>;
-                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-                          0x01000000 0x0 0x00000000 0xe3000000 0x0 0x08000000>;
-                clock-frequency = <33333333>;
+                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2800000 0x0 0x08000000>;
+                clock-frequency = <33000000>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
@@ -419,11 +418,11 @@
                         device_type = "pci";
                         ranges = <0x02000000 0x0 0xa0000000
                                   0x02000000 0x0 0xa0000000
-                                  0x0 0x20000000
+                                  0x0 0x10000000
 
                                   0x01000000 0x0 0x00000000
                                   0x01000000 0x0 0x00000000
-                                  0x0 0x08000000>;
+                                  0x0 0x00800000>;
                 };
         };
 };