[U-Boot] [PATCH] ot1200: fix sf detection
Commit 155fa9af95ac5be857a7327e7a968a296e60d4c8 changed the way to define a GPIO line, which can be used to force CS high across multiple transactions. In order to fix sf detection change board code to make use of board_spi_cs_gpio(..).
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- board/bachmann/ot1200/ot1200.c | 5 +++++ include/configs/ot1200.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index 0d5ede5..2962e0c 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -98,6 +98,11 @@ static void setup_iomux_spi(void) imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); }
+int board_spi_cs_gpio(unsigned bus, unsigned cs) +{ + return (bus == 2 && cs == 0) ? (IMX_GPIO_NR(1, 3)) : -1; +} + int board_early_init_f(void) { setup_iomux_uart(); diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 071880f..d7696bd 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -47,7 +47,7 @@ #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(1, 3)<<8)) +#define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
On 22/10/2014 11:29, Christian Gmeiner wrote:
Commit 155fa9af95ac5be857a7327e7a968a296e60d4c8 changed the way to define a GPIO line, which can be used to force CS high across multiple transactions. In order to fix sf detection change board code to make use of board_spi_cs_gpio(..).
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
board/bachmann/ot1200/ot1200.c | 5 +++++ include/configs/ot1200.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index 0d5ede5..2962e0c 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -98,6 +98,11 @@ static void setup_iomux_spi(void) imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); }
+int board_spi_cs_gpio(unsigned bus, unsigned cs) +{
- return (bus == 2 && cs == 0) ? (IMX_GPIO_NR(1, 3)) : -1;
+}
int board_early_init_f(void) { setup_iomux_uart(); diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 071880f..d7696bd 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -47,7 +47,7 @@ #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(1, 3)<<8)) +#define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Hi all,
On Wed, 22 Oct 2014 11:29:51 +0200 Christian Gmeiner christian.gmeiner@gmail.com wrote:
Commit 155fa9af95ac5be857a7327e7a968a296e60d4c8 changed the way to define a GPIO line, which can be used to force CS high across multiple transactions. In order to fix sf detection change board code to make use of board_spi_cs_gpio(..).
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
board/bachmann/ot1200/ot1200.c | 5 +++++ include/configs/ot1200.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
There are another two board that might be affected:
$ grep --exclude=ot1200.h -r SF_DEFAULT_CS include/configs/ | grep IMX_GPIO_NR include/configs/aristainetos.h:#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(3, 20)<<8)) include/configs/tqma6.h:#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(3, 19) << 8))
So, I'm CC'ing board maintainers, please test/fix them too. Thanks!
Anatolij
Hello Anatolij,
Am 22.10.2014 12:09, schrieb Anatolij Gustschin:
Hi all,
On Wed, 22 Oct 2014 11:29:51 +0200 Christian Gmeinerchristian.gmeiner@gmail.com wrote:
Commit 155fa9af95ac5be857a7327e7a968a296e60d4c8 changed the way to define a GPIO line, which can be used to force CS high across multiple transactions. In order to fix sf detection change board code to make use of board_spi_cs_gpio(..).
Signed-off-by: Christian Gmeinerchristian.gmeiner@gmail.com
board/bachmann/ot1200/ot1200.c | 5 +++++ include/configs/ot1200.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
There are another two board that might be affected:
$ grep --exclude=ot1200.h -r SF_DEFAULT_CS include/configs/ | grep IMX_GPIO_NR include/configs/aristainetos.h:#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(3, 20)<<8)) include/configs/tqma6.h:#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(3, 19)<< 8))
So, I'm CC'ing board maintainers, please test/fix them too. Thanks!
thanks for adding me to cc !
I fix this issue here:
http://git.denx.de/?p=u-boot/u-boot-imx.git;a=commit;h=2f6bb0a9419ec80165241...
already applied in the u-boot.imx tree ...
bye, Heiko
On 22/10/14 12:29, Christian Gmeiner wrote:
Commit 155fa9af95ac5be857a7327e7a968a296e60d4c8 changed the way to define a GPIO line, which can be used to force CS high across multiple transactions. In order to fix sf detection change board code to make use of board_spi_cs_gpio(..).
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
board/bachmann/ot1200/ot1200.c | 5 +++++ include/configs/ot1200.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index 0d5ede5..2962e0c 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -98,6 +98,11 @@ static void setup_iomux_spi(void) imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); }
+int board_spi_cs_gpio(unsigned bus, unsigned cs) +{
- return (bus == 2 && cs == 0) ? (IMX_GPIO_NR(1, 3)) : -1;
+}
- int board_early_init_f(void) { setup_iomux_uart();
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 071880f..d7696bd 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -47,7 +47,7 @@ #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(1, 3)<<8)) +#define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
Acked-by: Nikita Kiryanov nikita@compulab.co.il
Hi Christian,
On 22/10/2014 11:29, Christian Gmeiner wrote:
Commit 155fa9af95ac5be857a7327e7a968a296e60d4c8 changed the way to define a GPIO line, which can be used to force CS high across multiple transactions. In order to fix sf detection change board code to make use of board_spi_cs_gpio(..).
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
participants (5)
-
Anatolij Gustschin -
Christian Gmeiner -
Heiko Schocher -
Nikita Kiryanov -
Stefano Babic