From patchwork Tue Nov 29 13:52:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 5377 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9516323FFB for ; Tue, 29 Nov 2011 13:53:05 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 6CB6FA180AB for ; Tue, 29 Nov 2011 13:53:05 +0000 (UTC) Received: by laah2 with SMTP id h2so1342153laa.11 for ; Tue, 29 Nov 2011 05:53:05 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr31263252lab.40.1322574785091; Tue, 29 Nov 2011 05:53:05 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs1984lal; Tue, 29 Nov 2011 05:53:04 -0800 (PST) Received: by 10.213.9.206 with SMTP id m14mr1194990ebm.70.1322574783194; Tue, 29 Nov 2011 05:53:03 -0800 (PST) Received: from eu1sys200aog114.obsmtp.com (eu1sys200aog114.obsmtp.com. [207.126.144.137]) by mx.google.com with SMTP id s60si862571eeh.146.2011.11.29.05.52.59 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 05:53:03 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.137; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKTtTju5QDUqqNW+dmo4yVbtEfJT2Dsg+F@postini.com; Tue, 29 Nov 2011 13:53:03 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 58E4C62; Tue, 29 Nov 2011 13:52:54 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id BF4A650; Tue, 29 Nov 2011 13:36:33 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id B95ECA807B; Tue, 29 Nov 2011 14:52:49 +0100 (CET) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 29 Nov 2011 14:52:54 +0100 From: Linus Walleij To: Cc: Linus Walleij , Nicolas Pitre Subject: [PATCH] ARM: u300: delete memory.h Date: Tue, 29 Nov 2011 14:52:49 +0100 Message-ID: <1322574769-20453-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 From: Linus Walleij Last merge window the memory maps for U300 were simplified so we can now safely delete memory.h. Cc: Nicolas Pitre Signed-off-by: Linus Walleij --- arch/arm/Kconfig | 2 +- arch/arm/mach-u300/include/mach/memory.h | 19 ------------------- arch/arm/mach-u300/u300.c | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/memory.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 44789ef..3ce67eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -892,7 +892,7 @@ config ARCH_U300 select HAVE_MACH_CLKDEV select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB - select NEED_MACH_MEMORY_H + select NO_MACH_MEMORY_H help Support for ST-Ericsson U300 series mobile platforms. diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h deleted file mode 100644 index c808f34..0000000 --- a/arch/arm/mach-u300/include/mach/memory.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * - * arch/arm/mach-u300/include/mach/memory.h - * - * - * Copyright (C) 2007-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 - * Memory virtual/physical mapping constants. - * Author: Linus Walleij - * Author: Jonas Aaberg - */ - -#ifndef __MACH_MEMORY_H -#define __MACH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x48000000) -#define BOOT_PARAMS_OFFSET 0x100 - -#endif diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c index 89422ee..b200312 100644 --- a/arch/arm/mach-u300/u300.c +++ b/arch/arm/mach-u300/u300.c @@ -46,7 +46,7 @@ static void __init u300_init_machine(void) MACHINE_START(U300, MACH_U300_STRING) /* Maintainer: Linus Walleij */ - .atag_offset = BOOT_PARAMS_OFFSET, + .atag_offset = 0x100, .map_io = u300_map_io, .init_irq = u300_init_irq, .timer = &u300_timer,