The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=68dceb7b8f0e48c0878d3678b93d8625d98f58ef
commit 68dceb7b8f0e48c0878d3678b93d8625d98f58ef Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2026-02-19 23:10:34 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2026-02-26 23:08:13 +0000 qoriq / nxp: fix spelling in device_set_desc() The product series is called NXP QorIQ Layerscape. Remove the extra 'e. [1] Fix spelling of NXP, which is not NPX, in two places. [2] Reviewed by: mmel, emaste [1] Reported by: Kevin Bowling (kevin.bowling kev009.com), qoriq_dw_pci.c [2] Differential Revision: https://reviews.freebsd.org/D55388 (cherry picked from commit a4e30909ec983f7986954e6c509ea21422561d84) (cherry picked from commit c3ed2f3e414497ab3cf6ade17e52a87f07a547e6) --- sys/arm64/conf/std.nxp | 2 +- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp index b4552fadaff4..367d058bf666 100644 --- a/sys/arm64/conf/std.nxp +++ b/sys/arm64/conf/std.nxp @@ -6,7 +6,7 @@ options SOC_NXP_LS # I2C -device pca954x # NPX I2C bus multiplexer / switches +device pca954x # NXP I2C bus multiplexer / switches device pcf8563 # NXP Real-time clock/calendar device tca64xx # NXP I2C gpio expander device pcf85063 # NXP Real-time clock diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index b6eecba48c39..f4ca024c941f 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -176,7 +176,7 @@ qorif_dw_pci_probe(device_t dev) if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); - device_set_desc(dev, "NPX Layaerscape PCI-E Controller"); + device_set_desc(dev, "NXP QorIQ Layerscape PCI-E Controller"); return (BUS_PROBE_DEFAULT); }
