diff options
author | Jayachandran C <jchandra@broadcom.com> | 2016-06-10 15:55:09 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-06-10 16:21:17 -0400 |
commit | 80955f9ee51760db64795b3778365ccb8c3a2729 (patch) | |
tree | 8afd490616bc73edd7d494a5d518ce05d1f84bea | |
parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) |
PCI: Move ecam.h to linux/include/pci-ecam.h
This header will be used from arch/arm64 for ACPI PCI implementation so it
needs to be moved out of drivers/pci.
Update users of the header file to use the new name. No functional
changes.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-rw-r--r-- | drivers/pci/ecam.c | 3 | ||||
-rw-r--r-- | drivers/pci/host/pci-host-common.c | 3 | ||||
-rw-r--r-- | drivers/pci/host/pci-host-generic.c | 3 | ||||
-rw-r--r-- | drivers/pci/host/pci-thunder-ecam.c | 3 | ||||
-rw-r--r-- | drivers/pci/host/pci-thunder-pem.c | 3 | ||||
-rw-r--r-- | include/linux/pci-ecam.h (renamed from drivers/pci/ecam.h) | 0 |
6 files changed, 5 insertions, 10 deletions
diff --git a/drivers/pci/ecam.c b/drivers/pci/ecam.c index f9832ad8efe2..820e26b473f4 100644 --- a/drivers/pci/ecam.c +++ b/drivers/pci/ecam.c | |||
@@ -19,10 +19,9 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
22 | #include <linux/pci-ecam.h> | ||
22 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
23 | 24 | ||
24 | #include "ecam.h" | ||
25 | |||
26 | /* | 25 | /* |
27 | * On 64-bit systems, we do a single ioremap for the whole config space | 26 | * On 64-bit systems, we do a single ioremap for the whole config space |
28 | * since we have enough virtual address range available. On 32-bit, we | 27 | * since we have enough virtual address range available. On 32-bit, we |
diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c index 8cba7ab73df9..c18b9e3bb8bd 100644 --- a/drivers/pci/host/pci-host-common.c +++ b/drivers/pci/host/pci-host-common.c | |||
@@ -20,10 +20,9 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/of_address.h> | 21 | #include <linux/of_address.h> |
22 | #include <linux/of_pci.h> | 22 | #include <linux/of_pci.h> |
23 | #include <linux/pci-ecam.h> | ||
23 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
24 | 25 | ||
25 | #include "../ecam.h" | ||
26 | |||
27 | static int gen_pci_parse_request_of_pci_ranges(struct device *dev, | 26 | static int gen_pci_parse_request_of_pci_ranges(struct device *dev, |
28 | struct list_head *resources, struct resource **bus_range) | 27 | struct list_head *resources, struct resource **bus_range) |
29 | { | 28 | { |
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c index 6eaceab1bf04..f0ca6de0d87e 100644 --- a/drivers/pci/host/pci-host-generic.c +++ b/drivers/pci/host/pci-host-generic.c | |||
@@ -23,10 +23,9 @@ | |||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/of_address.h> | 24 | #include <linux/of_address.h> |
25 | #include <linux/of_pci.h> | 25 | #include <linux/of_pci.h> |
26 | #include <linux/pci-ecam.h> | ||
26 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
27 | 28 | ||
28 | #include "../ecam.h" | ||
29 | |||
30 | static struct pci_ecam_ops gen_pci_cfg_cam_bus_ops = { | 29 | static struct pci_ecam_ops gen_pci_cfg_cam_bus_ops = { |
31 | .bus_shift = 16, | 30 | .bus_shift = 16, |
32 | .pci_ops = { | 31 | .pci_ops = { |
diff --git a/drivers/pci/host/pci-thunder-ecam.c b/drivers/pci/host/pci-thunder-ecam.c index 540d030613eb..a9fc1c9105fd 100644 --- a/drivers/pci/host/pci-thunder-ecam.c +++ b/drivers/pci/host/pci-thunder-ecam.c | |||
@@ -11,10 +11,9 @@ | |||
11 | #include <linux/ioport.h> | 11 | #include <linux/ioport.h> |
12 | #include <linux/of_pci.h> | 12 | #include <linux/of_pci.h> |
13 | #include <linux/of.h> | 13 | #include <linux/of.h> |
14 | #include <linux/pci-ecam.h> | ||
14 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
15 | 16 | ||
16 | #include "../ecam.h" | ||
17 | |||
18 | static void set_val(u32 v, int where, int size, u32 *val) | 17 | static void set_val(u32 v, int where, int size, u32 *val) |
19 | { | 18 | { |
20 | int shift = (where & 3) * 8; | 19 | int shift = (where & 3) * 8; |
diff --git a/drivers/pci/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c index 9b8ab94f3c8c..5020d3d61ba7 100644 --- a/drivers/pci/host/pci-thunder-pem.c +++ b/drivers/pci/host/pci-thunder-pem.c | |||
@@ -18,10 +18,9 @@ | |||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/of_address.h> | 19 | #include <linux/of_address.h> |
20 | #include <linux/of_pci.h> | 20 | #include <linux/of_pci.h> |
21 | #include <linux/pci-ecam.h> | ||
21 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
22 | 23 | ||
23 | #include "../ecam.h" | ||
24 | |||
25 | #define PEM_CFG_WR 0x28 | 24 | #define PEM_CFG_WR 0x28 |
26 | #define PEM_CFG_RD 0x30 | 25 | #define PEM_CFG_RD 0x30 |
27 | 26 | ||
diff --git a/drivers/pci/ecam.h b/include/linux/pci-ecam.h index 9878bebd45bb..9878bebd45bb 100644 --- a/drivers/pci/ecam.h +++ b/include/linux/pci-ecam.h | |||