From patchwork Thu Sep 15 17:33:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 9334397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 671ED601C2 for ; Thu, 15 Sep 2016 17:26:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59EB929AB1 for ; Thu, 15 Sep 2016 17:26:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E4FB29AB7; Thu, 15 Sep 2016 17:26:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46D2A29AB1 for ; Thu, 15 Sep 2016 17:26:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751539AbcIOR0R (ORCPT ); Thu, 15 Sep 2016 13:26:17 -0400 Received: from mga14.intel.com ([192.55.52.115]:5896 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878AbcIOR0R (ORCPT ); Thu, 15 Sep 2016 13:26:17 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 15 Sep 2016 10:26:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,340,1470726000"; d="scan'208";a="1030730698" Received: from vkoul-udesk7.iind.intel.com ([10.223.84.143]) by orsmga001.jf.intel.com with ESMTP; 15 Sep 2016 10:26:13 -0700 From: Vinod Koul To: dmaengine@vger.kernel.org Cc: Arnd Bergmann , Vinod Koul , Lars-Peter Clausen Subject: [PATCH 01/30] dmaengine: move jz4740 header from asm Date: Thu, 15 Sep 2016 23:03:40 +0530 Message-Id: <1473960849-23024-2-git-send-email-vinod.koul@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473960849-23024-1-git-send-email-vinod.koul@intel.com> References: <1473960849-23024-1-git-send-email-vinod.koul@intel.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP jz4740 driver exposes slave id interface values in asm header. Moving it out helps the driver to be fine with COMPILE_TEST, so move for better coverage Cc: Lars-Peter Clausen Signed-off-by: Vinod Koul --- arch/mips/include/asm/mach-jz4740/dma.h | 32 -------------------------------- drivers/dma/dma-jz4740.c | 3 +-- drivers/mmc/host/jz4740_mmc.c | 2 +- include/linux/dma/jz-dma.h | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 arch/mips/include/asm/mach-jz4740/dma.h create mode 100644 include/linux/dma/jz-dma.h diff --git a/arch/mips/include/asm/mach-jz4740/dma.h b/arch/mips/include/asm/mach-jz4740/dma.h deleted file mode 100644 index 14ecc5313d2d..000000000000 --- a/arch/mips/include/asm/mach-jz4740/dma.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2010, Lars-Peter Clausen - * JZ7420/JZ4740 DMA definitions - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __ASM_MACH_JZ4740_DMA_H__ -#define __ASM_MACH_JZ4740_DMA_H__ - -enum jz4740_dma_request_type { - JZ4740_DMA_TYPE_AUTO_REQUEST = 8, - JZ4740_DMA_TYPE_UART_TRANSMIT = 20, - JZ4740_DMA_TYPE_UART_RECEIVE = 21, - JZ4740_DMA_TYPE_SPI_TRANSMIT = 22, - JZ4740_DMA_TYPE_SPI_RECEIVE = 23, - JZ4740_DMA_TYPE_MMC_TRANSMIT = 26, - JZ4740_DMA_TYPE_MMC_RECEIVE = 27, - JZ4740_DMA_TYPE_TCU = 28, - JZ4740_DMA_TYPE_SADC = 29, - JZ4740_DMA_TYPE_SLCD = 30, -}; - -#endif /* __ASM_JZ4740_DMA_H__ */ diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c index 9689b36c005a..2ad5caf0b47c 100644 --- a/drivers/dma/dma-jz4740.c +++ b/drivers/dma/dma-jz4740.c @@ -20,8 +20,7 @@ #include #include #include - -#include +#include #include "virt-dma.h" diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 684087db170b..3217bb237c49 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #define JZ_REG_MMC_STRPCL 0x00 diff --git a/include/linux/dma/jz-dma.h b/include/linux/dma/jz-dma.h new file mode 100644 index 000000000000..48419531e6ed --- /dev/null +++ b/include/linux/dma/jz-dma.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2010, Lars-Peter Clausen + * JZ7420/JZ4740 DMA definitions + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#ifndef __JZ4740_DMA_H__ +#define __JZ4740_DMA_H__ + +enum jz4740_dma_request_type { + JZ4740_DMA_TYPE_AUTO_REQUEST = 8, + JZ4740_DMA_TYPE_UART_TRANSMIT = 20, + JZ4740_DMA_TYPE_UART_RECEIVE = 21, + JZ4740_DMA_TYPE_SPI_TRANSMIT = 22, + JZ4740_DMA_TYPE_SPI_RECEIVE = 23, + JZ4740_DMA_TYPE_MMC_TRANSMIT = 26, + JZ4740_DMA_TYPE_MMC_RECEIVE = 27, + JZ4740_DMA_TYPE_TCU = 28, + JZ4740_DMA_TYPE_SADC = 29, + JZ4740_DMA_TYPE_SLCD = 30, +}; + +#endif /* __JZ4740_DMA_H__ */