Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

5 files changed, 177 insertions, 173 deletions

diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 403d17377f8..03798e9c882 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -133,12 +133,6 @@ static int controlfb_mmap(struct fb_info *info, struct file *file,
 static int controlfb_set_par (struct fb_info *info);
 static int controlfb_check_var (struct fb_var_screeninfo *var, struct fb_info *info);
 
-/*
- * inititialization
- */
-int control_init(void);
-void control_setup(char *);
-
 /******************** Prototypes for internal functions **********************/
 
 static void set_control_clock(unsigned char *params);
@@ -550,9 +544,46 @@ static void control_set_hardware(struct fb_info_control *p, struct fb_par_contro
 
 
 /*
- * Called from fbmem.c for probing & initializing
+ * Parse user speficied options (`video=controlfb:')
  */
-int __init control_init(void)
+static void __init control_setup(char *options)
+{
+        char *this_opt;
+
+        if (!options || !*options)
+                return;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!strncmp(this_opt, "vmode:", 6)) {
+                        int vmode = simple_strtoul(this_opt+6, NULL, 0);
+                        if (vmode > 0 && vmode <= VMODE_MAX &&
+                            control_mac_modes[vmode - 1].m[1] >= 0)
+                                default_vmode = vmode;
+                } else if (!strncmp(this_opt, "cmode:", 6)) {
+                        int depth = simple_strtoul(this_opt+6, NULL, 0);
+                        switch (depth) {
+                         case CMODE_8:
+                         case CMODE_16:
+                         case CMODE_32:
+                                default_cmode = depth;
+                                break;
+                         case 8:
+                                default_cmode = CMODE_8;
+                                break;
+                         case 15:
+                         case 16:
+                                default_cmode = CMODE_16;
+                                break;
+                         case 24:
+                         case 32:
+                                default_cmode = CMODE_32;
+                                break;
+                        }
+                }
+        }
+}
+
+static int __init control_init(void)
 {
         struct device_node *dp;
         char *option = NULL;
@@ -651,15 +682,16 @@ static void __init find_vram_size(struct fb_info_control *p)
 static int __init control_of_init(struct device_node *dp)
 {
         struct fb_info_control  *p;
-        unsigned long           addr;
-        int                     i;
+        struct resource         fb_res, reg_res;
 
         if (control_fb) {
                 printk(KERN_ERR "controlfb: only one control is supported\n");
                 return -ENXIO;
         }
-        if(dp->n_addrs != 2) {
-                printk(KERN_ERR "expecting 2 address for control (got %d)", dp->n_addrs);
+
+        if (of_pci_address_to_resource(dp, 2, &fb_res) ||
+            of_pci_address_to_resource(dp, 1, &reg_res)) {
+                printk(KERN_ERR "can't get 2 addresses for control\n");
                 return -ENXIO;
         }
         p = kmalloc(sizeof(*p), GFP_KERNEL);
@@ -669,18 +701,12 @@ static int __init control_of_init(struct device_node *dp)
         memset(p, 0, sizeof(*p));
 
         /* Map in frame buffer and registers */
-        for (i = 0; i < dp->n_addrs; ++i) {
-                addr = dp->addrs[i].address;
-                if (dp->addrs[i].size >= 0x800000) {
-                        p->fb_orig_base = addr;
-                        p->fb_orig_size = dp->addrs[i].size;
-                        /* use the big-endian aperture (??) */
-                        p->frame_buffer_phys = addr + 0x800000;
-                } else {
-                        p->control_regs_phys = addr;
-                        p->control_regs_size = dp->addrs[i].size;
-                }
-        }
+        p->fb_orig_base = fb_res.start;
+        p->fb_orig_size = fb_res.end - fb_res.start + 1;
+        /* use the big-endian aperture (??) */
+        p->frame_buffer_phys = fb_res.start + 0x800000;
+        p->control_regs_phys = reg_res.start;
+        p->control_regs_size = reg_res.end - reg_res.start + 1;
 
         if (!p->fb_orig_base ||
             !request_mem_region(p->fb_orig_base,p->fb_orig_size,"controlfb")) {
@@ -1059,43 +1085,3 @@ static void control_cleanup(void)
 }
 
 
-/*
- * Parse user speficied options (`video=controlfb:')
- */
-void __init control_setup(char *options)
-{
-        char *this_opt;
-
-        if (!options || !*options)
-                return;
-
-        while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!strncmp(this_opt, "vmode:", 6)) {
-                        int vmode = simple_strtoul(this_opt+6, NULL, 0);
-                        if (vmode > 0 && vmode <= VMODE_MAX &&
-                            control_mac_modes[vmode - 1].m[1] >= 0)
-                                default_vmode = vmode;
-                } else if (!strncmp(this_opt, "cmode:", 6)) {
-                        int depth = simple_strtoul(this_opt+6, NULL, 0);
-                        switch (depth) {
-                         case CMODE_8:
-                         case CMODE_16:
-                         case CMODE_32:
-                                default_cmode = depth;
-                                break;
-                         case 8:
-                                default_cmode = CMODE_8;
-                                break;
-                         case 15:
-                         case 16:
-                                default_cmode = CMODE_16;
-                                break;
-                         case 24:
-                         case 32:
-                                default_cmode = CMODE_32;
-                                break;
-                        }
-                }
-        }
-}
-
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 00d87f5bb7b..ad1434e3f22 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -223,6 +223,7 @@ static int offb_blank(int blank, struct fb_info *info)
 int __init offb_init(void)
 {
         struct device_node *dp = NULL, *boot_disp = NULL;
+
 #if defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32)
         struct device_node *macos_display = NULL;
 #endif
@@ -234,60 +235,54 @@ int __init offb_init(void)
         if (boot_infos != 0) {
                 unsigned long addr =
                     (unsigned long) boot_infos->dispDeviceBase;
+                u32 *addrp;
+                u64 daddr, dsize;
+                unsigned int flags;
+
                 /* find the device node corresponding to the macos display */
                 while ((dp = of_find_node_by_type(dp, "display"))) {
                         int i;
-                        /*
-                         * Grrr...  It looks like the MacOS ATI driver
-                         * munges the assigned-addresses property (but
-                         * the AAPL,address value is OK).
-                         */
-                        if (strncmp(dp->name, "ATY,", 4) == 0
-                            && dp->n_addrs == 1) {
-                                unsigned int *ap =
-                                    (unsigned int *) get_property(dp,
-                                                                  "AAPL,address",
-                                                                  NULL);
-                                if (ap != NULL) {
-                                        dp->addrs[0].address = *ap;
-                                        dp->addrs[0].size = 0x01000000;
-                                }
-                        }
 
                         /*
-                         * The LTPro on the Lombard powerbook has no addresses
-                         * on the display nodes, they are on their parent.
+                         * Look for an AAPL,address property first.
                          */
-                        if (dp->n_addrs == 0
-                            && device_is_compatible(dp, "ATY,264LTPro")) {
-                                int na;
-                                unsigned int *ap = (unsigned int *)
-                                    get_property(dp, "AAPL,address", &na);
-                                if (ap != 0)
-                                        for (na /= sizeof(unsigned int);
-                                             na > 0; --na, ++ap)
-                                                if (*ap <= addr
-                                                    && addr <
-                                                    *ap + 0x1000000)
-                                                        goto foundit;
+                        unsigned int na;
+                        unsigned int *ap =
+                                (unsigned int *)get_property(dp, "AAPL,address",
+                                                             &na);
+                        if (ap != 0) {
+                                for (na /= sizeof(unsigned int); na > 0;
+                                     --na, ++ap)
+                                        if (*ap <= addr &&
+                                            addr < *ap + 0x1000000) {
+                                                macos_display = dp;
+                                                goto foundit;
+                                        }
                         }
 
                         /*
                          * See if the display address is in one of the address
                          * ranges for this display.
                          */
-                        for (i = 0; i < dp->n_addrs; ++i) {
-                                if (dp->addrs[i].address <= addr
-                                    && addr <
-                                    dp->addrs[i].address +
-                                    dp->addrs[i].size)
+                        i = 0;
+                        for (;;) {
+                                addrp = of_get_address(dp, i++, &dsize, &flags);
+                                if (addrp == NULL)
                                         break;
+                                if (!(flags & IORESOURCE_MEM))
+                                        continue;
+                                daddr = of_translate_address(dp, addrp);
+                                if (daddr == OF_BAD_ADDR)
+                                        continue;
+                                if (daddr <= addr && addr < (daddr + dsize)) {
+                                        macos_display = dp;
+                                        goto foundit;
+                                }
                         }
-                        if (i < dp->n_addrs) {
-                              foundit:
+                foundit:
+                        if (macos_display) {
                                 printk(KERN_INFO "MacOS display is %s\n",
                                        dp->full_name);
-                                macos_display = dp;
                                 break;
                         }
                 }
@@ -326,8 +321,10 @@ static void __init offb_init_nodriver(struct device_node *dp)
         int *pp, i;
         unsigned int len;
         int width = 640, height = 480, depth = 8, pitch;
-        unsigned int rsize, *up;
-        unsigned long address = 0;
+        unsigned int flags, rsize, *up;
+        u64 address = OF_BAD_ADDR;
+        u32 *addrp;
+        u64 asize;
 
         if ((pp = (int *) get_property(dp, "depth", &len)) != NULL
             && len == sizeof(int))
@@ -363,7 +360,7 @@ static void __init offb_init_nodriver(struct device_node *dp)
                                break;
                }
                if (pdev) {
-                       for (i = 0; i < 6 && address == 0; i++) {
+                       for (i = 0; i < 6 && address == OF_BAD_ADDR; i++) {
                                if ((pci_resource_flags(pdev, i) &
                                     IORESOURCE_MEM) &&
                                    (pci_resource_len(pdev, i) >= rsize))
@@ -374,27 +371,33 @@ static void __init offb_init_nodriver(struct device_node *dp)
         }
 #endif /* CONFIG_PCI */
 
-        if (address == 0 &&
-            (up = (unsigned *) get_property(dp, "address", &len)) != NULL &&
-            len == sizeof(unsigned))
-                address = (u_long) * up;
-        if (address == 0) {
-                for (i = 0; i < dp->n_addrs; ++i)
-                        if (dp->addrs[i].size >=
-                            pitch * height * depth / 8)
-                                break;
-                if (i >= dp->n_addrs) {
+       /* This one is dodgy, we may drop it ... */
+       if (address == OF_BAD_ADDR &&
+           (up = (unsigned *) get_property(dp, "address", &len)) != NULL &&
+           len == sizeof(unsigned int))
+               address = (u64) * up;
+
+       if (address == OF_BAD_ADDR) {
+               for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
+                            != NULL; i++) {
+                       if (!(flags & IORESOURCE_MEM))
+                               continue;
+                       if (asize >= pitch * height * depth / 8)
+                               break;
+               }
+                if (addrp == NULL) {
                         printk(KERN_ERR
                                "no framebuffer address found for %s\n",
                                dp->full_name);
                         return;
                 }
-
-                address = (u_long) dp->addrs[i].address;
-
-#ifdef CONFIG_PPC64
-                address += ((struct pci_dn *)dp->data)->phb->pci_mem_offset;
-#endif
+                address = of_translate_address(dp, addrp);
+                if (address == OF_BAD_ADDR) {
+                        printk(KERN_ERR
+                               "can't translate framebuffer address for %s\n",
+                               dp->full_name);
+                        return;
+                }
 
                 /* kludge for valkyrie */
                 if (strcmp(dp->name, "valkyrie") == 0)
@@ -459,7 +462,9 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 
         par->cmap_type = cmap_unknown;
         if (depth == 8) {
-                /* XXX kludge for ati */
+
+                /* Palette hacks disabled for now */
+#if 0
                 if (dp && !strncmp(name, "ATY,Rage128", 11)) {
                         unsigned long regbase = dp->addrs[2].address;
                         par->cmap_adr = ioremap(regbase, 0x1FFF);
@@ -490,6 +495,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                         par->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
                         par->cmap_type = cmap_gxt2000;
                 }
+#endif
                 fix->visual = par->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
                     : FB_VISUAL_STATIC_PSEUDOCOLOR;
         } else
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index ca4082ae5a1..335e3746555 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -69,6 +69,8 @@ struct fb_info_platinum {
         unsigned long                   total_vram;
         int                             clktype;
         int                             dactype;
+
+        struct resource                 rsrc_fb, rsrc_reg;
 };
 
 /*
@@ -97,9 +99,6 @@ static int platinum_var_to_par(struct fb_var_screeninfo *var,
  * Interface used by the world
  */
 
-int platinumfb_init(void);
-int platinumfb_setup(char*);
-
 static struct fb_ops platinumfb_ops = {
         .owner =        THIS_MODULE,
         .fb_check_var   = platinumfb_check_var,
@@ -138,13 +137,15 @@ static int platinumfb_set_par (struct fb_info *info)
 
         init = platinum_reg_init[pinfo->vmode-1];
         
-        if (pinfo->vmode == 13 && pinfo->cmode > 0)
-                offset = 0x10;
+        if ((pinfo->vmode == VMODE_832_624_75) && (pinfo->cmode > CMODE_8))
+                offset = 0x10;
+
         info->screen_base = pinfo->frame_buffer + init->fb_offset + offset;
         info->fix.smem_start = (pinfo->frame_buffer_phys) + init->fb_offset + offset;
         info->fix.visual = (pinfo->cmode == CMODE_8) ?
                 FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
-        info->fix.line_length = vmode_attrs[pinfo->vmode-1].hres * (1<<pinfo->cmode) + offset;
+        info->fix.line_length = vmode_attrs[pinfo->vmode-1].hres * (1<<pinfo->cmode)
+                + offset;
         printk("line_length: %x\n", info->fix.line_length);
         return 0;
 }
@@ -221,7 +222,9 @@ static int platinumfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 static inline int platinum_vram_reqd(int video_mode, int color_mode)
 {
         return vmode_attrs[video_mode-1].vres *
-               (vmode_attrs[video_mode-1].hres * (1<<color_mode) + 0x20) +0x1000;
+               (vmode_attrs[video_mode-1].hres * (1<<color_mode) +
+                ((video_mode == VMODE_832_624_75) &&
+                 (color_mode > CMODE_8)) ? 0x10 : 0x20) + 0x1000;
 }
 
 #define STORE_D2(a, d) { \
@@ -481,7 +484,7 @@ static int platinum_var_to_par(struct fb_var_screeninfo *var,
 /* 
  * Parse user speficied options (`video=platinumfb:')
  */
-int __init platinumfb_setup(char *options)
+static int __init platinumfb_setup(char *options)
 {
         char *this_opt;
 
@@ -522,19 +525,15 @@ int __init platinumfb_setup(char *options)
 #define invalidate_cache(addr)
 #endif
 
-static int __devinit platinumfb_probe(struct of_device* odev, const struct of_device_id *match)
+static int __devinit platinumfb_probe(struct of_device* odev,
+                                      const struct of_device_id *match)
 {
         struct device_node      *dp = odev->node;
         struct fb_info          *info;
         struct fb_info_platinum *pinfo;
-        unsigned long           addr, size;
         volatile __u8           *fbuffer;
-        int                     i, bank0, bank1, bank2, bank3, rc;
+        int                     bank0, bank1, bank2, bank3, rc;
 
-        if (dp->n_addrs != 2) {
-                printk(KERN_ERR "expecting 2 address for platinum (got %d)", dp->n_addrs);
-                return -ENXIO;
-        }
         printk(KERN_INFO "platinumfb: Found Apple Platinum video hardware\n");
 
         info = framebuffer_alloc(sizeof(*pinfo), &odev->dev);
@@ -542,26 +541,39 @@ static int __devinit platinumfb_probe(struct of_device* odev, const struct of_de
                 return -ENOMEM;
         pinfo = info->par;
 
-        /* Map in frame buffer and registers */
-        for (i = 0; i < dp->n_addrs; ++i) {
-                addr = dp->addrs[i].address;
-                size = dp->addrs[i].size;
-                /* Let's assume we can request either all or nothing */
-                if (!request_mem_region(addr, size, "platinumfb")) {
-                        framebuffer_release(info);
-                        return -ENXIO;
-                }
-                if (size >= 0x400000) {
-                        /* frame buffer - map only 4MB */
-                        pinfo->frame_buffer_phys = addr;
-                        pinfo->frame_buffer = __ioremap(addr, 0x400000, _PAGE_WRITETHRU);
-                        pinfo->base_frame_buffer = pinfo->frame_buffer;
-                } else {
-                        /* registers */
-                        pinfo->platinum_regs_phys = addr;
-                        pinfo->platinum_regs = ioremap(addr, size);
-                }
+        if (of_address_to_resource(dp, 0, &pinfo->rsrc_reg) ||
+            of_address_to_resource(dp, 1, &pinfo->rsrc_fb)) {
+                printk(KERN_ERR "platinumfb: Can't get resources\n");
+                framebuffer_release(info);
+                return -ENXIO;
         }
+        if (!request_mem_region(pinfo->rsrc_reg.start,
+                                pinfo->rsrc_reg.start -
+                                pinfo->rsrc_reg.end + 1,
+                                "platinumfb registers")) {
+                framebuffer_release(info);
+                return -ENXIO;
+        }
+        if (!request_mem_region(pinfo->rsrc_fb.start,
+                                pinfo->rsrc_fb.start
+                                - pinfo->rsrc_fb.end + 1,
+                                "platinumfb framebuffer")) {
+                release_mem_region(pinfo->rsrc_reg.start,
+                                   pinfo->rsrc_reg.end -
+                                   pinfo->rsrc_reg.start + 1);
+                framebuffer_release(info);
+                return -ENXIO;
+        }
+
+        /* frame buffer - map only 4MB */
+        pinfo->frame_buffer_phys = pinfo->rsrc_fb.start;
+        pinfo->frame_buffer = __ioremap(pinfo->rsrc_fb.start, 0x400000,
+                                        _PAGE_WRITETHRU);
+        pinfo->base_frame_buffer = pinfo->frame_buffer;
+
+        /* registers */
+        pinfo->platinum_regs_phys = pinfo->rsrc_reg.start;
+        pinfo->platinum_regs = ioremap(pinfo->rsrc_reg.start, 0x1000);
 
         pinfo->cmap_regs_phys = 0xf301b000;     /* XXX not in prom? */
         request_mem_region(pinfo->cmap_regs_phys, 0x1000, "platinumfb cmap");
@@ -624,18 +636,16 @@ static int __devexit platinumfb_remove(struct of_device* odev)
 {
         struct fb_info          *info = dev_get_drvdata(&odev->dev);
         struct fb_info_platinum *pinfo = info->par;
-        struct device_node *dp = odev->node;
-        unsigned long addr, size;
-        int i;
         
         unregister_framebuffer (info);
         
         /* Unmap frame buffer and registers */
-        for (i = 0; i < dp->n_addrs; ++i) {
-                addr = dp->addrs[i].address;
-                size = dp->addrs[i].size;
-                release_mem_region(addr, size);
-        }
+        release_mem_region(pinfo->rsrc_fb.start,
+                           pinfo->rsrc_fb.end -
+                           pinfo->rsrc_fb.start + 1);
+        release_mem_region(pinfo->rsrc_reg.start,
+                           pinfo->rsrc_reg.end -
+                           pinfo->rsrc_reg.start + 1);
         iounmap(pinfo->frame_buffer);
         iounmap(pinfo->platinum_regs);
         release_mem_region(pinfo->cmap_regs_phys, 0x1000);
@@ -662,7 +672,7 @@ static struct of_platform_driver platinum_driver =
         .remove         = platinumfb_remove,
 };
 
-int __init platinumfb_init(void)
+static int __init platinumfb_init(void)
 {
 #ifndef MODULE
         char *option = NULL;
@@ -676,7 +686,7 @@ int __init platinumfb_init(void)
         return 0;
 }
 
-void __exit platinumfb_exit(void)
+static void __exit platinumfb_exit(void)
 {
         of_unregister_driver(&platinum_driver); 
 }
diff --git a/drivers/video/platinumfb.h b/drivers/video/platinumfb.h
index 2834fc1c344..f6bd77cafd1 100644
--- a/drivers/video/platinumfb.h
+++ b/drivers/video/platinumfb.h
@@ -158,7 +158,9 @@ static struct platinum_regvals platinum_reg_init_14 = {
 /* 832x624, 75Hz (13) */
 static struct platinum_regvals platinum_reg_init_13 = {
         0x70,
-        { 864, 1680, 3360 },    /* MacOS does 1680 instead of 1696 to fit 16bpp in 1MB */
+        { 864, 1680, 3344 },    /* MacOS does 1680 instead of 1696 to fit 16bpp in 1MB,
+                                 * and we use 3344 instead of 3360 to fit in 2Mb
+                                 */
         { 0xff0, 4, 0, 0, 0, 0, 0x299, 0,
           0, 0x21e, 0x120, 0x10, 0x23f, 0x1f, 0x25, 0x37,
           0x8a, 0x22a, 0x23e, 0x536, 0x534, 4, 9, 0x52,
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index ce97ec8eae9..2bdeb4baa95 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -342,19 +342,19 @@ int __init valkyriefb_init(void)
 #else /* ppc (!CONFIG_MAC) */
         {
                 struct device_node *dp;
+                struct resource r;
 
-                dp = find_devices("valkyrie");
+                dp = of_find_node_by_name(NULL, "valkyrie");
                 if (dp == 0)
                         return 0;
 
-                if (dp->n_addrs != 1) {
-                        printk(KERN_ERR "expecting 1 address for valkyrie (got %d)\n",
-                               dp->n_addrs);
+                if (of_address_to_resource(dp, 0, &r)) {
+                        printk(KERN_ERR "can't find address for valkyrie\n");
                         return 0;
                 }
 
-                frame_buffer_phys = dp->addrs[0].address;
-                cmap_regs_phys = dp->addrs[0].address+0x304000;
+                frame_buffer_phys = r.start;
+                cmap_regs_phys = r.start + 0x304000;
                 flags = _PAGE_WRITETHRU;
         }
 #endif /* ppc (!CONFIG_MAC) */