From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Thu, 6 Sep 2012 15:12:51 -0500 Subject: [PATCH 08/12] ARM: picoxcell: remove dependency on mach/* headers In-Reply-To: <1346962375-26163-1-git-send-email-robherring2@gmail.com> References: <1346962375-26163-1-git-send-email-robherring2@gmail.com> Message-ID: <1346962375-26163-9-git-send-email-robherring2@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.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/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__ */ 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 -- 1.7.9.5