From patchwork Wed Nov 25 15:37:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7700381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E9CEEBF90C for ; Wed, 25 Nov 2015 15:40:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02D4F2077D for ; Wed, 25 Nov 2015 15:40:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14210205BC for ; Wed, 25 Nov 2015 15:40:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a1c9X-0000m1-Vn; Wed, 25 Nov 2015 15:38:39 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a1c9K-0000gT-Qe for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2015 15:38:28 +0000 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0LpeUg-1aVhlM12ZS-00fPSi; Wed, 25 Nov 2015 16:38:02 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/7] ARM: mmp: remove remaining legacy pxa-dma support Date: Wed, 25 Nov 2015 16:37:52 +0100 Message-Id: <1448465875-435039-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1448465875-435039-1-git-send-email-arnd@arndb.de> References: <1448465875-435039-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:lcdyFCWcWrqRz5OPX3IdW1IRP+cl3V3Fe3++UQH69fR8vWD4GPF WnHE29i1tmFT0PCdy7EG8dy5wgRYNOPex2GWM+TCwInLgzsae+JpAZtE4W44wN7F+udrVuN 59iT7d5193qNeiTqDX1WazmY7yZDO5ifrYh/fqKgbM5ctUTDhZc1M9tKpE59bFYI8j+Hgil iRRNNtHbDeIki3/1WCw4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:XW2jpWjt1VE=:G/gbYwvJCxaTElAko1QgRZ 7ZKzZfeMJsMSafPN7bcxWA9pol4t9Q5c7eTwhFzAMX6y94MhbyxyaePJIjb35r4Dce5pS6rj+ nJ8qfNweSBTDrtgUazXd05/pCLnkhCtsXqQmb+6kQI7NF6tJ1rtKJ/n5G699wu6VPqGgVytlP yqH4W8XyuuJCIJs6dipI2fkdLfKloixrMZBYLJ3ylM2dM6kNz0gFRAq0tvjuL4eZPKuVO3KVi HnURJftHyMF1EuKaNeWNDjtt7OBXXaSV8QEY049X9rAuXLEpDMV+OhM1MO/TFedAUZbJUkFcE 2zI9Rqb6wDhnuGghdyI2zM9bBI08Ne2hRMOQVVp/VA1E5oRwHG1gwnMXV+pHc01qAk3gIsCYn p+zqn2ha16/bTt3t5ExSPIb+LZpDMlCCe37ZFfbl8TlEIwrmQtVz/cOhBan3W1Vs/WNoWGKK2 s58VoNA8u6K9fNsNE6ENqCf2/6tNH314Crt4OixvW+ne4gnkGxM/NMGP9BQYXqpegG1Zti1mm 6AXMoJRGq/3AsINnPsAMaokYiMnlRqKLRYDuCh88/VHVaMQKvi0TepW2g7qIy0X/llwNvHX8j KKSzeboaSR9O5WJKQ43XcxARrfvVAZZonxsX/dT9S7YpId89QmPyW9TvtRQlWuu2NveM0PoDJ dzfed4XWMRj2tAa5Xzr1QEG6vANtQRCQBGlCx7odnP1Gb7O5NQOGp2BXleApT3q0XsSQ= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151125_073827_237278_7BAC34D2 X-CRM114-Status: GOOD ( 14.54 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Miao , Arnd Bergmann , Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org, Haojian Zhuang , linux-clk@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All drivers have stopped using this code, so we can just as well stop initializing it. Signed-off-by: Arnd Bergmann --- arch/arm/mach-mmp/include/mach/dma.h | 13 ------------- arch/arm/mach-mmp/mmp2.c | 2 -- arch/arm/mach-mmp/pxa168.c | 2 -- arch/arm/mach-mmp/pxa910.c | 2 -- arch/arm/plat-pxa/Makefile | 2 +- 5 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 arch/arm/mach-mmp/include/mach/dma.h diff --git a/arch/arm/mach-mmp/include/mach/dma.h b/arch/arm/mach-mmp/include/mach/dma.h deleted file mode 100644 index 1d6914544da4..000000000000 --- a/arch/arm/mach-mmp/include/mach/dma.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * linux/arch/arm/mach-mmp/include/mach/dma.h - */ - -#ifndef __ASM_MACH_DMA_H -#define __ASM_MACH_DMA_H - -#include - -#define DMAC_REGS_VIRT (APB_VIRT_BASE + 0x00000) - -#include -#endif /* __ASM_MACH_DMA_H */ diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index c8914ef21f7f..82eb53f5136a 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -111,7 +110,6 @@ static int __init mmp2_init(void) #endif mfp_init_base(MFPR_VIRT_BASE); mfp_init_addr(mmp2_addr_map); - pxa_init_dma(IRQ_MMP2_DMA_RIQ, 16); mmp2_clk_init(APB_PHYS_BASE + 0x50000, AXI_PHYS_BASE + 0x82800, APB_PHYS_BASE + 0x15000); diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 53f21554ae63..7367f4b079e4 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,6 @@ static int __init pxa168_init(void) if (cpu_is_pxa168()) { mfp_init_base(MFPR_VIRT_BASE); mfp_init_addr(pxa168_mfp_addr_map); - pxa_init_dma(IRQ_PXA168_DMA_INT0, 32); pxa168_clk_init(APB_PHYS_BASE + 0x50000, AXI_PHYS_BASE + 0x82800, APB_PHYS_BASE + 0x15000); diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index 545404261327..15f7be01fed8 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -97,7 +96,6 @@ static int __init pxa910_init(void) #endif mfp_init_base(MFPR_VIRT_BASE); mfp_init_addr(pxa910_mfp_addr_map); - pxa_init_dma(IRQ_PXA910_DMA_INT0, 32); pxa910_clk_init(APB_PHYS_BASE + 0x50000, AXI_PHYS_BASE + 0x82800, APB_PHYS_BASE + 0x15000, diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index 1fc941944912..e507aebbef52 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile @@ -2,7 +2,7 @@ # Makefile for code common across different PXA processor families # -obj-y := dma.o +obj-$(CONFIG_ARCH_PXA) := dma.o obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o