diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 14:06:56 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 14:06:56 +0200 | 
| commit | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (patch) | |
| tree | b5c338d17f0633b7ec2e27d4d8b82dcf153a5281 /arch/arm/include/asm/arch-omap4/omap.h | |
| parent | 4eef93da262048eb1118e726b3ec5b8ebd3c6c91 (diff) | |
| parent | 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 (diff) | |
| download | olio-uboot-2014.01-e62d5fb0da76ef168e90cae9bbbda80349aaf137.tar.xz olio-uboot-2014.01-e62d5fb0da76ef168e90cae9bbbda80349aaf137.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-omap4/omap.h')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/omap.h | 1 | 
1 files changed, 1 insertions, 0 deletions
| diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index 3823a37f2..9129c0dd7 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -41,6 +41,7 @@  #define OMAP4_CONTROL_ID_CODE_ES2_3	0x6B95C02F  #define OMAP4460_CONTROL_ID_CODE_ES1_0	0x0B94E02F  #define OMAP4460_CONTROL_ID_CODE_ES1_1	0x2B94E02F +#define OMAP4470_CONTROL_ID_CODE_ES1_0	0x0B97502F  /* UART */  #define UART1_BASE		(OMAP44XX_L4_PER_BASE + 0x6a000) |