summaryrefslogtreecommitdiff
path: root/board/tqc/tqma6
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-05 12:48:09 -0500
committerTom Rini <trini@ti.com>2014-11-05 12:48:09 -0500
commit625509ab0edbb7d943ad9028de3c21ca48aa58be (patch)
tree2ea6bda524b3ad7e964f4357428de2890ad81cf4 /board/tqc/tqma6
parentd5325eff10922acb11c39efece6d5f24de5b1998 (diff)
parent0b23780ff02bdbec46fac1fe4151e2ebf1eae881 (diff)
downloadu-boot-625509ab0edbb7d943ad9028de3c21ca48aa58be.tar.gz
u-boot-625509ab0edbb7d943ad9028de3c21ca48aa58be.tar.bz2
u-boot-625509ab0edbb7d943ad9028de3c21ca48aa58be.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/tqc/tqma6')
-rw-r--r--board/tqc/tqma6/tqma6.c10
-rw-r--r--board/tqc/tqma6/tqma6_bb.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index b552bb8d7e..fd1bd59c6c 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -138,8 +138,10 @@ static iomux_v3_cfg_t const tqma6_ecspi1_pads[] = {
NEW_PAD_CTRL(MX6_PAD_EIM_D18__ECSPI1_MOSI, SPI_PAD_CTRL),
};
+#define TQMA6_SF_CS_GPIO IMX_GPIO_NR(3, 19)
+
static unsigned const tqma6_ecspi1_cs[] = {
- IMX_GPIO_NR(3, 19),
+ TQMA6_SF_CS_GPIO,
};
static void tqma6_iomuxc_spi(void)
@@ -152,6 +154,12 @@ static void tqma6_iomuxc_spi(void)
ARRAY_SIZE(tqma6_ecspi1_pads));
}
+int board_spi_cs_gpio(unsigned bus, unsigned cs)
+{
+ return ((bus == CONFIG_SF_DEFAULT_BUS) &&
+ (cs == CONFIG_SF_DEFAULT_CS)) ? TQMA6_SF_CS_GPIO : -1;
+}
+
static struct i2c_pads_info tqma6_i2c3_pads = {
/* I2C3: on board LM75, M24C64, */
.scl = {
diff --git a/board/tqc/tqma6/tqma6_bb.h b/board/tqc/tqma6/tqma6_bb.h
index 9d072d28ad..fb7b4626a1 100644
--- a/board/tqc/tqma6/tqma6_bb.h
+++ b/board/tqc/tqma6/tqma6_bb.h
@@ -6,7 +6,7 @@
*/
#ifndef __TQMA6_BB__
-#define __TQMA6_BB
+#define __TQMA6_BB__
#include <common.h>