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

Commit 67834fa9 authored by Jie Zhang's avatar Jie Zhang Committed by Mike Frysinger
Browse files

Blackfin: rename bfin_addr_dcachable to bfin_addr_dcacheable 



The latter naming convention is much more common.

Signed-off-by: default avatarJie Zhang <jie.zhang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent aa286ba3

arch/blackfin/include/asm/cacheflush.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ do { memcpy(dst, src, len); \ 
extern unsigned long reserved_mem_dcache_on;

extern unsigned long reserved_mem_icache_on;



static inline int bfin_addr_dcachable(unsigned long addr)

static inline int bfin_addr_dcacheable(unsigned long addr)

{

#ifdef CONFIG_BFIN_DCACHE

	if (addr < (_ramend - DMA_UNCACHED_REGION))

arch/blackfin/kernel/bfin_dma_5xx.c

+2 −2
Original line number Diff line number Diff line
@@ -453,10 +453,10 @@ void *dma_memcpy(void *pdst, const void *psrc, size_t size) 
	unsigned long src = (unsigned long)psrc;

	size_t bulk, rest;



	if (bfin_addr_dcachable(src))

	if (bfin_addr_dcacheable(src))

		blackfin_dcache_flush_range(src, src + size);



	if (bfin_addr_dcachable(dst))

	if (bfin_addr_dcacheable(dst))

		blackfin_dcache_invalidate_range(dst, dst + size);



	bulk = size & ~0xffff;

arch/blackfin/kernel/cplb-mpu/cplbmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static noinline int dcplb_miss(unsigned int cpu) 


	d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;

#ifdef CONFIG_BFIN_DCACHE

	if (bfin_addr_dcachable(addr)) {

	if (bfin_addr_dcacheable(addr)) {

		d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND;

#ifdef CONFIG_BFIN_WT

		d_data |= CPLB_L1_AOW | CPLB_WT;

drivers/spi/spi_bfin5xx.c

+2 −2
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static void bfin_spi_pump_transfers(unsigned long data) 
				drv_data->rx, drv_data->len_in_bytes);



			/* invalidate caches, if needed */

			if (bfin_addr_dcachable((unsigned long) drv_data->rx))

			if (bfin_addr_dcacheable((unsigned long) drv_data->rx))

				invalidate_dcache_range((unsigned long) drv_data->rx,

							(unsigned long) (drv_data->rx +

							drv_data->len_in_bytes));
@@ -816,7 +816,7 @@ static void bfin_spi_pump_transfers(unsigned long data) 
			dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");



			/* flush caches, if needed */

			if (bfin_addr_dcachable((unsigned long) drv_data->tx))

			if (bfin_addr_dcacheable((unsigned long) drv_data->tx))

				flush_dcache_range((unsigned long) drv_data->tx,

						(unsigned long) (drv_data->tx +

						drv_data->len_in_bytes));