[LinuxBIOS] r2420 - in trunk/LinuxBIOSv2/src: devices include/device mainboard/artecgroup/dbe61

Author: rminnich
Date: 2006-09-19 00:50:51 +0200 (Tue, 19 Sep 2006)
New Revision: 2420

Modified:
   trunk/LinuxBIOSv2/src/devices/pci_device.c
   trunk/LinuxBIOSv2/src/include/device/pci_ids.h
   trunk/LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Config.lb
Log:
fix old bug in the src/devices/pci_device.c 
add devices for the lx and artecgroup/dbe61
point artecgroup at cs5536_lx as it is so different.

Modified: trunk/LinuxBIOSv2/src/devices/pci_device.c
===================================================================
--- trunk/LinuxBIOSv2/src/devices/pci_device.c	2006-09-18 04:23:23 UTC (rev 2419)
+++ trunk/LinuxBIOSv2/src/devices/pci_device.c	2006-09-18 22:50:51 UTC (rev 2420)
@@ -761,7 +761,9 @@
    	return;
    }

-	/* Look through the list of setup drivers and find one for
+	printk_debug("%s: seeking driver for %x:%x class %x\n", 
+		__FUNCTION__, dev->vendor, dev->device, dev->class);
+ 	/* Look through the list of setup drivers and find one for
     * this pci device 
     */
    for(driver = &pci_drivers[0]; driver != &epci_drivers[0]; driver++) {
@@ -1176,13 +1178,13 @@

/* this seems like an error but is not ... */
 #if 1
-	if (inb(0x4d0) != (intBits & 0xf)) {
+	if (inb(0x4d0) != (intBits & 0xff)) {
      printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
-		     __func__, intBits &0xf, inb(0x4d0));
+		     __func__, intBits &0xff, inb(0x4d0));
    }
-	if (inb(0x4d1) != ((intBits >> 8) & 0xf)) {
+	if (inb(0x4d1) != ((intBits >> 8) & 0xff)) {
      printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
-		     __func__, (intBits>>8) &0xf, inb(0x4d1));
+		     __func__, (intBits>>8) &0xff, inb(0x4d1));
    }
 #endif
 }

Modified: trunk/LinuxBIOSv2/src/include/device/pci_ids.h
===================================================================
--- trunk/LinuxBIOSv2/src/include/device/pci_ids.h	2006-09-18 04:23:23 UTC (rev 2419)
+++ trunk/LinuxBIOSv2/src/include/device/pci_ids.h	2006-09-18 22:50:51 UTC (rev 2420)
@@ -400,6 +400,7 @@
 #define PCI_DEVICE_ID_AMD_LANCE		0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
 #define PCI_DEVICE_ID_AMD_LX		0x1054
+#define PCI_DEVICE_ID_AMD_LXBRIDGE	0x2080
 #define PCI_DEVICE_ID_AMD_SCSI		0x2020
 #define PCI_DEVICE_ID_AMD_FE_GATE_7006	0x7006
 #define PCI_DEVICE_ID_AMD_FE_GATE_7007	0x7007
@@ -448,7 +449,7 @@

#define PCI_DEVICE_ID_AMD_8132_PCIX     0x7458
 #define PCI_DEVICE_ID_AMD_8132_IOAPIC   0x7459
-
+#define PCI_DEVICE_ID_AMD_AES		0x2082
 #define PCI_DEVICE_ID_AMD_CS5536_ISA	0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH	0x2091
 #define PCI_DEVICE_ID_AMD_CS5536_IDE	0x2092

Modified: trunk/LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Config.lb
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Config.lb	2006-09-18 04:23:23 UTC (rev 2419)
+++ trunk/LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Config.lb	2006-09-18 22:50:51 UTC (rev 2420)
@@ -134,7 +134,7 @@
    device pci_domain 0 on 
     		device pci 1.0 on end
    	device pci 1.1 on end
-      		chip southbridge/amd/cs5536
+      		chip southbridge/amd/cs5536_lx
                         register "enable_gpio0_inta" = "1"
    		register "enable_ide_nand_flash" = "1"
    		register "enable_uarta" = "1"