Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/arch/arm/include/asm/arch-mxs/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h
index 3e8dfe782fded69d85148a65096eb6ccc83dd1c3..529a3bcdd1c9ec105e54c02fb617ed578ce5254c 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-timrot.h
+++ b/arch/arm/include/asm/arch-mxs/regs-timrot.h
@@ -28,26 +28,26 @@
 #include <asm/arch/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_timrot_regs {
-       mx28_reg_32(hw_timrot_rotctrl)
-       mx28_reg_32(hw_timrot_rotcount)
-       mx28_reg_32(hw_timrot_timctrl0)
-       mx28_reg_32(hw_timrot_running_count0)
-       mx28_reg_32(hw_timrot_fixed_count0)
-       mx28_reg_32(hw_timrot_match_count0)
-       mx28_reg_32(hw_timrot_timctrl1)
-       mx28_reg_32(hw_timrot_running_count1)
-       mx28_reg_32(hw_timrot_fixed_count1)
-       mx28_reg_32(hw_timrot_match_count1)
-       mx28_reg_32(hw_timrot_timctrl2)
-       mx28_reg_32(hw_timrot_running_count2)
-       mx28_reg_32(hw_timrot_fixed_count2)
-       mx28_reg_32(hw_timrot_match_count2)
-       mx28_reg_32(hw_timrot_timctrl3)
-       mx28_reg_32(hw_timrot_running_count3)
-       mx28_reg_32(hw_timrot_fixed_count3)
-       mx28_reg_32(hw_timrot_match_count3)
-       mx28_reg_32(hw_timrot_version)
+struct mxs_timrot_regs {
+       mxs_reg_32(hw_timrot_rotctrl)
+       mxs_reg_32(hw_timrot_rotcount)
+       mxs_reg_32(hw_timrot_timctrl0)
+       mxs_reg_32(hw_timrot_running_count0)
+       mxs_reg_32(hw_timrot_fixed_count0)
+       mxs_reg_32(hw_timrot_match_count0)
+       mxs_reg_32(hw_timrot_timctrl1)
+       mxs_reg_32(hw_timrot_running_count1)
+       mxs_reg_32(hw_timrot_fixed_count1)
+       mxs_reg_32(hw_timrot_match_count1)
+       mxs_reg_32(hw_timrot_timctrl2)
+       mxs_reg_32(hw_timrot_running_count2)
+       mxs_reg_32(hw_timrot_fixed_count2)
+       mxs_reg_32(hw_timrot_match_count2)
+       mxs_reg_32(hw_timrot_timctrl3)
+       mxs_reg_32(hw_timrot_running_count3)
+       mxs_reg_32(hw_timrot_fixed_count3)
+       mxs_reg_32(hw_timrot_match_count3)
+       mxs_reg_32(hw_timrot_version)
 };
 #endif