aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/gxt4500.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/gxt4500.c')
-rw-r--r--drivers/video/gxt4500.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 0e9afa41d163..4bdea6e9bd55 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -1,5 +1,6 @@
1/* 1/*
2 * Frame buffer device for IBM GXT4500P and GXT6000P display adaptors 2 * Frame buffer device for IBM GXT4500P/6500P and GXT4000P/6000P
3 * display adaptors
3 * 4 *
4 * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org> 5 * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org>
5 */ 6 */
@@ -14,6 +15,8 @@
14#include <linux/string.h> 15#include <linux/string.h>
15 16
16#define PCI_DEVICE_ID_IBM_GXT4500P 0x21c 17#define PCI_DEVICE_ID_IBM_GXT4500P 0x21c
18#define PCI_DEVICE_ID_IBM_GXT6500P 0x21b
19#define PCI_DEVICE_ID_IBM_GXT4000P 0x16e
17#define PCI_DEVICE_ID_IBM_GXT6000P 0x170 20#define PCI_DEVICE_ID_IBM_GXT6000P 0x170
18 21
19/* GXT4500P registers */ 22/* GXT4500P registers */
@@ -173,6 +176,8 @@ static const struct fb_videomode defaultmode __devinitconst = {
173/* List of supported cards */ 176/* List of supported cards */
174enum gxt_cards { 177enum gxt_cards {
175 GXT4500P, 178 GXT4500P,
179 GXT6500P,
180 GXT4000P,
176 GXT6000P 181 GXT6000P
177}; 182};
178 183
@@ -182,6 +187,8 @@ static const struct cardinfo {
182 const char *cardname; 187 const char *cardname;
183} cardinfo[] = { 188} cardinfo[] = {
184 [GXT4500P] = { .refclk_ps = 9259, .cardname = "IBM GXT4500P" }, 189 [GXT4500P] = { .refclk_ps = 9259, .cardname = "IBM GXT4500P" },
190 [GXT6500P] = { .refclk_ps = 9259, .cardname = "IBM GXT6500P" },
191 [GXT4000P] = { .refclk_ps = 40000, .cardname = "IBM GXT4000P" },
185 [GXT6000P] = { .refclk_ps = 40000, .cardname = "IBM GXT6000P" }, 192 [GXT6000P] = { .refclk_ps = 40000, .cardname = "IBM GXT6000P" },
186}; 193};
187 194
@@ -736,6 +743,10 @@ static void __devexit gxt4500_remove(struct pci_dev *pdev)
736static const struct pci_device_id gxt4500_pci_tbl[] = { 743static const struct pci_device_id gxt4500_pci_tbl[] = {
737 { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P), 744 { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P),
738 .driver_data = GXT4500P }, 745 .driver_data = GXT4500P },
746 { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6500P),
747 .driver_data = GXT6500P },
748 { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4000P),
749 .driver_data = GXT4000P },
739 { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6000P), 750 { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6000P),
740 .driver_data = GXT6000P }, 751 .driver_data = GXT6000P },
741 { 0 } 752 { 0 }
@@ -768,7 +779,7 @@ static void __exit gxt4500_exit(void)
768module_exit(gxt4500_exit); 779module_exit(gxt4500_exit);
769 780
770MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>"); 781MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>");
771MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6000P"); 782MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6500P and GXT4000P/6000P");
772MODULE_LICENSE("GPL"); 783MODULE_LICENSE("GPL");
773module_param(mode_option, charp, 0); 784module_param(mode_option, charp, 0);
774MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\""); 785MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\"");