Skip to contentSkip to conversation

i.MX6: get rid of redundant struct src_regs (dupe of struct src)

PATCH New Eric Nelson 3 participants 3 messages Sep 19, 2012 – Sep 25, 2012

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Eric Nelson

author
#0 lore raw

PATCH 1/1 i.MX6: get rid of redundant struct src_regs (dupe of struct src)

Signed-off-by Eric Nelson <[email protected]>
---
 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(-)
arch/arm/cpu/armv7/mx6/soc.c +1 -1
index 7380ffe..bc65767 100644
@@ -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)
arch/arm/include/asm/arch-mx6/imx-regs.h +0 -21
index 8834c59..3651cdf 100644
@@ -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__ */
Signature · 1 line
1.7.9
#1 lore raw

PATCH 1/1 i.MX6: get rid of redundant struct src_regs (dupe of struct src)

Quoted 40 lines · Eric Nelson
Signed-off-by Eric Nelson <[email protected]>
---
  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(-)
arch/arm/cpu/armv7/mx6/soc.c +1 -1
index 7380ffe..bc65767 100644
@@ -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)
arch/arm/include/asm/arch-mx6/imx-regs.h +0 -13
index 8834c59..3651cdf 100644
@@ -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 */

arch/arm/include/asm/arch-mx6/imx-regs.h struct iomuxc_base_regs { · line 452

Quoted 10 lines
arch/arm/include/asm/arch-mx6/imx-regs.h +0 -8
-	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

#2 lore raw

PATCH 1/1 i.MX6: get rid of redundant struct src_regs (dupe of struct src)

In reply to Eric Nelson
Quoted 2 lines · Eric Nelson
Signed-off-by Eric Nelson <[email protected]>

---

Applied to u-boot-imx, next branch, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================