diff options
| author | Heiko Schocher <hs@denx.de> | 2014-10-30 13:14:03 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-03 11:21:50 +0100 |
| commit | 2f6bb0a9419ec8016524142cb54fef81038b346e (patch) | |
| tree | 1089ba3c808848a9bb0960cf09c165c055401b74 | |
| parent | 8fe280f330ddfd4a9e395ca15ab4019a1a32aa1f (diff) | |
| download | u-boot-imx-2f6bb0a9419ec8016524142cb54fef81038b346e.zip u-boot-imx-2f6bb0a9419ec8016524142cb54fef81038b346e.tar.gz u-boot-imx-2f6bb0a9419ec8016524142cb54fef81038b346e.tar.bz2 | |
arm, imx, spi: detect spi flash again on aristainetos board
155fa9af95a "spi: mxc: fix sf probe when using mxc_spi" break
spi flash detection on the aristainetos board. Fix this.
Signed-off-by: Heiko Schocher <hs@denx.de>
| -rw-r--r-- | board/aristainetos/aristainetos.c | 6 | ||||
| -rw-r--r-- | include/configs/aristainetos.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 3bfcf5b..06922c0 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -230,6 +230,12 @@ static iomux_v3_cfg_t const backlight_pads[] = { MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL), }; +int board_spi_cs_gpio(unsigned bus, unsigned cs) +{ + return (bus == CONFIG_SF_DEFAULT_BUS && cs == CONFIG_SF_DEFAULT_CS) + ? (IMX_GPIO_NR(3, 20)) : -1; +} + static void setup_spi(void) { int i; diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 20aea85..e6a08df 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -77,7 +77,7 @@ #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 3 -#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(3, 20)<<8)) +#define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN |