diff options
| author |   Rob Herring <robh@kernel.org> | 2020-02-27 14:38:03 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2020-02-27 14:38:03 -0600 |
| commit | 85e1f2217e4bc4b55f0d8fa9fa388e07580d4ae2 (patch) | |
| tree | cf72d2e25a7d0c3c1e75b634a6a7110f7f0ac6eb /include/linux | |
| parent | dt-bindings: vendor-prefixes: Add prefix for PocketBook International SA (diff) | |
| parent | of/address: Support multiple 'dma-ranges' entries (diff) | |
Merge branch 'dt/ranges-rework' into dt/next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_address.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index eac7ab109df4..763022ed3456 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -10,21 +10,27 @@ struct of_pci_range_parser { struct device_node *node; const __be32 *range; const __be32 *end; - int np; + int na; + int ns; int pna; bool dma; }; +#define of_range_parser of_pci_range_parser struct of_pci_range { - u32 pci_space; - u64 pci_addr; + union { + u64 pci_addr; + u64 bus_addr; + }; u64 cpu_addr; u64 size; u32 flags; }; +#define of_range of_pci_range #define for_each_of_pci_range(parser, range) \ for (; of_pci_range_parser_one(parser, range);) +#define for_each_of_range for_each_of_pci_range /* Translate a DMA address from device space to CPU space */ extern u64 of_translate_dma_address(struct device_node *dev, @@ -143,4 +149,3 @@ static inline int of_pci_range_to_resource(struct of_pci_range *range, #endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */ #endif /* __OF_ADDRESS_H */ - |