diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-06-19 10:34:16 +0800 |
|---|---|---|
| committer | Peng Fan <Peng.Fan@freescale.com> | 2015-06-19 12:22:36 +0800 |
| commit | 02c781ffe5d3dd52fcefe7686695ca2eefce2d5f (patch) | |
| tree | f4b35577a4a42c0bfdd14bf3faa1041667946441 | |
| parent | 374aad6eca0632f7472d71330c79c72014149dee (diff) | |
| download | u-boot-imx-02c781ffe5d3dd52fcefe7686695ca2eefce2d5f.zip u-boot-imx-02c781ffe5d3dd52fcefe7686695ca2eefce2d5f.tar.gz u-boot-imx-02c781ffe5d3dd52fcefe7686695ca2eefce2d5f.tar.bz2 | |
MLK-11134-2 imx: mx7d_12x12_ddr3_arm2 update spi nor code
We should use board_spi_cs_gpio and remove the GPIO from
CONFIG_SF_DEFAULT_CS.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit 4209e0a4d324a99511a85dfe1fb3107518ff02c4)
| -rw-r--r-- | board/freescale/mx7d_12x12_ddr3_arm2/mx7d_12x12_ddr3_arm2.c | 5 | ||||
| -rw-r--r-- | include/configs/mx7d_12x12_ddr3_arm2.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/mx7d_12x12_ddr3_arm2.c b/board/freescale/mx7d_12x12_ddr3_arm2/mx7d_12x12_ddr3_arm2.c index 3f5dcf5..91fa798 100644 --- a/board/freescale/mx7d_12x12_ddr3_arm2/mx7d_12x12_ddr3_arm2.c +++ b/board/freescale/mx7d_12x12_ddr3_arm2/mx7d_12x12_ddr3_arm2.c @@ -252,6 +252,11 @@ void setup_spinor(void) ARRAY_SIZE(ecspi1_pads)); gpio_direction_output(IMX_GPIO_NR(5, 3), 0); } + +int board_spi_cs_gpio(unsigned bus, unsigned cs) +{ + return (bus == 3 && cs == 0) ? (IMX_GPIO_NR(5, 3)) : -1; +} #endif int board_early_init_f(void) diff --git a/include/configs/mx7d_12x12_ddr3_arm2.h b/include/configs/mx7d_12x12_ddr3_arm2.h index 5ff3625..f65df50 100644 --- a/include/configs/mx7d_12x12_ddr3_arm2.h +++ b/include/configs/mx7d_12x12_ddr3_arm2.h @@ -47,7 +47,7 @@ #define CONFIG_SF_DEFAULT_BUS 3 #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) -#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(5, 3)<<8)) +#define CONFIG_SF_DEFAULT_CS 0 #endif #include "mx7d_arm2.h" |