Hi Peng,
On Thu, Feb 20, 2020 at 1:34 PM Tom Rini trini@konsulko.com wrote:
On Thu, Feb 20, 2020 at 01:56:41AM +0000, Peng Fan wrote:
Hi Tom
Please pull mmc-2-29-2020.
NAK, this breaks nios2: nios2: + 10m50 3c120 +(10m50,3c120) ../drivers/net/altera_tse.c: In function 'altera_tse_probe': +(10m50,3c120) ../drivers/net/altera_tse.c:646:15: error: implicit declaration of function 'dma_alloc_coherent'; did you mean 'lmb_alloc_addr'? [-Werror=implicit-function-declaration] +(10m50,3c120) desc_mem = dma_alloc_coherent(len, &addr); +(10m50,3c120) ^~~~~~~~~~~~~~~~~~ +(10m50,3c120) lmb_alloc_addr +(10m50,3c120) ../drivers/net/altera_tse.c:646:13: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] +(10m50,3c120) ^ +(10m50,3c120) cc1: all warnings being treated as errors +(10m50,3c120) make[2]: *** [drivers/net/altera_tse.o] Error 1 +(10m50,3c120) make[1]: *** [drivers/net] Error 2 +(10m50,3c120) make: *** [sub-make] Error 2
-- Tom
Agh, something strange happens somehow in the following commit.
commit 87a6590d6eb500db95bcdb09c16efb16559f67c6 Author: Masahiro Yamada yamada.masahiro@socionext.com Date: Fri Feb 14 16:40:20 2020 +0900
dma-mapping: add <asm/dma-mapping.h> for all architectures
Peng,
Could you replace it with this? http://patchwork.ozlabs.org/patch/1241209/
(Or, just revert the diff for arch/nios2/include/asm/dma-mapping)