diff options
| author | Michael Brandt <michael.brandt@stericsson.com> | 2010-11-18 09:33:15 +0100 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-11-19 15:18:20 +0100 |
| commit | 0f4cedc41f19ebf32c40c244b09b71787458e27f (patch) | |
| tree | 6cbf3ff4a2f6ad98d43b7ca7d9b7e345ba7c793c /include | |
| parent | c8c9d8e3dac93c840baa93db847f72f63a61790c (diff) | |
U8500: Removed duplicates of common.h and gpio.h
common.h and gpio.h were present in the u8500 board directory and in the
SoC include directory include/asm-arch/arch-stw8500.
This patch removes the duplicates in the board directory and replaces
all "common.h" and "gpio.h" with <asm/arch/common.h> and
<asm/arch/gpio.h>, respectively.
Change-Id: I4ff2a3a11324200222e3ae5b9d22eee6427f6d4c
Signed-off-by: Michael Brandt <michael.brandt@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/8838
Reviewed-by: Markus HELGESSON <markus.helgesson@stericsson.com>
Reviewed-by: Rikard OLSSON <rikard.p.olsson@stericsson.com>
Diffstat (limited to 'include')
| -rw-r--r--[-rwxr-xr-x] | include/asm-arm/arch-stw8500/common.h | 13 | ||||
| -rwxr-xr-x | include/asm-arm/arch-stw8500/gpio.h | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/asm-arm/arch-stw8500/common.h b/include/asm-arm/arch-stw8500/common.h index 4b8c2b80a..38079b79c 100755..100644 --- a/include/asm-arm/arch-stw8500/common.h +++ b/include/asm-arm/arch-stw8500/common.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ -#ifndef _COMMON_H_ -#define _COMMON_H_ +#ifndef _DB8500_COMMON_H_ +#define _DB8500_COMMON_H_ #include <common.h> #define PASS (1) @@ -128,6 +128,11 @@ typedef u32 t_logical_address; /*function prototypes*/ void gpio_init(void); -int emmc_init (u8); -#endif /* _COMMON_H_ */ +int u8500_is_earlydrop(void); +int cpu_is_u8500v11(void); +int cpu_is_u8500v1(void); +int cpu_is_u8500v2(void); + +int board_early_access(block_dev_desc_t *block_dev); +#endif /* _DB8500_COMMON_H_ */ diff --git a/include/asm-arm/arch-stw8500/gpio.h b/include/asm-arm/arch-stw8500/gpio.h index 24f3c6ee6..fbff7fcb6 100755 --- a/include/asm-arm/arch-stw8500/gpio.h +++ b/include/asm-arm/arch-stw8500/gpio.h @@ -26,8 +26,7 @@ #include <asm/io.h> #include <asm/errno.h> -#include "common.h" -#include <configs/u8500.h> +#include <asm/arch/common.h> #define GPIO_TOTAL_PINS 268 |