Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e677c4 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32,leon: always support leon in ioport 



Unconditially define pci32_dma_ops as this is used
for leon.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
parent 556626ad

arch/sparc/include/asm/dma-mapping.h

+7 −2
Original line number Diff line number Diff line
@@ -12,13 +12,18 @@ extern int dma_supported(struct device *dev, u64 mask); 
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



extern struct dma_map_ops *dma_ops, pci32_dma_ops;

extern struct dma_map_ops *dma_ops;

extern struct dma_map_ops *leon_dma_ops;

extern struct dma_map_ops pci32_dma_ops;



extern struct bus_type pci_bus_type;



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)

	if (dev->bus == &pci_bus_type)

	if (sparc_cpu_model == sparc_leon)

		return leon_dma_ops;

	else if (dev->bus == &pci_bus_type)

		return &pci32_dma_ops;

#endif

	return dma_ops;

arch/sparc/kernel/ioport.c

+2 −9
Original line number Diff line number Diff line
@@ -427,9 +427,6 @@ arch_initcall(sparc_register_ioport); 
#endif /* CONFIG_SBUS */





/* LEON reuses PCI DMA ops */

#if defined(CONFIG_PCI) || defined(CONFIG_SPARC_LEON)



/* Allocate and map kernel buffer using consistent mode DMA for a device.

 * hwdev should be valid struct pci_dev pointer for PCI devices.

 */
@@ -657,13 +654,9 @@ struct dma_map_ops pci32_dma_ops = { 
};

EXPORT_SYMBOL(pci32_dma_ops);



#endif /* CONFIG_PCI || CONFIG_SPARC_LEON */



#ifdef CONFIG_SPARC_LEON

struct dma_map_ops *dma_ops = &pci32_dma_ops;

#elif defined(CONFIG_SBUS)

/* leon re-uses pci32_dma_ops */

struct dma_map_ops *leon_dma_ops = &pci32_dma_ops;

struct dma_map_ops *dma_ops = &sbus_dma_ops;

#endif



EXPORT_SYMBOL(dma_ops);