tpm: tpm_tis_i2c: Merge struct tpm_dev into tpm_chip

[karo-tx-uboot.git] / drivers / misc / fsl_iim.c

diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index 36433a74f85f37e2f7877856853328d3d38527cf..008919f99b64bbc0b9cb09a4b925c5327133ea20 100644 (file)
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -16,7 +16,7 @@
 #ifndef CONFIG_MPC512X
 #include <asm/arch/imx-regs.h>
 #endif
-#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
+#if defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53)
 #include <asm/arch/clock.h>
 #endif
 
@@ -89,14 +89,14 @@ struct fsl_iim {
        u32 sdat;
        u32 prev;
        u32 srev;
-       u32 prg_p;
+       u32 preg_p;
        u32 scs[0x1f5];
        struct {
                u32 word[0x100];
        } bank[8];
 };
 
-#if !defined(CONFIG_MX51) && !defined(CONFIG_MX53)
+#if !defined(CONFIG_SOC_MX51) && !defined(CONFIG_SOC_MX53)
 #define enable_efuse_prog_supply(enable)
 #endif
 
@@ -169,7 +169,7 @@ static void direct_access(struct fsl_iim *regs, u32 bank, u32 word, u32 bit,
        iim_write32(&regs->ua, bank << 3 | word >> 5);
        iim_write32(&regs->la, (word << 3 | bit) & 0xff);
        if (fctl == FCTL_PRG)
-               iim_write32(&regs->prg_p, 0xaa);
+               iim_write32(&regs->preg_p, 0xaa);
        iim_setbits32(&regs->fctl, fctl);
        while (iim_read32(&regs->stat) & STAT_BUSY)
                udelay(20);
@@ -208,7 +208,7 @@ static int prog_bit(struct fsl_iim *regs, u32 bank, u32 word, u32 bit)
 
        clear_status(regs);
        direct_access(regs, bank, word, bit, FCTL_PRG, &stat, &err);
-       iim_write32(&regs->prg_p, 0x00);
+       iim_write32(&regs->preg_p, 0x00);
 
        if (err & ERR_PRGE) {
                puts("fsl_iim fuse_prog(): Program error\n");