diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-01-04 13:38:03 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 21:14:03 +0100 |
| commit | 662146b155c09d4b1fd01b5a1fb4e8464cce6685 (patch) | |
| tree | b361c8a3970ecbca99aee5f78ff53c86b2a8aedd /arch/arm/mach-gemini/include | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
ARM: gemini: get platform to build again
There is no defconfig file for gemini, which has lead to a lot
of bitrot. This makes the broken board files, the gpio implementation
and the reset logic work again, and fixes the build warnings
that got introduced with the changes to the readl/writel prototypes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-gemini/include')
| -rw-r--r-- | arch/arm/mach-gemini/include/mach/hardware.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-gemini/include/mach/system.h | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm/mach-gemini/include/mach/hardware.h b/arch/arm/mach-gemini/include/mach/hardware.h index 8c950e1d06be..98e7b0f286bf 100644 --- a/arch/arm/mach-gemini/include/mach/hardware.h +++ b/arch/arm/mach-gemini/include/mach/hardware.h @@ -69,6 +69,6 @@ /* * macro to get at IO space when running virtually */ -#define IO_ADDRESS(x) ((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000) +#define IO_ADDRESS(x) IOMEM((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000) #endif diff --git a/arch/arm/mach-gemini/include/mach/system.h b/arch/arm/mach-gemini/include/mach/system.h deleted file mode 100644 index a33b5a1f8ab4..000000000000 --- a/arch/arm/mach-gemini/include/mach/system.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2001-2006 Storlink, Corp. - * Copyright (C) 2008-2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt> - * - * 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. - */ -#ifndef __MACH_SYSTEM_H -#define __MACH_SYSTEM_H - -#include <linux/io.h> -#include <mach/hardware.h> -#include <mach/global_reg.h> - -static inline void arch_reset(char mode, const char *cmd) -{ - __raw_writel(RESET_GLOBAL | RESET_CPU1, - IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET); -} - -#endif /* __MACH_SYSTEM_H */ |