summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-mxs
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-08-13 10:55:34 +0800
committerStefano Babic <sbabic@denx.de>2015-09-02 15:29:14 +0200
commitfc684e87a1d1342cecbaf68ad8690482e4baff76 (patch)
treeb7d010c037c42275411c6813a26826961f6c76cc /arch/arm/include/asm/arch-mxs
parentbf3b9cb6e8088955c4271f1af03596cc2df26cd8 (diff)
downloadu-boot-imx-fc684e87a1d1342cecbaf68ad8690482e4baff76.zip
u-boot-imx-fc684e87a1d1342cecbaf68ad8690482e4baff76.tar.gz
u-boot-imx-fc684e87a1d1342cecbaf68ad8690482e4baff76.tar.bz2
imx-common: consolidate macros and prototypes into sys_proto.h
Move most macro definitions and prototypes into "arch/arm/include/asm/imx-common/sys_proto.h" to avoid duplicated function prototypes and marco definitions for different i.MX SoCs. This patch do not remove the sys_proto.h for different i.MX SoCs, because we need to modify lots of driver code and others. This patch remove duplicated macros and prototypes and incude "sys_proto.h" of imx-common for each sys_proto.h of different i.MX platforms. Then later we should avoid add stuff in sys_proto.h of each platform, and modify driver to include common sys_proto.h. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/include/asm/arch-mxs')
-rw-r--r--arch/arm/include/asm/arch-mxs/sys_proto.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index d6e9fdb..20ff101 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -7,19 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __SYS_PROTO_H__
-#define __SYS_PROTO_H__
+#ifndef __MXS_SYS_PROTO_H__
+#define __MXS_SYS_PROTO_H__
-#include <asm/imx-common/regs-common.h>
-#include <../arch-imx/cpu.h>
-
-int mxs_reset_block(struct mxs_register_32 *reg);
-int mxs_wait_mask_set(struct mxs_register_32 *reg,
- uint32_t mask,
- unsigned int timeout);
-int mxs_wait_mask_clr(struct mxs_register_32 *reg,
- uint32_t mask,
- unsigned int timeout);
+#include <asm/imx-common/sys_proto.h>
int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int));