tqma6: trivial fixes
cover tqma6: trivial fixes
From: Markus Niebel <[email protected]>
two trivial fixes for the TQ Systems TQMa6 modules. Thanks to Anatolij Gustschin to bring the first to my attention
Markus Niebel (2):
tqma6: fix sf detection
tqma6: fix typo in header guard define
board/tqc/tqma6/tqma6.c | 10 +++++++++- board/tqc/tqma6/tqma6_bb.h | 2 +- include/configs/tqma6.h | 19 ++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-)
Signature · 1 line
2.1.1
PATCH 1/2 tqma6: fix sf detection
From: Markus Niebel <[email protected]>
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(..).
--- board/tqc/tqma6/tqma6.c | 10 +++++++++- include/configs/tqma6.h | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-)
board/tqc/tqma6/tqma6.c +9 -1
@@ -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 = {
include/configs/tqma6.h +16 -3
@@ -9,13 +9,26 @@#ifndef __CONFIG_H#define __CONFIG_H +#define CONFIG_MX6 + +/* SPL */ +/* #if defined(CONFIG_SPL_BUILD) */ + +#define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_EXT_SUPPORT + +/* common IMX6 SPL configuration */ +#include "imx6_spl.h" + +/* #endif */ +#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> #include <linux/sizes.h> -#define CONFIG_MX6 -#if defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S )#define PHYS_SDRAM_SIZE (512u * SZ_1M)#elif defined(CONFIG_MX6Q ) || defined(CONFIG_MX6D )
@@ -57,7 +70,7 @@#define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(3, 19) << 8)) +#define CONFIG_SF_DEFAULT_CS 0#define CONFIG_SF_DEFAULT_SPEED 50000000#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
Signature · 1 line
2.1.1
PATCH 1/2 tqma6: fix sf detection
Quoted 30 lines · Markus Niebel
From: Markus Niebel <[email protected]>
Commit
155fa9af95ac5be857a7327e7a968a296e60d4c8changed 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 ofboard_spi_cs_gpio(..).Signed-off-by Markus Niebel <[email protected]>--- board/tqc/tqma6/tqma6.c | 10 +++++++++- include/configs/tqma6.h | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-)board/tqc/tqma6/tqma6.c +3
-1@@ -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 )
board/tqc/tqma6/tqma6.c static void tqma6_iomuxc_spi(void) · line 162
Quoted 9 lines
board/tqc/tqma6/tqma6.c +6
-0@@ -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 ; +} +
This always be a puzzle to me, (spi flash, here) driver controlled stuff is validating in board entries.
Which I couldn't see a correct idea.
Quoted 48 lines
board/tqc/tqma6/tqma6.c +0
-0static struct i2c_pads_info tqma6_i2c3_pads = {/* I2C3: on board LM75, M24C64, */ .scl = {include/configs/tqma6.h +16
-4@@ -9,13 +9,26 @@#ifndef __CONFIG_H#define __CONFIG_H +#define CONFIG_MX6 + +/* SPL */ +/* #if defined(CONFIG_SPL_BUILD) */ + +#define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_EXT_SUPPORT + +/* common IMX6 SPL configuration */ +#include "imx6_spl.h" + +/* #endif */ +#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> #include <linux/sizes.h> -#define CONFIG_MX6 -#if defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S )#define PHYS_SDRAM_SIZE (512u * SZ_1M)#elif defined(CONFIG_MX6Q ) || defined(CONFIG_MX6D )@@ -57,7 +70,7 @@#define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(3, 19) << 8)) +#define CONFIG_SF_DEFAULT_CS 0#define CONFIG_SF_DEFAULT_SPEED 50000000#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) --2.1.1
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
thanks!
Signature · 1 line
Jagan.
PATCH 1/2 tqma6: fix sf detection
In reply to Markus NiebelQuoted 9 lines · Markus Niebel
From: Markus Niebel <[email protected]>
Commit
155fa9af95ac5be857a7327e7a968a296e60d4c8changed 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 ofboard_spi_cs_gpio(..).Signed-off-by Markus Niebel <[email protected]>---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/2 tqma6: fix typo in header guard define
In reply to Markus NiebelFrom: Markus Niebel <[email protected]>
--- board/tqc/tqma6/tqma6_bb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/tqc/tqma6/tqma6_bb.h +1 -1
@@ -6,7 +6,7 @@*/ #ifndef __TQMA6_BB__ -#define __TQMA6_BB +#define __TQMA6_BB__#include <common.h>
Signature · 1 line
2.1.1
PATCH 2/2 tqma6: fix typo in header guard define
Quoted 4 lines · Markus Niebel
From: Markus Niebel <[email protected]>
Signed-off-by Markus Niebel <[email protected]>---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================