diff options
| author | Tom Rini <trini@ti.com> | 2014-12-10 09:07:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-10 09:07:25 -0500 |
| commit | 9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326 (patch) | |
| tree | 3860918ed8ce1a395d7dea349faee5485dd45948 /arch/arm/include | |
| parent | d51aae64236878b72283bd135df716e30f7f5ded (diff) | |
| parent | 9e89a64fbd0ddfde17741b38cc95fbdc02679d86 (diff) | |
| download | u-boot-imx-9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326.zip u-boot-imx-9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326.tar.gz u-boot-imx-9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/clock.h | 8 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-vf610/imx-regs.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index 323805c..226a4cd 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -43,10 +43,10 @@ enum mxc_clock { }; enum enet_freq { - ENET_25MHz, - ENET_50MHz, - ENET_100MHz, - ENET_125MHz, + ENET_25MHZ, + ENET_50MHZ, + ENET_100MHZ, + ENET_125MHZ, }; u32 imx_get_uartclk(void); diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h index 9d797db..6b10bdf 100644 --- a/arch/arm/include/asm/arch-vf610/imx-regs.h +++ b/arch/arm/include/asm/arch-vf610/imx-regs.h @@ -256,6 +256,14 @@ #define DDRMC_CR161_TODTH_RD(v) (((v) & 0xf) << 8) #define DDRMC_CR161_TODTH_WR(v) ((v) & 0xf) +/* System Reset Controller (SRC) */ +#define SRC_SRSR_SW_RST (0x1 << 18) +#define SRC_SRSR_RESETB (0x1 << 7) +#define SRC_SRSR_JTAG_RST (0x1 << 5) +#define SRC_SRSR_WDOG_M4 (0x1 << 4) +#define SRC_SRSR_WDOG_A5 (0x1 << 3) +#define SRC_SRSR_POR_RST (0x1 << 0) + #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> |