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

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

diff --git a/arch/arm/include/asm/arch-mxs/regs-i2c.h b/arch/arm/include/asm/arch-mxs/regs-i2c.h
index 2e2e81453d86b78f56bb6f244645d371394cbb96..067cfd394730268523a3a9894f1b9dbba93a12cb 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-i2c.h
+++ b/arch/arm/include/asm/arch-mxs/regs-i2c.h
@@ -26,21 +26,21 @@
 #include <asm/arch/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_i2c_regs {
-       mx28_reg_32(hw_i2c_ctrl0)
-       mx28_reg_32(hw_i2c_timing0)
-       mx28_reg_32(hw_i2c_timing1)
-       mx28_reg_32(hw_i2c_timing2)
-       mx28_reg_32(hw_i2c_ctrl1)
-       mx28_reg_32(hw_i2c_stat)
-       mx28_reg_32(hw_i2c_queuectrl)
-       mx28_reg_32(hw_i2c_queuestat)
-       mx28_reg_32(hw_i2c_queuecmd)
-       mx28_reg_32(hw_i2c_queuedata)
-       mx28_reg_32(hw_i2c_data)
-       mx28_reg_32(hw_i2c_debug0)
-       mx28_reg_32(hw_i2c_debug1)
-       mx28_reg_32(hw_i2c_version)
+struct mxs_i2c_regs {
+       mxs_reg_32(hw_i2c_ctrl0)
+       mxs_reg_32(hw_i2c_timing0)
+       mxs_reg_32(hw_i2c_timing1)
+       mxs_reg_32(hw_i2c_timing2)
+       mxs_reg_32(hw_i2c_ctrl1)
+       mxs_reg_32(hw_i2c_stat)
+       mxs_reg_32(hw_i2c_queuectrl)
+       mxs_reg_32(hw_i2c_queuestat)
+       mxs_reg_32(hw_i2c_queuecmd)
+       mxs_reg_32(hw_i2c_queuedata)
+       mxs_reg_32(hw_i2c_data)
+       mxs_reg_32(hw_i2c_debug0)
+       mxs_reg_32(hw_i2c_debug1)
+       mxs_reg_32(hw_i2c_version)
 };
 #endif