* [U-Boot] [PATCH] i.MX6: get rid of redundant struct src_regs (dupe of struct src)
@ 2012-09-19 1:26 Eric Nelson
2012-09-19 1:48 ` Troy Kisky
2012-09-25 12:52 ` Stefano Babic
0 siblings, 2 replies; 3+ messages in thread
From: Eric Nelson @ 2012-09-19 1:26 UTC (permalink / raw)
To: u-boot
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__ */
--
1.7.9
^ permalink raw reply related [flat|nested] 3+ messages in thread* [U-Boot] [PATCH] i.MX6: get rid of redundant struct src_regs (dupe of struct src)
2012-09-19 1:26 [U-Boot] [PATCH] i.MX6: get rid of redundant struct src_regs (dupe of struct src) Eric Nelson
@ 2012-09-19 1:48 ` Troy Kisky
2012-09-25 12:52 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Troy Kisky @ 2012-09-19 1:48 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 3+ messages in thread* [U-Boot] [PATCH] i.MX6: get rid of redundant struct src_regs (dupe of struct src)
2012-09-19 1:26 [U-Boot] [PATCH] i.MX6: get rid of redundant struct src_regs (dupe of struct src) Eric Nelson
2012-09-19 1:48 ` Troy Kisky
@ 2012-09-25 12:52 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2012-09-25 12:52 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-25 12:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-19 1:26 [U-Boot] [PATCH] i.MX6: get rid of redundant struct src_regs (dupe of struct src) Eric Nelson
2012-09-19 1:48 ` Troy Kisky
2012-09-25 12:52 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox