diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:25:25 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:25:25 +1100 |
| commit | 3991782ea3e41412f8a665cd6ce66943d76aff8a (patch) | |
| tree | cb4287612e4a23a2f663a9be910ff9cb8365563b /arch/powerpc/include/asm/fsl_guts.h | |
| parent | 2a859ab07b6ab66f4134c4fffc341398bd3d328c (diff) | |
| parent | 1723d90915d4689fa2e8cd4151d45ea38c96cb99 (diff) | |
| download | kernel_replicant_linux-3991782ea3e41412f8a665cd6ce66943d76aff8a.tar.gz kernel_replicant_linux-3991782ea3e41412f8a665cd6ce66943d76aff8a.tar.bz2 kernel_replicant_linux-3991782ea3e41412f8a665cd6ce66943d76aff8a.zip | |
Merge remote-tracking branch 'kumar/next' into next
Freescale updates from Kumar
Diffstat (limited to 'arch/powerpc/include/asm/fsl_guts.h')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_guts.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/fsl_guts.h b/arch/powerpc/include/asm/fsl_guts.h index dd5ba2c22771..77ced0b3d81d 100644 --- a/arch/powerpc/include/asm/fsl_guts.h +++ b/arch/powerpc/include/asm/fsl_guts.h @@ -71,7 +71,9 @@ struct ccsr_guts { u8 res0c4[0x224 - 0xc4]; __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */ __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */ - u8 res22c[0x800 - 0x22c]; + u8 res22c[0x604 - 0x22c]; + __be32 pamubypenr; /* 0x.604 - PAMU bypass enable register */ + u8 res608[0x800 - 0x608]; __be32 clkdvdr; /* 0x.0800 - Clock Divide Register */ u8 res804[0x900 - 0x804]; __be32 ircr; /* 0x.0900 - Infrared Control Register */ |