mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-23 05:00:24 +09:00
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. Reported-by: Heiko Schocher <hs@denx.de> Reported-by: Derek Atkins <derek@ihtfp.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> Tested-by: Derek Atkins <derek@ihtfp.com> Tested-by: Heiko Schocher <hs@denx.de> Tested-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
parent
84eea6a118
commit
4c13a4db60
@ -627,7 +627,7 @@ dtb-y += \
|
|||||||
imx6dl-pico.dtb \
|
imx6dl-pico.dtb \
|
||||||
imx6dl-sabreauto.dtb \
|
imx6dl-sabreauto.dtb \
|
||||||
imx6dl-sabresd.dtb \
|
imx6dl-sabresd.dtb \
|
||||||
imx6dl-wandboard-revb1.dtb \
|
imx6dl-wandboard-revd1.dtb \
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -661,7 +661,7 @@ dtb-y += \
|
|||||||
imx6q-sabrelite.dtb \
|
imx6q-sabrelite.dtb \
|
||||||
imx6q-sabresd.dtb \
|
imx6q-sabresd.dtb \
|
||||||
imx6q-tbs2910.dtb \
|
imx6q-tbs2910.dtb \
|
||||||
imx6q-wandboard-revb1.dtb \
|
imx6q-wandboard-revd1.dtb \
|
||||||
imx6qp-sabreauto.dtb \
|
imx6qp-sabreauto.dtb \
|
||||||
imx6qp-sabresd.dtb \
|
imx6qp-sabresd.dtb \
|
||||||
imx6qp-wandboard-revd1.dtb \
|
imx6qp-wandboard-revd1.dtb \
|
||||||
|
@ -6,10 +6,10 @@
|
|||||||
*/
|
*/
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "imx6dl.dtsi"
|
#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";
|
compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
|
||||||
|
|
||||||
memory@10000000 {
|
memory@10000000 {
|
@ -6,10 +6,10 @@
|
|||||||
*/
|
*/
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "imx6q.dtsi"
|
#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";
|
compatible = "wand,imx6q-wandboard", "fsl,imx6q";
|
||||||
|
|
||||||
memory@10000000 {
|
memory@10000000 {
|
@ -484,13 +484,13 @@ int checkboard(void)
|
|||||||
int board_fit_config_name_match(const char *name)
|
int board_fit_config_name_match(const char *name)
|
||||||
{
|
{
|
||||||
if (is_mx6dq()) {
|
if (is_mx6dq()) {
|
||||||
if (!strcmp(name, "imx6q-wandboard-revb1"))
|
if (!strcmp(name, "imx6q-wandboard-revd1"))
|
||||||
return 0;
|
return 0;
|
||||||
} else if (is_mx6dqp()) {
|
} else if (is_mx6dqp()) {
|
||||||
if (!strcmp(name, "imx6qp-wandboard-revd1"))
|
if (!strcmp(name, "imx6qp-wandboard-revd1"))
|
||||||
return 0;
|
return 0;
|
||||||
} else if (is_mx6dl() || is_mx6solo()) {
|
} else if (is_mx6dl() || is_mx6solo()) {
|
||||||
if (!strcmp(name, "imx6dl-wandboard-revb1"))
|
if (!strcmp(name, "imx6dl-wandboard-revd1"))
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,8 +46,8 @@ CONFIG_CMD_BMP=y
|
|||||||
CONFIG_CMD_CACHE=y
|
CONFIG_CMD_CACHE=y
|
||||||
CONFIG_CMD_EXT4_WRITE=y
|
CONFIG_CMD_EXT4_WRITE=y
|
||||||
CONFIG_OF_CONTROL=y
|
CONFIG_OF_CONTROL=y
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1"
|
CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revd1"
|
||||||
CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1"
|
CONFIG_OF_LIST="imx6q-wandboard-revd1 imx6qp-wandboard-revd1 imx6dl-wandboard-revd1"
|
||||||
CONFIG_MULTI_DTB_FIT=y
|
CONFIG_MULTI_DTB_FIT=y
|
||||||
CONFIG_ENV_IS_IN_MMC=y
|
CONFIG_ENV_IS_IN_MMC=y
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
|
Loading…
Reference in New Issue
Block a user