summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-mx5
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-02-21 08:00:22 -0500
committerTom Rini <trini@ti.com>2014-02-21 08:00:22 -0500
commit4c89a369c7cd6e7ad3adec4601cfa69fec476164 (patch)
tree79beb1aa83998aa8beb9fe29b5930deb1235d68e /arch/arm/include/asm/arch-mx5
parent36ae5cd2a824597b4c53b045ac0f4c1e3b4eaf65 (diff)
parent9ea09e20376abbca21760ed4ba87d6b5c4df465c (diff)
downloadblackbird-obmc-uboot-4c89a369c7cd6e7ad3adec4601cfa69fec476164.tar.gz
blackbird-obmc-uboot-4c89a369c7cd6e7ad3adec4601cfa69fec476164.zip
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'arch/arm/include/asm/arch-mx5')
-rw-r--r--arch/arm/include/asm/arch-mx5/imx-regs.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h
index 4955ccff87..054c680a5a 100644
--- a/arch/arm/include/asm/arch-mx5/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx5/imx-regs.h
@@ -230,9 +230,10 @@
#define MXC_CSPICTRL_CHAN 18
/* Bit position inside CON register to be associated with SS */
-#define MXC_CSPICON_POL 4
-#define MXC_CSPICON_PHA 0
-#define MXC_CSPICON_SSPOL 12
+#define MXC_CSPICON_PHA 0 /* SCLK phase control */
+#define MXC_CSPICON_POL 4 /* SCLK polarity */
+#define MXC_CSPICON_SSPOL 12 /* SS polarity */
+#define MXC_CSPICON_CTL 20 /* inactive state of SCLK */
#define MXC_SPI_BASE_ADDRESSES \
CSPI1_BASE_ADDR, \
CSPI2_BASE_ADDR, \
OpenPOWER on IntegriCloud