summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-17 21:59:57 +0200
committerWolfgang Denk <wd@denx.de>2010-06-17 21:59:57 +0200
commit530135dcacac278798346ad5825c03131ce51772 (patch)
treec99311a1ebab3dc97c30a0a92d88f9183da69ab0 /arch
parent399b09331f313d57b16b583f453387231d217f15 (diff)
parent89b765c7f6ddfde07ba673dd4adbeb5da391a81b (diff)
downloadu-boot-imx-530135dcacac278798346ad5825c03131ce51772.zip
u-boot-imx-530135dcacac278798346ad5825c03131ce51772.tar.gz
u-boot-imx-530135dcacac278798346ad5825c03131ce51772.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ti
Conflicts: CONFLICT (rename/add): Rename board/davinci/da830evm/Makefile->board/ti/tnetv107xevm/Makefile in 89b765c7f6ddfde07ba673dd4adbeb5da391a81b. board/ti/tnetv107xevm/Makefile added in HEAD But files were identical, so no problem. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/arch-davinci/hardware.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h
index 81cc8ab..3520cf8 100644
--- a/arch/arm/include/asm/arch-davinci/hardware.h
+++ b/arch/arm/include/asm/arch-davinci/hardware.h
@@ -398,6 +398,7 @@ struct davinci_syscfg_regs {
#define DAVINCI_SYSCFG_SUSPSRC_EMAC (1 << 5)
#define DAVINCI_SYSCFG_SUSPSRC_I2C (1 << 16)
#define DAVINCI_SYSCFG_SUSPSRC_SPI0 (1 << 21)
+#define DAVINCI_SYSCFG_SUSPSRC_SPI1 (1 << 22)
#define DAVINCI_SYSCFG_SUSPSRC_UART2 (1 << 20)
#define DAVINCI_SYSCFG_SUSPSRC_TIMER0 (1 << 27)