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

Commit 7f5c1ea3 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

c6x: use generic dma_noncoherent_ops 



Switch to the generic noncoherent direct mapping implementation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMark Salter <msalter@redhat.com>
parent 6c3e71dd

arch/c6x/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ 


config C6X

	def_bool y

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select CLKDEV_LOOKUP

	select DMA_NONCOHERENT_OPS

	select GENERIC_ATOMIC64

	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_TRACEHOOK

arch/c6x/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ generic-y += current.h 
generic-y += device.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

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

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot <aurelien.jacquiot@ti.com>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 *

 */

#ifndef _ASM_C6X_DMA_MAPPING_H

#define _ASM_C6X_DMA_MAPPING_H



extern const struct dma_map_ops c6x_dma_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	return &c6x_dma_ops;

}



extern void coherent_mem_init(u32 start, u32 size);

void *c6x_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,

		gfp_t gfp, unsigned long attrs);

void c6x_dma_free(struct device *dev, size_t size, void *vaddr,

		dma_addr_t dma_handle, unsigned long attrs);



#endif	/* _ASM_C6X_DMA_MAPPING_H */

arch/c6x/include/asm/setup.h

+2 −0
Original line number Diff line number Diff line
@@ -28,5 +28,7 @@ extern unsigned char c6x_fuse_mac[6]; 
extern void machine_init(unsigned long dt_ptr);

extern void time_init(void);



extern void coherent_mem_init(u32 start, u32 size);



#endif /* !__ASSEMBLY__ */

#endif /* _ASM_C6X_SETUP_H */

arch/c6x/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ extra-y := head.o vmlinux.lds 
obj-y := process.o traps.o irq.o signal.o ptrace.o

obj-y += setup.o sys_c6x.o time.o devicetree.o

obj-y += switch_to.o entry.o vectors.o c6x_ksyms.o

obj-y += soc.o dma.o

obj-y += soc.o



obj-$(CONFIG_MODULES)           += module.o