diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/dec/21143/21143.c | 37 | ||||
| -rw-r--r-- | src/mainboard/nokia/ip530/Kconfig | 13 |
2 files changed, 9 insertions, 41 deletions
diff --git a/src/drivers/dec/21143/21143.c b/src/drivers/dec/21143/21143.c index 7ca6f12078..c89d4f08de 100644 --- a/src/drivers/dec/21143/21143.c +++ b/src/drivers/dec/21143/21143.c @@ -24,42 +24,23 @@ #include <device/pci_ids.h> #include <console/console.h> -/** - * The following should be set in the mainboard-specific Kconfig file. - */ -#if (!defined(CONFIG_DEC21143_CACHE_LINE_SIZE) || \ - !defined(CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS) || \ - !defined(CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION)) -#error "you must supply these values in your mainboard-specific Kconfig file" -#endif - -/* CONFIG_DEC21143_CACHE_LINE_SIZE try 0x00000000 if unsure */ -/* CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS try 0x00000000 if unsure */ -/* CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION try 0x02800107 or 0x02800007 if unsure */ - -/** - * This driver takes the values from Kconfig and loads them in the registers. - */ static void dec_21143_enable(device_t dev) { printk(BIOS_DEBUG, "Initializing DECchip 21143\n"); + // The resource allocator should do this. If not, it needs to be fixed + // differently. +#if 0 /* Command and status configuration (offset 0x04) */ - pci_write_config32(dev, 0x04, - CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION); + pci_write_config32(dev, 0x04, 0x02800107); printk(BIOS_DEBUG, "0x04 = %08x (07 01 80 02)\n", pci_read_config32(dev, 0x04)); /* Cache line size (offset 0x0C) */ - pci_write_config8(dev, 0x0C, CONFIG_DEC21143_CACHE_LINE_SIZE); - printk(BIOS_DEBUG, "0x0c = %08x (00 80 00 00)\n", - pci_read_config32(dev, 0x0C)); - - /* Expansion ROM base address (offset 0x30) */ - pci_write_config32(dev, 0x30, - CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS); - printk(BIOS_DEBUG, "0x30 = %08x (0x00000000)\n", - pci_read_config32(dev, 0x30)); + pci_write_config8(dev, 0x0C, 0x00); + printk(BIOS_DEBUG, "0x0c = %08x (00)\n", + pci_read_config8(dev, 0x0C)); +#endif } static struct device_operations dec_21143_ops = { @@ -73,5 +54,5 @@ static struct device_operations dec_21143_ops = { static const struct pci_driver dec_21143_driver __pci_driver = { .ops = &dec_21143_ops, .vendor = PCI_VENDOR_ID_DEC, - .device = PCI_DEVICE_ID_DEC_21142, + .device = PCI_DEVICE_ID_DEC_21142, // FIXME wrong ID? }; diff --git a/src/mainboard/nokia/ip530/Kconfig b/src/mainboard/nokia/ip530/Kconfig index 656ec3c1c6..31c6216923 100644 --- a/src/mainboard/nokia/ip530/Kconfig +++ b/src/mainboard/nokia/ip530/Kconfig @@ -45,19 +45,6 @@ config IRQ_SLOT_COUNT int default 22 -## Configuration items for the ethernet adaptors -config DEC21143_CACHE_LINE_SIZE - hex - default 0x00000000 - -config DEC21143_EXPANSION_ROM_BASE_ADDRESS - hex - default 0x00000000 - -config DEC21143_COMMAND_AND_STATUS_CONFIGURATION - hex - default 0x02800107 - ## Configuration for the PCMCIA-Cardbus controller. config TI_PCMCIA_CARDBUS_CMDR hex |