From patchwork Thu Sep 6 20:12:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1417711 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 C8E003FC85 for ; Thu, 6 Sep 2012 20:17:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9iT9-0006WL-Iv; Thu, 06 Sep 2012 20:14:31 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9iS2-0006Cr-Rd for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 20:13:24 +0000 Received: by mail-ob0-f177.google.com with SMTP id ta17so3374893obb.36 for ; Thu, 06 Sep 2012 13:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=RGY3p50He2CTfPeYhjsaP9eAvRcz2m+5USHqso8gdaI=; b=lZErtbGmqz51mQgSiJ7R+ijvFZewROKkTeTal5J6Mu9sZ/0QWjs3R6KgUBpq5H0pyG zR7LvXk7p39/taSbFsUnFmfpZvbxm9yUKFZGq7OTe9yUiQ0wbLAwwooNWqgrricSI6FR WT1jBSJjMaIEZNIuIQoDE5v9Z0Eqe0nyxLJiI9loDcVkUn/g/JkBhF3gmqFM6tMayFKf /MUVvIutpOCfISmK8XqE7cheehu6+r2YaQlJJJnZoICYQTaBzq72tJIuQQdwo0xDQqNe yWlpoJVokpann0YrFHMGQ2poinK11k44DYKDHEKLco1qahgcLII+cZYs0yoDRxjSmXO2 yCtw== Received: by 10.182.118.8 with SMTP id ki8mr3655422obb.79.1346962402658; Thu, 06 Sep 2012 13:13:22 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id n8sm2259708oec.5.2012.09.06.13.13.21 (version=SSLv3 cipher=OTHER); Thu, 06 Sep 2012 13:13:22 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/12] ARM: picoxcell: remove dependency on mach/* headers Date: Thu, 6 Sep 2012 15:12:51 -0500 Message-Id: <1346962375-26163-9-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346962375-26163-1-git-send-email-robherring2@gmail.com> References: <1346962375-26163-1-git-send-email-robherring2@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Olof Johansson , Jamie Iles , Russell King , Rob Herring , Arnd Bergmann 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rob Herring Signed-off-by: Rob Herring Cc: Jamie Iles --- arch/arm/mach-picoxcell/common.c | 6 ++--- arch/arm/mach-picoxcell/include/mach/map.h | 25 -------------------- .../{include/mach => }/picoxcell_soc.h | 0 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 arch/arm/mach-picoxcell/include/mach/map.h rename arch/arm/mach-picoxcell/{include/mach => }/picoxcell_soc.h (100%) diff --git a/arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h b/arch/arm/mach-picoxcell/picoxcell_soc.h similarity index 100% rename from arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h rename to arch/arm/mach-picoxcell/picoxcell_soc.h diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index 8f9a0b4..a8b70b5 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -20,11 +20,11 @@ #include #include -#include -#include - +#include "picoxcell_soc.h" #include "common.h" +#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000) + #define WDT_CTRL_REG_EN_MASK (1 << 0) #define WDT_CTRL_REG_OFFS (0x00) #define WDT_TIMEOUT_REG_OFFS (0x04) diff --git a/arch/arm/mach-picoxcell/include/mach/map.h b/arch/arm/mach-picoxcell/include/mach/map.h deleted file mode 100644 index c06afad..0000000 --- a/arch/arm/mach-picoxcell/include/mach/map.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2011 Picochip Ltd., Jamie Iles - * - * 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. - */ -#ifndef __PICOXCELL_MAP_H__ -#define __PICOXCELL_MAP_H__ - -#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000) - -#ifdef __ASSEMBLY__ -#define IO_ADDRESS(x) PHYS_TO_IO((x)) -#else -#define IO_ADDRESS(x) (void __iomem __force *)(PHYS_TO_IO((x))) -#endif - -#endif /* __PICOXCELL_MAP_H__ */