Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / arm / include / asm / imx-common / regs-common.h

diff --git a/arch/arm/include/asm/arch-mxs/regs-common.h b/arch/arm/include/asm/imx-common/regs-common.h
similarity index 65%
rename from arch/arm/include/asm/arch-mxs/regs-common.h
rename to arch/arm/include/asm/imx-common/regs-common.h
index bcea419f99939ebd86c0fc3cef660cce04cd43b8..6fdcc5987f8ade451920789a245d7e673aa38c99 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-common.h
+++ b/arch/arm/include/asm/imx-common/regs-common.h
@@ -4,20 +4,7 @@
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
  *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __MXS_REGS_COMMON_H__
@@ -47,36 +34,48 @@
  *
  */
 
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
 #define        __mxs_reg_8(name)               \
        uint8_t name[4];                \
        uint8_t name##_set[4];          \
        uint8_t name##_clr[4];          \
-       uint8_t name##_tog[4];          \
+       uint8_t name##_tog[4]
 
 #define        __mxs_reg_32(name)              \
        uint32_t name;                  \
        uint32_t name##_set;            \
        uint32_t name##_clr;            \
-       uint32_t name##_tog;
+       uint32_t name##_tog
+
+#define __reg_32(name)                 \
+       uint32_t name;                  \
+       uint32_t reserved_##name[3]
 
 struct mxs_register_8 {
-       __mxs_reg_8(reg)
+       __mxs_reg_8(reg);
 };
 
 struct mxs_register_32 {
-       __mxs_reg_32(reg)
+       __mxs_reg_32(reg);
 };
 
-#define        mxs_reg_8(name)                         \
+#define        mxs_reg_8(name)                                 \
        union {                                         \
-               struct { __mxs_reg_8(name) };           \
+               struct { __mxs_reg_8(name); };          \
                struct mxs_register_8 name##_reg;       \
-       };
+       }
 
-#define        mxs_reg_32(name)                                \
+#define        mxs_reg_32(name);                               \
        union {                                         \
-               struct { __mxs_reg_32(name) };          \
+               struct { __mxs_reg_32(name); };         \
                struct mxs_register_32 name##_reg;      \
-       };
+       }
+
+#define        reg_32(name)                                    \
+       struct { __reg_32(name); }
+#endif
 
 #endif /* __MXS_REGS_COMMON_H__ */