diff options
author | John Rigby <john.rigby@linaro.org> | 2011-08-17 14:04:52 -0600 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2011-08-17 14:04:52 -0600 |
commit | 88dc9b97249963a59f8eea37f2c7f634ac1c5619 (patch) | |
tree | cfd488c3da6b769e54ef68344d365aba0399710c /arch/arm/include/asm/arch-mx5/imx-regs.h | |
parent | 8ed2c44f563f03ecfe0999dd475e51a574cd93e0 (diff) |
Revert "Revert "MX5: Update to autogenerated asm-offsets.h""2011.08.2
Reverting the revert so non O= builds work again. This is temporary
until a proper fix comes from upstream.
This reverts commit 512f8bbdf964cc873d87cb557c1a03101a6c0c2f.
Diffstat (limited to 'arch/arm/include/asm/arch-mx5/imx-regs.h')
-rw-r--r-- | arch/arm/include/asm/arch-mx5/imx-regs.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 2e9fd3364..af55d9d03 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -318,9 +318,27 @@ struct clkctl { u32 ccgr4; u32 ccgr5; u32 ccgr6; +#if defined(CONFIG_MX53) + u32 ccgr7; +#endif u32 cmeor; }; +/* DPLL registers */ +struct dpll { + u32 dp_ctl; + u32 dp_config; + u32 dp_op; + u32 dp_mfd; + u32 dp_mfn; + u32 dp_mfn_minus; + u32 dp_mfn_plus; + u32 dp_hfs_op; + u32 dp_hfs_mfd; + u32 dp_hfs_mfn; + u32 dp_mfn_togc; + u32 dp_destat; +}; /* WEIM registers */ struct weim { u32 cs0gcr1; |