diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 09:05:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 09:05:43 -0400 |
| commit | 5aa7bece1045c28806ce919099616ebe8fa63325 (patch) | |
| tree | c19240d9c85e3f4f839596e5197c619d872021be /arch/arm/include/asm/arch-omap3 | |
| parent | 674ca84d11391cd2e7faf8f638fc25ed4b782a91 (diff) | |
| parent | b5ff205cdb0da6eff8a02653bf5192ea8d661faa (diff) | |
| download | u-boot-imx-5aa7bece1045c28806ce919099616ebe8fa63325.zip u-boot-imx-5aa7bece1045c28806ce919099616ebe8fa63325.tar.gz u-boot-imx-5aa7bece1045c28806ce919099616ebe8fa63325.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'arch/arm/include/asm/arch-omap3')
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/mux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h index 2f83206..eba4a5c 100644 --- a/arch/arm/include/asm/arch-omap3/mux.h +++ b/arch/arm/include/asm/arch-omap3/mux.h @@ -281,7 +281,7 @@ #define CONTROL_PADCONF_SYS_OFF_MODE 0x0A18 #define CONTROL_PADCONF_SYS_CLKOUT1 0x0A1A #define CONTROL_PADCONF_SYS_CLKOUT2 0x01E2 -#define CONTROL_PADCONF_JTAG_nTRST 0x0A1C +#define CONTROL_PADCONF_JTAG_NTRST 0x0A1C #define CONTROL_PADCONF_JTAG_TCK 0x0A1E #define CONTROL_PADCONF_JTAG_TMS 0x0A20 #define CONTROL_PADCONF_JTAG_TDI 0x0A22 @@ -443,7 +443,7 @@ #define OMAP34XX_CTRL_WKUP_CTRL (OMAP34XX_CTRL_BASE + 0x0A5C) #define OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ (1<<6) -#define MUX_VAL(OFFSET,VALUE)\ +#define MUX_VAL(OFFSET, VALUE)\ writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET)); #define CP(x) (CONTROL_PADCONF_##x) |