December 2021 - U-Boot

[PATCH v1] driver: fastboot: Fix getvar_get_part_info when flash nand
by qianfanguijin＠qq.com 27 Jan '22

27 Jan '22

From: qianfan Zhao <qianfanguijin(a)163.com> find_dev_and_part return 0 on success, 1 otherwise. So fastboot_nand_get_part_info follow this rule. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- drivers/fastboot/fb_getvar.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index d43f2cfee6..a7a8dc458f 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -114,7 +114,10 @@ static int getvar_get_part_info(const char *part_name, char *response, struct part_info *part_info; r = fastboot_nand_get_part_info(part_name, &part_info, response); - if (r >= 0 && size) + + if (r) /* find nand device and part failed */ + r = -ENODEV; + else if (size) *size = part_info->size; # else fastboot_fail("this storage is not supported in bootloader", response); -- 2.17.1

3 2

Possiable memory conflict with fdt memory region
by Fangsuo Wu 27 Jan '22

27 Jan '22

Hi, in image_setup_linux(), stage 1: Boot_fdt_add_mem_rsv_regions() is called first to add the mem reserve regions which prevents u-boot from using them to store the initrd or the fdt blob; stage 2: Then boot_relocate_fdt() is called to reserve or alloc fdt blob from the avaiable lmb region. But it seems at stage 1 it doesn't cover up all mem reserve regions. For example, if CMD_PSTORE is configured, fdt_fixup_pstore(blob) will add pstore to reserved-memory node in fdt in image_setup_libfdt() after stage 2 , which may conflict with fdt memory region and can't be detected since fdt_fixup_pstore doesn't call lmb_reserve(lmb, pstrore addr, pstore len). In image_setup_libfdt, there are also other functions like ft_board_setup which may change existing reserved memory node's size and lead to the same issue. Do you think a common function is needed before boot_fdt_add_mem_rsv_regions() in stage 1? The function can be used to fix-up or add new reserved memory nodes. Thanks.

2 1

[PATCH 00/16] tools: Add support for signing devicetree blobs
by Simon Glass 27 Jan '22

27 Jan '22

At present mkimage supports signing FITs, the standard U-Boot image type. Various people are opposed to using FIT since: a) it requires adding support for FIT into other bootloaders, notably UEFI b) it requires packaging a kernel in this standard U-Boot format, meaning that distros must run 'mkimage' and deal with the kernel and initrd being inside a FIT The kernel and initrd can be dealt with in other ways. But without FIT, we have no standard way of signing and grouping FDT files. Instead we must include them in the distro as separate files. In particular, some sort of mechanism for verifying FDT files is needed. One option would be to tack a signature on before or after the file, processing it accordingly. But due to the nature of the FDT binary format, it is possible to embed a signature inside the FDT itself, which is very convenient. This series provides a tool, fdt_sign, which can add a signature to an FDT. The signature can be checked later, preventing any change to the FDT, other than in permitted nodes (e.g. /chosen). This series also provides a fdt_check_sign tool, used to check signatures. Both of these tools are stand-alone do not require mkimage or FIT. As with FIT signing, multiple signatures are possible, but in this case that requires that fit_sign be called once for each signature. To make the check fail if a signature does not match, it should be marked as 'required' using the -r flag to fdt_sign. Run-time support for checking FDT signatures could be added to U-Boot fairly easily, but needs further discussion as the correct plumbing needs to be determined. For now there is absolutely no configurability in the signature mechanism. It would of course be possible to adjust which nodes are signed, as is done for FIT, but that needs further discussion also. The omission of the /chosen node is implemented in h_exclude_nodes() like this: if (type == FDT_IS_NODE) { /* Ignore the chosen node as well as /signature and subnodes */ if (!strcmp("/chosen", data) || !strncmp("/signature", data, 10)) return 0; } Man pages are provided with example usage of the tools. Use this to view them: man -l doc/fdt_check_sign.1 This series also includes various clean-ups noticed along the way, as well as refactoring to avoid code duplication with the new tools. The last four patches are the new code. This series is available at u-boot-dm/fdt-sign-working : https://source.denx.de/u-boot/custodians/u-boot-dm/-/tree/fdt-sign-working Simon Glass (16): rsa: Add debugging for failure cases fit_check_sign: Update help to mention the key is in a dtb tools: Move copyfile() into a common file tools: Avoid leaving extra data at the end of copied files tools: Improve comments in signing functions tools: Drop unused name in image-host tools: Avoid confusion between keys and signatures tools: Tidy up argument order in fit_config_check_sig() tools: Pass the key blob around image: Return destination node for add_verify_data() method tools: Pass public-key node through to caller tools: mkimage: Show where signatures/keys are written tools: Add a new tool to sign FDT blobs tools: Add a new tool to check FDT-blob signatures test: Add a test for FDT signing tools: Add man pages for fdt_sign and fdt_check_sign MAINTAINERS | 7 + boot/image-fit-sig.c | 151 +++++++++---- boot/image-fit.c | 12 +- common/spl/spl_fit.c | 3 +- doc/fdt_check_sign.1 | 74 +++++++ doc/fdt_sign.1 | 111 ++++++++++ include/image.h | 80 ++++++- include/u-boot/ecdsa.h | 5 +- include/u-boot/rsa.h | 5 +- lib/ecdsa/ecdsa-libcrypto.c | 4 +- lib/rsa/rsa-sign.c | 5 +- lib/rsa/rsa-verify.c | 13 +- test/py/tests/test_fdt_sign.py | 83 ++++++++ test/py/tests/test_vboot.py | 21 +- test/py/tests/vboot/sign-fdt.dts | 23 ++ test/py/tests/vboot_comm.py | 22 ++ tools/Makefile | 10 +- tools/fdt-host.c | 353 +++++++++++++++++++++++++++++++ tools/fdt_check_sign.c | 85 ++++++++ tools/fdt_host.h | 46 ++++ tools/fdt_sign.c | 210 ++++++++++++++++++ tools/fit_check_sign.c | 4 +- tools/fit_common.c | 69 ++++++ tools/fit_common.h | 23 ++ tools/fit_image.c | 59 +----- tools/image-fdt-sig.c | 254 ++++++++++++++++++++++ tools/image-host.c | 155 +++++++++++--- tools/imagetool.h | 4 + tools/mkimage.c | 4 + 29 files changed, 1714 insertions(+), 181 deletions(-) create mode 100644 doc/fdt_check_sign.1 create mode 100644 doc/fdt_sign.1 create mode 100644 test/py/tests/test_fdt_sign.py create mode 100644 test/py/tests/vboot/sign-fdt.dts create mode 100644 test/py/tests/vboot_comm.py create mode 100644 tools/fdt-host.c create mode 100644 tools/fdt_check_sign.c create mode 100644 tools/fdt_sign.c create mode 100644 tools/image-fdt-sig.c -- 2.34.0.rc1.387.gb447b232ab-goog

5 40

[PATCH] usb: Use the first available device for ehci_gadget
by Sean Anderson 26 Jan '22

26 Jan '22

For whatever reason, usb_setup_ehci_gadget removes and probes USB device 0. However, not all systems have a device 0. Use the first device instead. The device probed should probably have something to do with the controller (as specified by e.g. ums <controller> or fastboot <controller>). In fact, I find it odd that we probe the USB device in the first place, because this is just to set up the gadget itself. Presumably, the controller should be probed by usb_gadget_initialize somehow. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- drivers/usb/host/usb-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index fd39c3345c..27e2fc6fcd 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -396,7 +396,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) int ret; /* Find the old device and remove it */ - ret = uclass_find_device_by_seq(UCLASS_USB, 0, &dev); + ret = uclass_find_first_device(UCLASS_USB, &dev); if (ret) return ret; ret = device_remove(dev, DM_REMOVE_NORMAL); @@ -419,7 +419,7 @@ int usb_remove_ehci_gadget(struct ehci_ctrl **ctlrp) int ret; /* Find the old device and remove it */ - ret = uclass_find_device_by_seq(UCLASS_USB, 0, &dev); + ret = uclass_find_first_device(UCLASS_USB, &dev); if (ret) return ret; ret = device_remove(dev, DM_REMOVE_NORMAL); -- 2.25.1

2 2

[PATCH] introduce CONFIG_DEVICE_TREE_INCLUDES
by Rasmus Villemoes 26 Jan '22

26 Jan '22

The build system already automatically looks for and includes an in-tree *-u-boot.dtsi when building the control .dtb. However, there are some things that are awkward to maintain in such an in-tree file, most notably the metadata associated to public keys used for verified boot. The only "official" API to get that metadata into the .dtb is via mkimage, as a side effect of building an actual signed image. But there are multiple problems with that. First of all, the final U-Boot (be it U-Boot proper or an SPL) image is built based on a binary image, the .dtb, and possibly some other binary artifacts. So modifying the .dtb after the build requires the meta-buildsystem (Yocto, buildroot, whatnot) to know about and repeat some of the steps that are already known to and handled by U-Boot's build system, resulting in needless duplication of code. It's also somewhat annoying and inconsistent to have a .dtb file in the build folder which is not generated by the command listed in the corresponding .cmd file (that of course applies to any generated file). So the contents of the /signature node really needs to be baked into the .dtb file when it is first created, which means providing the relevant data in the form of a .dtsi file. One could in theory put that data into the *-u-boot.dtsi file, but it's more convenient to be able to provide it externally: For example, when developing for a customer, it's common to use a set of dummy keys for development, while the consultants do not (and should not) have access to the actual keys used in production. For such a setup, it's easier if the keys used are chosen via the meta-buildsystem and the path(s) patched in during the configure step. And of course, nothing prevents anybody from having DEVICE_TREE_INCLUDES point at files maintained in git, or for that matter from including the public key metadata in the *-u-boot.dtsi directly and ignore this feature. There are other uses for this, e.g. in combination with ENV_IMPORT_FDT it can be used for providing the contents of the /config/environment node, so I don't want to tie this exclusively to use for verified boot. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- Getting the public key metadata into .dtsi form can be done with a little scripting (roughly 'mkimage -K' of a dummy image followed by 'dtc -I dtb -O dts'). I have a script that does that, along with options to set 'required' and 'required-mode' properties, include u-boot,dm-spl properties in case one wants to check U-Boot proper from SPL with the verified boot mechanism, etc. I'm happy to share that script if this gets accepted, but it's moot if this is rejected. I have previously tried to get an fdt_add_pubkey tool accepted [1,2] to disentangle the kernel and u-boot builds (or u-boot and SPL builds for that matter!), but as I've since realized, that isn't quite enough - the above points re modifying the .dtb after it is created but before that is used to create further build artifacts still stand. However, such a tool could still be useful for creating the .dtsi info without the private keys being present, and my key2dtsi.sh script could easily be modified to use a tool like that should it ever appear. [1] https://lore.kernel.org/u-boot/20200211094818.14219-3-rasmus.villemoes@prev… [2] https://lore.kernel.org/u-boot/2184f1e6dd6247e48133c76205feeabe@kaspersky.c… dts/Kconfig | 9 +++++++++ scripts/Makefile.lib | 2 ++ 2 files changed, 11 insertions(+) diff --git a/dts/Kconfig b/dts/Kconfig index dabe0080c1..593dddbaf0 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -139,6 +139,15 @@ config DEFAULT_DEVICE_TREE It can be overridden from the command line: $ make DEVICE_TREE=<device-tree-name> +config DEVICE_TREE_INCLUDES + string "Extra .dtsi files to include when building DT control" + depends on OF_CONTROL + help + U-Boot's control .dtb is usually built from an in-tree .dts + file, plus (if available) an in-tree U-Boot-specific .dtsi + file. This option specifies a space-separated list of extra + .dtsi files that will also be used. + config OF_LIST string "List of device tree files to include for DT control" depends on SPL_LOAD_FIT || MULTI_DTB_FIT diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 78bbebe7e9..a2accba940 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -320,6 +320,8 @@ quiet_cmd_dtc = DTC $@ # Bring in any U-Boot-specific include at the end of the file cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \ + $(foreach f,$(subst $(quote),,$(CONFIG_DEVICE_TREE_INCLUDES)), \ + echo '$(pound)include "$(f)"' >> $(pre-tmp);) \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ -- 2.31.1

5 23

[PATCH 0/6] moveconfig: Improve the pylist score a little
by Simon Glass 25 Jan '22

25 Jan '22

There are about 240 warnings in this file. This series refactors file reading and writing, which fixes about 40. It also includes a patch to make a start on the rest, reducing the count to about 160. It also tidies up quoting. There are still about 160 warnings left. Simon Glass (6): moveconfig: Use single quotes moveconfig: Convert to ArgumentParser moveconfig: Drop check for old Python moveconfig: Use a function to write files moveconfig: Use a function to read files moveconfig: Fix some pylint errors tools/moveconfig.py | 645 +++++++++++++++++++++++--------------------- 1 file changed, 336 insertions(+), 309 deletions(-) -- 2.34.1.173.g76aa8bc2d0-goog

3 17

[PATCH 1/5] moveconfig: Correct operation of the 'imply' feature
by Simon Glass 25 Jan '22

25 Jan '22

This doesn't work anymore, since the Kconfig update. The script has no tests so we did not notice. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/moveconfig.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 373b395fda4..8d059be039d 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -1263,7 +1263,7 @@ def find_kconfig_rules(kconf, config, imply_config): sym = kconf.syms.get(imply_config) if sym: for sel, cond in (sym.selects + sym.implies): - if sel == config: + if sel.name == config: return sym return None @@ -1291,7 +1291,8 @@ def check_imply_rule(kconf, config, imply_config): nodes = sym.nodes if len(nodes) != 1: return '%d locations' % len(nodes) - fname, linenum = nodes[0].filename, nodes[0].linern + node = nodes[0] + fname, linenum = node.filename, node.linenr cwd = os.getcwd() if cwd and fname.startswith(cwd): fname = fname[len(cwd) + 1:] @@ -1382,7 +1383,7 @@ def do_imply_config(config_list, add_imply, imply_flags, skip_added, """ kconf = KconfigScanner().conf if check_kconfig else None if add_imply and add_imply != 'all': - add_imply = add_imply.split() + add_imply = add_imply.split(',') # key is defconfig name, value is dict of (CONFIG_xxx, value) config_db = {} @@ -1414,7 +1415,7 @@ def do_imply_config(config_list, add_imply, imply_flags, skip_added, else: # New defconfig defconfig = line - # Work through each target config option in tern, independently + # Work through each target config option in turn, independently for config in config_list: defconfigs = defconfig_db.get(config) if not defconfigs: -- 2.34.1.173.g76aa8bc2d0-goog

2 9

[PATCH 1/1] test: fix pylint warnings in test_env.py
by Heinrich Schuchardt 25 Jan '22

25 Jan '22

* assert does not need parentheses * add module docstring * fix misspelled constant True * limit lines to 100 characters Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/py/tests/test_env.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 9bed2f48d7..39fad4194b 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -2,11 +2,13 @@ # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# Test operation of shell commands relating to environment variables. +""" +Test operation of shell commands relating to environment variables. +""" import os import os.path -from subprocess import call, check_call, CalledProcessError +from subprocess import call, CalledProcessError import pytest import u_boot_utils @@ -191,7 +193,7 @@ def test_env_printenv_non_existent(state_test_env): c = state_test_env.u_boot_console with c.disable_check('error_notification'): response = c.run_command('printenv %s' % var) - assert(response == '## Error: "%s" not defined' % var) + assert response == '## Error: "%s" not defined' % var @pytest.mark.buildconfigspec('cmd_echo') def test_env_unset_non_existent(state_test_env): @@ -256,7 +258,7 @@ def test_env_import_checksum_no_size(state_test_env): with c.disable_check('error_notification'): response = c.run_command('env import -c %s -' % addr) - assert(response == '## Error: external checksum format must pass size') + assert response == '## Error: external checksum format must pass size' @pytest.mark.buildconfigspec('cmd_importenv') def test_env_import_whitelist_checksum_no_size(state_test_env): @@ -269,7 +271,7 @@ def test_env_import_whitelist_checksum_no_size(state_test_env): with c.disable_check('error_notification'): response = c.run_command('env import -c %s - foo1 foo2 foo4' % addr) - assert(response == '## Error: external checksum format must pass size') + assert response == '## Error: external checksum format must pass size' @pytest.mark.buildconfigspec('cmd_exportenv') @pytest.mark.buildconfigspec('cmd_importenv') @@ -358,12 +360,14 @@ def test_env_info(state_test_env): assert '= true' in l or '= false' in l nb_line += 1 else: - assert true + assert True assert nb_line == 3 response = c.run_command('env info -p -d') - assert 'Default environment is used' in response or "Environment was loaded from persistent storage" in response - assert 'Environment can be persisted' in response or "Environment cannot be persisted" in response + assert 'Default environment is used' in response or \ + "Environment was loaded from persistent storage" in response + assert 'Environment can be persisted' in response or \ + "Environment cannot be persisted" in response response = c.run_command('env info -p -d -q') assert response == "" -- 2.32.0

2 1

[PATCH 0/6] Add a pylint check
by Simon Glass 25 Jan '22

25 Jan '22

U-Boot has about 60k lines of Python code. This is quite small relative to the total code size, but it is still important to keep the code style consistent. This series allows pylint to be run on Python files within U-Boot to detect any changes that reduce the current pylint ‘score’ of any modules. It works by comparing the current state against a base state kept in a file. The check is invoked with: make pylint This should gradually help to improve the code. The series also tidies up a few minor nits to produce better pylint output. Simon Glass (6): .gitignore: Ignore any html coverage directory dtoc: Fix up a code comment that confuses pylint patman: Update the list of modules tools: Add init files for Python tools Makefile: Add a pylint checker to the build Azure/GitLab CI: Add the pylint checker .azure-pipelines.yml | 17 +++ .gitignore | 7 ++ .gitlab-ci.yml | 12 +++ Makefile | 45 +++++++- doc/develop/index.rst | 8 ++ doc/develop/python_cq.rst | 80 ++++++++++++++ scripts/pylint.base | 211 +++++++++++++++++++++++++++++++++++++ tools/binman/__init__.py | 0 tools/buildman/__init__.py | 0 tools/dtoc/__init__.py | 0 tools/dtoc/dtb_platdata.py | 2 +- tools/patman/__init__.py | 9 +- 12 files changed, 386 insertions(+), 5 deletions(-) create mode 100644 doc/develop/python_cq.rst create mode 100644 scripts/pylint.base create mode 100644 tools/binman/__init__.py create mode 100644 tools/buildman/__init__.py create mode 100644 tools/dtoc/__init__.py -- 2.34.0.rc2.393.gf8c9666880-goog

3 17

[PATCH 1/2] ARM: dts: stm32: Synchronize DHCOR DTs with Linux 5.15.12
by Marek Vasut 24 Jan '22

24 Jan '22

Synchronize DH DHCOR DTs with Linux commit 25960cafa06e ("Linux 5.15.12"). There is no functional change to the resulting DTs. The eeprom0 alias is now reinstated in SoM u-boot dtsi, the PHY reset GPIO is reinstated in AV96 u-boot dtsi. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- arch/arm/dts/Makefile | 1 - arch/arm/dts/stm32mp157a-avenger96.dts | 8 - arch/arm/dts/stm32mp157a-dhcor-avenger96.dts | 38 ++ .../stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 2 + arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 202 +------- arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi | 431 ++++++++++++++++++ arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi | 7 +- ...-io3v3.dtsi => stm32mp15xx-dhcor-som.dtsi} | 30 +- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 + 9 files changed, 503 insertions(+), 224 deletions(-) delete mode 100644 arch/arm/dts/stm32mp157a-avenger96.dts create mode 100644 arch/arm/dts/stm32mp157a-dhcor-avenger96.dts create mode 100644 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi rename arch/arm/dts/{stm32mp15xx-dhcor-io3v3.dtsi => stm32mp15xx-dhcor-som.dtsi} (91%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index b3e2a9c9d77..03064632999 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1098,7 +1098,6 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb dtb-$(CONFIG_STM32MP15x) += \ stm32mp157a-dk1.dtb \ - stm32mp157a-avenger96.dtb \ stm32mp157a-icore-stm32mp1-ctouch2.dtb \ stm32mp157a-icore-stm32mp1-edimm2.2.dtb \ stm32mp157a-microgea-stm32mp1-microdev2.0.dtb \ diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-avenger96.dts deleted file mode 100644 index 9c165104fbe..00000000000 --- a/arch/arm/dts/stm32mp157a-avenger96.dts +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -/* - * Copyright (C) Linaro Ltd 2019 - All Rights Reserved - * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> - */ - -/* This is kept for backward compatibility and will be removed */ -#include "stm32mp15xx-dhcor-avenger96.dts" diff --git a/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts b/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts new file mode 100644 index 00000000000..2e3c9fbb4eb --- /dev/null +++ b/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved + * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> + * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> + * + * DHCOR STM32MP1 variant: + * DHCR-STM32MP157A-C065-R102-V18-SPI-C-01LG + * DHCOR PCB number: 586-100 or newer + * Avenger96 PCB number: 588-200 or newer + */ + +/dts-v1/; + +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xx-dhcor-som.dtsi" +#include "stm32mp15xx-dhcor-avenger96.dtsi" + +/ { + model = "Arrow Electronics STM32MP157A Avenger96 board"; + compatible = "arrow,stm32mp157a-avenger96", "dh,stm32mp157a-dhcor-som", + "st,stm32mp157"; +}; + +&m_can1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&m_can1_pins_b>; + pinctrl-1 = <&m_can1_sleep_pins_b>; + status = "disabled"; +}; + +&m_can2 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&m_can2_pins_a>; + pinctrl-1 = <&m_can2_sleep_pins_a>; + status = "disabled"; +}; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi index c96eba99c5e..6e6543b5e4a 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi @@ -21,6 +21,8 @@ &ethernet0 { + phy-reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>; + mdio0 { ethernet-phy@7 { reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts index 0e860e5cf88..76ac5a873c1 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts @@ -7,206 +7,12 @@ /dts-v1/; -#include "stm32mp15xx-dhcor-io1v8.dtsi" -#include "stm32mp15xx-dhcor-avenger96-u-boot.dtsi" +#include "stm32mp151.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xx-dhcor-som.dtsi" +#include "stm32mp15xx-dhcor-avenger96.dtsi" / { model = "Arrow Electronics STM32MP15xx Avenger96 board"; compatible = "arrow,stm32mp15xx-avenger96", "st,stm32mp15x"; - - aliases { - eeprom0 = &eeprom0; - ethernet0 = &ethernet0; - mmc0 = &sdmmc1; - serial0 = &uart4; - serial1 = &uart7; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - led { - compatible = "gpio-leds"; - led1 { - label = "green:user0"; - gpios = <&gpioz 7 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - default-state = "off"; - }; - - led2 { - label = "green:user1"; - gpios = <&gpiof 3 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "mmc0"; - default-state = "off"; - }; - - led3 { - label = "green:user2"; - gpios = <&gpiog 0 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "mmc1"; - default-state = "off"; - }; - - led4 { - label = "green:user3"; - gpios = <&gpiog 1 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "none"; - default-state = "off"; - panic-indicator; - }; - - led5 { - label = "yellow:wifi"; - gpios = <&gpioz 3 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy0tx"; - default-state = "off"; - }; - - led6 { - label = "blue:bt"; - gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "bluetooth-power"; - default-state = "off"; - }; - }; - - sd_switch: regulator-sd_switch { - compatible = "regulator-gpio"; - regulator-name = "sd_switch"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2900000>; - regulator-type = "voltage"; - regulator-always-on; - - gpios = <&gpioi 5 GPIO_ACTIVE_HIGH>; - gpios-states = <0>; - states = <1800000 0x1>, - <2900000 0x0>; - }; -}; - -&ethernet0 { - status = "okay"; - pinctrl-0 = <&ethernet0_rgmii_pins_c>; - pinctrl-1 = <&ethernet0_rgmii_sleep_pins_c>; - pinctrl-names = "default", "sleep"; - phy-mode = "rgmii"; - max-speed = <1000>; - phy-handle = <&phy0>; - phy-reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>; - - mdio0 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,dwmac-mdio"; - phy0: ethernet-phy@7 { - reg = <7>; - }; - }; -}; - -&i2c1 { /* X6 I2C1 */ - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_b>; - i2c-scl-rising-time-ns = <185>; - i2c-scl-falling-time-ns = <20>; - status = "okay"; - /delete-property/dmas; - /delete-property/dma-names; -}; - -&i2c2 { /* X6 I2C2 */ - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_c>; - i2c-scl-rising-time-ns = <185>; - i2c-scl-falling-time-ns = <20>; - status = "okay"; - /delete-property/dmas; - /delete-property/dma-names; -}; - -&i2c4 { - eeprom0: eeprom@53 { - compatible = "atmel,24c02"; - reg = <0x53>; - pagesize = <16>; - }; -}; - -&sdmmc1 { - pinctrl-names = "default", "opendrain", "sleep"; - pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>; - pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_b>; - pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_b>; - disable-wp; - st,sig-dir; - st,neg-edge; - st,use-ckin; - bus-width = <4>; - vmmc-supply = <&vdd_sd>; - vqmmc-supply = <&sd_switch>; - status = "okay"; -}; - -&sdmmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_c>; - non-removable; - no-sd; - no-sdio; - st,neg-edge; - bus-width = <8>; - vmmc-supply = <&v3v3>; - mmc-ddr-3_3v; - status = "okay"; -}; - -&spi2 { - pinctrl-names = "default"; - pinctrl-0 = <&spi2_pins_a>; - status = "okay"; -}; - -&uart4 { - /* On Low speed expansion header */ - label = "LS-UART1"; - pinctrl-names = "default"; - pinctrl-0 = <&uart4_pins_b>; - status = "okay"; -}; - -&uart7 { - /* On Low speed expansion header */ - label = "LS-UART0"; - pinctrl-names = "default"; - pinctrl-0 = <&uart7_pins_a>; - status = "okay"; -}; - -&usbh_ehci { - phys = <&usbphyc_port0>; - phy-names = "usb"; - status = "okay"; -}; - -&usbotg_hs { - pinctrl-0 = <&usbotg_hs_pins_a>; - pinctrl-names = "default"; - phys = <&usbphyc_port1 0>; - phy-names = "usb2-phy"; - status = "okay"; -}; - -&usbphyc { - status = "okay"; -}; - -&usbphyc_port0 { - phy-supply = <&vdd_usb>; -}; - -&usbphyc_port1 { - phy-supply = <&vdd_usb>; }; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi new file mode 100644 index 00000000000..6885948f302 --- /dev/null +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi @@ -0,0 +1,431 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +/* + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved + * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> + * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> + */ + +/* Avenger96 uses DHCOR SoM configured for 1V8 IO operation */ +#include "stm32mp15xx-dhcor-io1v8.dtsi" + +/ { + aliases { + ethernet0 = &ethernet0; + mmc0 = &sdmmc1; + serial0 = &uart4; + serial1 = &uart7; + serial2 = &usart2; + spi0 = &qspi; + }; + + /* XTal Q1 */ + cec_clock: clk-cec-fixed { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + hdmi-out { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con: endpoint { + remote-endpoint = <&adv7513_out>; + }; + }; + }; + + led { + compatible = "gpio-leds"; + led1 { + label = "green:user0"; + gpios = <&gpioz 7 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + + led2 { + label = "green:user1"; + gpios = <&gpiof 3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc0"; + default-state = "off"; + }; + + led3 { + label = "green:user2"; + gpios = <&gpiog 0 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc1"; + default-state = "off"; + }; + + led4 { + label = "green:user3"; + gpios = <&gpiog 1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "none"; + default-state = "off"; + panic-indicator; + }; + }; + + sd_switch: regulator-sd_switch { + compatible = "regulator-gpio"; + regulator-name = "sd_switch"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2900000>; + regulator-type = "voltage"; + regulator-always-on; + + gpios = <&gpioi 5 GPIO_ACTIVE_HIGH>; + gpios-states = <0>; + states = <1800000 0x1>, + <2900000 0x0>; + }; + + sound { + compatible = "audio-graph-card"; + label = "STM32MP1-AV96-HDMI"; + dais = <&sai2a_port>; + status = "okay"; + }; + + wlan_pwr: regulator-wlan { + compatible = "regulator-fixed"; + + regulator-name = "wl-reg"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpioz 3 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; +}; + +&adc { + pinctrl-names = "default"; + pinctrl-0 = <&adc12_ain_pins_b>; + vdd-supply = <&vdd>; + vdda-supply = <&vdda>; + vref-supply = <&vdda>; + status = "okay"; + + adc1: adc@0 { + st,adc-channels = <0 1 6>; + st,min-sample-time-nsecs = <5000>; + status = "okay"; + }; + + adc2: adc@100 { + st,adc-channels = <0 1 2>; + st,min-sample-time-nsecs = <5000>; + status = "okay"; + }; +}; + +&ethernet0 { + status = "okay"; + pinctrl-0 = <&ethernet0_rgmii_pins_c>; + pinctrl-1 = <&ethernet0_rgmii_sleep_pins_c>; + pinctrl-names = "default", "sleep"; + phy-mode = "rgmii"; + max-speed = <1000>; + phy-handle = <&phy0>; + + mdio0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + + phy0: ethernet-phy@7 { + reg = <7>; + + rxc-skew-ps = <1500>; + rxdv-skew-ps = <540>; + rxd0-skew-ps = <420>; + rxd1-skew-ps = <420>; + rxd2-skew-ps = <420>; + rxd3-skew-ps = <420>; + + txc-skew-ps = <1440>; + txen-skew-ps = <540>; + txd0-skew-ps = <420>; + txd1-skew-ps = <420>; + txd2-skew-ps = <420>; + txd3-skew-ps = <420>; + }; + }; +}; + +&gpioa { + gpio-line-names = "", "", "", "", + "", "", "", "", + "", "", "", "AV96-K", + "AV96-I", "", "AV96-A", ""; +}; + +&gpiob { + gpio-line-names = "", "", "", "", + "", "AV96-J", "", "", + "", "", "", "AV96-B", + "", "AV96-L", "", ""; +}; + +&gpioc { + gpio-line-names = "", "", "", "AV96-C", + "", "", "", "", + "", "", "", "", + "", "", "", ""; +}; + +&gpiod { + gpio-line-names = "", "", "", "", + "", "", "", "", + "AV96-D", "", "", "", + "", "", "AV96-E", "AV96-F"; +}; + +&gpiof { + gpio-line-names = "", "", "", "", + "", "", "", "", + "", "", "", "", + "AV96-G", "AV96-H", "", ""; +}; + +&i2c1 { /* X6 I2C1 */ + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins_b>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c2 { /* X6 I2C2 */ + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins_c>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c4 { + hdmi-transmitter@3d { + compatible = "adi,adv7513"; + reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>; + reg-names = "main", "edid", "cec", "packet"; + clocks = <&cec_clock>; + clock-names = "cec"; + + avdd-supply = <&v3v3>; + dvdd-supply = <&v3v3>; + pvdd-supply = <&v3v3>; + dvdd-3v-supply = <&v3v3>; + bgvdd-supply = <&v3v3>; + + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpiog>; + + status = "okay"; + + adi,input-depth = <8>; + adi,input-colorspace = "rgb"; + adi,input-clock = "1x"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + adv7513_in: endpoint { + remote-endpoint = <&ltdc_ep0_out>; + }; + }; + + port@1 { + reg = <1>; + adv7513_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + + port@2 { + reg = <2>; + adv7513_i2s0: endpoint { + remote-endpoint = <&sai2a_endpoint>; + }; + }; + }; + }; +}; + +&ltdc { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&ltdc_pins_d>; + pinctrl-1 = <&ltdc_sleep_pins_d>; + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + ltdc_ep0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&adv7513_in>; + }; + }; +}; + +&sai2 { + clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sai2a_pins_c>; + pinctrl-1 = <&sai2a_sleep_pins_c>; + clock-names = "pclk", "x8k", "x11k"; + status = "okay"; + + sai2a: audio-controller@4400b004 { + #clock-cells = <0>; + dma-names = "tx"; + clocks = <&rcc SAI2_K>; + clock-names = "sai_ck"; + status = "okay"; + + sai2a_port: port { + sai2a_endpoint: endpoint { + remote-endpoint = <&adv7513_i2s0>; + format = "i2s"; + mclk-fs = <256>; + }; + }; + }; +}; + +&sdmmc1 { + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>; + pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_b>; + pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_b>; + cd-gpios = <&gpioi 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disable-wp; + st,sig-dir; + st,neg-edge; + st,use-ckin; + bus-width = <4>; + vmmc-supply = <&vdd_sd>; + vqmmc-supply = <&sd_switch>; + status = "okay"; +}; + +&sdmmc2 { + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_c>; + pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_c>; + pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_c>; + bus-width = <8>; + mmc-ddr-1_8v; + no-sd; + no-sdio; + non-removable; + st,neg-edge; + vmmc-supply = <&v3v3>; + vqmmc-supply = <&vdd_io>; + status = "okay"; +}; + +&sdmmc3 { + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc3_b4_pins_b>; + pinctrl-1 = <&sdmmc3_b4_od_pins_b>; + pinctrl-2 = <&sdmmc3_b4_sleep_pins_b>; + broken-cd; + non-removable; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&wlan_pwr>; + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + brcmf: bcrmf@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + +&spi2 { + pinctrl-names = "default"; + pinctrl-0 = <&spi2_pins_a>; + cs-gpios = <&gpioi 0 0>; + status = "disabled"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&uart4 { + /* On Low speed expansion header */ + label = "LS-UART1"; + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins_b>; + status = "okay"; +}; + +&uart7 { + /* On Low speed expansion header */ + label = "LS-UART0"; + pinctrl-names = "default"; + pinctrl-0 = <&uart7_pins_a>; + uart-has-rtscts; + status = "okay"; +}; + +/* Bluetooth */ +&usart2 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&usart2_pins_a>; + pinctrl-1 = <&usart2_sleep_pins_a>; + st,hw-flow-ctrl; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + max-speed = <3000000>; + shutdown-gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>; + }; +}; + +&usbh_ehci { + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbotg_hs { + pinctrl-0 = <&usbotg_hs_pins_a>; + pinctrl-names = "default"; + phy-names = "usb2-phy"; + phys = <&usbphyc_port1 0>; + status = "okay"; + vbus-supply = <&vbus_otg>; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; +}; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi index 75435424d67..75172314d7a 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi @@ -1,12 +1,12 @@ // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) /* + * Copyright (C) Linaro Ltd 2019 - All Rights Reserved + * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ -#include "stm32mp15xx-dhcor-io3v3.dtsi" - / { - /* Enpirion EP3A8LQI U2 on the 1V8 IO DHCOR */ + /* Enpirion EP3A8LQI U2 on the DHCOR */ vdd_io: regulator-buck-io { compatible = "regulator-fixed"; regulator-name = "buck-io"; @@ -20,5 +20,4 @@ &pwr_regulators { vdd-supply = <&vdd_io>; - vdd_3v3_usbfs-supply = <&vdd_usb>; }; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-som.dtsi similarity index 91% rename from arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi rename to arch/arm/dts/stm32mp15xx-dhcor-som.dtsi index 94cf80dbede..44ecc470858 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-som.dtsi @@ -4,9 +4,7 @@ * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ -/dts-v1/; -#include "stm32mp157.dtsi" #include "stm32mp15-pinctrl.dtsi" #include "stm32mp15xxac-pinctrl.dtsi" #include <dt-bindings/gpio/gpio.h> @@ -23,6 +21,14 @@ }; }; +&crc1 { + status = "okay"; +}; + +&dts { + status = "okay"; +}; + &i2c4 { pinctrl-names = "default"; pinctrl-0 = <&i2c4_pins_a>; @@ -35,7 +41,7 @@ pmic: stpmic@33 { compatible = "st,stpmic1"; reg = <0x33>; - interrupts-extended = <&exti 55 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; interrupt-controller; #interrupt-cells = <2>; status = "okay"; @@ -53,7 +59,7 @@ vddcore: buck1 { regulator-name = "vddcore"; - regulator-min-microvolt = <800000>; + regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1350000>; regulator-always-on; regulator-initial-mode = <0>; @@ -92,7 +98,6 @@ regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; interrupts = <IT_CURLIM_LDO1 0>; - interrupt-parent = <&pmic>; }; v2v8: ldo2 { @@ -100,7 +105,6 @@ regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; interrupts = <IT_CURLIM_LDO2 0>; - interrupt-parent = <&pmic>; }; vtt_ddr: ldo3 { @@ -114,7 +118,6 @@ vdd_usb: ldo4 { regulator-name = "vdd_usb"; interrupts = <IT_CURLIM_LDO4 0>; - interrupt-parent = <&pmic>; }; vdd_sd: ldo5 { @@ -122,7 +125,6 @@ regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; interrupts = <IT_CURLIM_LDO5 0>; - interrupt-parent = <&pmic>; regulator-boot-on; }; @@ -131,7 +133,6 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; interrupts = <IT_CURLIM_LDO6 0>; - interrupt-parent = <&pmic>; regulator-enable-ramp-delay = <300000>; }; @@ -143,20 +144,17 @@ bst_out: boost { regulator-name = "bst_out"; interrupts = <IT_OCP_BOOST 0>; - interrupt-parent = <&pmic>; }; vbus_otg: pwr_sw1 { regulator-name = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; - interrupt-parent = <&pmic>; regulator-active-discharge = <1>; }; vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - interrupt-parent = <&pmic>; regulator-active-discharge = <1>; }; }; @@ -173,6 +171,12 @@ status = "disabled"; }; }; + + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; &iwdg2 { @@ -194,7 +198,7 @@ #size-cells = <0>; status = "okay"; - flash0: spi-flash@0 { + flash0: flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi index 71375510b4a..338b674368a 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi @@ -15,6 +15,11 @@ / { u-boot,dm-pre-reloc; + + aliases { + eeprom0 = &eeprom0; + }; + config { dh,ddr3-coding-gpios = <&gpiog 0 0>, <&gpiog 1 0>; dh,som-coding-gpios = <&gpioz 7 0>, <&gpiof 3 0>; @@ -28,6 +33,9 @@ &i2c4 { u-boot,dm-pre-reloc; u-boot,dm-spl; + + eeprom0: eeprom@53 { + }; }; &i2c4_pins_a { -- 2.34.1

3 6