Author: uwe Date: 2008-10-13 23:41:03 +0200 (Mon, 13 Oct 2008) New Revision: 922
Modified: coreboot-v3/include/device/pci_ids.h coreboot-v3/southbridge/amd/rs690/rs690.h coreboot-v3/southbridge/amd/sb600/sb600.h Log: 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 uwe@hermann-uwe.de Acked-by: Marc Jones marc.jones@amd.com
Modified: coreboot-v3/include/device/pci_ids.h =================================================================== --- coreboot-v3/include/device/pci_ids.h 2008-10-13 20:15:56 UTC (rev 921) +++ coreboot-v3/include/device/pci_ids.h 2008-10-13 21:41:03 UTC (rev 922) @@ -203,8 +203,35 @@ #define PCI_DEVICE_ID_AMD_CS5536_OTG 0x2097 #define PCI_DEVICE_ID_AMD_CS5536_B0_IDE 0x209A
-#define PCI_VENDOR_ID_ATI 0x1002 +#define PCI_VENDOR_ID_ATI 0x1002
+#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_CIRRUS 0x1013 #define PCI_DEVICE_ID_CIRRUS_5446 0x00b8 /* Used by QEMU */
Modified: coreboot-v3/southbridge/amd/rs690/rs690.h =================================================================== --- coreboot-v3/southbridge/amd/rs690/rs690.h 2008-10-13 20:15:56 UTC (rev 921) +++ coreboot-v3/southbridge/amd/rs690/rs690.h 2008-10-13 21:41:03 UTC (rev 922) @@ -19,20 +19,10 @@
#ifndef __RS690_H__ #define __RS690_H__ + #include <types.h> +#include <device/pci_ids.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
Modified: coreboot-v3/southbridge/amd/sb600/sb600.h =================================================================== --- coreboot-v3/southbridge/amd/sb600/sb600.h 2008-10-13 20:15:56 UTC (rev 921) +++ coreboot-v3/southbridge/amd/sb600/sb600.h 2008-10-13 21:41:03 UTC (rev 922) @@ -20,20 +20,7 @@ #ifndef SB600_H #define SB600_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 +#include <device/pci_ids.h>
void pm_iowrite(u8 reg, u8 value); u8 pm_ioread(u8 reg);