diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-07-21 15:27:35 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2022-07-25 16:12:00 +0200 |
| commit | 25ab97986c0f96247e9911f6872f7dbc9c40a12e (patch) | |
| tree | 0249524eaf72afb5bd3d9a4cd5dec1d74e950df2 /board/toradex | |
| parent | 2f96d4dd95f848c738eb08d7783e495a225191bf (diff) | |
colibri-imx7d/-emmc: synchronise device tree with linux
Synchronise device tree with linux-next next-20220708.
Please note that this also means that instead of the previous "generic"
U-Boot specific carrier board agnostic device trees we are now using the
regular ones for the Colibri Evaluation (carrier) board V3 (e.g.
imx7d-colibri-eval-v3.dtb rather than the previous
imx7-colibri-rawnand.dtb and imx7d-colibri-emmc-eval-v3.dtb rather than
the previous imx7-colibri-emmc.dtb).
Please further note that the PMIC node name got changed from rn5t567@33
to pmic@33 which required adjustment in resp. board file
board/toradex/colibri_imx7/colibri_imx7.c.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'board/toradex')
| -rw-r--r-- | board/toradex/colibri_imx7/MAINTAINERS | 14 | ||||
| -rw-r--r-- | board/toradex/colibri_imx7/colibri_imx7.c | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS index 24bec3ef14..513679a41c 100644 --- a/board/toradex/colibri_imx7/MAINTAINERS +++ b/board/toradex/colibri_imx7/MAINTAINERS @@ -3,12 +3,14 @@ M: Marcel Ziswiler <marcel.ziswiler@toradex.com> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained +F: arch/arm/boot/dts/imx7-colibri.dtsi +F: arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +F: arch/arm/boot/dts/imx7d-colibri.dtsi +F: arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +F: arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts +F: arch/arm/boot/dts/imx7d-colibri-eval-v3.dts F: board/toradex/colibri_imx7/ -F: doc/board/toradex/colibri_imx7.rst -F: include/configs/colibri_imx7.h F: configs/colibri_imx7_defconfig F: configs/colibri_imx7_emmc_defconfig -F: arch/arm/dts/imx7-colibri.dtsi -F: arch/arm/dts/imx7-colibri-u-boot.dtsi -F: arch/arm/dts/imx7-colibri-emmc.dts -F: arch/arm/dts/imx7-colibri-rawnand.dts +F: doc/board/toradex/colibri_imx7.rst +F: include/configs/colibri_imx7.h diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 486299b5e9..4f04543832 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -207,7 +207,7 @@ int power_init_board(void) int ret; - ret = pmic_get("rn5t567@33", &dev); + ret = pmic_get("pmic@33", &dev); if (ret) return ret; ver = pmic_reg_read(dev, RN5T567_LSIVER); @@ -241,7 +241,7 @@ void reset_cpu(void) { struct udevice *dev; - pmic_get("rn5t567@33", &dev); + pmic_get("pmic@33", &dev); /* Use PMIC to reset, set REPWRTIM to 0 and REPWRON to 1 */ pmic_reg_write(dev, RN5T567_REPCNT, 0x1); |