Skip to content

Commit

Permalink
Merge tag 'u-boot-imx-20220523' of https://gitlab.denx.de/u-boot/cust…
Browse files Browse the repository at this point in the history
…odians/u-boot-imx

u-boot-imx-20220523
-------------------

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/12087

Additionally to u-boot-imx20200520:

- DH MX8MP
- i.MX GPIO: reading GPIO when direction is output
- Menlo i.MX53: switch to DM

And from u-boot-imx20200520:

- fix Verdin hang
- add pca9450 regulator
- conversion to DM_SERIAL
- NAND block handling
- fix crypto
- enable cache on some boards
- add ACC board (MX6)
  • Loading branch information
trini committed May 23, 2022
2 parents 6f00b97 + 4d573d5 commit 004d30c
Show file tree
Hide file tree
Showing 149 changed files with 7,063 additions and 956 deletions.
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv7/ls102xa/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ int arch_misc_init(void)

ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev);
if (ret)
printf("Failed to initialize %s: %d\n", dev->name, ret);
printf("Failed to initialize caam_jr: %d\n", ret);
}

return 0;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv8/fsl-layerscape/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ int arch_misc_init(void)

ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev);
if (ret)
printf("Failed to initialize %s: %d\n", dev->name, ret);
printf("Failed to initialize caam_jr: %d\n", ret);
}
serdes_misc_init();

Expand Down
4 changes: 4 additions & 0 deletions arch/arm/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,7 @@ dtb-y += \
imx6dl-cubox-i-emmc-som-v15.dtb \
imx6dl-cubox-i-som-v15.dtb \
imx6dl-dhcom-pdk2.dtb \
imx6dl-dhcom-picoitx.dts \
imx6dl-gw51xx.dtb \
imx6dl-gw52xx.dtb \
imx6dl-gw53xx.dtb \
Expand Down Expand Up @@ -771,12 +772,14 @@ dtb-y += \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
imx6dl-wandboard-revd1.dtb \
imx6s-dhcom-drc02.dtb

endif

ifneq ($(CONFIG_MX6Q)$(CONFIG_MX6QDL),)
dtb-y += \
imx6-apalis.dtb \
imx6q-bosch-acc.dtb \
imx6q-cm-fx6.dtb \
imx6q-cubox-i.dtb \
imx6q-cubox-i-emmc-som-v15.dtb \
Expand Down Expand Up @@ -936,6 +939,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
imx8mn-beacon-kit.dtb \
imx8mq-mnt-reform2.dtb \
imx8mq-phanbell.dtb \
imx8mp-dhcom-pdk2.dtb \
imx8mp-evk.dtb \
imx8mp-phyboard-pollux-rdk.dtb \
imx8mp-venice.dtb \
Expand Down
10 changes: 10 additions & 0 deletions arch/arm/dts/imx6dl-dhcom-picoitx-u-boot.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// SPDX-License-Identifier: (GPL-2.0+)
/*
* Copyright (C) 2022 Philip Oberfichtner <[email protected]>
*/

#include "imx6qdl-dhcom-u-boot.dtsi"

&fec {
phy-reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
};
20 changes: 20 additions & 0 deletions arch/arm/dts/imx6dl-dhcom-picoitx.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2021 DH electronics GmbH
*
* DHCOM iMX6 variant:
* DHCM-iMX6DL-C0800-R102-F0819-E-SD-RTC-T-HS-I-01D2
* DHCOM PCB number: 493-300 or newer
* PicoITX PCB number: 487-600 or newer
*/
/dts-v1/;

#include "imx6dl.dtsi"
#include "imx6qdl-dhcom-som.dtsi"
#include "imx6qdl-dhcom-picoitx.dtsi"

/ {
model = "DH electronics i.MX6DL DHCOM on PicoITX";
compatible = "dh,imx6dl-dhcom-picoitx", "dh,imx6dl-dhcom-som",
"fsl,imx6dl";
};
80 changes: 80 additions & 0 deletions arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
// SPDX-License-Identifier: GPL-2.0+

/* Copyright (C) 2022 Denx Software Engineering GmbH
* Philip Oberfichtner <[email protected]>
*/

/ {
chosen {
stdout-path = &uart2;
};

soc {
u-boot,dm-spl;

bus@2000000 {
u-boot,dm-spl;

spba-bus@2000000 {
u-boot,dm-spl;
};
};

bus@2100000 {
u-boot,dm-spl;
};
};

bootcount {
compatible = "u-boot,bootcount-pmic";
pmic = <&pmic>;
};
};

&uart1 {
u-boot,dm-spl;
};

&uart2 {
u-boot,dm-spl;
};

&usdhc2 {
u-boot,dm-spl;
};

&usdhc4 {
u-boot,dm-spl;
};

&gpio1 {
u-boot,dm-spl;
};

&gpio2 {
u-boot,dm-spl;
};

&gpio3 {
u-boot,dm-spl;
};

&gpio4 {
u-boot,dm-spl;
};

&gpio5 {
u-boot,dm-spl;
};

&gpio6 {
u-boot,dm-spl;
};

&gpio7 {
u-boot,dm-spl;
};

&wdog1 {
u-boot,dm-spl;
};
Loading

0 comments on commit 004d30c

Please sign in to comment.