]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
mxs: put semicolon at end of macro invocation rather than macro definition
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 15 Jul 2013 07:49:18 +0000 (09:49 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 15 Jul 2013 07:49:18 +0000 (09:49 +0200)
15 files changed:
arch/arm/include/asm/arch-mxs/regs-apbh.h
arch/arm/include/asm/arch-mxs/regs-bch.h
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
arch/arm/include/asm/arch-mxs/regs-common.h
arch/arm/include/asm/arch-mxs/regs-digctl.h
arch/arm/include/asm/arch-mxs/regs-gpmi.h
arch/arm/include/asm/arch-mxs/regs-i2c.h
arch/arm/include/asm/arch-mxs/regs-lcdif.h
arch/arm/include/asm/arch-mxs/regs-ocotp.h
arch/arm/include/asm/arch-mxs/regs-pinctrl.h
arch/arm/include/asm/arch-mxs/regs-power-mx28.h
arch/arm/include/asm/arch-mxs/regs-rtc.h
arch/arm/include/asm/arch-mxs/regs-ssp.h
arch/arm/include/asm/arch-mxs/regs-timrot.h
arch/arm/include/asm/arch-mxs/regs-usbphy.h

index 7a09b6dfcac81f967d58a0442b74c1764d754c49..1c6597b890fded16200065e729ba605e026e75f4 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct apbh_regs {
-       mxs_reg_32(hw_apbh_ctrl0)
-       mxs_reg_32(hw_apbh_ctrl1)
-       mxs_reg_32(hw_apbh_ctrl2)
-       mxs_reg_32(hw_apbh_channel_ctrl)
-       mxs_reg_32(hw_apbh_devsel)
-       mxs_reg_32(hw_apbh_dma_burst_size)
-       mxs_reg_32(hw_apbh_debug)
+       mxs_reg_32(hw_apbh_ctrl0);
+       mxs_reg_32(hw_apbh_ctrl1);
+       mxs_reg_32(hw_apbh_ctrl2);
+       mxs_reg_32(hw_apbh_channel_ctrl);
+       mxs_reg_32(hw_apbh_devsel);
+       mxs_reg_32(hw_apbh_dma_burst_size);
+       mxs_reg_32(hw_apbh_debug);
 
        uint32_t        reserved[36];
 
        union {
        struct {
-               mxs_reg_32(hw_apbh_ch_curcmdar)
-               mxs_reg_32(hw_apbh_ch_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch_cmd)
-               mxs_reg_32(hw_apbh_ch_bar)
-               mxs_reg_32(hw_apbh_ch_sema)
-               mxs_reg_32(hw_apbh_ch_debug1)
-               mxs_reg_32(hw_apbh_ch_debug2)
+               mxs_reg_32(hw_apbh_ch_curcmdar);
+               mxs_reg_32(hw_apbh_ch_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch_cmd);
+               mxs_reg_32(hw_apbh_ch_bar);
+               mxs_reg_32(hw_apbh_ch_sema);
+               mxs_reg_32(hw_apbh_ch_debug1);
+               mxs_reg_32(hw_apbh_ch_debug2);
        } ch[16];
        struct {
-               mxs_reg_32(hw_apbh_ch0_curcmdar)
-               mxs_reg_32(hw_apbh_ch0_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch0_cmd)
-               mxs_reg_32(hw_apbh_ch0_bar)
-               mxs_reg_32(hw_apbh_ch0_sema)
-               mxs_reg_32(hw_apbh_ch0_debug1)
-               mxs_reg_32(hw_apbh_ch0_debug2)
-               mxs_reg_32(hw_apbh_ch1_curcmdar)
-               mxs_reg_32(hw_apbh_ch1_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch1_cmd)
-               mxs_reg_32(hw_apbh_ch1_bar)
-               mxs_reg_32(hw_apbh_ch1_sema)
-               mxs_reg_32(hw_apbh_ch1_debug1)
-               mxs_reg_32(hw_apbh_ch1_debug2)
-               mxs_reg_32(hw_apbh_ch2_curcmdar)
-               mxs_reg_32(hw_apbh_ch2_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch2_cmd)
-               mxs_reg_32(hw_apbh_ch2_bar)
-               mxs_reg_32(hw_apbh_ch2_sema)
-               mxs_reg_32(hw_apbh_ch2_debug1)
-               mxs_reg_32(hw_apbh_ch2_debug2)
-               mxs_reg_32(hw_apbh_ch3_curcmdar)
-               mxs_reg_32(hw_apbh_ch3_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch3_cmd)
-               mxs_reg_32(hw_apbh_ch3_bar)
-               mxs_reg_32(hw_apbh_ch3_sema)
-               mxs_reg_32(hw_apbh_ch3_debug1)
-               mxs_reg_32(hw_apbh_ch3_debug2)
-               mxs_reg_32(hw_apbh_ch4_curcmdar)
-               mxs_reg_32(hw_apbh_ch4_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch4_cmd)
-               mxs_reg_32(hw_apbh_ch4_bar)
-               mxs_reg_32(hw_apbh_ch4_sema)
-               mxs_reg_32(hw_apbh_ch4_debug1)
-               mxs_reg_32(hw_apbh_ch4_debug2)
-               mxs_reg_32(hw_apbh_ch5_curcmdar)
-               mxs_reg_32(hw_apbh_ch5_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch5_cmd)
-               mxs_reg_32(hw_apbh_ch5_bar)
-               mxs_reg_32(hw_apbh_ch5_sema)
-               mxs_reg_32(hw_apbh_ch5_debug1)
-               mxs_reg_32(hw_apbh_ch5_debug2)
-               mxs_reg_32(hw_apbh_ch6_curcmdar)
-               mxs_reg_32(hw_apbh_ch6_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch6_cmd)
-               mxs_reg_32(hw_apbh_ch6_bar)
-               mxs_reg_32(hw_apbh_ch6_sema)
-               mxs_reg_32(hw_apbh_ch6_debug1)
-               mxs_reg_32(hw_apbh_ch6_debug2)
-               mxs_reg_32(hw_apbh_ch7_curcmdar)
-               mxs_reg_32(hw_apbh_ch7_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch7_cmd)
-               mxs_reg_32(hw_apbh_ch7_bar)
-               mxs_reg_32(hw_apbh_ch7_sema)
-               mxs_reg_32(hw_apbh_ch7_debug1)
-               mxs_reg_32(hw_apbh_ch7_debug2)
-               mxs_reg_32(hw_apbh_ch8_curcmdar)
-               mxs_reg_32(hw_apbh_ch8_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch8_cmd)
-               mxs_reg_32(hw_apbh_ch8_bar)
-               mxs_reg_32(hw_apbh_ch8_sema)
-               mxs_reg_32(hw_apbh_ch8_debug1)
-               mxs_reg_32(hw_apbh_ch8_debug2)
-               mxs_reg_32(hw_apbh_ch9_curcmdar)
-               mxs_reg_32(hw_apbh_ch9_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch9_cmd)
-               mxs_reg_32(hw_apbh_ch9_bar)
-               mxs_reg_32(hw_apbh_ch9_sema)
-               mxs_reg_32(hw_apbh_ch9_debug1)
-               mxs_reg_32(hw_apbh_ch9_debug2)
-               mxs_reg_32(hw_apbh_ch10_curcmdar)
-               mxs_reg_32(hw_apbh_ch10_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch10_cmd)
-               mxs_reg_32(hw_apbh_ch10_bar)
-               mxs_reg_32(hw_apbh_ch10_sema)
-               mxs_reg_32(hw_apbh_ch10_debug1)
-               mxs_reg_32(hw_apbh_ch10_debug2)
-               mxs_reg_32(hw_apbh_ch11_curcmdar)
-               mxs_reg_32(hw_apbh_ch11_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch11_cmd)
-               mxs_reg_32(hw_apbh_ch11_bar)
-               mxs_reg_32(hw_apbh_ch11_sema)
-               mxs_reg_32(hw_apbh_ch11_debug1)
-               mxs_reg_32(hw_apbh_ch11_debug2)
-               mxs_reg_32(hw_apbh_ch12_curcmdar)
-               mxs_reg_32(hw_apbh_ch12_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch12_cmd)
-               mxs_reg_32(hw_apbh_ch12_bar)
-               mxs_reg_32(hw_apbh_ch12_sema)
-               mxs_reg_32(hw_apbh_ch12_debug1)
-               mxs_reg_32(hw_apbh_ch12_debug2)
-               mxs_reg_32(hw_apbh_ch13_curcmdar)
-               mxs_reg_32(hw_apbh_ch13_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch13_cmd)
-               mxs_reg_32(hw_apbh_ch13_bar)
-               mxs_reg_32(hw_apbh_ch13_sema)
-               mxs_reg_32(hw_apbh_ch13_debug1)
-               mxs_reg_32(hw_apbh_ch13_debug2)
-               mxs_reg_32(hw_apbh_ch14_curcmdar)
-               mxs_reg_32(hw_apbh_ch14_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch14_cmd)
-               mxs_reg_32(hw_apbh_ch14_bar)
-               mxs_reg_32(hw_apbh_ch14_sema)
-               mxs_reg_32(hw_apbh_ch14_debug1)
-               mxs_reg_32(hw_apbh_ch14_debug2)
-               mxs_reg_32(hw_apbh_ch15_curcmdar)
-               mxs_reg_32(hw_apbh_ch15_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch15_cmd)
-               mxs_reg_32(hw_apbh_ch15_bar)
-               mxs_reg_32(hw_apbh_ch15_sema)
-               mxs_reg_32(hw_apbh_ch15_debug1)
-               mxs_reg_32(hw_apbh_ch15_debug2)
+               mxs_reg_32(hw_apbh_ch0_curcmdar);
+               mxs_reg_32(hw_apbh_ch0_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch0_cmd);
+               mxs_reg_32(hw_apbh_ch0_bar);
+               mxs_reg_32(hw_apbh_ch0_sema);
+               mxs_reg_32(hw_apbh_ch0_debug1);
+               mxs_reg_32(hw_apbh_ch0_debug2);
+               mxs_reg_32(hw_apbh_ch1_curcmdar);
+               mxs_reg_32(hw_apbh_ch1_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch1_cmd);
+               mxs_reg_32(hw_apbh_ch1_bar);
+               mxs_reg_32(hw_apbh_ch1_sema);
+               mxs_reg_32(hw_apbh_ch1_debug1);
+               mxs_reg_32(hw_apbh_ch1_debug2);
+               mxs_reg_32(hw_apbh_ch2_curcmdar);
+               mxs_reg_32(hw_apbh_ch2_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch2_cmd);
+               mxs_reg_32(hw_apbh_ch2_bar);
+               mxs_reg_32(hw_apbh_ch2_sema);
+               mxs_reg_32(hw_apbh_ch2_debug1);
+               mxs_reg_32(hw_apbh_ch2_debug2);
+               mxs_reg_32(hw_apbh_ch3_curcmdar);
+               mxs_reg_32(hw_apbh_ch3_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch3_cmd);
+               mxs_reg_32(hw_apbh_ch3_bar);
+               mxs_reg_32(hw_apbh_ch3_sema);
+               mxs_reg_32(hw_apbh_ch3_debug1);
+               mxs_reg_32(hw_apbh_ch3_debug2);
+               mxs_reg_32(hw_apbh_ch4_curcmdar);
+               mxs_reg_32(hw_apbh_ch4_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch4_cmd);
+               mxs_reg_32(hw_apbh_ch4_bar);
+               mxs_reg_32(hw_apbh_ch4_sema);
+               mxs_reg_32(hw_apbh_ch4_debug1);
+               mxs_reg_32(hw_apbh_ch4_debug2);
+               mxs_reg_32(hw_apbh_ch5_curcmdar);
+               mxs_reg_32(hw_apbh_ch5_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch5_cmd);
+               mxs_reg_32(hw_apbh_ch5_bar);
+               mxs_reg_32(hw_apbh_ch5_sema);
+               mxs_reg_32(hw_apbh_ch5_debug1);
+               mxs_reg_32(hw_apbh_ch5_debug2);
+               mxs_reg_32(hw_apbh_ch6_curcmdar);
+               mxs_reg_32(hw_apbh_ch6_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch6_cmd);
+               mxs_reg_32(hw_apbh_ch6_bar);
+               mxs_reg_32(hw_apbh_ch6_sema);
+               mxs_reg_32(hw_apbh_ch6_debug1);
+               mxs_reg_32(hw_apbh_ch6_debug2);
+               mxs_reg_32(hw_apbh_ch7_curcmdar);
+               mxs_reg_32(hw_apbh_ch7_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch7_cmd);
+               mxs_reg_32(hw_apbh_ch7_bar);
+               mxs_reg_32(hw_apbh_ch7_sema);
+               mxs_reg_32(hw_apbh_ch7_debug1);
+               mxs_reg_32(hw_apbh_ch7_debug2);
+               mxs_reg_32(hw_apbh_ch8_curcmdar);
+               mxs_reg_32(hw_apbh_ch8_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch8_cmd);
+               mxs_reg_32(hw_apbh_ch8_bar);
+               mxs_reg_32(hw_apbh_ch8_sema);
+               mxs_reg_32(hw_apbh_ch8_debug1);
+               mxs_reg_32(hw_apbh_ch8_debug2);
+               mxs_reg_32(hw_apbh_ch9_curcmdar);
+               mxs_reg_32(hw_apbh_ch9_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch9_cmd);
+               mxs_reg_32(hw_apbh_ch9_bar);
+               mxs_reg_32(hw_apbh_ch9_sema);
+               mxs_reg_32(hw_apbh_ch9_debug1);
+               mxs_reg_32(hw_apbh_ch9_debug2);
+               mxs_reg_32(hw_apbh_ch10_curcmdar);
+               mxs_reg_32(hw_apbh_ch10_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch10_cmd);
+               mxs_reg_32(hw_apbh_ch10_bar);
+               mxs_reg_32(hw_apbh_ch10_sema);
+               mxs_reg_32(hw_apbh_ch10_debug1);
+               mxs_reg_32(hw_apbh_ch10_debug2);
+               mxs_reg_32(hw_apbh_ch11_curcmdar);
+               mxs_reg_32(hw_apbh_ch11_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch11_cmd);
+               mxs_reg_32(hw_apbh_ch11_bar);
+               mxs_reg_32(hw_apbh_ch11_sema);
+               mxs_reg_32(hw_apbh_ch11_debug1);
+               mxs_reg_32(hw_apbh_ch11_debug2);
+               mxs_reg_32(hw_apbh_ch12_curcmdar);
+               mxs_reg_32(hw_apbh_ch12_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch12_cmd);
+               mxs_reg_32(hw_apbh_ch12_bar);
+               mxs_reg_32(hw_apbh_ch12_sema);
+               mxs_reg_32(hw_apbh_ch12_debug1);
+               mxs_reg_32(hw_apbh_ch12_debug2);
+               mxs_reg_32(hw_apbh_ch13_curcmdar);
+               mxs_reg_32(hw_apbh_ch13_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch13_cmd);
+               mxs_reg_32(hw_apbh_ch13_bar);
+               mxs_reg_32(hw_apbh_ch13_sema);
+               mxs_reg_32(hw_apbh_ch13_debug1);
+               mxs_reg_32(hw_apbh_ch13_debug2);
+               mxs_reg_32(hw_apbh_ch14_curcmdar);
+               mxs_reg_32(hw_apbh_ch14_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch14_cmd);
+               mxs_reg_32(hw_apbh_ch14_bar);
+               mxs_reg_32(hw_apbh_ch14_sema);
+               mxs_reg_32(hw_apbh_ch14_debug1);
+               mxs_reg_32(hw_apbh_ch14_debug2);
+               mxs_reg_32(hw_apbh_ch15_curcmdar);
+               mxs_reg_32(hw_apbh_ch15_nxtcmdar);
+               mxs_reg_32(hw_apbh_ch15_cmd);
+               mxs_reg_32(hw_apbh_ch15_bar);
+               mxs_reg_32(hw_apbh_ch15_sema);
+               mxs_reg_32(hw_apbh_ch15_debug1);
+               mxs_reg_32(hw_apbh_ch15_debug2);
        };
        };
-       mxs_reg_32(hw_apbh_version)
+       mxs_reg_32(hw_apbh_version);
 };
 #endif
 
index 287ea91768fa83c5fc0e3b2777f87135f86cdfee..6c8649fad7f5395495bdc62b8917d2830fdfa66e 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct bch_regs {
-       mxs_reg_32(hw_bch_ctrl)
-       mxs_reg_32(hw_bch_status0)
-       mxs_reg_32(hw_bch_mode)
-       mxs_reg_32(hw_bch_encodeptr)
-       mxs_reg_32(hw_bch_dataptr)
-       mxs_reg_32(hw_bch_metaptr)
+       mxs_reg_32(hw_bch_ctrl);
+       mxs_reg_32(hw_bch_status0);
+       mxs_reg_32(hw_bch_mode);
+       mxs_reg_32(hw_bch_encodeptr);
+       mxs_reg_32(hw_bch_dataptr);
+       mxs_reg_32(hw_bch_metaptr);
 
        uint32_t        reserved[4];
 
-       mxs_reg_32(hw_bch_layoutselect)
-       mxs_reg_32(hw_bch_flash0layout0)
-       mxs_reg_32(hw_bch_flash0layout1)
-       mxs_reg_32(hw_bch_flash1layout0)
-       mxs_reg_32(hw_bch_flash1layout1)
-       mxs_reg_32(hw_bch_flash2layout0)
-       mxs_reg_32(hw_bch_flash2layout1)
-       mxs_reg_32(hw_bch_flash3layout0)
-       mxs_reg_32(hw_bch_flash3layout1)
-       mxs_reg_32(hw_bch_dbgkesread)
-       mxs_reg_32(hw_bch_dbgcsferead)
-       mxs_reg_32(hw_bch_dbgsyndegread)
-       mxs_reg_32(hw_bch_dbgahbmread)
-       mxs_reg_32(hw_bch_blockname)
-       mxs_reg_32(hw_bch_version)
+       mxs_reg_32(hw_bch_layoutselect);
+       mxs_reg_32(hw_bch_flash0layout0);
+       mxs_reg_32(hw_bch_flash0layout1);
+       mxs_reg_32(hw_bch_flash1layout0);
+       mxs_reg_32(hw_bch_flash1layout1);
+       mxs_reg_32(hw_bch_flash2layout0);
+       mxs_reg_32(hw_bch_flash2layout1);
+       mxs_reg_32(hw_bch_flash3layout0);
+       mxs_reg_32(hw_bch_flash3layout1);
+       mxs_reg_32(hw_bch_dbgkesread);
+       mxs_reg_32(hw_bch_dbgcsferead);
+       mxs_reg_32(hw_bch_dbgsyndegread);
+       mxs_reg_32(hw_bch_dbgahbmread);
+       mxs_reg_32(hw_bch_blockname);
+       mxs_reg_32(hw_bch_version);
 };
 #endif
 
index 23e9adc25a28ee1cf8251b4b00ef70fe6bb67d46..d3beb3a79d91dbe7a4e2152327f8688a94b5593f 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_clkctrl_regs {
-       mxs_reg_32(hw_clkctrl_pll0ctrl0)        /* 0x00 */
+       mxs_reg_32(hw_clkctrl_pll0ctrl0);       /* 0x00 */
        uint32_t        hw_clkctrl_pll0ctrl1;   /* 0x10 */
        uint32_t        reserved_pll0ctrl1[3];  /* 0x14-0x1c */
-       mxs_reg_32(hw_clkctrl_pll1ctrl0)        /* 0x20 */
+       mxs_reg_32(hw_clkctrl_pll1ctrl0);       /* 0x20 */
        uint32_t        hw_clkctrl_pll1ctrl1;   /* 0x30 */
        uint32_t        reserved_pll1ctrl1[3];  /* 0x34-0x3c */
-       mxs_reg_32(hw_clkctrl_pll2ctrl0)        /* 0x40 */
-       mxs_reg_32(hw_clkctrl_cpu)              /* 0x50 */
-       mxs_reg_32(hw_clkctrl_hbus)             /* 0x60 */
-       mxs_reg_32(hw_clkctrl_xbus)             /* 0x70 */
-       mxs_reg_32(hw_clkctrl_xtal)             /* 0x80 */
-       mxs_reg_32(hw_clkctrl_ssp0)             /* 0x90 */
-       mxs_reg_32(hw_clkctrl_ssp1)             /* 0xa0 */
-       mxs_reg_32(hw_clkctrl_ssp2)             /* 0xb0 */
-       mxs_reg_32(hw_clkctrl_ssp3)             /* 0xc0 */
-       mxs_reg_32(hw_clkctrl_gpmi)             /* 0xd0 */
-       mxs_reg_32(hw_clkctrl_spdif)            /* 0xe0 */
-       mxs_reg_32(hw_clkctrl_emi)              /* 0xf0 */
-       mxs_reg_32(hw_clkctrl_saif0)            /* 0x100 */
-       mxs_reg_32(hw_clkctrl_saif1)            /* 0x110 */
-       mxs_reg_32(hw_clkctrl_lcdif)            /* 0x120 */
-       mxs_reg_32(hw_clkctrl_etm)              /* 0x130 */
-       mxs_reg_32(hw_clkctrl_enet)             /* 0x140 */
-       mxs_reg_32(hw_clkctrl_hsadc)            /* 0x150 */
-       mxs_reg_32(hw_clkctrl_flexcan)          /* 0x160 */
+       mxs_reg_32(hw_clkctrl_pll2ctrl0);       /* 0x40 */
+       mxs_reg_32(hw_clkctrl_cpu);             /* 0x50 */
+       mxs_reg_32(hw_clkctrl_hbus);            /* 0x60 */
+       mxs_reg_32(hw_clkctrl_xbus);            /* 0x70 */
+       mxs_reg_32(hw_clkctrl_xtal);            /* 0x80 */
+       mxs_reg_32(hw_clkctrl_ssp0);            /* 0x90 */
+       mxs_reg_32(hw_clkctrl_ssp1);            /* 0xa0 */
+       mxs_reg_32(hw_clkctrl_ssp2);            /* 0xb0 */
+       mxs_reg_32(hw_clkctrl_ssp3);            /* 0xc0 */
+       mxs_reg_32(hw_clkctrl_gpmi);            /* 0xd0 */
+       mxs_reg_32(hw_clkctrl_spdif);           /* 0xe0 */
+       mxs_reg_32(hw_clkctrl_emi);             /* 0xf0 */
+       mxs_reg_32(hw_clkctrl_saif0);           /* 0x100 */
+       mxs_reg_32(hw_clkctrl_saif1);           /* 0x110 */
+       mxs_reg_32(hw_clkctrl_lcdif);           /* 0x120 */
+       mxs_reg_32(hw_clkctrl_etm);             /* 0x130 */
+       mxs_reg_32(hw_clkctrl_enet);            /* 0x140 */
+       mxs_reg_32(hw_clkctrl_hsadc);           /* 0x150 */
+       mxs_reg_32(hw_clkctrl_flexcan);         /* 0x160 */
 
        uint32_t        reserved[16];
 
-       mxs_reg_8(hw_clkctrl_frac0)             /* 0x1b0 */
-       mxs_reg_8(hw_clkctrl_frac1)             /* 0x1c0 */
-       mxs_reg_32(hw_clkctrl_clkseq)           /* 0x1d0 */
-       mxs_reg_32(hw_clkctrl_reset)            /* 0x1e0 */
-       mxs_reg_32(hw_clkctrl_status)           /* 0x1f0 */
-       mxs_reg_32(hw_clkctrl_version)          /* 0x200 */
+       mxs_reg_8(hw_clkctrl_frac0);            /* 0x1b0 */
+       mxs_reg_8(hw_clkctrl_frac1);            /* 0x1c0 */
+       mxs_reg_32(hw_clkctrl_clkseq);          /* 0x1d0 */
+       mxs_reg_32(hw_clkctrl_reset);           /* 0x1e0 */
+       mxs_reg_32(hw_clkctrl_status);          /* 0x1f0 */
+       mxs_reg_32(hw_clkctrl_version);         /* 0x200 */
 };
 #endif
 
index bcea419f99939ebd86c0fc3cef660cce04cd43b8..eaaad6c14964eff79467faa0b9eda50315e5795b 100644 (file)
        uint8_t name[4];                \
        uint8_t name##_set[4];          \
        uint8_t name##_clr[4];          \
-       uint8_t name##_tog[4];          \
+       uint8_t name##_tog[4]
 
 #define        __mxs_reg_32(name)              \
        uint32_t name;                  \
        uint32_t name##_set;            \
        uint32_t name##_clr;            \
-       uint32_t name##_tog;
+       uint32_t name##_tog
 
 struct mxs_register_8 {
-       __mxs_reg_8(reg)
+       __mxs_reg_8(reg);
 };
 
 struct mxs_register_32 {
-       __mxs_reg_32(reg)
+       __mxs_reg_32(reg);
 };
 
-#define        mxs_reg_8(name)                         \
+#define        mxs_reg_8(name)                                 \
        union {                                         \
-               struct { __mxs_reg_8(name) };           \
+               struct { __mxs_reg_8(name); };          \
                struct mxs_register_8 name##_reg;       \
-       };
+       }
 
-#define        mxs_reg_32(name)                                \
+#define        mxs_reg_32(name);                               \
        union {                                         \
-               struct { __mxs_reg_32(name) };          \
+               struct { __mxs_reg_32(name); };         \
                struct mxs_register_32 name##_reg;      \
-       };
+       }
 
 #endif /* __MXS_REGS_COMMON_H__ */
index e7cc4b45d5a285f20e07111a8cb8c265498f0860..77e52bc85bb244f68fda9b94c50e6dcbbc49e1fb 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_digctl_regs {
-       mxs_reg_32(hw_digctl_ctrl)                              /* 0x000 */
-       mxs_reg_32(hw_digctl_status)                            /* 0x010 */
-       mxs_reg_32(hw_digctl_hclkcount)                 /* 0x020 */
-       mxs_reg_32(hw_digctl_ramctrl)                           /* 0x030 */
-       mxs_reg_32(hw_digctl_emi_status)                        /* 0x040 */
-       mxs_reg_32(hw_digctl_read_margin)                       /* 0x050 */
+       mxs_reg_32(hw_digctl_ctrl);                             /* 0x000 */
+       mxs_reg_32(hw_digctl_status);                           /* 0x010 */
+       mxs_reg_32(hw_digctl_hclkcount);                        /* 0x020 */
+       mxs_reg_32(hw_digctl_ramctrl);                          /* 0x030 */
+       mxs_reg_32(hw_digctl_emi_status);                       /* 0x040 */
+       mxs_reg_32(hw_digctl_read_margin);                      /* 0x050 */
        uint32_t        hw_digctl_writeonce;                    /* 0x060 */
        uint32_t        reserved_writeonce[3];
-       mxs_reg_32(hw_digctl_bist_ctl)                          /* 0x070 */
-       mxs_reg_32(hw_digctl_bist_status)                       /* 0x080 */
+       mxs_reg_32(hw_digctl_bist_ctl);                         /* 0x070 */
+       mxs_reg_32(hw_digctl_bist_status);                      /* 0x080 */
        uint32_t        hw_digctl_entropy;                      /* 0x090 */
        uint32_t        reserved_entropy[3];
        uint32_t        hw_digctl_entropy_latched;              /* 0x0a0 */
@@ -43,7 +43,7 @@ struct mxs_digctl_regs {
 
        uint32_t        reserved1[4];
 
-       mxs_reg_32(hw_digctl_microseconds)                      /* 0x0c0 */
+       mxs_reg_32(hw_digctl_microseconds);                     /* 0x0c0 */
        uint32_t        hw_digctl_dbgrd;                        /* 0x0d0 */
        uint32_t        reserved_hw_digctl_dbgrd[3];
        uint32_t        hw_digctl_dbg;                          /* 0x0e0 */
@@ -51,21 +51,21 @@ struct mxs_digctl_regs {
 
        uint32_t        reserved2[4];
 
-       mxs_reg_32(hw_digctl_usb_loopback)                      /* 0x100 */
-       mxs_reg_32(hw_digctl_ocram_status0)                     /* 0x110 */
-       mxs_reg_32(hw_digctl_ocram_status1)                     /* 0x120 */
-       mxs_reg_32(hw_digctl_ocram_status2)                     /* 0x130 */
-       mxs_reg_32(hw_digctl_ocram_status3)                     /* 0x140 */
-       mxs_reg_32(hw_digctl_ocram_status4)                     /* 0x150 */
-       mxs_reg_32(hw_digctl_ocram_status5)                     /* 0x160 */
-       mxs_reg_32(hw_digctl_ocram_status6)                     /* 0x170 */
-       mxs_reg_32(hw_digctl_ocram_status7)                     /* 0x180 */
-       mxs_reg_32(hw_digctl_ocram_status8)                     /* 0x190 */
-       mxs_reg_32(hw_digctl_ocram_status9)                     /* 0x1a0 */
-       mxs_reg_32(hw_digctl_ocram_status10)                    /* 0x1b0 */
-       mxs_reg_32(hw_digctl_ocram_status11)                    /* 0x1c0 */
-       mxs_reg_32(hw_digctl_ocram_status12)                    /* 0x1d0 */
-       mxs_reg_32(hw_digctl_ocram_status13)                    /* 0x1e0 */
+       mxs_reg_32(hw_digctl_usb_loopback);                     /* 0x100 */
+       mxs_reg_32(hw_digctl_ocram_status0);                    /* 0x110 */
+       mxs_reg_32(hw_digctl_ocram_status1);                    /* 0x120 */
+       mxs_reg_32(hw_digctl_ocram_status2);                    /* 0x130 */
+       mxs_reg_32(hw_digctl_ocram_status3);                    /* 0x140 */
+       mxs_reg_32(hw_digctl_ocram_status4);                    /* 0x150 */
+       mxs_reg_32(hw_digctl_ocram_status5);                    /* 0x160 */
+       mxs_reg_32(hw_digctl_ocram_status6);                    /* 0x170 */
+       mxs_reg_32(hw_digctl_ocram_status7);                    /* 0x180 */
+       mxs_reg_32(hw_digctl_ocram_status8);                    /* 0x190 */
+       mxs_reg_32(hw_digctl_ocram_status9);                    /* 0x1a0 */
+       mxs_reg_32(hw_digctl_ocram_status10);                   /* 0x1b0 */
+       mxs_reg_32(hw_digctl_ocram_status11);                   /* 0x1c0 */
+       mxs_reg_32(hw_digctl_ocram_status12);                   /* 0x1d0 */
+       mxs_reg_32(hw_digctl_ocram_status13);                   /* 0x1e0 */
 
        uint32_t        reserved3[36];
 
@@ -75,7 +75,7 @@ struct mxs_digctl_regs {
        uint32_t        reserved_hw_digctl_scratch1[3];
        uint32_t        hw_digctl_armcache;                     /* 0x2a0 */
        uint32_t        reserved_hw_digctl_armcache[3];
-       mxs_reg_32(hw_digctl_debug_trap)                        /* 0x2b0 */
+       mxs_reg_32(hw_digctl_debug_trap);                       /* 0x2b0 */
        uint32_t        hw_digctl_debug_trap_l0_addr_low;       /* 0x2c0 */
        uint32_t        reserved_hw_digctl_debug_trap_l0_addr_low[3];
        uint32_t        hw_digctl_debug_trap_l0_addr_high;      /* 0x2d0 */
index cd630d336cd8620533bc239c2e1b47237840da8b..c437bf9c61c21836c2015777a959f5fd8072b56b 100644 (file)
 
 #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
 
index 067cfd394730268523a3a9894f1b9dbba93a12cb..628e7c70487bcdd06f5854562d7b63fe6903fc6a 100644 (file)
 
 #ifndef        __ASSEMBLY__
 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)
+       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
 
index 10b33dd4d90c81f5e26a9973477a45fc79fcfdcb..ea2e67393fb069b0c46f0232f91b2cfa903e33bb 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_lcdif_regs {
-       mxs_reg_32(hw_lcdif_ctrl)               /* 0x00 */
-       mxs_reg_32(hw_lcdif_ctrl1)              /* 0x10 */
-       mxs_reg_32(hw_lcdif_ctrl2)              /* 0x20 */
-       mxs_reg_32(hw_lcdif_transfer_count)     /* 0x30 */
-       mxs_reg_32(hw_lcdif_cur_buf)            /* 0x40 */
-       mxs_reg_32(hw_lcdif_next_buf)           /* 0x50 */
-       mxs_reg_32(hw_lcdif_timing)             /* 0x60 */
-       mxs_reg_32(hw_lcdif_vdctrl0)            /* 0x70 */
-       mxs_reg_32(hw_lcdif_vdctrl1)            /* 0x80 */
-       mxs_reg_32(hw_lcdif_vdctrl2)            /* 0x90 */
-       mxs_reg_32(hw_lcdif_vdctrl3)            /* 0xa0 */
-       mxs_reg_32(hw_lcdif_vdctrl4)            /* 0xb0 */
-       mxs_reg_32(hw_lcdif_dvictrl0)           /* 0xc0 */
-       mxs_reg_32(hw_lcdif_dvictrl1)           /* 0xd0 */
-       mxs_reg_32(hw_lcdif_dvictrl2)           /* 0xe0 */
-       mxs_reg_32(hw_lcdif_dvictrl3)           /* 0xf0 */
-       mxs_reg_32(hw_lcdif_dvictrl4)           /* 0x100 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl0)     /* 0x110 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl1)     /* 0x120 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl2)     /* 0x130 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl3)     /* 0x140 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl4)     /* 0x150 */
-       mxs_reg_32(hw_lcdif_csc_offset) /* 0x160 */
-       mxs_reg_32(hw_lcdif_csc_limit)          /* 0x170 */
-       mxs_reg_32(hw_lcdif_data)               /* 0x180 */
-       mxs_reg_32(hw_lcdif_bm_error_stat)      /* 0x190 */
-       mxs_reg_32(hw_lcdif_crc_stat)           /* 0x1a0 */
-       mxs_reg_32(hw_lcdif_lcdif_stat) /* 0x1b0 */
-       mxs_reg_32(hw_lcdif_version)            /* 0x1c0 */
-       mxs_reg_32(hw_lcdif_debug0)             /* 0x1d0 */
-       mxs_reg_32(hw_lcdif_debug1)             /* 0x1e0 */
-       mxs_reg_32(hw_lcdif_debug2)             /* 0x1f0 */
+       mxs_reg_32(hw_lcdif_ctrl);              /* 0x00 */
+       mxs_reg_32(hw_lcdif_ctrl1);             /* 0x10 */
+       mxs_reg_32(hw_lcdif_ctrl2);             /* 0x20 */
+       mxs_reg_32(hw_lcdif_transfer_count);    /* 0x30 */
+       mxs_reg_32(hw_lcdif_cur_buf);           /* 0x40 */
+       mxs_reg_32(hw_lcdif_next_buf);          /* 0x50 */
+       mxs_reg_32(hw_lcdif_timing);            /* 0x60 */
+       mxs_reg_32(hw_lcdif_vdctrl0);           /* 0x70 */
+       mxs_reg_32(hw_lcdif_vdctrl1);           /* 0x80 */
+       mxs_reg_32(hw_lcdif_vdctrl2);           /* 0x90 */
+       mxs_reg_32(hw_lcdif_vdctrl3);           /* 0xa0 */
+       mxs_reg_32(hw_lcdif_vdctrl4);           /* 0xb0 */
+       mxs_reg_32(hw_lcdif_dvictrl0);          /* 0xc0 */
+       mxs_reg_32(hw_lcdif_dvictrl1);          /* 0xd0 */
+       mxs_reg_32(hw_lcdif_dvictrl2);          /* 0xe0 */
+       mxs_reg_32(hw_lcdif_dvictrl3);          /* 0xf0 */
+       mxs_reg_32(hw_lcdif_dvictrl4);          /* 0x100 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl0);    /* 0x110 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl1);    /* 0x120 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl2);    /* 0x130 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl3);    /* 0x140 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl4);    /* 0x150 */
+       mxs_reg_32(hw_lcdif_csc_offset);        /* 0x160 */
+       mxs_reg_32(hw_lcdif_csc_limit);         /* 0x170 */
+       mxs_reg_32(hw_lcdif_data);              /* 0x180 */
+       mxs_reg_32(hw_lcdif_bm_error_stat);     /* 0x190 */
+       mxs_reg_32(hw_lcdif_crc_stat);          /* 0x1a0 */
+       mxs_reg_32(hw_lcdif_lcdif_stat);        /* 0x1b0 */
+       mxs_reg_32(hw_lcdif_version);           /* 0x1c0 */
+       mxs_reg_32(hw_lcdif_debug0);            /* 0x1d0 */
+       mxs_reg_32(hw_lcdif_debug1);            /* 0x1e0 */
+       mxs_reg_32(hw_lcdif_debug2);            /* 0x1f0 */
 };
 #endif
 
index 3269892f99dbb8d4797c627eeb5c6efa7650a5f6..79c00aae64dc065ab8177b43c49c4a0a270f3d16 100644 (file)
 
 #ifndef        __ASSEMBLY__
 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 */
+       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
 
index d5841709c4a3c12e4650acb7282be24260365781..6b921c2af4869d579b71a6dd9851eece1e300869 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_pinctrl_regs {
-       mxs_reg_32(hw_pinctrl_ctrl)             /* 0x0 */
+       mxs_reg_32(hw_pinctrl_ctrl);            /* 0x0 */
 
        uint32_t        reserved1[60];
 
-       mxs_reg_32(hw_pinctrl_muxsel0)          /* 0x100 */
-       mxs_reg_32(hw_pinctrl_muxsel1)          /* 0x110 */
-       mxs_reg_32(hw_pinctrl_muxsel2)          /* 0x120 */
-       mxs_reg_32(hw_pinctrl_muxsel3)          /* 0x130 */
-       mxs_reg_32(hw_pinctrl_muxsel4)          /* 0x140 */
-       mxs_reg_32(hw_pinctrl_muxsel5)          /* 0x150 */
-       mxs_reg_32(hw_pinctrl_muxsel6)          /* 0x160 */
-       mxs_reg_32(hw_pinctrl_muxsel7)          /* 0x170 */
-       mxs_reg_32(hw_pinctrl_muxsel8)          /* 0x180 */
-       mxs_reg_32(hw_pinctrl_muxsel9)          /* 0x190 */
-       mxs_reg_32(hw_pinctrl_muxsel10) /* 0x1a0 */
-       mxs_reg_32(hw_pinctrl_muxsel11) /* 0x1b0 */
-       mxs_reg_32(hw_pinctrl_muxsel12) /* 0x1c0 */
-       mxs_reg_32(hw_pinctrl_muxsel13) /* 0x1d0 */
+       mxs_reg_32(hw_pinctrl_muxsel0);         /* 0x100 */
+       mxs_reg_32(hw_pinctrl_muxsel1);         /* 0x110 */
+       mxs_reg_32(hw_pinctrl_muxsel2);         /* 0x120 */
+       mxs_reg_32(hw_pinctrl_muxsel3);         /* 0x130 */
+       mxs_reg_32(hw_pinctrl_muxsel4);         /* 0x140 */
+       mxs_reg_32(hw_pinctrl_muxsel5);         /* 0x150 */
+       mxs_reg_32(hw_pinctrl_muxsel6);         /* 0x160 */
+       mxs_reg_32(hw_pinctrl_muxsel7);         /* 0x170 */
+       mxs_reg_32(hw_pinctrl_muxsel8);         /* 0x180 */
+       mxs_reg_32(hw_pinctrl_muxsel9);         /* 0x190 */
+       mxs_reg_32(hw_pinctrl_muxsel10);        /* 0x1a0 */
+       mxs_reg_32(hw_pinctrl_muxsel11);        /* 0x1b0 */
+       mxs_reg_32(hw_pinctrl_muxsel12);        /* 0x1c0 */
+       mxs_reg_32(hw_pinctrl_muxsel13);        /* 0x1d0 */
 
        uint32_t        reserved2[72];
 
-       mxs_reg_32(hw_pinctrl_drive0)           /* 0x300 */
-       mxs_reg_32(hw_pinctrl_drive1)           /* 0x310 */
-       mxs_reg_32(hw_pinctrl_drive2)           /* 0x320 */
-       mxs_reg_32(hw_pinctrl_drive3)           /* 0x330 */
-       mxs_reg_32(hw_pinctrl_drive4)           /* 0x340 */
-       mxs_reg_32(hw_pinctrl_drive5)           /* 0x350 */
-       mxs_reg_32(hw_pinctrl_drive6)           /* 0x360 */
-       mxs_reg_32(hw_pinctrl_drive7)           /* 0x370 */
-       mxs_reg_32(hw_pinctrl_drive8)           /* 0x380 */
-       mxs_reg_32(hw_pinctrl_drive9)           /* 0x390 */
-       mxs_reg_32(hw_pinctrl_drive10)          /* 0x3a0 */
-       mxs_reg_32(hw_pinctrl_drive11)          /* 0x3b0 */
-       mxs_reg_32(hw_pinctrl_drive12)          /* 0x3c0 */
-       mxs_reg_32(hw_pinctrl_drive13)          /* 0x3d0 */
-       mxs_reg_32(hw_pinctrl_drive14)          /* 0x3e0 */
-       mxs_reg_32(hw_pinctrl_drive15)          /* 0x3f0 */
-       mxs_reg_32(hw_pinctrl_drive16)          /* 0x400 */
-       mxs_reg_32(hw_pinctrl_drive17)          /* 0x410 */
-       mxs_reg_32(hw_pinctrl_drive18)          /* 0x420 */
-       mxs_reg_32(hw_pinctrl_drive19)          /* 0x430 */
+       mxs_reg_32(hw_pinctrl_drive0);          /* 0x300 */
+       mxs_reg_32(hw_pinctrl_drive1);          /* 0x310 */
+       mxs_reg_32(hw_pinctrl_drive2);          /* 0x320 */
+       mxs_reg_32(hw_pinctrl_drive3);          /* 0x330 */
+       mxs_reg_32(hw_pinctrl_drive4);          /* 0x340 */
+       mxs_reg_32(hw_pinctrl_drive5);          /* 0x350 */
+       mxs_reg_32(hw_pinctrl_drive6);          /* 0x360 */
+       mxs_reg_32(hw_pinctrl_drive7);          /* 0x370 */
+       mxs_reg_32(hw_pinctrl_drive8);          /* 0x380 */
+       mxs_reg_32(hw_pinctrl_drive9);          /* 0x390 */
+       mxs_reg_32(hw_pinctrl_drive10);         /* 0x3a0 */
+       mxs_reg_32(hw_pinctrl_drive11);         /* 0x3b0 */
+       mxs_reg_32(hw_pinctrl_drive12);         /* 0x3c0 */
+       mxs_reg_32(hw_pinctrl_drive13);         /* 0x3d0 */
+       mxs_reg_32(hw_pinctrl_drive14);         /* 0x3e0 */
+       mxs_reg_32(hw_pinctrl_drive15);         /* 0x3f0 */
+       mxs_reg_32(hw_pinctrl_drive16);         /* 0x400 */
+       mxs_reg_32(hw_pinctrl_drive17);         /* 0x410 */
+       mxs_reg_32(hw_pinctrl_drive18);         /* 0x420 */
+       mxs_reg_32(hw_pinctrl_drive19);         /* 0x430 */
 
        uint32_t        reserved3[112];
 
-       mxs_reg_32(hw_pinctrl_pull0)            /* 0x600 */
-       mxs_reg_32(hw_pinctrl_pull1)            /* 0x610 */
-       mxs_reg_32(hw_pinctrl_pull2)            /* 0x620 */
-       mxs_reg_32(hw_pinctrl_pull3)            /* 0x630 */
-       mxs_reg_32(hw_pinctrl_pull4)            /* 0x640 */
-       mxs_reg_32(hw_pinctrl_pull5)            /* 0x650 */
-       mxs_reg_32(hw_pinctrl_pull6)            /* 0x660 */
+       mxs_reg_32(hw_pinctrl_pull0);           /* 0x600 */
+       mxs_reg_32(hw_pinctrl_pull1);           /* 0x610 */
+       mxs_reg_32(hw_pinctrl_pull2);           /* 0x620 */
+       mxs_reg_32(hw_pinctrl_pull3);           /* 0x630 */
+       mxs_reg_32(hw_pinctrl_pull4);           /* 0x640 */
+       mxs_reg_32(hw_pinctrl_pull5);           /* 0x650 */
+       mxs_reg_32(hw_pinctrl_pull6);           /* 0x660 */
 
        uint32_t        reserved4[36];
 
-       mxs_reg_32(hw_pinctrl_dout0)            /* 0x700 */
-       mxs_reg_32(hw_pinctrl_dout1)            /* 0x710 */
-       mxs_reg_32(hw_pinctrl_dout2)            /* 0x720 */
-       mxs_reg_32(hw_pinctrl_dout3)            /* 0x730 */
-       mxs_reg_32(hw_pinctrl_dout4)            /* 0x740 */
+       mxs_reg_32(hw_pinctrl_dout0);           /* 0x700 */
+       mxs_reg_32(hw_pinctrl_dout1);           /* 0x710 */
+       mxs_reg_32(hw_pinctrl_dout2);           /* 0x720 */
+       mxs_reg_32(hw_pinctrl_dout3);           /* 0x730 */
+       mxs_reg_32(hw_pinctrl_dout4);           /* 0x740 */
 
        uint32_t        reserved5[108];
 
-       mxs_reg_32(hw_pinctrl_din0)             /* 0x900 */
-       mxs_reg_32(hw_pinctrl_din1)             /* 0x910 */
-       mxs_reg_32(hw_pinctrl_din2)             /* 0x920 */
-       mxs_reg_32(hw_pinctrl_din3)             /* 0x930 */
-       mxs_reg_32(hw_pinctrl_din4)             /* 0x940 */
+       mxs_reg_32(hw_pinctrl_din0);            /* 0x900 */
+       mxs_reg_32(hw_pinctrl_din1);            /* 0x910 */
+       mxs_reg_32(hw_pinctrl_din2);            /* 0x920 */
+       mxs_reg_32(hw_pinctrl_din3);            /* 0x930 */
+       mxs_reg_32(hw_pinctrl_din4);            /* 0x940 */
 
        uint32_t        reserved6[108];
 
-       mxs_reg_32(hw_pinctrl_doe0)             /* 0xb00 */
-       mxs_reg_32(hw_pinctrl_doe1)             /* 0xb10 */
-       mxs_reg_32(hw_pinctrl_doe2)             /* 0xb20 */
-       mxs_reg_32(hw_pinctrl_doe3)             /* 0xb30 */
-       mxs_reg_32(hw_pinctrl_doe4)             /* 0xb40 */
+       mxs_reg_32(hw_pinctrl_doe0);            /* 0xb00 */
+       mxs_reg_32(hw_pinctrl_doe1);            /* 0xb10 */
+       mxs_reg_32(hw_pinctrl_doe2);            /* 0xb20 */
+       mxs_reg_32(hw_pinctrl_doe3);            /* 0xb30 */
+       mxs_reg_32(hw_pinctrl_doe4);            /* 0xb40 */
 
        uint32_t        reserved7[300];
 
-       mxs_reg_32(hw_pinctrl_pin2irq0) /* 0x1000 */
-       mxs_reg_32(hw_pinctrl_pin2irq1) /* 0x1010 */
-       mxs_reg_32(hw_pinctrl_pin2irq2) /* 0x1020 */
-       mxs_reg_32(hw_pinctrl_pin2irq3) /* 0x1030 */
-       mxs_reg_32(hw_pinctrl_pin2irq4) /* 0x1040 */
+       mxs_reg_32(hw_pinctrl_pin2irq0);        /* 0x1000 */
+       mxs_reg_32(hw_pinctrl_pin2irq1);        /* 0x1010 */
+       mxs_reg_32(hw_pinctrl_pin2irq2);        /* 0x1020 */
+       mxs_reg_32(hw_pinctrl_pin2irq3);        /* 0x1030 */
+       mxs_reg_32(hw_pinctrl_pin2irq4);        /* 0x1040 */
 
        uint32_t        reserved8[44];
 
-       mxs_reg_32(hw_pinctrl_irqen0)           /* 0x1100 */
-       mxs_reg_32(hw_pinctrl_irqen1)           /* 0x1110 */
-       mxs_reg_32(hw_pinctrl_irqen2)           /* 0x1120 */
-       mxs_reg_32(hw_pinctrl_irqen3)           /* 0x1130 */
-       mxs_reg_32(hw_pinctrl_irqen4)           /* 0x1140 */
+       mxs_reg_32(hw_pinctrl_irqen0);          /* 0x1100 */
+       mxs_reg_32(hw_pinctrl_irqen1);          /* 0x1110 */
+       mxs_reg_32(hw_pinctrl_irqen2);          /* 0x1120 */
+       mxs_reg_32(hw_pinctrl_irqen3);          /* 0x1130 */
+       mxs_reg_32(hw_pinctrl_irqen4);          /* 0x1140 */
 
        uint32_t        reserved9[44];
 
-       mxs_reg_32(hw_pinctrl_irqlevel0)        /* 0x1200 */
-       mxs_reg_32(hw_pinctrl_irqlevel1)        /* 0x1210 */
-       mxs_reg_32(hw_pinctrl_irqlevel2)        /* 0x1220 */
-       mxs_reg_32(hw_pinctrl_irqlevel3)        /* 0x1230 */
-       mxs_reg_32(hw_pinctrl_irqlevel4)        /* 0x1240 */
+       mxs_reg_32(hw_pinctrl_irqlevel0);       /* 0x1200 */
+       mxs_reg_32(hw_pinctrl_irqlevel1);       /* 0x1210 */
+       mxs_reg_32(hw_pinctrl_irqlevel2);       /* 0x1220 */
+       mxs_reg_32(hw_pinctrl_irqlevel3);       /* 0x1230 */
+       mxs_reg_32(hw_pinctrl_irqlevel4);       /* 0x1240 */
 
        uint32_t        reserved10[44];
 
-       mxs_reg_32(hw_pinctrl_irqpol0)          /* 0x1300 */
-       mxs_reg_32(hw_pinctrl_irqpol1)          /* 0x1310 */
-       mxs_reg_32(hw_pinctrl_irqpol2)          /* 0x1320 */
-       mxs_reg_32(hw_pinctrl_irqpol3)          /* 0x1330 */
-       mxs_reg_32(hw_pinctrl_irqpol4)          /* 0x1340 */
+       mxs_reg_32(hw_pinctrl_irqpol0);         /* 0x1300 */
+       mxs_reg_32(hw_pinctrl_irqpol1);         /* 0x1310 */
+       mxs_reg_32(hw_pinctrl_irqpol2);         /* 0x1320 */
+       mxs_reg_32(hw_pinctrl_irqpol3);         /* 0x1330 */
+       mxs_reg_32(hw_pinctrl_irqpol4);         /* 0x1340 */
 
        uint32_t        reserved11[44];
 
-       mxs_reg_32(hw_pinctrl_irqstat0) /* 0x1400 */
-       mxs_reg_32(hw_pinctrl_irqstat1) /* 0x1410 */
-       mxs_reg_32(hw_pinctrl_irqstat2) /* 0x1420 */
-       mxs_reg_32(hw_pinctrl_irqstat3) /* 0x1430 */
-       mxs_reg_32(hw_pinctrl_irqstat4) /* 0x1440 */
+       mxs_reg_32(hw_pinctrl_irqstat0);        /* 0x1400 */
+       mxs_reg_32(hw_pinctrl_irqstat1);        /* 0x1410 */
+       mxs_reg_32(hw_pinctrl_irqstat2);        /* 0x1420 */
+       mxs_reg_32(hw_pinctrl_irqstat3);        /* 0x1430 */
+       mxs_reg_32(hw_pinctrl_irqstat4);        /* 0x1440 */
 
        uint32_t        reserved12[380];
 
-       mxs_reg_32(hw_pinctrl_emi_odt_ctrl)     /* 0x1a40 */
+       mxs_reg_32(hw_pinctrl_emi_odt_ctrl);    /* 0x1a40 */
 
        uint32_t        reserved13[76];
 
-       mxs_reg_32(hw_pinctrl_emi_ds_ctrl)      /* 0x1b80 */
+       mxs_reg_32(hw_pinctrl_emi_ds_ctrl);     /* 0x1b80 */
 };
 #endif
 
index 257ee88e82eef99f708edb14dbb6860d7e13d7b5..bcbe9984cfe55b9869a6d3954730c9b934b40744 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_power_regs {
-       mxs_reg_32(hw_power_ctrl)
-       mxs_reg_32(hw_power_5vctrl)
-       mxs_reg_32(hw_power_minpwr)
-       mxs_reg_32(hw_power_charge)
+       mxs_reg_32(hw_power_ctrl);
+       mxs_reg_32(hw_power_5vctrl);
+       mxs_reg_32(hw_power_minpwr);
+       mxs_reg_32(hw_power_charge);
        uint32_t        hw_power_vdddctrl;
        uint32_t        reserved_vddd[3];
        uint32_t        hw_power_vddactrl;
@@ -44,23 +44,23 @@ struct mxs_power_regs {
        uint32_t        reserved_misc[3];
        uint32_t        hw_power_dclimits;
        uint32_t        reserved_dclimits[3];
-       mxs_reg_32(hw_power_loopctrl)
+       mxs_reg_32(hw_power_loopctrl);
        uint32_t        hw_power_sts;
        uint32_t        reserved_sts[3];
-       mxs_reg_32(hw_power_speed)
+       mxs_reg_32(hw_power_speed);
        uint32_t        hw_power_battmonitor;
        uint32_t        reserved_battmonitor[3];
 
        uint32_t        reserved[4];
 
-       mxs_reg_32(hw_power_reset)
-       mxs_reg_32(hw_power_debug)
-       mxs_reg_32(hw_power_thermal)
-       mxs_reg_32(hw_power_usb1ctrl)
-       mxs_reg_32(hw_power_special)
-       mxs_reg_32(hw_power_version)
-       mxs_reg_32(hw_power_anaclkctrl)
-       mxs_reg_32(hw_power_refctrl)
+       mxs_reg_32(hw_power_reset);
+       mxs_reg_32(hw_power_debug);
+       mxs_reg_32(hw_power_thermal);
+       mxs_reg_32(hw_power_usb1ctrl);
+       mxs_reg_32(hw_power_special);
+       mxs_reg_32(hw_power_version);
+       mxs_reg_32(hw_power_anaclkctrl);
+       mxs_reg_32(hw_power_refctrl);
 };
 #endif
 
index 6b2dd332e3040ee70e5ddb5efa2298f1a028f3dc..10a1956d866e3b6d7704086c8fc6fb88bead4fbb 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_rtc_regs {
-       mxs_reg_32(hw_rtc_ctrl)
-       mxs_reg_32(hw_rtc_stat)
-       mxs_reg_32(hw_rtc_milliseconds)
-       mxs_reg_32(hw_rtc_seconds)
-       mxs_reg_32(hw_rtc_rtc_alarm)
-       mxs_reg_32(hw_rtc_watchdog)
-       mxs_reg_32(hw_rtc_persistent0)
-       mxs_reg_32(hw_rtc_persistent1)
-       mxs_reg_32(hw_rtc_persistent2)
-       mxs_reg_32(hw_rtc_persistent3)
-       mxs_reg_32(hw_rtc_persistent4)
-       mxs_reg_32(hw_rtc_persistent5)
-       mxs_reg_32(hw_rtc_debug)
-       mxs_reg_32(hw_rtc_version)
+       mxs_reg_32(hw_rtc_ctrl);
+       mxs_reg_32(hw_rtc_stat);
+       mxs_reg_32(hw_rtc_milliseconds);
+       mxs_reg_32(hw_rtc_seconds);
+       mxs_reg_32(hw_rtc_rtc_alarm);
+       mxs_reg_32(hw_rtc_watchdog);
+       mxs_reg_32(hw_rtc_persistent0);
+       mxs_reg_32(hw_rtc_persistent1);
+       mxs_reg_32(hw_rtc_persistent2);
+       mxs_reg_32(hw_rtc_persistent3);
+       mxs_reg_32(hw_rtc_persistent4);
+       mxs_reg_32(hw_rtc_persistent5);
+       mxs_reg_32(hw_rtc_debug);
+       mxs_reg_32(hw_rtc_version);
 };
 #endif
 
index cf52a28c3becf83b79f7e74dc0da602784dc40db..51a703775225b6681245ac43d9fecf91893acc30 100644 (file)
 
 #ifndef        __ASSEMBLY__
 struct mxs_ssp_regs {
-       mxs_reg_32(hw_ssp_ctrl0)
-       mxs_reg_32(hw_ssp_cmd0)
-       mxs_reg_32(hw_ssp_cmd1)
-       mxs_reg_32(hw_ssp_xfer_size)
-       mxs_reg_32(hw_ssp_block_size)
-       mxs_reg_32(hw_ssp_compref)
-       mxs_reg_32(hw_ssp_compmask)
-       mxs_reg_32(hw_ssp_timing)
-       mxs_reg_32(hw_ssp_ctrl1)
-       mxs_reg_32(hw_ssp_data)
-       mxs_reg_32(hw_ssp_sdresp0)
-       mxs_reg_32(hw_ssp_sdresp1)
-       mxs_reg_32(hw_ssp_sdresp2)
-       mxs_reg_32(hw_ssp_sdresp3)
-       mxs_reg_32(hw_ssp_ddr_ctrl)
-       mxs_reg_32(hw_ssp_dll_ctrl)
-       mxs_reg_32(hw_ssp_status)
-       mxs_reg_32(hw_ssp_dll_sts)
-       mxs_reg_32(hw_ssp_debug)
-       mxs_reg_32(hw_ssp_version)
+       mxs_reg_32(hw_ssp_ctrl0);
+       mxs_reg_32(hw_ssp_cmd0);
+       mxs_reg_32(hw_ssp_cmd1);
+       mxs_reg_32(hw_ssp_xfer_size);
+       mxs_reg_32(hw_ssp_block_size);
+       mxs_reg_32(hw_ssp_compref);
+       mxs_reg_32(hw_ssp_compmask);
+       mxs_reg_32(hw_ssp_timing);
+       mxs_reg_32(hw_ssp_ctrl1);
+       mxs_reg_32(hw_ssp_data);
+       mxs_reg_32(hw_ssp_sdresp0);
+       mxs_reg_32(hw_ssp_sdresp1);
+       mxs_reg_32(hw_ssp_sdresp2);
+       mxs_reg_32(hw_ssp_sdresp3);
+       mxs_reg_32(hw_ssp_ddr_ctrl);
+       mxs_reg_32(hw_ssp_dll_ctrl);
+       mxs_reg_32(hw_ssp_status);
+       mxs_reg_32(hw_ssp_dll_sts);
+       mxs_reg_32(hw_ssp_debug);
+       mxs_reg_32(hw_ssp_version);
 };
 #endif
 
index 529a3bcdd1c9ec105e54c02fb617ed578ce5254c..5849d383a04c15ddd47b1a73012d047f5d33cd8b 100644 (file)
 
 #ifndef        __ASSEMBLY__
 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)
+       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
 
index 288e8fa6d0a82d010bb845cb7cc3a3b31acab732..653f307e37766d529759104c24cc6a58c55995f6 100644 (file)
 #define __REGS_USBPHY_H__
 
 struct mxs_usbphy_regs {
-       mxs_reg_32(hw_usbphy_pwd)
-       mxs_reg_32(hw_usbphy_tx)
-       mxs_reg_32(hw_usbphy_rx)
-       mxs_reg_32(hw_usbphy_ctrl)
-       mxs_reg_32(hw_usbphy_status)
-       mxs_reg_32(hw_usbphy_debug)
-       mxs_reg_32(hw_usbphy_debug0_status)
-       mxs_reg_32(hw_usbphy_debug1)
-       mxs_reg_32(hw_usbphy_version)
-       mxs_reg_32(hw_usbphy_ip)
+       mxs_reg_32(hw_usbphy_pwd);
+       mxs_reg_32(hw_usbphy_tx);
+       mxs_reg_32(hw_usbphy_rx);
+       mxs_reg_32(hw_usbphy_ctrl);
+       mxs_reg_32(hw_usbphy_status);
+       mxs_reg_32(hw_usbphy_debug);
+       mxs_reg_32(hw_usbphy_debug0_status);
+       mxs_reg_32(hw_usbphy_debug1);
+       mxs_reg_32(hw_usbphy_version);
+       mxs_reg_32(hw_usbphy_ip);
 };
 
 #define        USBPHY_PWD_RXPWDRX                              (1 << 20)