From patchwork Tue Dec 30 19:28:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 5552951 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 EBFD3BF6C3 for ; Tue, 30 Dec 2014 19:33:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07379200FE for ; Tue, 30 Dec 2014 19:33:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 154C6200DC for ; Tue, 30 Dec 2014 19:33:43 +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 1Y62Vn-00075L-LR; Tue, 30 Dec 2014 19:31:23 +0000 Received: from mail-oi0-x22c.google.com ([2607:f8b0:4003:c06::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y62Tx-0005Bg-Dx for linux-arm-kernel@lists.infradead.org; Tue, 30 Dec 2014 19:29:31 +0000 Received: by mail-oi0-f44.google.com with SMTP id e131so33458045oig.3 for ; Tue, 30 Dec 2014 11:29:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jOaPMYLSmx/cM727wZqc5uopaL9sZSMlLkRdHp12uLM=; b=HlFnJOW8NvO2nkMxyIVoHN8YP1h8eIygb01jmkbakvLyKVohgc+BSKTMJXaor/73NO gqK2gHqp7FFbo+ER5cUV6MRspK/lI2cEOXitVWacLjMUbrFVklk1qGKkUajmBU70R9RB w1tN+xyvXN/wwTy2UObmQMLHS9jGR09mtdSVSa9vWYzmeje+VJamdPJnMgTwHwVGYta3 KpXO28NUluLeG43fpOYHV0cAO2AXp+OCt/1G7V0gd8hD1Wu/yb8IBVAZQfvINibdctAS iCyQimNpOEJHcaGarPbO0FCF9zPrRoocKwAuUZZV1x8adY/HTYcuCVpC++uHoJKfFWux QZ+Q== X-Received: by 10.182.27.241 with SMTP id w17mr7895435obg.14.1419967748348; Tue, 30 Dec 2014 11:29:08 -0800 (PST) Received: from rob-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id e3sm20469216oib.27.2014.12.30.11.29.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Dec 2014 11:29:07 -0800 (PST) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 7/9] ARM: versatile: move mach includes into mach directory Date: Tue, 30 Dec 2014 13:28:36 -0600 Message-Id: <1419967718-26909-8-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419967718-26909-1-git-send-email-robherring2@gmail.com> References: <1419967718-26909-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141230_112929_553940_6B176C32 X-CRM114-Status: GOOD ( 13.43 ) X-Spam-Score: -0.6 (/) Cc: Peter Maydell , Russell King , Rob Herring , Linus Walleij , arm@kernel.org, Bjorn Helgaas X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 From: Rob Herring In preparation for multi-platform support, move platform.h and hardware.h into mach-versatile directory. Combine them into a single file in the process. Signed-off-by: Rob Herring Cc: Russell King Cc: Linus Walleij --- arch/arm/mach-versatile/core.c | 3 +- arch/arm/mach-versatile/include/mach/hardware.h | 32 ---------------------- .../mach-versatile/{include/mach => }/platform.h | 5 ++++ 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 arch/arm/mach-versatile/include/mach/hardware.h rename arch/arm/mach-versatile/{include/mach => }/platform.h (98%) diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 566a946..f6b122b 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -34,8 +34,7 @@ #include #include -#include -#include +#include "platform.h" #include "core.h" diff --git a/arch/arm/mach-versatile/include/mach/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h deleted file mode 100644 index 22a1158..0000000 --- a/arch/arm/mach-versatile/include/mach/hardware.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * arch/arm/mach-versatile/include/mach/hardware.h - * - * This file contains the hardware definitions of the Versatile boards. - * - * Copyright (C) 2003 ARM Limited. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H - -#include - -/* macro to get at MMIO space when running virtually */ -#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) - -#define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - -#endif diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/platform.h similarity index 98% rename from arch/arm/mach-versatile/include/mach/platform.h rename to arch/arm/mach-versatile/platform.h index 7fe008b..05deec2 100644 --- a/arch/arm/mach-versatile/include/mach/platform.h +++ b/arch/arm/mach-versatile/platform.h @@ -21,6 +21,11 @@ #ifndef __address_h #define __address_h 1 +/* macro to get at MMIO space when running virtually */ +#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) + +#define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) + /* * Memory definitions */