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

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>

i.MX6: get rid of redundant struct src_regs (dupe of struct src)
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Eric Nelson · Tom Rini
1 parent de710a14b5
Showing 2 changed files with 1 additions and 22 deletions Side-by-side Diff
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/include/asm/arch-mx6/imx-regs.h
@@ -146,7 +146,7 @@
 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)
@@ -593,27 +593,6 @@
 	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__ */
...	...	@@ -146,7 +146,7 @@
146	146	void boot_mode_apply(unsigned cfg_val)
147	147	{
148	148	unsigned reg;
149		- struct src_regs psrc = (struct src_regs )SRC_BASE_ADDR;
	149	+ struct src psrc = (struct src )SRC_BASE_ADDR;
150	150	writel(cfg_val, &psrc->gpr9);
151	151	reg = readl(&psrc->gpr10);
152	152	if (cfg_val)
...	...	@@ -593,27 +593,6 @@
593	593	u32 daisy[104]; /* 0x7b0..94c */
594	594	};
595	595
596		-struct src_regs {
597		- u32 scr; /* 0x00 */
598		- u32 sbmr1; /* 0x04 */
599		- u32 srsr; /* 0x08 */
600		- u32 reserved1; /* 0x0c */
601		- u32 reserved2; /* 0x10 */
602		- u32 sisr; /* 0x14 */
603		- u32 simr; /* 0x18 */
604		- u32 sbmr2; /* 0x1c */
605		- u32 gpr1; /* 0x20 */
606		- u32 gpr2; /* 0x24 */
607		- u32 gpr3; /* 0x28 */
608		- u32 gpr4; /* 0x2c */
609		- u32 gpr5; /* 0x30 */
610		- u32 gpr6; /* 0x34 */
611		- u32 gpr7; /* 0x38 */
612		- u32 gpr8; /* 0x3c */
613		- u32 gpr9; /* 0x40 */
614		- u32 gpr10; /* 0x44 */
615		-};
616		-
617	596	#endif /* __ASSEMBLER__*/
618	597	#endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */