Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
  [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
  [POWERPC] remove kernel module option for booke wdt
  [POWERPC] Avoid putting cpu node twice
  [POWERPC] Spinlock initializer cleanup
  [POWERPC] ppc4xx_sgdma needs dma-mapping.h
  [POWERPC] arch/powerpc/sysdev/timer.c build fix
  [POWERPC] get_property cleanups
  [POWERPC] Remove the unused HTDMSOUND driver
  [POWERPC] cell: cbe_cpufreq cleanup and crash fix
  [POWERPC] Declare enable_kernel_spe in a header
  [POWERPC] Add dt_xlate_addr() to bootwrapper
  [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
  [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
  [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
  [POWERPC] Add uartlite boot console driver for the zImage wrapper
  [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
  [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
  [POWERPC] Merge common virtex header files
  [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
  [POWERPC] Clean up cpufreq Kconfig dependencies
  ...

1 files changed, 33 insertions, 22 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 4fb5938ce6d3..e27d9d1b6e67 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2035,39 +2035,50 @@ static void __init fixup_device_tree_maple(void)
 #endif
 
 #ifdef CONFIG_PPC_CHRP
-/* Pegasos and BriQ lacks the "ranges" property in the isa node */
+/*
+ * Pegasos and BriQ lacks the "ranges" property in the isa node
+ * Pegasos needs decimal IRQ 14/15, not hexadecimal
+ */
 static void __init fixup_device_tree_chrp(void)
 {
-        phandle isa;
-        u32 isa_ranges[6];
+        phandle ph;
+        u32 prop[6];
         u32 rloc = 0x01006000; /* IO space; PCI device = 12 */
         char *name;
         int rc;
 
         name = "/pci@80000000/isa@c";
-        isa = call_prom("finddevice", 1, 1, ADDR(name));
-        if (!PHANDLE_VALID(isa)) {
+        ph = call_prom("finddevice", 1, 1, ADDR(name));
+        if (!PHANDLE_VALID(ph)) {
                 name = "/pci@ff500000/isa@6";
-                isa = call_prom("finddevice", 1, 1, ADDR(name));
+                ph = call_prom("finddevice", 1, 1, ADDR(name));
                 rloc = 0x01003000; /* IO space; PCI device = 6 */
         }
-        if (!PHANDLE_VALID(isa))
-                return;
-
-        rc = prom_getproplen(isa, "ranges");
-        if (rc != 0 && rc != PROM_ERROR)
-                return;
-
-        prom_printf("Fixing up missing ISA range on Pegasos...\n");
+        if (PHANDLE_VALID(ph)) {
+                rc = prom_getproplen(ph, "ranges");
+                if (rc == 0 || rc == PROM_ERROR) {
+                        prom_printf("Fixing up missing ISA range on Pegasos...\n");
+
+                        prop[0] = 0x1;
+                        prop[1] = 0x0;
+                        prop[2] = rloc;
+                        prop[3] = 0x0;
+                        prop[4] = 0x0;
+                        prop[5] = 0x00010000;
+                        prom_setprop(ph, name, "ranges", prop, sizeof(prop));
+                }
+        }
 
-        isa_ranges[0] = 0x1;
-        isa_ranges[1] = 0x0;
-        isa_ranges[2] = rloc;
-        isa_ranges[3] = 0x0;
-        isa_ranges[4] = 0x0;
-        isa_ranges[5] = 0x00010000;
-        prom_setprop(isa, name, "ranges",
-                        isa_ranges, sizeof(isa_ranges));
+        name = "/pci@80000000/ide@C,1";
+        ph = call_prom("finddevice", 1, 1, ADDR(name));
+        if (PHANDLE_VALID(ph)) {
+                prom_printf("Fixing up IDE interrupt on Pegasos...\n");
+                prop[0] = 14;
+                prop[1] = 0x0;
+                prop[2] = 15;
+                prop[3] = 0x0;
+                prom_setprop(ph, name, "interrupts", prop, 4*sizeof(u32));
+        }
 }
 #else
 #define fixup_device_tree_chrp()