| Submitter | Eric Nelson |
|---|---|
| Date | Sept. 19, 2012, 1:26 a.m. |
| Message ID | <1348017992-17291-1-git-send-email-eric.nelson@boundarydevices.com> |
| Download | mbox | patch |
| Permalink | /patch/184901/ |
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
Comments
On 9/18/2012 6:26 PM, Eric Nelson wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > --- > arch/arm/cpu/armv7/mx6/soc.c | 2 +- > arch/arm/include/asm/arch-mx6/imx-regs.h | 21 --------------------- > 2 files changed, 1 insertions(+), 22 deletions(-) > > diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c > index 7380ffe..bc65767 100644 > --- a/arch/arm/cpu/armv7/mx6/soc.c > +++ b/arch/arm/cpu/armv7/mx6/soc.c > @@ -146,7 +146,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) > void boot_mode_apply(unsigned cfg_val) > { > unsigned reg; > - struct src_regs *psrc = (struct src_regs *)SRC_BASE_ADDR; > + struct src *psrc = (struct src *)SRC_BASE_ADDR; > writel(cfg_val, &psrc->gpr9); > reg = readl(&psrc->gpr10); > if (cfg_val) > diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h > index 8834c59..3651cdf 100644 > --- a/arch/arm/include/asm/arch-mx6/imx-regs.h > +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h > @@ -448,26 +448,5 @@ struct iomuxc_base_regs { > u32 daisy[104]; /* 0x7b0..94c */ > }; > > -struct src_regs { > - u32 scr; /* 0x00 */ > - u32 sbmr1; /* 0x04 */ > - u32 srsr; /* 0x08 */ > - u32 reserved1; /* 0x0c */ > - u32 reserved2; /* 0x10 */ > - u32 sisr; /* 0x14 */ > - u32 simr; /* 0x18 */ > - u32 sbmr2; /* 0x1c */ > - u32 gpr1; /* 0x20 */ > - u32 gpr2; /* 0x24 */ > - u32 gpr3; /* 0x28 */ > - u32 gpr4; /* 0x2c */ > - u32 gpr5; /* 0x30 */ > - u32 gpr6; /* 0x34 */ > - u32 gpr7; /* 0x38 */ > - u32 gpr8; /* 0x3c */ > - u32 gpr9; /* 0x40 */ > - u32 gpr10; /* 0x44 */ > -}; > - > #endif /* __ASSEMBLER__*/ > #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */ Good catch!! Don't know how I missed that. Thanks Troy
On 19/09/2012 03:26, Eric Nelson wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > --- Applied to u-boot-imx, next branch, thanks. Best regards, Stefano Babic
Patch
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 7380ffe..bc65767 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -146,7 +146,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) void boot_mode_apply(unsigned cfg_val) { unsigned reg; - struct src_regs *psrc = (struct src_regs *)SRC_BASE_ADDR; + struct src *psrc = (struct src *)SRC_BASE_ADDR; writel(cfg_val, &psrc->gpr9); reg = readl(&psrc->gpr10); if (cfg_val) diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 8834c59..3651cdf 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -448,26 +448,5 @@ struct iomuxc_base_regs { u32 daisy[104]; /* 0x7b0..94c */ }; -struct src_regs { - u32 scr; /* 0x00 */ - u32 sbmr1; /* 0x04 */ - u32 srsr; /* 0x08 */ - u32 reserved1; /* 0x0c */ - u32 reserved2; /* 0x10 */ - u32 sisr; /* 0x14 */ - u32 simr; /* 0x18 */ - u32 sbmr2; /* 0x1c */ - u32 gpr1; /* 0x20 */ - u32 gpr2; /* 0x24 */ - u32 gpr3; /* 0x28 */ - u32 gpr4; /* 0x2c */ - u32 gpr5; /* 0x30 */ - u32 gpr6; /* 0x34 */ - u32 gpr7; /* 0x38 */ - u32 gpr8; /* 0x3c */ - u32 gpr9; /* 0x40 */ - u32 gpr10; /* 0x44 */ -}; - #endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- arch/arm/cpu/armv7/mx6/soc.c | 2 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 21 --------------------- 2 files changed, 1 insertions(+), 22 deletions(-)