Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e3a1938805d2e81b27d3d348788644f3bad004f2

Authored by Darrick J. Wong
Committed by Linus Torvalds
1 parent 0b178883b3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

matroxfb: support G200eV chip 

Support the Matrox G200eV chip, based on timings that I found in the X.org
matrox driver.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 10 additions and 0 deletions Side-by-side Diff

drivers/video/matrox/matroxfb_base.c
Diff comments   View file @ e3a1938
... ... @@ -1453,6 +1453,13 @@
1453 1453 MGA_G100,
1454 1454 &vbG100,
1455 1455 "MGA-G100 (AGP)"},
  1456 + {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI, 0xFF,
  1457 + 0, 0,
  1458 + DEVF_G200,
  1459 + 230000,
  1460 + MGA_G200,
  1461 + &vbG200,
  1462 + "MGA-G200eV (PCI)"},
1456 1463 {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, 0xFF,
1457 1464 0, 0,
1458 1465 DEVF_G200,
... ... @@ -2117,6 +2124,8 @@
2117 2124 {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_MM,
2118 2125 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2119 2126 {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_AGP,
  2127 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
  2128 + {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI,
2120 2129 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2121 2130 {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI,
2122 2131 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
include/linux/pci_ids.h
Diff comments   View file @ e3a1938
... ... @@ -587,6 +587,7 @@
587 587 #define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520
588 588 #define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521
589 589 #define PCI_DEVICE_ID_MATROX_G400 0x0525
  590 +#define PCI_DEVICE_ID_MATROX_G200EV_PCI 0x0530
590 591 #define PCI_DEVICE_ID_MATROX_G550 0x2527
591 592 #define PCI_DEVICE_ID_MATROX_VIA 0x4536
592 593