From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 4/7] ARM: mmp: remove remaining legacy pxa-dma support
Date: Wed, 25 Nov 2015 16:37:52 +0100 [thread overview]
Message-ID: <1448465875-435039-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1448465875-435039-1-git-send-email-arnd@arndb.de>
All drivers have stopped using this code, so we can just
as well stop initializing it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <mach/addr-map.h>
-
-#define DMAC_REGS_VIRT (APB_VIRT_BASE + 0x00000)
-
-#include <plat/dma.h>
-#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 <mach/regs-apbc.h>
#include <mach/cputype.h>
#include <mach/irqs.h>
-#include <mach/dma.h>
#include <mach/mfp.h>
#include <mach/devices.h>
#include <mach/mmp2.h>
@@ -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 <mach/regs-apbc.h>
#include <mach/regs-apmu.h>
#include <mach/irqs.h>
-#include <mach/dma.h>
#include <mach/devices.h>
#include <mach/mfp.h>
#include <linux/dma-mapping.h>
@@ -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 <mach/regs-apbc.h>
#include <mach/cputype.h>
#include <mach/irqs.h>
-#include <mach/dma.h>
#include <mach/mfp.h>
#include <mach/devices.h>
#include <mach/pm-pxa910.h>
@@ -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
--
2.1.0.rc2
next prev parent reply other threads:[~2015-11-25 15:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 15:37 [PATCH 0/7] ARM: mmp multiplatform support Arnd Bergmann
2015-11-25 15:37 ` [PATCH 1/7] clk: mmp: stop using platform headers Arnd Bergmann
2015-11-25 19:21 ` Stephen Boyd
2015-11-25 21:26 ` Arnd Bergmann
2015-11-25 21:32 ` Stephen Boyd
2015-11-25 21:57 ` Arnd Bergmann
2015-11-25 15:37 ` [PATCH 2/7] ARM: make xscale iwmmxt code multiplatform aware Arnd Bergmann
2015-11-25 15:37 ` [PATCH 3/7] ARM: mohawk: allow building with MMU disabled Arnd Bergmann
2015-11-25 15:37 ` Arnd Bergmann [this message]
2015-11-25 15:37 ` [PATCH 5/7] ARM: mmp: make plat-pxa build standalone Arnd Bergmann
2015-11-25 15:37 ` [PATCH 6/7] ARM: mmp: make all header files local Arnd Bergmann
2015-11-25 15:37 ` [PATCH 7/7] ARM: mmp: move into ARCH_MULTIPLATFORM Arnd Bergmann
2015-11-25 19:27 ` Stephen Boyd
2015-11-25 20:11 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448465875-435039-5-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=eric.y.miao@gmail.com \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox