Skip to contentSkip to conversation

wandboard: Fix version detection for mx6q/mx6dl revD1

PATCH New Fabio Estevam 4 participants 16 messages Apr 17, 2020 – Apr 19, 2020

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/5 wandboard: Fix version detection for mx6q/mx6dl revD1

The detection of the revD1 version is based on the presence of the PMIC.

Currently revb1 device trees are used for mx6q/mx6dl variants, which do not have the PMIC nodes.

This causes revD1 boards to be incorrectly be detected as revB1.

Fix this issue by using the revd1 device trees, so that the PMIC node can be found and then the PMIC can be detected by reading its register ID.

Imported the revd1 device trees from mainline kernel version 5.7-rc1.

---
Changes since v1:
- Also use the revd1 dtb's inside board_fit_config_name_match(), which fixes truncated console output on i.MX6DL wandboard as reported by Heiko.
- Added Tested-by from Derek as he confirmed it works on a imx6q revd1.

 arch/arm/dts/Makefile                                         | 4 ++--
 ...{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} | 4 ++--
 .../{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts}  | 4 ++--
 board/wandboard/wandboard.c                                   | 4 ++--
 configs/wandboard_defconfig                                   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename arch/arm/dts/{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} (78%)
 rename arch/arm/dts/{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts} (80%)
arch/arm/dts/Makefile +2 -2
index 820ee9733a..2a71917c92 100644
@@ -622,7 +622,7 @@ dtb-y += \
 	imx6dl-pico.dtb \
 	imx6dl-sabreauto.dtb \
 	imx6dl-sabresd.dtb \
-	imx6dl-wandboard-revb1.dtb \
+	imx6dl-wandboard-revd1.dtb \
 
 endif
 
@@ -654,7 +654,7 @@ dtb-y += \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-tbs2910.dtb \
-	imx6q-wandboard-revb1.dtb \
+	imx6q-wandboard-revd1.dtb \
 	imx6qp-sabreauto.dtb \
 	imx6qp-sabresd.dtb \
 	imx6qp-wandboard-revd1.dtb \
arch/arm/dts/imx6dl-wandboard-revd1.dts renamed from arch/arm/dts/imx6dl-wandboard-revb1.dts +2 -2
similarity index 78%
rename from arch/arm/dts/imx6dl-wandboard-revb1.dts
rename to arch/arm/dts/imx6dl-wandboard-revd1.dts
index c2946fbaa0..6d1d863c2e 100644
@@ -6,10 +6,10 @@
  */
 /dts-v1/;
 #include "imx6dl.dtsi"
-#include "imx6qdl-wandboard-revb1.dtsi"
+#include "imx6qdl-wandboard-revd1.dtsi"
 
 / {
-	model = "Wandboard i.MX6 Dual Lite Board rev B1";
+	model = "Wandboard i.MX6 Dual Lite Board revD1";
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
 	memory at 10000000 {
arch/arm/dts/imx6q-wandboard-revd1.dts renamed from arch/arm/dts/imx6q-wandboard-revb1.dts +2 -2
similarity index 80%
rename from arch/arm/dts/imx6q-wandboard-revb1.dts
rename to arch/arm/dts/imx6q-wandboard-revd1.dts
index f6ccbecff9..55331021d8 100644
@@ -6,10 +6,10 @@
  */
 /dts-v1/;
 #include "imx6q.dtsi"
-#include "imx6qdl-wandboard-revb1.dtsi"
+#include "imx6qdl-wandboard-revd1.dtsi"
 
 / {
-	model = "Wandboard i.MX6 Quad Board rev B1";
+	model = "Wandboard i.MX6 Quad Board revD1";
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
 	memory at 10000000 {
board/wandboard/wandboard.c +2 -2
index 5725c5816c..90957167b2 100644
@@ -484,13 +484,13 @@ int checkboard(void)
 int board_fit_config_name_match(const char *name)
 {
 	if (is_mx6dq()) {
-		if (!strcmp(name, "imx6q-wandboard-revb1"))
+		if (!strcmp(name, "imx6q-wandboard-revd1"))
 			return 0;
 	} else if (is_mx6dqp()) {
 		if (!strcmp(name, "imx6qp-wandboard-revd1"))
 			return 0;
 	} else if (is_mx6dl() || is_mx6solo()) {
-		if (!strcmp(name, "imx6dl-wandboard-revb1"))
+		if (!strcmp(name, "imx6dl-wandboard-revd1"))
 			return 0;
 	}
 
configs/wandboard_defconfig +2 -2
index 82e517b90f..ee70758f3a 100644
@@ -46,8 +46,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1"
-CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revd1"
+CONFIG_OF_LIST="imx6q-wandboard-revd1 imx6qp-wandboard-revd1 imx6dl-wandboard-revd1"
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.17.1
author reviewer
#1 lore raw

PATCH v2 2/5 pmic: pfuze100: Change error message level to debug

In some cases U-Boot runs the same binary on different board versions.

In wandboard, for example, there are versions with the PFUZE100 PMIC populated and others without it.

When the PMIC is not present, it is not really useful to get PMIC error, so change the error message level to debug instead.

---
Changes since v1:
- Reworded the commit log for clarity

 drivers/power/pmic/pfuze100.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/pmic/pfuze100.c +1 -1
index 6cf5f35f0f..db630f3ad0 100644
@@ -41,7 +41,7 @@ static int pfuze100_write(struct udevice *dev, uint reg, const uint8_t *buff,
 static int pfuze100_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
 {
 	if (dm_i2c_read(dev, reg, buff, len)) {
-		pr_err("read error from device: %p register: %#x!\n", dev, reg);
+		debug("read error from device: %p register: %#x!\n", dev, reg);
 		return -EIO;
 	}
 
Signature · 1 line
2.17.1
author reviewer
#4 lore raw

PATCH v2 3/5 wandboard: Do not print error when PMIC is not present

In reply to Fabio Estevam

On wandboard variants prior to revD1, there is no PMIC populated, so do not print an error when the reading of the device ID register fails.

---
Changes since v1:
- None

 board/wandboard/wandboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/wandboard/wandboard.c +1 -1
index 90957167b2..7fd60682a5 100644
@@ -369,7 +369,7 @@ int power_init_board(void)
 
 	reg = pmic_reg_read(dev, PFUZE100_DEVICEID);
 	if (reg < 0) {
-		printf("pmic_reg_read() ret %d\n", reg);
+		debug("pmic_reg_read() ret %d\n", reg);
 		return 0;
 	}
 	printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
Signature · 1 line
2.17.1
author reviewer
#7 lore raw

PATCH v2 4/5 wandboard: Remove CONFIG_DISPLAY_BOARDINFO_LATE

In reply to Fabio Estevam

Since we are using revD1 device tree for all board revisions, the following can be seen on a revB1 board:

Model: Wandboard i.MX6 Quad Board revD1
Board: Wandboard rev B1

To avoid such confusing messages, disable CONFIG_DISPLAY_BOARDINFO_LATE.

---
Changes since v1:
- None

 configs/wandboard_defconfig | 1 -
 1 file changed, 1 deletion(-)
configs/wandboard_defconfig +0 -1
index ee70758f3a..f9a5fe479b 100644
@@ -29,7 +29,6 @@ CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_SEPARATE_BSS=y
Signature · 1 line
2.17.1
author reviewer
#10 lore raw

PATCH v2 5/5 wandboard: Print the board version in board_late_init()

In reply to Fabio Estevam

Since CONFIG_DISPLAY_BOARDINFO_LATE is no longer used, the checkboard() function is no longer called.

As it is useful to print the board revision, print it inside board_late_init() instead.

Also, to avoid GPIO errors related to using a GPIO without requesting it, move the gpio_request(REV_DETECTION, "REV_DETECT") call prior to its usage.

---
Changes since v1:
- Still print the board revision, but on a different location now.

 board/wandboard/wandboard.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)
board/wandboard/wandboard.c +9 -14
index 7fd60682a5..fb2f3c1fd2 100644
@@ -404,6 +404,7 @@ static const struct boot_mode board_boot_modes[] = {
 static bool is_revc1(void)
 {
 	SETUP_IOMUX_PADS(rev_detection_pad);
+	gpio_request(REV_DETECTION, "REV_DETECT");
 	gpio_direction_input(REV_DETECTION);
 
 	if (gpio_get_value(REV_DETECTION))
@@ -442,6 +443,14 @@ int board_late_init(void)
 		env_set("board_name", "B1");
 #endif
 	setup_iomux_enet();
+
+	if (is_revd1())
+		puts("Board: Wandboard rev D1\n");
+	else if (is_revc1())
+		puts("Board: Wandboard rev C1\n");
+	else
+		puts("Board: Wandboard rev B1\n");
+
 	return 0;
 }
 
@@ -466,20 +475,6 @@ int board_init(void)
 	return 0;
 }
 
-int checkboard(void)
-{
-	gpio_request(REV_DETECTION, "REV_DETECT");
-
-	if (is_revd1())
-		puts("Board: Wandboard rev D1\n");
-	else if (is_revc1())
-		puts("Board: Wandboard rev C1\n");
-	else
-		puts("Board: Wandboard rev B1\n");
-
-	return 0;
-}
-
 #ifdef CONFIG_SPL_LOAD_FIT
 int board_fit_config_name_match(const char *name)
 {
Signature · 1 line
2.17.1
#13 lore raw

PATCH v2 1/5 wandboard: Fix version detection for mx6q/mx6dl revD1

In reply to Fabio Estevam

Hello Fabio,

Am 17.04.2020 um 14:27 schrieb Fabio Estevam:

Quoted 22 lines

The detection of the revD1 version is based on the presence of the PMIC.

Currently revb1 device trees are used for mx6q/mx6dl variants, which do not have the PMIC nodes.

This causes revD1 boards to be incorrectly be detected as revB1.

Fix this issue by using the revd1 device trees, so that the PMIC node can be found and then the PMIC can be detected by reading its register ID.

Imported the revd1 device trees from mainline kernel version 5.7-rc1.

---
Changes since v1:
- Also use the revd1 dtb's inside board_fit_config_name_match(), which fixes truncated console output on i.MX6DL wandboard as reported by Heiko.
- Added Tested-by from Derek as he confirmed it works on a imx6q revd1.

Quoted 8 lines
  arch/arm/dts/Makefile                                         | 4 ++--
  ...{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} | 4 ++--
  .../{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts}  | 4 ++--
  board/wandboard/wandboard.c                                   | 4 ++--
  configs/wandboard_defconfig                                   | 4 ++--
  5 files changed, 10 insertions(+), 10 deletions(-)

rename arch/arm/dts/{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} (78%) rename arch/arm/dts/{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts} (80%)

Thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#2 lore raw

PATCH v2 2/5 pmic: pfuze100: Change error message level to debug

In reply to Fabio Estevam

Hello Fabio,

Am 17.04.2020 um 14:27 schrieb Fabio Estevam:

Quoted 8 lines

In some cases U-Boot runs the same binary on different board versions.

In wandboard, for example, there are versions with the PFUZE100 PMIC populated and others without it.

When the PMIC is not present, it is not really useful to get PMIC error, so change the error message level to debug instead.

Quoted 7 lines

---
Changes since v1:
- Reworded the commit log for clarity

  drivers/power/pmic/pfuze100.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks!

bye,
Heiko

Quoted 15 lines
drivers/power/pmic/pfuze100.c +1 -1
index 6cf5f35f0f..db630f3ad0 100644
@@ -41,7 +41,7 @@ static int pfuze100_write(struct udevice *dev, uint reg, const uint8_t *buff,
  static int pfuze100_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
  {
  	if (dm_i2c_read(dev, reg, buff, len)) {
-		pr_err("read error from device: %p register: %#x!\n", dev, reg);
+		debug("read error from device: %p register: %#x!\n", dev, reg);
  		return -EIO;
  	}
 
Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#5 lore raw

PATCH v2 3/5 wandboard: Do not print error when PMIC is not present

In reply to Fabio Estevam

Hello Fabio,

Am 17.04.2020 um 14:27 schrieb Fabio Estevam:

Quoted 10 lines

On wandboard variants prior to revD1, there is no PMIC populated, so do not print an error when the reading of the device ID register fails.

---
Changes since v1:
- None

  board/wandboard/wandboard.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks!

bye,
Heiko

Quoted 15 lines
board/wandboard/wandboard.c +1 -1
index 90957167b2..7fd60682a5 100644
@@ -369,7 +369,7 @@ int power_init_board(void)
 
  	reg = pmic_reg_read(dev, PFUZE100_DEVICEID);
  	if (reg < 0) {
-		printf("pmic_reg_read() ret %d\n", reg);
+		debug("pmic_reg_read() ret %d\n", reg);
  		return 0;
  	}
  	printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#8 lore raw

PATCH v2 4/5 wandboard: Remove CONFIG_DISPLAY_BOARDINFO_LATE

In reply to Fabio Estevam

Hello Fabio,

Am 17.04.2020 um 14:27 schrieb Fabio Estevam:

Quoted 8 lines

Since we are using revD1 device tree for all board revisions, the following can be seen on a revB1 board:

Model: Wandboard i.MX6 Quad Board revD1
Board: Wandboard rev B1

To avoid such confusing messages, disable CONFIG_DISPLAY_BOARDINFO_LATE.

Quoted 7 lines

---
Changes since v1:
- None

  configs/wandboard_defconfig | 1 -
  1 file changed, 1 deletion(-)

Thanks!

bye,
Heiko

Quoted 14 lines
configs/wandboard_defconfig +0 -1
index ee70758f3a..f9a5fe479b 100644
@@ -29,7 +29,6 @@ CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
  # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL_SEPARATE_BSS=y
Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#11 lore raw

PATCH v2 5/5 wandboard: Print the board version in board_late_init()

In reply to Fabio Estevam

Hello Fabio,

Am 17.04.2020 um 14:27 schrieb Fabio Estevam:

Quoted 10 lines

Since CONFIG_DISPLAY_BOARDINFO_LATE is no longer used, the checkboard() function is no longer called.

As it is useful to print the board revision, print it inside board_late_init() instead.

Also, to avoid GPIO errors related to using a GPIO without requesting it, move the gpio_request(REV_DETECTION, "REV_DETECT") call prior to its usage.

Quoted 7 lines

---
Changes since v1:
- Still print the board revision, but on a different location now.

  board/wandboard/wandboard.c | 23 +++++++++--------------
  1 file changed, 9 insertions(+), 14 deletions(-)

Thanks!

bye,
Heiko

Quoted 50 lines
board/wandboard/wandboard.c +9 -14
index 7fd60682a5..fb2f3c1fd2 100644
@@ -404,6 +404,7 @@ static const struct boot_mode board_boot_modes[] = {
  static bool is_revc1(void)
  {
  	SETUP_IOMUX_PADS(rev_detection_pad);
+	gpio_request(REV_DETECTION, "REV_DETECT");
  	gpio_direction_input(REV_DETECTION);
 
  	if (gpio_get_value(REV_DETECTION))
@@ -442,6 +443,14 @@ int board_late_init(void)
  		env_set("board_name", "B1");
  #endif
  	setup_iomux_enet();
+
+	if (is_revd1())
+		puts("Board: Wandboard rev D1\n");
+	else if (is_revc1())
+		puts("Board: Wandboard rev C1\n");
+	else
+		puts("Board: Wandboard rev B1\n");
+
  	return 0;
  }
 
@@ -466,20 +475,6 @@ int board_init(void)
  	return 0;
  }
 
-int checkboard(void)
-{
-	gpio_request(REV_DETECTION, "REV_DETECT");
-
-	if (is_revd1())
-		puts("Board: Wandboard rev D1\n");
-	else if (is_revc1())
-		puts("Board: Wandboard rev C1\n");
-	else
-		puts("Board: Wandboard rev B1\n");
-
-	return 0;
-}
-
  #ifdef CONFIG_SPL_LOAD_FIT
  int board_fit_config_name_match(const char *name)
  {
Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#14 lore raw

PATCH v2 1/5 wandboard: Fix version detection for mx6q/mx6dl revD1

In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

The detection of the revD1 version is based on the presence of the PMIC.

Currently revb1 device trees are used for mx6q/mx6dl variants, which do not have the PMIC nodes.

This causes revD1 boards to be incorrectly be detected as revB1.

Fix this issue by using the revd1 device trees, so that the PMIC node can be found and then the PMIC can be detected by reading its register ID.

Quoted 6 lines

Imported the revd1 device trees from mainline kernel version 5.7-rc1.

Series is tested on a B1 and a C1

Quoted 115 lines

---
Changes since v1:
- Also use the revd1 dtb's inside board_fit_config_name_match(), which fixes truncated console output on i.MX6DL wandboard as reported by Heiko.
- Added Tested-by from Derek as he confirmed it works on a imx6q revd1.

 arch/arm/dts/Makefile                                         | 4 ++--
 ...{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} | 4 ++--
 .../{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts}  | 4 ++--
 board/wandboard/wandboard.c                                   | 4 ++--
 configs/wandboard_defconfig                                   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename arch/arm/dts/{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} (78%)
 rename arch/arm/dts/{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts} (80%)
arch/arm/dts/Makefile +2 -2
index 820ee9733a..2a71917c92 100644
@@ -622,7 +622,7 @@ dtb-y += \
        imx6dl-pico.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabresd.dtb \
-       imx6dl-wandboard-revb1.dtb \
+       imx6dl-wandboard-revd1.dtb \
 
 endif
 
@@ -654,7 +654,7 @@ dtb-y += \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-tbs2910.dtb \
-       imx6q-wandboard-revb1.dtb \
+       imx6q-wandboard-revd1.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb \
        imx6qp-wandboard-revd1.dtb \
arch/arm/dts/imx6dl-wandboard-revd1.dts renamed from arch/arm/dts/imx6dl-wandboard-revb1.dts +2 -2
similarity index 78%
rename from arch/arm/dts/imx6dl-wandboard-revb1.dts
rename to arch/arm/dts/imx6dl-wandboard-revd1.dts
index c2946fbaa0..6d1d863c2e 100644
@@ -6,10 +6,10 @@
  */
 /dts-v1/;
 #include "imx6dl.dtsi"
-#include "imx6qdl-wandboard-revb1.dtsi"
+#include "imx6qdl-wandboard-revd1.dtsi"
 
 / {
-       model = "Wandboard i.MX6 Dual Lite Board rev B1";
+       model = "Wandboard i.MX6 Dual Lite Board revD1";
        compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
        memory at 10000000 {
arch/arm/dts/imx6q-wandboard-revd1.dts renamed from arch/arm/dts/imx6q-wandboard-revb1.dts +2 -2
similarity index 80%
rename from arch/arm/dts/imx6q-wandboard-revb1.dts
rename to arch/arm/dts/imx6q-wandboard-revd1.dts
index f6ccbecff9..55331021d8 100644
@@ -6,10 +6,10 @@
  */
 /dts-v1/;
 #include "imx6q.dtsi"
-#include "imx6qdl-wandboard-revb1.dtsi"
+#include "imx6qdl-wandboard-revd1.dtsi"
 
 / {
-       model = "Wandboard i.MX6 Quad Board rev B1";
+       model = "Wandboard i.MX6 Quad Board revD1";
        compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
        memory at 10000000 {
board/wandboard/wandboard.c +2 -2
index 5725c5816c..90957167b2 100644
@@ -484,13 +484,13 @@ int checkboard(void)
 int board_fit_config_name_match(const char *name)
 {
        if (is_mx6dq()) {
-               if (!strcmp(name, "imx6q-wandboard-revb1"))
+               if (!strcmp(name, "imx6q-wandboard-revd1"))
                        return 0;
        } else if (is_mx6dqp()) {
                if (!strcmp(name, "imx6qp-wandboard-revd1"))
                        return 0;
        } else if (is_mx6dl() || is_mx6solo()) {
-               if (!strcmp(name, "imx6dl-wandboard-revb1"))
+               if (!strcmp(name, "imx6dl-wandboard-revd1"))
                        return 0;
        }
 
configs/wandboard_defconfig +2 -3
index 82e517b90f..ee70758f3a 100644
@@ -46,8 +46,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1"
-CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revd1"
+CONFIG_OF_LIST="imx6q-wandboard-revd1 imx6qp-wandboard-revd1 imx6dl-wandboard-revd1"
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
--

2.17.1

#15 lore raw

PATCH v2 1/5 wandboard: Fix version detection for mx6q/mx6dl revD1

In reply to Fabio Estevam
Quoted 7 lines

The detection of the revD1 version is based on the presence of the PMIC. Currently revb1 device trees are used for mx6q/mx6dl variants, which do not have the PMIC nodes.
This causes revD1 boards to be incorrectly be detected as revB1. Fix this issue by using the revd1 device trees, so that the PMIC node can be found and then the PMIC can be detected by reading its register ID. Imported the revd1 device trees from mainline kernel version 5.7-rc1.

Quoted 6 lines

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================
#3 lore raw

PATCH v2 2/5 pmic: pfuze100: Change error message level to debug

In reply to Fabio Estevam
Quoted 7 lines

In some cases U-Boot runs the same binary on different board versions. In wandboard, for example, there are versions with the PFUZE100 PMIC populated and others without it.
When the PMIC is not present, it is not really useful to get PMIC error, so change the error message level to debug instead.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================
#9 lore raw

PATCH v2 4/5 wandboard: Remove CONFIG_DISPLAY_BOARDINFO_LATE

In reply to Fabio Estevam
Quoted 7 lines

Since we are using revD1 device tree for all board revisions, the following can be seen on a revB1 board:
Model: Wandboard i.MX6 Quad Board revD1
Board: Wandboard rev B1
To avoid such confusing messages, disable CONFIG_DISPLAY_BOARDINFO_LATE.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================
#12 lore raw

PATCH v2 5/5 wandboard: Print the board version in board_late_init()

In reply to Fabio Estevam
Quoted 9 lines

Since CONFIG_DISPLAY_BOARDINFO_LATE is no longer used, the checkboard() function is no longer called.
As it is useful to print the board revision, print it inside board_late_init() instead.
Also, to avoid GPIO errors related to using a GPIO without requesting it, move the gpio_request(REV_DETECTION, "REV_DETECT") call prior to its usage.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================
#6 lore raw

PATCH v2 3/5 wandboard: Do not print error when PMIC is not present

In reply to Fabio Estevam
Quoted 4 lines

On wandboard variants prior to revD1, there is no PMIC populated, so do not print an error when the reading of the device ID register fails.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================