The branch main has been updated by adrian:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=dc1d78b2c2d293565017542006aeaed64a390196

commit dc1d78b2c2d293565017542006aeaed64a390196
Author:     Adrian Chadd <adr...@freebsd.org>
AuthorDate: 2025-04-05 20:30:13 +0000
Commit:     Adrian Chadd <adr...@freebsd.org>
CommitDate: 2025-04-08 03:45:07 +0000

    qcom_dwc3: update naming to match the later device tree drops.
    
    The device tree renamed master -> core, so rename the fields here.
    
    Locally tested:
    
    * IPQ4019, ASUS RT-AC58U, USB works (enough for umass!)
    
    Differential Revision:  https://reviews.freebsd.org/D49684
    Reviewed by:    manu
---
 sys/dev/qcom_dwc3/qcom_dwc3.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c
index 5c5a47989441..7352d658d326 100644
--- a/sys/dev/qcom_dwc3/qcom_dwc3.c
+++ b/sys/dev/qcom_dwc3/qcom_dwc3.c
@@ -58,7 +58,7 @@ static struct ofw_compat_data compat_data[] = {
 struct qcom_dwc3_softc {
        struct simplebus_softc  sc;
        device_t                dev;
-       clk_t                   clk_master;
+       clk_t                   clk_core;
        clk_t                   clk_sleep;
        clk_t                   clk_mock_utmi;
        int                     type;
@@ -98,8 +98,8 @@ qcom_dwc3_attach(device_t dev)
        sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
 
        /* Mandatory clocks */
-       if (clk_get_by_ofw_name(dev, 0, "master", &sc->clk_master) != 0) {
-               device_printf(dev, "Cannot get master clock\n");
+       if (clk_get_by_ofw_name(dev, 0, "core", &sc->clk_core) != 0) {
+               device_printf(dev, "Cannot get core clock\n");
                return (ENXIO);
        }
 
@@ -121,10 +121,10 @@ qcom_dwc3_attach(device_t dev)
        /*
         * Now, iterate over the clocks and enable them.
         */
-       err = clk_enable(sc->clk_master);
+       err = clk_enable(sc->clk_core);
        if (err != 0) {
                device_printf(dev, "Could not enable clock %s\n",
-                   clk_get_name(sc->clk_master));
+                   clk_get_name(sc->clk_core));
                return (ENXIO);
        }
        err = clk_enable(sc->clk_sleep);

Reply via email to