diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2013-03-27 00:47:03 +0000 |
---|---|---|
committer | Michael Ellerman <michael@ellerman.id.au> | 2013-04-18 13:03:53 +1000 |
commit | 933ee7119fb14156f46dc8bce8218f62db13c568 (patch) | |
tree | d42fe89c8f7a28351e8139743601c45c9c6a32df /drivers/video/cirrusfb.c | |
parent | 9850baed30dd445b0a2bb58045b8edff74953952 (diff) | |
download | op-kernel-dev-933ee7119fb14156f46dc8bce8218f62db13c568.zip op-kernel-dev-933ee7119fb14156f46dc8bce8218f62db13c568.tar.gz |
powerpc: remove PReP platform
PPC_PREP is marked as BROKEN since v2.6.15. Remove all PReP specific
code now.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Diffstat (limited to 'drivers/video/cirrusfb.c')
-rw-r--r-- | drivers/video/cirrusfb.c | 62 |
1 files changed, 12 insertions, 50 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index c3dbbe6..97db3ba 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c @@ -53,12 +53,6 @@ #ifdef CONFIG_AMIGA #include <asm/amigahw.h> #endif -#ifdef CONFIG_PPC_PREP -#include <asm/machdep.h> -#define isPReP machine_is(prep) -#else -#define isPReP 0 -#endif #include <video/vga.h> #include <video/cirrus.h> @@ -557,30 +551,18 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var, break; case 16: - if (isPReP) { - var->red.offset = 2; - var->green.offset = -3; - var->blue.offset = 8; - } else { - var->red.offset = 11; - var->green.offset = 5; - var->blue.offset = 0; - } + var->red.offset = 11; + var->green.offset = 5; + var->blue.offset = 0; var->red.length = 5; var->green.length = 6; var->blue.length = 5; break; case 24: - if (isPReP) { - var->red.offset = 0; - var->green.offset = 8; - var->blue.offset = 16; - } else { - var->red.offset = 16; - var->green.offset = 8; - var->blue.offset = 0; - } + var->red.offset = 16; + var->green.offset = 8; + var->blue.offset = 0; var->red.length = 8; var->green.length = 8; var->blue.length = 8; @@ -1874,17 +1856,6 @@ static void cirrusfb_imageblit(struct fb_info *info, } } -#ifdef CONFIG_PPC_PREP -#define PREP_VIDEO_BASE ((volatile unsigned long) 0xC0000000) -#define PREP_IO_BASE ((volatile unsigned char *) 0x80000000) -static void get_prep_addrs(unsigned long *display, unsigned long *registers) -{ - *display = PREP_VIDEO_BASE; - *registers = (unsigned long) PREP_IO_BASE; -} - -#endif /* CONFIG_PPC_PREP */ - #ifdef CONFIG_PCI static int release_io_ports; @@ -2139,21 +2110,12 @@ static int cirrusfb_pci_register(struct pci_dev *pdev, dev_dbg(info->device, " base address 1 is 0x%Lx\n", (unsigned long long)pdev->resource[1].start); - if (isPReP) { - pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, 0x00000000); -#ifdef CONFIG_PPC_PREP - get_prep_addrs(&board_addr, &info->fix.mmio_start); -#endif - /* PReP dies if we ioremap the IO registers, but it works w/out... */ - cinfo->regbase = (char __iomem *) info->fix.mmio_start; - } else { - dev_dbg(info->device, - "Attempt to get PCI info for Cirrus Graphics Card\n"); - get_pci_addrs(pdev, &board_addr, &info->fix.mmio_start); - /* FIXME: this forces VGA. alternatives? */ - cinfo->regbase = NULL; - cinfo->laguna_mmio = ioremap(info->fix.mmio_start, 0x1000); - } + dev_dbg(info->device, + "Attempt to get PCI info for Cirrus Graphics Card\n"); + get_pci_addrs(pdev, &board_addr, &info->fix.mmio_start); + /* FIXME: this forces VGA. alternatives? */ + cinfo->regbase = NULL; + cinfo->laguna_mmio = ioremap(info->fix.mmio_start, 0x1000); dev_dbg(info->device, "Board address: 0x%lx, register address: 0x%lx\n", board_addr, info->fix.mmio_start); |