Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (25 commits)
  atyfb: Fix bootup hangs on sparc64.
  sparc: update copyright in piggyback.c
  sparc: unify strip command in boot/Makefile
  sparc: rename piggyback_32 to piggyback
  sparc: fix tftpboot.img for sparc64 on little-endian host
  sparc: add $BITS to piggyback arguments
  sparc: remove obsolete ELF support in piggyback_32.c
  sparc: additional comments to piggyback_32.c
  sparc: use _start for the start entry (like 64 bit does)
  sparc: use trapbase in setup_arch
  sparc: refactor piggy_32.c
  Added support for ampopts in APBUART driver. Used in AMP systems.
  APBUART: added raw AMBA vendor/device number to match against.
  SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing
  SPARC/LEON: added support for selecting Timer Core and Timer within core
  LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL
  SPARC/LEON: added support for IRQAMP IRQ Controller
  SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded.
  sparc: fix sparse warnings in arch/sparc/prom for 32 bit build
  sparc: remove unused prom tree functions
  ...

2 files changed, 12 insertions, 23 deletions

diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index cc01c650a144..767ce9e396c5 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -26,6 +26,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/serial_core.h>
@@ -573,13 +574,15 @@ static int __devinit apbuart_probe(struct platform_device *op,
         printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n",
                (unsigned long long) port->mapbase, port->irq);
         return 0;
-
 }
 
 static struct of_device_id __initdata apbuart_match[] = {
         {
          .name = "GAISLER_APBUART",
          },
+        {
+         .name = "01_00c",
+         },
         {},
 };
 
@@ -620,9 +623,12 @@ static void grlib_apbuart_configure(void)
                 int *vendor = (int *) of_get_property(np, "vendor", NULL);
                 int *device = (int *) of_get_property(np, "device", NULL);
                 int *irqs = (int *) of_get_property(np, "interrupts", NULL);
+                int *ampopts = (int *) of_get_property(np, "ampopts", NULL);
                 regs = (struct amba_prom_registers *)
                     of_get_property(np, "reg", NULL);
 
+                if (ampopts && (*ampopts == 0))
+                        continue; /* Ignore if used by another OS instance */
                 if (vendor)
                         v = *vendor;
                 if (device)
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 5bf91236c701..5a3ce3ad1ec8 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2969,10 +2969,8 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
 {
         struct atyfb_par *par = info->par;
         struct device_node *dp;
-        char prop[128];
-        phandle node;
-        int len, i, j, ret;
         u32 mem, chip_id;
+        int i, j, ret;
 
         /*
          * Map memory-mapped registers.
@@ -3088,23 +3086,8 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                 aty_st_le32(MEM_CNTL, mem, par);
         }
 
-        /*
-         * If this is the console device, we will set default video
-         * settings to what the PROM left us with.
-         */
-        node = prom_getchild(prom_root_node);
-        node = prom_searchsiblings(node, "aliases");
-        if (node) {
-                len = prom_getproperty(node, "screen", prop, sizeof(prop));
-                if (len > 0) {
-                        prop[len] = '\0';
-                        node = prom_finddevice(prop);
-                } else
-                        node = 0;
-        }
-
         dp = pci_device_to_OF_node(pdev);
-        if (node == dp->phandle) {
+        if (dp == of_console_device) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;
@@ -3112,9 +3095,9 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                 u8 pll_regs[16];
                 u8 clock_cntl;
 
-                crtc.vxres = prom_getintdefault(node, "width", 1024);
-                crtc.vyres = prom_getintdefault(node, "height", 768);
-                var->bits_per_pixel = prom_getintdefault(node, "depth", 8);
+                crtc.vxres = of_getintprop_default(dp, "width", 1024);
+                crtc.vyres = of_getintprop_default(dp, "height", 768);
+                var->bits_per_pixel = of_getintprop_default(dp, "depth", 8);
                 var->xoffset = var->yoffset = 0;
                 crtc.h_tot_disp = aty_ld_le32(CRTC_H_TOTAL_DISP, par);
                 crtc.h_sync_strt_wid = aty_ld_le32(CRTC_H_SYNC_STRT_WID, par);