From 0f4cedc41f19ebf32c40c244b09b71787458e27f Mon Sep 17 00:00:00 2001
From: Michael Brandt <michael.brandt@stericsson.com>
Date: Thu, 18 Nov 2010 09:33:15 +0100
Subject: 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>
---
 include/asm-arm/arch-stw8500/common.h | 13 +++++++++----
 include/asm-arm/arch-stw8500/gpio.h   |  3 +--
 2 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 include/asm-arm/arch-stw8500/common.h

(limited to 'include')

diff --git a/include/asm-arm/arch-stw8500/common.h b/include/asm-arm/arch-stw8500/common.h
old mode 100755
new mode 100644
index 4b8c2b80a..38079b79c
--- 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
 
-- 
cgit v1.2.3