From patchwork Thu Oct 13 15:16:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 119548 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6C740B6F18 for ; Fri, 14 Oct 2011 02:16:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756067Ab1JMPQf (ORCPT ); Thu, 13 Oct 2011 11:16:35 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:59022 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753355Ab1JMPQe (ORCPT ); Thu, 13 Oct 2011 11:16:34 -0400 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lzq1j-1R0bfY0NZT-014gTj; Thu, 13 Oct 2011 17:16:23 +0200 From: Arnd Bergmann To: Olof Johansson Subject: Re: [GIT PULL] Please pull tegra cleanups for 3.2 Date: Thu, 13 Oct 2011 17:16:17 +0200 User-Agent: KMail/1.12.2 (Linux/2.6.37; KDE/4.3.2; x86_64; ; ) Cc: linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stephen Warren , Colin Cross , "Russell King - ARM Linux" References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201110131716.18358.arnd@arndb.de> X-Provags-ID: V02:K0:OLSLXvrF+BLL8nR4nCgRHAMmB8DsB+zogsvXMsLvNJv 09N7B7428tDevt23J53f/BJWXEt+cdPMyQKgsTr96pJL3isAsZ +Hra5+FCTriLpSwFWxTojjwTfOCrjIyKsLm8YIfomMQCObt1Bo qAfJujOFKPhRWI9S8bYUceSKGklJvHtfmXYNsCQE/Y70nO+/mu jnA2xVbGpA5SPI9or7dx2JsVLP8OkMSWhtBH+JNz1CpCKd6lNm PIiV9XQcFeUFNcC/tPIihfQeej8/s7VWpp5r8C4vlihTlxGjvM Om2n+YZg/awdWSAQqdzCqLYFtaBCnBIIW3oiJ7+5gq5XAeV9Co 08Kk+q36J6eUo9J9/ajk= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org On Thursday 13 October 2011, Olof Johansson wrote: > Hi Arnd, > > Please pull the below branch of cleanups for the 3.2 merge window. > They have been included in linux-next for a couple of days already. I saw Russell had a comment on the macro name should be addressed. I've put your series plus an additional commit to fix this up into the tegra/cleanup branch. When you ack this patch, I'll include this branch into next/cleanup and the for-next branch. Thanks, Arnd --- ARM: tegra renamed __IOVADDR to IOMEM This matches how other platforms name the same macro, as pointed out by Russell King. Signed-off-by: Arnd Bergmann -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-tegra/include/mach/io.h b/arch/arm/mach-tegra/include/mach/io.h index 971be4b..35a011f 100644 --- a/arch/arm/mach-tegra/include/mach/io.h +++ b/arch/arm/mach-tegra/include/mach/io.h @@ -34,25 +34,25 @@ */ #ifdef __ASSEMBLY__ -#define __IOVADDR(x) (x) +#define IOMEM(x) (x) #else -#define __IOVADDR(x) ((void __force __iomem *)(x)) +#define IOMEM(x) ((void __force __iomem *)(x)) #endif #define IO_IRAM_PHYS 0x40000000 -#define IO_IRAM_VIRT __IOVADDR(0xFE400000) +#define IO_IRAM_VIRT IOMEM(0xFE400000) #define IO_IRAM_SIZE SZ_256K #define IO_CPU_PHYS 0x50040000 -#define IO_CPU_VIRT __IOVADDR(0xFE000000) +#define IO_CPU_VIRT IOMEM(0xFE000000) #define IO_CPU_SIZE SZ_16K #define IO_PPSB_PHYS 0x60000000 -#define IO_PPSB_VIRT __IOVADDR(0xFE200000) +#define IO_PPSB_VIRT IOMEM(0xFE200000) #define IO_PPSB_SIZE SZ_1M #define IO_APB_PHYS 0x70000000 -#define IO_APB_VIRT __IOVADDR(0xFE300000) +#define IO_APB_VIRT IOMEM(0xFE300000) #define IO_APB_SIZE SZ_1M #define IO_TO_VIRT_BETWEEN(p, st, sz) ((p) >= (st) && (p) < ((st) + (sz)))