Update from 2013.01 to 2013.07

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

diff --git a/arch/arm/include/asm/arch-mxs/regs-gpmi.h b/arch/arm/include/asm/imx-common/regs-gpmi.h
similarity index 87%
rename from arch/arm/include/asm/arch-mxs/regs-gpmi.h
rename to arch/arm/include/asm/imx-common/regs-gpmi.h
index cd630d336cd8620533bc239c2e1b47237840da8b..642864f3cfdcdc14b16a9cd323a502033dcab974 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-gpmi.h
+++ b/arch/arm/include/asm/imx-common/regs-gpmi.h
@@ -7,45 +7,32 @@
  * Based on code from LTIB:
  * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  *
- * 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 __MX28_REGS_GPMI_H__
 #define __MX28_REGS_GPMI_H__
 
-#include <asm/arch/regs-common.h>
+#include <asm/imx-common/regs-common.h>
 
 #ifndef        __ASSEMBLY__
 struct gpmi_regs {
-       mxs_reg_32(hw_gpmi_ctrl0)
-       mxs_reg_32(hw_gpmi_compare)
-       mxs_reg_32(hw_gpmi_eccctrl)
-       mxs_reg_32(hw_gpmi_ecccount)
-       mxs_reg_32(hw_gpmi_payload)
-       mxs_reg_32(hw_gpmi_auxiliary)
-       mxs_reg_32(hw_gpmi_ctrl1)
-       mxs_reg_32(hw_gpmi_timing0)
-       mxs_reg_32(hw_gpmi_timing1)
+       mxs_reg_32(hw_gpmi_ctrl0);
+       mxs_reg_32(hw_gpmi_compare);
+       mxs_reg_32(hw_gpmi_eccctrl);
+       mxs_reg_32(hw_gpmi_ecccount);
+       mxs_reg_32(hw_gpmi_payload);
+       mxs_reg_32(hw_gpmi_auxiliary);
+       mxs_reg_32(hw_gpmi_ctrl1);
+       mxs_reg_32(hw_gpmi_timing0);
+       mxs_reg_32(hw_gpmi_timing1);
 
        uint32_t        reserved[4];
 
-       mxs_reg_32(hw_gpmi_data)
-       mxs_reg_32(hw_gpmi_stat)
-       mxs_reg_32(hw_gpmi_debug)
-       mxs_reg_32(hw_gpmi_version)
+       mxs_reg_32(hw_gpmi_data);
+       mxs_reg_32(hw_gpmi_stat);
+       mxs_reg_32(hw_gpmi_debug);
+       mxs_reg_32(hw_gpmi_version);
 };
 #endif