diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-07-09 20:59:54 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-07-23 10:25:41 (GMT) |
| commit | 0a11d6f29ce48c649e4358a24b5781d3171c5406 (patch) | |
| tree | 0794f0e12674fed4a24da70cd4921f4b2fd9cbb3 /arch | |
| parent | fa8cf3176cc3360d308db1aad8bd70458553c78a (diff) | |
| download | u-boot-fsl-qoriq-0a11d6f29ce48c649e4358a24b5781d3171c5406.tar.xz | |
mx6: Remove duplication of iomuxc structure
There is no need to keep iomuxc_base_regs structure as it serves the exact same
purpose of the iomuxc structure, which is to provide access to the GPR
registers.
The additional fields of iomuxc_base_regs are not used. Other advantage of
'iomuxc' is that it has a shorter name and the variable declarations can fit
into a single line.
So remove iomuxc_base_regs structure and use iomuxc instead.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/imx-common/sata.c | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/imx-regs.h | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c index c10dd28..d174a46 100644 --- a/arch/arm/imx-common/sata.c +++ b/arch/arm/imx-common/sata.c @@ -12,8 +12,7 @@ int setup_sata(void) { - struct iomuxc_base_regs *const iomuxc_regs - = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR; + struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; int ret; if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D)) diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index df87123..782d9c4 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -764,15 +764,6 @@ struct anatop_regs { #define ANATOP_PFD_CLKGATE_SHIFT(n) (7+((n)*8)) #define ANATOP_PFD_CLKGATE_MASK(n) (1<<ANATOP_PFD_CLKGATE_SHIFT(n)) -struct iomuxc_base_regs { - u32 gpr[14]; /* 0x000 */ - u32 obsrv[5]; /* 0x038 */ - u32 swmux_ctl[197]; /* 0x04c */ - u32 swpad_ctl[250]; /* 0x360 */ - u32 swgrp[26]; /* 0x748 */ - u32 daisy[104]; /* 0x7b0..94c */ -}; - struct wdog_regs { u16 wcr; /* Control */ u16 wsr; /* Service */ |