From: Fabio Estevam fabio.estevam@freescale.com
Currently when accessing an element of mxs_pinctrl_regs structure we do:
&pinctrl_regs->hw_pinctrl_emi_ds_ctrl_set
The 'hw_pinctrl' prefix is a redundant information as we already know that we are accessing a pinctrl register.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 2 +- arch/arm/include/asm/arch-mxs/regs-pinctrl.h | 168 +++++++++++++------------- 2 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c index 4950490..1c509d6 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c @@ -294,7 +294,7 @@ static void mx28_mem_init(void)
/* Set DDR2 mode */ writel(PINCTRL_EMI_DS_CTRL_DDR_MODE_DDR2, - &pinctrl_regs->hw_pinctrl_emi_ds_ctrl_set); + &pinctrl_regs->emi_ds_ctrl_set);
/* * Configure the DRAM registers diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h index 191093b..c3a8700 100644 --- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h +++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h @@ -30,129 +30,129 @@
#ifndef __ASSEMBLY__ struct mxs_pinctrl_regs { - mxs_reg_32(hw_pinctrl_ctrl) /* 0x0 */ + mxs_reg_32(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(muxsel0) /* 0x100 */ + mxs_reg_32(muxsel1) /* 0x110 */ + mxs_reg_32(muxsel2) /* 0x120 */ + mxs_reg_32(muxsel3) /* 0x130 */ + mxs_reg_32(muxsel4) /* 0x140 */ + mxs_reg_32(muxsel5) /* 0x150 */ + mxs_reg_32(muxsel6) /* 0x160 */ + mxs_reg_32(muxsel7) /* 0x170 */ + mxs_reg_32(muxsel8) /* 0x180 */ + mxs_reg_32(muxsel9) /* 0x190 */ + mxs_reg_32(muxsel10) /* 0x1a0 */ + mxs_reg_32(muxsel11) /* 0x1b0 */ + mxs_reg_32(muxsel12) /* 0x1c0 */ + mxs_reg_32(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(drive0) /* 0x300 */ + mxs_reg_32(drive1) /* 0x310 */ + mxs_reg_32(drive2) /* 0x320 */ + mxs_reg_32(drive3) /* 0x330 */ + mxs_reg_32(drive4) /* 0x340 */ + mxs_reg_32(drive5) /* 0x350 */ + mxs_reg_32(drive6) /* 0x360 */ + mxs_reg_32(drive7) /* 0x370 */ + mxs_reg_32(drive8) /* 0x380 */ + mxs_reg_32(drive9) /* 0x390 */ + mxs_reg_32(drive10) /* 0x3a0 */ + mxs_reg_32(drive11) /* 0x3b0 */ + mxs_reg_32(drive12) /* 0x3c0 */ + mxs_reg_32(drive13) /* 0x3d0 */ + mxs_reg_32(drive14) /* 0x3e0 */ + mxs_reg_32(drive15) /* 0x3f0 */ + mxs_reg_32(drive16) /* 0x400 */ + mxs_reg_32(drive17) /* 0x410 */ + mxs_reg_32(drive18) /* 0x420 */ + mxs_reg_32(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(pull0) /* 0x600 */ + mxs_reg_32(pull1) /* 0x610 */ + mxs_reg_32(pull2) /* 0x620 */ + mxs_reg_32(pull3) /* 0x630 */ + mxs_reg_32(pull4) /* 0x640 */ + mxs_reg_32(pull5) /* 0x650 */ + mxs_reg_32(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(dout0) /* 0x700 */ + mxs_reg_32(dout1) /* 0x710 */ + mxs_reg_32(dout2) /* 0x720 */ + mxs_reg_32(dout3) /* 0x730 */ + mxs_reg_32(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(din0) /* 0x900 */ + mxs_reg_32(din1) /* 0x910 */ + mxs_reg_32(din2) /* 0x920 */ + mxs_reg_32(din3) /* 0x930 */ + mxs_reg_32(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(doe0) /* 0xb00 */ + mxs_reg_32(doe1) /* 0xb10 */ + mxs_reg_32(doe2) /* 0xb20 */ + mxs_reg_32(doe3) /* 0xb30 */ + mxs_reg_32(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(pin2irq0) /* 0x1000 */ + mxs_reg_32(pin2irq1) /* 0x1010 */ + mxs_reg_32(pin2irq2) /* 0x1020 */ + mxs_reg_32(pin2irq3) /* 0x1030 */ + mxs_reg_32(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(irqen0) /* 0x1100 */ + mxs_reg_32(irqen1) /* 0x1110 */ + mxs_reg_32(irqen2) /* 0x1120 */ + mxs_reg_32(irqen3) /* 0x1130 */ + mxs_reg_32(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(irqlevel0) /* 0x1200 */ + mxs_reg_32(irqlevel1) /* 0x1210 */ + mxs_reg_32(irqlevel2) /* 0x1220 */ + mxs_reg_32(irqlevel3) /* 0x1230 */ + mxs_reg_32(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(irqpol0) /* 0x1300 */ + mxs_reg_32(irqpol1) /* 0x1310 */ + mxs_reg_32(irqpol2) /* 0x1320 */ + mxs_reg_32(irqpol3) /* 0x1330 */ + mxs_reg_32(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(irqstat0) /* 0x1400 */ + mxs_reg_32(irqstat1) /* 0x1410 */ + mxs_reg_32(irqstat2) /* 0x1420 */ + mxs_reg_32(irqstat3) /* 0x1430 */ + mxs_reg_32(irqstat4) /* 0x1440 */
uint32_t reserved12[380];
- mxs_reg_32(hw_pinctrl_emi_odt_ctrl) /* 0x1a40 */ + mxs_reg_32(emi_odt_ctrl) /* 0x1a40 */
uint32_t reserved13[76];
- mxs_reg_32(hw_pinctrl_emi_ds_ctrl) /* 0x1b80 */ + mxs_reg_32(emi_ds_ctrl) /* 0x1b80 */ }; #endif