[PATCH 07/10] ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

From: nicolas.pitre@linaro.org (Nicolas Pitre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/10] ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
Date: Tue, 05 Jul 2011 22:30:39 -0400	[thread overview]
Message-ID: <1309919442-20451-7-git-send-email-nicolas.pitre@linaro.org> (raw)
In-Reply-To: <1309919442-20451-1-git-send-email-nicolas.pitre@linaro.org>

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
---
 arch/arm/mach-realview/include/mach/memory.h |    4 ----
 arch/arm/mach-realview/realview_eb.c         |    3 +++
 arch/arm/mach-realview/realview_pb1176.c     |    3 +++
 arch/arm/mach-realview/realview_pb11mp.c     |    3 +++
 arch/arm/mach-realview/realview_pba8.c       |    3 +++
 arch/arm/mach-realview/realview_pbx.c        |    3 +++
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index 1759fa6..2022e09 100644
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -29,10 +29,6 @@
 #define PLAT_PHYS_OFFSET		UL(0x00000000)
 #endif
 
-#ifdef CONFIG_ZONE_DMA
-#define ARM_DMA_ZONE_SIZE	SZ_256M
-#endif
-
 #ifdef CONFIG_SPARSEMEM
 
 /*
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 10e75fa..006a11b 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -470,4 +470,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
 	.init_irq	= gic_init_irq,
 	.timer		= &realview_eb_timer,
 	.init_machine	= realview_eb_init,
+#ifdef CONFIG_ZONE_DMA
+	.dma_zone_size	= SZ_128M,
+#endif
 MACHINE_END
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index eab6070..a43ca35 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -365,4 +365,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
 	.init_irq	= gic_init_irq,
 	.timer		= &realview_pb1176_timer,
 	.init_machine	= realview_pb1176_init,
+#ifdef CONFIG_ZONE_DMA
+	.dma_zone_size	= SZ_128M,
+#endif
 MACHINE_END
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index b2985fc..1f56fef 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -367,4 +367,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")
 	.init_irq	= gic_init_irq,
 	.timer		= &realview_pb11mp_timer,
 	.init_machine	= realview_pb11mp_init,
+#ifdef CONFIG_ZONE_DMA
+	.dma_zone_size	= SZ_128M,
+#endif
 MACHINE_END
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index fb68665..64374d7 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -317,4 +317,7 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
 	.init_irq	= gic_init_irq,
 	.timer		= &realview_pba8_timer,
 	.init_machine	= realview_pba8_init,
+#ifdef CONFIG_ZONE_DMA
+	.dma_zone_size	= SZ_128M,
+#endif
 MACHINE_END
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 92ace2c..1f9eae6 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -400,4 +400,7 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")
 	.init_irq	= gic_init_irq,
 	.timer		= &realview_pbx_timer,
 	.init_machine	= realview_pbx_init,
+#ifdef CONFIG_ZONE_DMA
+	.dma_zone_size	= SZ_128M,
+#endif
 MACHINE_END
-- 
1.7.4

next prev parent reply	other threads:[~2011-07-06  2:30 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-06  2:30 [PATCH 01/10] ARM: change ARM_DMA_ZONE_SIZE into a variable Nicolas Pitre
2011-07-06  2:30 ` [PATCH 02/10] ARM: add dma_zone_size to the machine_desc structure Nicolas Pitre
2011-07-06 23:10   ` Russell King - ARM Linux
2011-07-07  2:59     ` Nicolas Pitre
2011-07-06  2:30 ` [PATCH 03/10] ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size Nicolas Pitre
2011-07-06  2:30 ` [PATCH 04/10] ARM: mach-h720x: " Nicolas Pitre
2011-07-06  2:30 ` [PATCH 05/10] ARM: mach-ixp4xx: " Nicolas Pitre
2011-07-06 23:12   ` Russell King - ARM Linux
2011-07-07  3:31     ` Nicolas Pitre
2011-07-06  2:30 ` [PATCH 06/10] ARM: mach-pxa: " Nicolas Pitre
2011-07-06  2:30 ` Nicolas Pitre [this message]
2011-07-06 23:15   ` [PATCH 07/10] ARM: mach-realview: " Russell King - ARM Linux
2011-07-07  3:59     ` Nicolas Pitre
2011-07-06  2:30 ` [PATCH 08/10] ARM: mach-sa1100: move " Nicolas Pitre
2011-07-06  2:30 ` [PATCH 09/10] ARM: mach-shark: " Nicolas Pitre
2011-07-06  2:30 ` [PATCH 10/10] ARM: ARM_DMA_ZONE_SIZE is no more Nicolas Pitre
2011-07-06  2:48 ` [PATCH 01/10] ARM: change ARM_DMA_ZONE_SIZE into a variable Barry Song
2011-07-06  3:12   ` Nicolas Pitre
2011-07-06 23:09     ` Russell King - ARM Linux
2011-07-07  2:50       ` Nicolas Pitre
2011-07-07 16:17         ` Arnd Bergmann
2011-07-07 17:08           ` John Linn
2011-07-07 17:40             ` Arnd Bergmann
2011-07-08  8:59             ` Russell King - ARM Linux
2011-07-08 13:58               ` John Linn
2011-07-08 16:23                 ` Russell King - ARM Linux
2011-07-07 18:15           ` Grant Likely
2011-07-06 23:04 ` Russell King - ARM Linux
2011-07-07  2:46   ` Nicolas Pitre
2011-07-08 12:14     ` Russell King - ARM Linux
2011-07-08 20:30       ` Russell King - ARM Linux
2011-07-09  8:12         ` Russell King - ARM Linux
2011-07-09  8:13         ` Russell King - ARM Linux

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:1759fa6 dfblob:2022e09 dfblob:10e75fa dfblob:006a11b
dfblob:eab6070 dfblob:a43ca35 dfblob:b2985fc dfblob:1f56fef
dfblob:fb68665 dfblob:64374d7 dfblob:92ace2c dfblob:1f9eae6 )
 OR (
bs:"[PATCH 07/10] ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size" )
	(help)

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=1309919442-20451-7-git-send-email-nicolas.pitre@linaro.org \
    --to=nicolas.pitre@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).