Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

[oweals/u-boot.git] / arch / arm / include / asm / arch-mxs / regs-ocotp.h

diff --git a/arch/arm/include/asm/arch-mxs/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
index 2738035519290dc3487f38e5985768a29c83b1a6..3269892f99dbb8d4797c627eeb5c6efa7650a5f6 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-ocotp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
@@ -29,50 +29,50 @@
 #include <asm/arch/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_ocotp_regs {
-       mx28_reg_32(hw_ocotp_ctrl)      /* 0x0 */
-       mx28_reg_32(hw_ocotp_data)      /* 0x10 */
-       mx28_reg_32(hw_ocotp_cust0)     /* 0x20 */
-       mx28_reg_32(hw_ocotp_cust1)     /* 0x30 */
-       mx28_reg_32(hw_ocotp_cust2)     /* 0x40 */
-       mx28_reg_32(hw_ocotp_cust3)     /* 0x50 */
-       mx28_reg_32(hw_ocotp_crypto0)   /* 0x60 */
-       mx28_reg_32(hw_ocotp_crypto1)   /* 0x70 */
-       mx28_reg_32(hw_ocotp_crypto2)   /* 0x80 */
-       mx28_reg_32(hw_ocotp_crypto3)   /* 0x90 */
-       mx28_reg_32(hw_ocotp_hwcap0)    /* 0xa0 */
-       mx28_reg_32(hw_ocotp_hwcap1)    /* 0xb0 */
-       mx28_reg_32(hw_ocotp_hwcap2)    /* 0xc0 */
-       mx28_reg_32(hw_ocotp_hwcap3)    /* 0xd0 */
-       mx28_reg_32(hw_ocotp_hwcap4)    /* 0xe0 */
-       mx28_reg_32(hw_ocotp_hwcap5)    /* 0xf0 */
-       mx28_reg_32(hw_ocotp_swcap)     /* 0x100 */
-       mx28_reg_32(hw_ocotp_custcap)   /* 0x110 */
-       mx28_reg_32(hw_ocotp_lock)      /* 0x120 */
-       mx28_reg_32(hw_ocotp_ops0)      /* 0x130 */
-       mx28_reg_32(hw_ocotp_ops1)      /* 0x140 */
-       mx28_reg_32(hw_ocotp_ops2)      /* 0x150 */
-       mx28_reg_32(hw_ocotp_ops3)      /* 0x160 */
-       mx28_reg_32(hw_ocotp_un0)       /* 0x170 */
-       mx28_reg_32(hw_ocotp_un1)       /* 0x180 */
-       mx28_reg_32(hw_ocotp_un2)       /* 0x190 */
-       mx28_reg_32(hw_ocotp_rom0)      /* 0x1a0 */
-       mx28_reg_32(hw_ocotp_rom1)      /* 0x1b0 */
-       mx28_reg_32(hw_ocotp_rom2)      /* 0x1c0 */
-       mx28_reg_32(hw_ocotp_rom3)      /* 0x1d0 */
-       mx28_reg_32(hw_ocotp_rom4)      /* 0x1e0 */
-       mx28_reg_32(hw_ocotp_rom5)      /* 0x1f0 */
-       mx28_reg_32(hw_ocotp_rom6)      /* 0x200 */
-       mx28_reg_32(hw_ocotp_rom7)      /* 0x210 */
-       mx28_reg_32(hw_ocotp_srk0)      /* 0x220 */
-       mx28_reg_32(hw_ocotp_srk1)      /* 0x230 */
-       mx28_reg_32(hw_ocotp_srk2)      /* 0x240 */
-       mx28_reg_32(hw_ocotp_srk3)      /* 0x250 */
-       mx28_reg_32(hw_ocotp_srk4)      /* 0x260 */
-       mx28_reg_32(hw_ocotp_srk5)      /* 0x270 */
-       mx28_reg_32(hw_ocotp_srk6)      /* 0x280 */
-       mx28_reg_32(hw_ocotp_srk7)      /* 0x290 */
-       mx28_reg_32(hw_ocotp_version)   /* 0x2a0 */
+struct mxs_ocotp_regs {
+       mxs_reg_32(hw_ocotp_ctrl)       /* 0x0 */
+       mxs_reg_32(hw_ocotp_data)       /* 0x10 */
+       mxs_reg_32(hw_ocotp_cust0)      /* 0x20 */
+       mxs_reg_32(hw_ocotp_cust1)      /* 0x30 */
+       mxs_reg_32(hw_ocotp_cust2)      /* 0x40 */
+       mxs_reg_32(hw_ocotp_cust3)      /* 0x50 */
+       mxs_reg_32(hw_ocotp_crypto0)    /* 0x60 */
+       mxs_reg_32(hw_ocotp_crypto1)    /* 0x70 */
+       mxs_reg_32(hw_ocotp_crypto2)    /* 0x80 */
+       mxs_reg_32(hw_ocotp_crypto3)    /* 0x90 */
+       mxs_reg_32(hw_ocotp_hwcap0)     /* 0xa0 */
+       mxs_reg_32(hw_ocotp_hwcap1)     /* 0xb0 */
+       mxs_reg_32(hw_ocotp_hwcap2)     /* 0xc0 */
+       mxs_reg_32(hw_ocotp_hwcap3)     /* 0xd0 */
+       mxs_reg_32(hw_ocotp_hwcap4)     /* 0xe0 */
+       mxs_reg_32(hw_ocotp_hwcap5)     /* 0xf0 */
+       mxs_reg_32(hw_ocotp_swcap)      /* 0x100 */
+       mxs_reg_32(hw_ocotp_custcap)    /* 0x110 */
+       mxs_reg_32(hw_ocotp_lock)       /* 0x120 */
+       mxs_reg_32(hw_ocotp_ops0)       /* 0x130 */
+       mxs_reg_32(hw_ocotp_ops1)       /* 0x140 */
+       mxs_reg_32(hw_ocotp_ops2)       /* 0x150 */
+       mxs_reg_32(hw_ocotp_ops3)       /* 0x160 */
+       mxs_reg_32(hw_ocotp_un0)        /* 0x170 */
+       mxs_reg_32(hw_ocotp_un1)        /* 0x180 */
+       mxs_reg_32(hw_ocotp_un2)        /* 0x190 */
+       mxs_reg_32(hw_ocotp_rom0)       /* 0x1a0 */
+       mxs_reg_32(hw_ocotp_rom1)       /* 0x1b0 */
+       mxs_reg_32(hw_ocotp_rom2)       /* 0x1c0 */
+       mxs_reg_32(hw_ocotp_rom3)       /* 0x1d0 */
+       mxs_reg_32(hw_ocotp_rom4)       /* 0x1e0 */
+       mxs_reg_32(hw_ocotp_rom5)       /* 0x1f0 */
+       mxs_reg_32(hw_ocotp_rom6)       /* 0x200 */
+       mxs_reg_32(hw_ocotp_rom7)       /* 0x210 */
+       mxs_reg_32(hw_ocotp_srk0)       /* 0x220 */
+       mxs_reg_32(hw_ocotp_srk1)       /* 0x230 */
+       mxs_reg_32(hw_ocotp_srk2)       /* 0x240 */
+       mxs_reg_32(hw_ocotp_srk3)       /* 0x250 */
+       mxs_reg_32(hw_ocotp_srk4)       /* 0x260 */
+       mxs_reg_32(hw_ocotp_srk5)       /* 0x270 */
+       mxs_reg_32(hw_ocotp_srk6)       /* 0x280 */
+       mxs_reg_32(hw_ocotp_srk7)       /* 0x290 */
+       mxs_reg_32(hw_ocotp_version)    /* 0x2a0 */
 };
 #endif