Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'

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

diff --git a/arch/arm/include/asm/arch-mxs/regs-gpmi.h b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
index 1b487f46c6406f7a55afc52cb6039c6acd105a7b..624d6185603777281f29bb18ca13ac3a8e88c988 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-gpmi.h
+++ b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
@@ -29,23 +29,23 @@
 #include <asm/arch/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_gpmi_regs {
-       mx28_reg_32(hw_gpmi_ctrl0)
-       mx28_reg_32(hw_gpmi_compare)
-       mx28_reg_32(hw_gpmi_eccctrl)
-       mx28_reg_32(hw_gpmi_ecccount)
-       mx28_reg_32(hw_gpmi_payload)
-       mx28_reg_32(hw_gpmi_auxiliary)
-       mx28_reg_32(hw_gpmi_ctrl1)
-       mx28_reg_32(hw_gpmi_timing0)
-       mx28_reg_32(hw_gpmi_timing1)
+struct mxs_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)
 
        uint32_t        reserved[4];
 
-       mx28_reg_32(hw_gpmi_data)
-       mx28_reg_32(hw_gpmi_stat)
-       mx28_reg_32(hw_gpmi_debug)
-       mx28_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