diff options
| author | Peter Maydell | 2016-01-11 17:09:50 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-01-11 17:09:50 +0100 |
| commit | 7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6 (patch) | |
| tree | 8b3d2f11cfbcf8c3ae5d8350829a341556f2679d /include/hw/misc/imx31_ccm.h | |
| parent | Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160111' int... (diff) | |
| parent | hw/arm/virt: Support legacy -nic command line syntax (diff) | |
| download | qemu-7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6.tar.gz qemu-7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6.tar.xz qemu-7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160111-1' into staging
target-arm queue:
* i.MX: move i.MX31 CCM object to register array
* xilinx_axidma: remove dead code
* disas/libvixl: Update to upstream VIXL 1.12
* virt: Support legacy -nic command line syntax
# gpg: Signature made Mon 11 Jan 2016 16:05:58 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-target-arm-20160111-1:
hw/arm/virt: Support legacy -nic command line syntax
disas/libvixl: Update to upstream VIXL 1.12
hw/dma/xilinx_axidma: remove dead code
i.MX: move i.MX31 CCM object to register array
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/misc/imx31_ccm.h')
| -rw-r--r-- | include/hw/misc/imx31_ccm.h | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/include/hw/misc/imx31_ccm.h b/include/hw/misc/imx31_ccm.h index fcae36d426..c376fad14c 100644 --- a/include/hw/misc/imx31_ccm.h +++ b/include/hw/misc/imx31_ccm.h @@ -13,6 +13,34 @@ #include "hw/misc/imx_ccm.h" +#define IMX31_CCM_CCMR_REG 0 +#define IMX31_CCM_PDR0_REG 1 +#define IMX31_CCM_PDR1_REG 2 +#define IMX31_CCM_RCSR_REG 3 +#define IMX31_CCM_MPCTL_REG 4 +#define IMX31_CCM_UPCTL_REG 5 +#define IMX31_CCM_SPCTL_REG 6 +#define IMX31_CCM_COSR_REG 7 +#define IMX31_CCM_CGR0_REG 8 +#define IMX31_CCM_CGR1_REG 9 +#define IMX31_CCM_CGR2_REG 10 +#define IMX31_CCM_WIMR_REG 11 +#define IMX31_CCM_LDC_REG 12 +#define IMX31_CCM_DCVR0_REG 13 +#define IMX31_CCM_DCVR1_REG 14 +#define IMX31_CCM_DCVR2_REG 15 +#define IMX31_CCM_DCVR3_REG 16 +#define IMX31_CCM_LTR0_REG 17 +#define IMX31_CCM_LTR1_REG 18 +#define IMX31_CCM_LTR2_REG 19 +#define IMX31_CCM_LTR3_REG 20 +#define IMX31_CCM_LTBR0_REG 21 +#define IMX31_CCM_LTBR1_REG 22 +#define IMX31_CCM_PMCR0_REG 23 +#define IMX31_CCM_PMCR1_REG 24 +#define IMX31_CCM_PDR2_REG 25 +#define IMX31_CCM_MAX_REG 26 + /* CCMR */ #define CCMR_FPME (1<<0) #define CCMR_MPE (1<<3) @@ -53,14 +81,8 @@ typedef struct IMX31CCMState { /* <public> */ MemoryRegion iomem; - uint32_t ccmr; - uint32_t pdr0; - uint32_t pdr1; - uint32_t mpctl; - uint32_t spctl; - uint32_t cgr[3]; - uint32_t pmcr0; - uint32_t pmcr1; + uint32_t reg[IMX31_CCM_MAX_REG]; + } IMX31CCMState; #endif /* IMX31_CCM_H */ |