diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-20 20:40:20 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-20 20:40:20 +0300 |
| commit | 2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2 (patch) | |
| tree | 96e28ce689933dd4ebd120309a9caa2e02897d48 /arch/mips | |
| parent | 3918376e91dac7711cf04bd06f8de80e797edfea (diff) | |
| parent | 8f880c3d89432e9988b23bb7099d6360c14a206f (diff) | |
| download | u-boot-2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- fdt_support: Add fdt_for_each_node_by_compatible() helper macro
(Marek)
- turris_omnia: Fixup SATA or PCIe nodes at runtime in DT blob (Pali)
- pci_mvebu: Add support for Kirkwood PCIe controllers (Pali)
- SPL: More verifications for kwbimage in SPL (Pali)
- mvebu: Remove comphy_update_map() (Pali)
- Minor misc stuff
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/mach-octeon/octeon_fdt.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/mips/mach-octeon/octeon_fdt.c b/arch/mips/mach-octeon/octeon_fdt.c index 9b16104ba7..0ccfe149dc 100644 --- a/arch/mips/mach-octeon/octeon_fdt.c +++ b/arch/mips/mach-octeon/octeon_fdt.c @@ -424,12 +424,8 @@ void __octeon_fixup_fdt_mac_addr(void) } /* Assign 78XX addresses in the order they appear in the device tree. */ - node = fdt_node_offset_by_compatible(working_fdt, -1, "cavium,octeon-7890-bgx-port"); - while (node != -FDT_ERR_NOTFOUND) { + fdt_for_each_node_by_compatible(node, working_fdt, -1, "cavium,octeon-7890-bgx-port") octeon_set_one_fdt_mac(node, &mac); - node = fdt_node_offset_by_compatible(working_fdt, node, - "cavium,octeon-7890-bgx-port"); - } } #endif @@ -450,11 +446,8 @@ void __octeon_fixup_fdt_uart(void) /* Device trees already have good values for fast simulator * output, real boards need the correct value. */ - node = fdt_node_offset_by_compatible(working_fdt, -1, "cavium,octeon-3860-uart"); - while (node != -FDT_ERR_NOTFOUND) { + fdt_for_each_node_by_compatible(node, working_fdt, -1, "cavium,octeon-3860-uart") fdt_setprop_inplace_cell(working_fdt, node, "clock-frequency", clk); - node = fdt_node_offset_by_compatible(working_fdt, node, "cavium,octeon-3860-uart"); - } } /** |