diff options
author | Tom Rini <trini@konsulko.com> | 2016-01-25 10:40:38 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-25 10:40:38 -0500 |
commit | 2218c54bc13c8045903afc05d1364439a230da1f (patch) | |
tree | 04c07b31c7953846b907fab4a4609a38e312b4ab /arch/arm/include/asm/imx-common/regs-apbh.h | |
parent | cc4228f9d69f58495c2404adba9145bb36e613bf (diff) | |
parent | ed3fb1fb22fb9e0e786c58c2d80cd030b89b9b7d (diff) | |
download | talos-obmc-uboot-2218c54bc13c8045903afc05d1364439a230da1f.tar.gz talos-obmc-uboot-2218c54bc13c8045903afc05d1364439a230da1f.zip |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/imx-common/regs-apbh.h')
-rw-r--r-- | arch/arm/include/asm/imx-common/regs-apbh.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/imx-common/regs-apbh.h b/arch/arm/include/asm/imx-common/regs-apbh.h index ca77436004..391452cc12 100644 --- a/arch/arm/include/asm/imx-common/regs-apbh.h +++ b/arch/arm/include/asm/imx-common/regs-apbh.h @@ -96,7 +96,7 @@ struct mxs_apbh_regs { mxs_reg_32(hw_apbh_version) }; -#elif (defined(CONFIG_MX28) || defined(CONFIG_MX6)) +#elif (defined(CONFIG_MX28) || defined(CONFIG_MX6) || defined(CONFIG_MX7)) struct mxs_apbh_regs { mxs_reg_32(hw_apbh_ctrl0) mxs_reg_32(hw_apbh_ctrl1) @@ -275,7 +275,7 @@ struct mxs_apbh_regs { #define APBH_CTRL0_CLKGATE_CHANNEL_NAND7 0x0800 #define APBH_CTRL0_CLKGATE_CHANNEL_HSADC 0x1000 #define APBH_CTRL0_CLKGATE_CHANNEL_LCDIF 0x2000 -#elif defined(CONFIG_MX6) +#elif (defined(CONFIG_MX6) || defined(CONFIG_MX7)) #define APBH_CTRL0_CLKGATE_CHANNEL_OFFSET 0 #define APBH_CTRL0_CLKGATE_CHANNEL_NAND0 0x0001 #define APBH_CTRL0_CLKGATE_CHANNEL_NAND1 0x0002 @@ -391,7 +391,7 @@ struct mxs_apbh_regs { #define APBH_CHANNEL_CTRL_FREEZE_CHANNEL_LCDIF 0x2000 #endif -#if defined(CONFIG_MX6) +#if (defined(CONFIG_MX6) || defined(CONFIG_MX7)) #define APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET 16 #endif |