The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=a9fd65d51106cbc9ab9428c5319363e27b3dd456
commit a9fd65d51106cbc9ab9428c5319363e27b3dd456 Author: Oskar Holmlund <[email protected]> AuthorDate: 2026-08-28 17:50:05 +0000 Commit: Oskar Holmlund <[email protected]> CommitDate: 2026-08-28 17:50:05 +0000 TI AM335x: update clock names Due to upstream has changed to use clock-output-names we need to update the names in our code aswell. Approved by: imp(earlier revison), manu(mentor) Tested by: Rick Richard Differential revision: https://reviews.freebsd.org/D46713 --- sys/arm/ti/am335x/am335x_dmtimer.c | 4 ++-- sys/arm/ti/am335x/am335x_dmtpps.c | 4 ++-- sys/arm/ti/am335x/am335x_lcd.c | 5 ++--- sys/arm/ti/ti_pruss.c | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c index 7b97e0f611f9..1e3410a9e93f 100644 --- a/sys/arm/ti/am335x/am335x_dmtimer.c +++ b/sys/arm/ti/am335x/am335x_dmtimer.c @@ -298,9 +298,9 @@ am335x_dmtimer_attach(device_t dev) return (ENXIO); } - err = clk_get_by_name(dev, "sys_clkin_ck@40", &sys_clkin); + err = clk_get_by_name(dev, "sys_clkin_ck", &sys_clkin); if (err != 0) { - device_printf(dev, "Cant find sys_clkin_ck@40 err: %d\n", err); + device_printf(dev, "Cant find sys_clkin_ck err: %d\n", err); return (ENXIO); } diff --git a/sys/arm/ti/am335x/am335x_dmtpps.c b/sys/arm/ti/am335x/am335x_dmtpps.c index 32f975a310de..19ad1002b8e2 100644 --- a/sys/arm/ti/am335x/am335x_dmtpps.c +++ b/sys/arm/ti/am335x/am335x_dmtpps.c @@ -485,9 +485,9 @@ dmtpps_attach(device_t dev) return (ENXIO); } - err = clk_get_by_name(dev, "sys_clkin_ck@40", &sys_clkin); + err = clk_get_by_name(dev, "sys_clkin_ck", &sys_clkin); if (err != 0) { - device_printf(dev, "Cant find sys_clkin_ck@40 err: %d\n", err); + device_printf(dev, "Cant find sys_clkin_ck err: %d\n", err); return (ENXIO); } diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c index 9bef1df0c64c..1addb90e12dc 100644 --- a/sys/arm/ti/am335x/am335x_lcd.c +++ b/sys/arm/ti/am335x/am335x_lcd.c @@ -974,10 +974,9 @@ am335x_lcd_attach(device_t dev) return (ENXIO); } - /* Fixme: Cant find any reference in DTS for dpll_disp_ck@498 for now. */ - err = clk_get_by_name(dev, "dpll_disp_ck@498", &sc->sc_clk_dpll_disp_ck); + err = clk_get_by_name(dev, "dpll_disp_ck", &sc->sc_clk_dpll_disp_ck); if (err != 0) { - device_printf(dev, "Cant get dpll_disp_ck@49\n"); + device_printf(dev, "Cant get dpll_disp_ck\n"); return (ENXIO); } diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c index bae1de9f2ddf..6b28c5316e92 100644 --- a/sys/arm/ti/ti_pruss.c +++ b/sys/arm/ti/ti_pruss.c @@ -556,9 +556,9 @@ ti_pruss_attach(device_t dev) return (ENXIO); } - err = clk_get_by_name(dev, "pruss_ocp_gclk@530", &pruss_ocp_gclk); + err = clk_get_by_name(dev, "pruss_ocp_gclk", &pruss_ocp_gclk); if (err) { - device_printf(dev, "Cant get pruss_ocp_gclk@530 err %d\n", err); + device_printf(dev, "Cant get pruss_ocp_gclk err %d\n", err); return (ENXIO); }
