diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:59 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:59 +0200 |
| commit | f1ee4e8b73a356278056666da8d0c6b5aa53088d (patch) | |
| tree | 160f8440f19bd0702aed7323900e7412ea11ff0f /include/linux | |
| parent | c138893990013fa9f3008325fdf4fd8ac0628ba2 (diff) | |
| parent | 11b34ab22f4072db0cdbf605d6ffbd472618175b (diff) | |
| download | barebox-f1ee4e8b73a356278056666da8d0c6b5aa53088d.tar.gz barebox-f1ee4e8b73a356278056666da8d0c6b5aa53088d.tar.xz | |
Merge branch 'for-next/marvell'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mbus.h | 2 | ||||
| -rw-r--r-- | include/linux/pci.h | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/linux/mbus.h b/include/linux/mbus.h index 578ff33146..ac14982875 100644 --- a/include/linux/mbus.h +++ b/include/linux/mbus.h @@ -58,4 +58,6 @@ int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, phys_addr_t base, size_t size); int mvebu_mbus_del_window(phys_addr_t base, size_t size); +void mvebu_mbus_add_range(u8 target, u8 attr, u32 remap); + #endif /* __LINUX_MBUS_H */ diff --git a/include/linux/pci.h b/include/linux/pci.h index 6caed01c99..0ec1320b2f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -91,9 +91,6 @@ struct pci_dev { struct list_head bus_list; /* node in per-bus list */ struct pci_bus *bus; /* bus this device is on */ struct pci_bus *subordinate; /* bus this device bridges to */ - - void *sysdata; /* hook for sys-specific extension */ - struct proc_dir_entry *procent; /* device entry in /proc/bus/pci */ struct pci_slot *slot; /* Physical slot this device is in */ struct device_d dev; @@ -118,6 +115,7 @@ struct pci_dev { #define to_pci_dev(dev) container_of(dev, struct pci_dev, dev) struct pci_bus { + struct pci_controller *host; /* associated host controller */ struct list_head node; /* node in list of buses */ struct list_head children; /* list of child buses */ struct list_head devices; /* list of devices on this bus */ @@ -126,8 +124,6 @@ struct pci_bus { struct list_head resources; /* address space routed to this bus */ struct pci_ops *ops; /* configuration access functions */ - void *sysdata; /* hook for sys-specific extension */ - struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */ unsigned char number; /* bus number */ unsigned char primary; /* number of primary bridge */ @@ -167,10 +163,8 @@ struct pci_controller { unsigned int index; - /* Optional access methods for reading/writing the bus number - of the PCI controller */ - int (*get_busno)(void); - void (*set_busno)(int busno); + /* Optional access method for writing the bus number */ + void (*set_busno)(struct pci_controller *host, int busno); }; struct pci_driver { |