Merge commit 'wd/master'

[platform/kernel/u-boot.git] / include / pci.h

diff --git a/include/pci.h b/include/pci.h
index 7c9a0e3..1c8e216 100644 (file)
--- a/include/pci.h
+++ b/include/pci.h
@@ -302,13 +302,19 @@
 #define PCI_MAX_PCI_DEVICES    32
 #define PCI_MAX_PCI_FUNCTIONS  8
 
+#define PCI_DCR                0x54    /* PCIe Device Control Register */
+#define PCI_DSR                0x56    /* PCIe Device Status Register */
+#define PCI_LSR                0x5e    /* PCIe Link Status Register */
+#define PCI_LTSSM      0x404   /* PCIe Link Training, Status State Machine */
+#define  PCI_LTSSM_L0  0x16    /* L0 state */
+
 /* Include the ID list */
 
 #include <pci_ids.h>
 
 struct pci_region {
        unsigned long bus_start;                /* Start on the bus */
-       unsigned long phys_start;               /* Start in physical address space */
+       phys_addr_t phys_start;                 /* Start in physical address space */
        unsigned long size;                     /* Size */
        unsigned long flags;                    /* Resource flags */
 
@@ -325,7 +331,7 @@ struct pci_region {
 
 extern __inline__ void pci_set_region(struct pci_region *reg,
                                      unsigned long bus_start,
-                                     unsigned long phys_start,
+                                     phys_addr_t phys_start,
                                      unsigned long size,
                                      unsigned long flags) {
        reg->bus_start  = bus_start;
@@ -426,10 +432,10 @@ extern __inline__ void pci_set_ops(struct pci_controller *hose,
 
 extern void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data);
 
-extern unsigned long pci_hose_bus_to_phys(struct pci_controller* hose,
-                                         unsigned long addr, unsigned long flags);
+extern phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose,
+                                       unsigned long addr, unsigned long flags);
 extern unsigned long pci_hose_phys_to_bus(struct pci_controller* hose,
-                                         unsigned long addr, unsigned long flags);
+                                         phys_addr_t addr, unsigned long flags);
 
 #define pci_phys_to_bus(dev, addr, flags) \
        pci_hose_phys_to_bus(pci_bus_to_hose(PCI_BUS(dev)), (addr), (flags))