From patchwork Mon Jul 9 11:52:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 1172621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 3B8F040B18 for ; Mon, 9 Jul 2012 11:55:22 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SoCVz-0000xZ-0m; Mon, 09 Jul 2012 11:52:31 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SoCVb-0000u4-Ht for linux-arm-kernel@lists.infradead.org; Mon, 09 Jul 2012 11:52:09 +0000 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id A6970F0649; Mon, 9 Jul 2012 13:52:06 +0200 (CEST) Date: Mon, 9 Jul 2012 13:52:04 +0200 From: Pavel Machek To: Rob Herring Subject: Re: [RFC PATCHv1 1/2] ARM: socfpga: initial support for Altera's SOCFPGA platform. Message-ID: <20120709115204.GC12130@elf.ucw.cz> References: <1340805007-3313-1-git-send-email-dinguyen@altera.com> <1340805007-3313-2-git-send-email-dinguyen@altera.com> <4FF483D2.70000@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4FF483D2.70000@gmail.com> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [195.113.26.193 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org, cytan@altera.com, linux@arm.linux.org.uk, wd@denx.de, dinguyen@altera.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi! > > diff --git a/arch/arm/mach-socfpga/include/mach/memory.h b/arch/arm/mach-socfpga/include/mach/memory.h > > new file mode 100644 > > index 0000000..88e0ae9 > > +#ifndef __ASM_ARCH_MEMORY_H > > +#define __ASM_ARCH_MEMORY_H > > + > > +/* > > + * Physical DRAM offset. > > + */ > > +#define PLAT_PHYS_OFFSET UL(0x00000000) > > + > > +#if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA) > > + > > +#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1) > > +#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) > > +#endif > > You shouldn't need memory.h. Yep. Deleting it was easier than expected. Thanks. Pavel commit 39edfa179a37d38352b21894fbd9b559e52dcf31 Author: Pavel Date: Mon Jul 9 13:48:27 2012 +0200 Remove memory.h/system.h. Signed-off-by: Pavel Machek diff --git a/arch/arm/mach-socfpga/include/mach/memory.h b/arch/arm/mach-socfpga/include/mach/memory.h deleted file mode 100644 index e69de29..0000000 diff --git a/arch/arm/mach-socfpga/include/mach/system.h b/arch/arm/mach-socfpga/include/mach/system.h deleted file mode 100644 index e69de29..0000000 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ab3b389..8e69b05 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -261,7 +261,6 @@ config ARCH_SOCFPGA select GENERIC_CLOCKEVENTS select HAVE_MACH_CLKDEV select MIGHT_HAVE_CACHE_L2X0 - select NEED_MACH_MEMORY_H select SPARSE_IRQ select USE_OF help