diff options
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.c')
-rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 918be816b097..f82d274fc91d 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c | |||
@@ -135,7 +135,7 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask) | |||
135 | * mapping that allows addressing any RAM address from across PCI. | 135 | * mapping that allows addressing any RAM address from across PCI. |
136 | */ | 136 | */ |
137 | if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) { | 137 | if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) { |
138 | set_dma_ops(dev, &dma_nommu_ops); | 138 | dev->bus_dma_mask = 0; |
139 | set_dma_offset(dev, pci64_dma_offset); | 139 | set_dma_offset(dev, pci64_dma_offset); |
140 | } | 140 | } |
141 | 141 | ||
@@ -395,10 +395,6 @@ static void setup_pci_atmu(struct pci_controller *hose) | |||
395 | out_be32(&pci->piw[win_idx].piwar, piwar); | 395 | out_be32(&pci->piw[win_idx].piwar, piwar); |
396 | } | 396 | } |
397 | 397 | ||
398 | /* | ||
399 | * install our own dma_set_mask handler to fixup dma_ops | ||
400 | * and dma_offset | ||
401 | */ | ||
402 | ppc_md.dma_set_mask = fsl_pci_dma_set_mask; | 398 | ppc_md.dma_set_mask = fsl_pci_dma_set_mask; |
403 | 399 | ||
404 | pr_info("%pOF: Setup 64-bit PCI DMA window\n", hose->dn); | 400 | pr_info("%pOF: Setup 64-bit PCI DMA window\n", hose->dn); |