Skip to content

Commit

Permalink
MIPS: Octeon: move swiotlb declarations out of dma-coherence.h
Browse files Browse the repository at this point in the history
No need to pull them into a global header.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Patchwork: https://patchwork.linux-mips.org/patch/19538/
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-mips@linux-mips.org
  • Loading branch information
Christoph Hellwig authored and Paul Burton committed Jun 24, 2018
1 parent 1f99e4b commit a330a9c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 22 deletions.
18 changes: 0 additions & 18 deletions arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h

This file was deleted.

3 changes: 3 additions & 0 deletions arch/mips/include/asm/octeon/pci-octeon.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,7 @@ enum octeon_dma_bar_type {
*/
extern enum octeon_dma_bar_type octeon_dma_bar_type;

void octeon_pci_dma_init(void);
extern char *octeon_swiotlb;

#endif
2 changes: 0 additions & 2 deletions arch/mips/pci/pci-octeon.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include <asm/octeon/cvmx-pci-defs.h>
#include <asm/octeon/pci-octeon.h>

#include <dma-coherence.h>

#define USE_OCTEON_INTERNAL_ARBITER

/*
Expand Down
2 changes: 0 additions & 2 deletions arch/mips/pci/pcie-octeon.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ union cvmx_pcie_address {

static int cvmx_pcie_rc_initialize(int pcie_port);

#include <dma-coherence.h>

/**
* Return the Core virtual base address for PCIe IO access. IOs are
* read/written as an offset from this address.
Expand Down

0 comments on commit a330a9c

Please sign in to comment.