diff options
| author | Ye.Li <B37916@freescale.com> | 2014-01-06 11:37:01 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-01-06 14:04:39 +0800 |
| commit | 52c6163df27c6d4c8fafed55480c816101be571c (patch) | |
| tree | fbc9693424df372f18af054471f76b311315e699 /board | |
| parent | 3128af60873243691705f33156c54c27144d808e (diff) | |
| download | u-boot-imx-52c6163df27c6d4c8fafed55480c816101be571c.zip u-boot-imx-52c6163df27c6d4c8fafed55480c816101be571c.tar.gz u-boot-imx-52c6163df27c6d4c8fafed55480c816101be571c.tar.bz2 | |
imx: Homogenize and fix fuse register definitions
IIM:
- Homogenize prg_p naming (the reference manuals are not always self-consistent
for that).
- Add missing SCSx and bank registers.
- Fix the number of banks on i.MX53.
OCOTP:
- Rename iim to ocotp in order to avoid confusion.
- Rename fuse_data to read_fuse_data, and sticky to sw_sticky, according to the
reference manual.
- Merge the existing spinoff gp1 fuse definition on i.MX6.
- Fix the number of banks on i.MX6.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 8f3ff11c1f82e51e3f4c1f7c32b88693046dc318)
Conflicts:
arch/arm/include/asm/arch-mx6/imx-regs.h
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6qsabreauto.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index 9a2b280..cb627d7 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -696,7 +696,10 @@ static int mx6sabre_rev(void) * i.MX6Q ARD RevB: 0x02 */ struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; - int reg = readl(&ocotp->gp1); + struct fuse_bank *bank = &ocotp->bank[4]; + struct fuse_bank4_regs *fuse = + (struct fuse_bank4_regs *)bank->fuse_regs; + int reg = readl(&fuse->gp1); int ret; switch (reg >> 8 & 0x0F) { |