summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-06-19 10:34:16 +0800
committerPeng Fan <Peng.Fan@freescale.com>2015-06-19 11:40:23 +0800
commit4209e0a4d324a99511a85dfe1fb3107518ff02c4 (patch)
tree5c94253325bcab588e01b9111ba0ab25834403b3
parent2accd8a3cd743ae033528ae30a65f742447583c3 (diff)
downloadu-boot-imx-4209e0a4d324a99511a85dfe1fb3107518ff02c4.zip
u-boot-imx-4209e0a4d324a99511a85dfe1fb3107518ff02c4.tar.gz
u-boot-imx-4209e0a4d324a99511a85dfe1fb3107518ff02c4.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>
-rw-r--r--board/freescale/mx7d_12x12_ddr3_arm2/mx7d_12x12_ddr3_arm2.c5
-rw-r--r--include/configs/mx7d_12x12_ddr3_arm2.h2
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"