From b7d781dad58471d42c68eff3cf9317430a42af72 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 13 Oct 2008 21:41:24 +0000 Subject: [PATCH] Move AMD RS690 and SB600 PCI IDs to pci_ids.h where they should be. Build-tested with the AMD dbm690t board. Signed-off-by: Uwe Hermann Acked-by: Marc Jones git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3655 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/device/pci_ids.h | 27 +++++++++++++++++++++++++++ src/southbridge/amd/rs690/rs690.h | 13 +------------ src/southbridge/amd/sb600/sb600.h | 15 +-------------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index da01fba2a..36e9c915d 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -283,6 +283,33 @@ #define PCI_DEVICE_ID_ATI_RADEON_RC 0x5146 #define PCI_DEVICE_ID_ATI_RADEON_RD 0x5147 +#define PCI_DEVICE_ID_ATI_SB600_LPC 0x438D +#define PCI_DEVICE_ID_ATI_SB600_SATA 0x4380 +#define PCI_DEVICE_ID_ATI_SB600_IDE 0x438C +#define PCI_DEVICE_ID_ATI_SB600_HDA 0x4383 +#define PCI_DEVICE_ID_ATI_SB600_ACI 0x4382 +#define PCI_DEVICE_ID_ATI_SB600_MCI 0x438E +#define PCI_DEVICE_ID_ATI_SB600_USB2 0x4386 +#define PCI_DEVICE_ID_ATI_SB600_PCI 0x4384 +#define PCI_DEVICE_ID_ATI_SB600_SM 0x4385 +#define PCI_DEVICE_ID_ATI_SB600_USB_0 0x4387 +#define PCI_DEVICE_ID_ATI_SB600_USB_1 0x4388 +#define PCI_DEVICE_ID_ATI_SB600_USB_2 0x4389 +#define PCI_DEVICE_ID_ATI_SB600_USB_3 0x438A +#define PCI_DEVICE_ID_ATI_SB600_USB_4 0x438B + +#define PCI_DEVICE_ID_ATI_RS690_HT 0x7910 +#define PCI_DEVICE_ID_ATI_RS690_PCIE 0x7912 +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV2 0x7913 +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV3 0x791B +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV4 0x7914 +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV5 0x7915 +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV6 0x7916 +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV7 0x7917 +#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV8 0x7918 +#define PCI_DEVICE_ID_ATI_RS690_INT_GFX 0x791e +#define PCI_DEVICE_ID_ATI_RS690MT_INT_GFX 0x791f + #define PCI_VENDOR_ID_VLSI 0x1004 #define PCI_DEVICE_ID_VLSI_82C592 0x0005 #define PCI_DEVICE_ID_VLSI_82C593 0x0006 diff --git a/src/southbridge/amd/rs690/rs690.h b/src/southbridge/amd/rs690/rs690.h index e617d600d..3350251a8 100644 --- a/src/southbridge/amd/rs690/rs690.h +++ b/src/southbridge/amd/rs690/rs690.h @@ -21,20 +21,9 @@ #define __RS690_H__ #include +#include #include "chip.h" -#define PCI_DEVICE_ID_ATI_RS690_HT 0x7910 -#define PCI_DEVICE_ID_ATI_RS690_PCIE 0x7912 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV2 0x7913 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV3 0x791B -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV4 0x7914 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV5 0x7915 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV6 0x7916 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV7 0x7917 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV8 0x7918 -#define PCI_DEVICE_ID_ATI_RS690_INT_GFX 0x791e -#define PCI_DEVICE_ID_ATI_RS690MT_INT_GFX 0x791f - #define NBMISC_INDEX 0x60 #define NBHTIU_INDEX 0xA8 #define NBMC_INDEX 0xE8 diff --git a/src/southbridge/amd/sb600/sb600.h b/src/southbridge/amd/sb600/sb600.h index 27d42364a..24b028de3 100644 --- a/src/southbridge/amd/sb600/sb600.h +++ b/src/southbridge/amd/sb600/sb600.h @@ -20,22 +20,9 @@ #ifndef SB600_H #define SB600_H +#include #include "chip.h" -#define PCI_DEVICE_ID_ATI_SB600_LPC 0x438D -#define PCI_DEVICE_ID_ATI_SB600_SATA 0x4380 -#define PCI_DEVICE_ID_ATI_SB600_IDE 0x438C -#define PCI_DEVICE_ID_ATI_SB600_HDA 0x4383 -#define PCI_DEVICE_ID_ATI_SB600_ACI 0x4382 -#define PCI_DEVICE_ID_ATI_SB600_MCI 0x438E -#define PCI_DEVICE_ID_ATI_SB600_USB2 0x4386 -#define PCI_DEVICE_ID_ATI_SB600_PCI 0x4384 -#define PCI_DEVICE_ID_ATI_SB600_SM 0x4385 -#define PCI_DEVICE_ID_ATI_SB600_USB_0 0x4387 -#define PCI_DEVICE_ID_ATI_SB600_USB_1 0x4388 -#define PCI_DEVICE_ID_ATI_SB600_USB_2 0x4389 -#define PCI_DEVICE_ID_ATI_SB600_USB_3 0x438A -#define PCI_DEVICE_ID_ATI_SB600_USB_4 0x438B extern void pm_iowrite(u8 reg, u8 value); extern u8 pm_ioread(u8 reg); extern void pm2_iowrite(u8 reg, u8 value); -- 2.25.1