From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Antonino A. Daplas" Subject: [PATCH 16/18] atyfb: VT/GT cleanup Date: Sat, 10 Dec 2005 14:14:27 +0800 Message-ID: <439A7243.1080208@gmail.com> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1Eky6L-0002s5-Fg for linux-fbdev-devel@lists.sourceforge.net; Fri, 09 Dec 2005 22:20:57 -0800 Received: from zproxy.gmail.com ([64.233.162.202]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1Eky6L-0007YV-2a for linux-fbdev-devel@lists.sourceforge.net; Fri, 09 Dec 2005 22:20:57 -0800 Received: by zproxy.gmail.com with SMTP id o1so1121639nzf for ; Fri, 09 Dec 2005 22:20:56 -0800 (PST) Sender: linux-fbdev-devel-admin@lists.sourceforge.net Errors-To: linux-fbdev-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: List-Post: List-Help: List-Subscribe: , List-Archive: Content-Type: text/plain; charset="iso-8859-1" To: Andrew Morton Cc: Linux Fbdev development list , =?ISO-8859-1?Q?Ville_Syrj=C3=A4l=C3=A4?= atyfb: VT/GT cleanup From: Ville Syrj=E4l=E4 Clean up VT and GT chip descriptions. All B revision VT chips are called 264VT3. Verified from pictures of the chips as the specs are a bit unlear in this. GT revision B1 is Rage II, B2 is Rage II+. Specs and chip pictures seem to agree. VT revision A4 is 264VT2. Revision A3 is probably a plain 264VT. Signed-off-by: Ville Syrj=E4l=E4 Signed-off-by: Antonino Daplas --- drivers/video/aty/atyfb_base.c | 62 ++++++++++++++++++++++++++--------= ------ 1 files changed, 41 insertions(+), 21 deletions(-) diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_bas= e.c index 52b8b36..36c6449 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -380,11 +380,12 @@ static struct { #ifdef CONFIG_FB_ATY_CT { PCI_CHIP_MACH64CT, "ATI264CT (Mach64 CT)", 135, 60, 60, 0, ATI_CHIP_2= 64CT }, { PCI_CHIP_MACH64ET, "ATI264ET (Mach64 ET)", 135, 60, 60, 0, ATI_CHIP_2= 64ET }, - { PCI_CHIP_MACH64VT, "ATI264VT? (Mach64 VT)", 170, 67, 67, 80, ATI_CHIP= _264VT }, + + { PCI_CHIP_MACH64VT, "ATI264VT (Mach64 VT)", 170, 67, 67, 80, ATI_CHIP_= 264VT }, { PCI_CHIP_MACH64GT, "3D RAGE (Mach64 GT)", 135, 63, 63, 80, ATI_CHIP_2= 64GT }, - /* FIXME { ...ATI_264GU, maybe ATI_CHIP_264GTDVD }, */ - { PCI_CHIP_MACH64GU, "3D RAGE II+ (Mach64 GTB)", 200, 67, 67, 100, ATI_= CHIP_264GTB }, - { PCI_CHIP_MACH64VU, "ATI264VTB (Mach64 VU)", 200, 67, 67, 80, ATI_CHIP= _264VT3 }, + + { PCI_CHIP_MACH64VU, "ATI264VT3 (Mach64 VU)", 200, 67, 67, 80, ATI_CHIP= _264VT3 }, + { PCI_CHIP_MACH64GU, "3D RAGE II+ (Mach64 GU)", 200, 67, 67, 100, ATI_C= HIP_264GTB }, =20 { PCI_CHIP_MACH64LT, "3D RAGE LT (Mach64 LT)", 135, 63, 63, 0, ATI_CHIP= _264LT }, /* FIXME chipset maybe ATI_CHIP_264LTPRO ? */ @@ -460,44 +461,63 @@ static int __devinit correct_chipset(str #endif #ifdef CONFIG_FB_ATY_CT case PCI_CHIP_MACH64VT: - rev &=3D 0xc7; - if(rev =3D=3D 0x00) { - name =3D "ATI264VTA3 (Mach64 VT)"; - par->pll_limits.pll_max =3D 170; - par->pll_limits.mclk =3D 67; - par->pll_limits.xclk =3D 67; - par->pll_limits.ecp_max =3D 80; - par->features =3D ATI_CHIP_264VT; - } else if(rev =3D=3D 0x40) { - name =3D "ATI264VTA4 (Mach64 VT)"; + switch (rev & 0x07) { + case 0x00: + switch (rev & 0xc0) { + case 0x00: + name =3D "ATI264VT (A3) (Mach64 VT)"; + par->pll_limits.pll_max =3D 170; + par->pll_limits.mclk =3D 67; + par->pll_limits.xclk =3D 67; + par->pll_limits.ecp_max =3D 80; + par->features =3D ATI_CHIP_264VT; + break; + case 0x40: + name =3D "ATI264VT2 (A4) (Mach64 VT)"; + par->pll_limits.pll_max =3D 200; + par->pll_limits.mclk =3D 67; + par->pll_limits.xclk =3D 67; + par->pll_limits.ecp_max =3D 80; + par->features =3D ATI_CHIP_264VT | M64F_MAGIC_POSTDIV; + break; + } + break; + case 0x01: + name =3D "ATI264VT3 (B1) (Mach64 VT)"; par->pll_limits.pll_max =3D 200; par->pll_limits.mclk =3D 67; par->pll_limits.xclk =3D 67; par->pll_limits.ecp_max =3D 80; - par->features =3D ATI_CHIP_264VT | M64F_MAGIC_POSTDIV; - } else { - name =3D "ATI264VTB (Mach64 VT)"; + par->features =3D ATI_CHIP_264VTB; + break; + case 0x02: + name =3D "ATI264VT3 (B2) (Mach64 VT)"; par->pll_limits.pll_max =3D 200; par->pll_limits.mclk =3D 67; par->pll_limits.xclk =3D 67; par->pll_limits.ecp_max =3D 80; - par->features =3D ATI_CHIP_264VTB; + par->features =3D ATI_CHIP_264VT3; + break; } break; case PCI_CHIP_MACH64GT: - rev &=3D 0x07; - if(rev =3D=3D 0x01) { + switch (rev & 0x07) { + case 0x01: + name =3D "3D RAGE II (Mach64 GT)"; par->pll_limits.pll_max =3D 170; par->pll_limits.mclk =3D 67; par->pll_limits.xclk =3D 67; par->pll_limits.ecp_max =3D 80; par->features =3D ATI_CHIP_264GTB; - } else if(rev =3D=3D 0x02) { + break; + case 0x02: + name =3D "3D RAGE II+ (Mach64 GT)"; par->pll_limits.pll_max =3D 200; par->pll_limits.mclk =3D 67; par->pll_limits.xclk =3D 67; par->pll_limits.ecp_max =3D 100; par->features =3D ATI_CHIP_264GTB; + break; } break; #endif ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log fi= les for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=3D7637&alloc_id=3D16865&op=3Dclick