diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c --- a/sys/arm/ti/am335x/am335x_dmtimer.c +++ b/sys/arm/ti/am335x/am335x_dmtimer.c @@ -277,6 +277,9 @@ device_set_descf(dev, "AM335x DMTimer%d", tmr_num); + if (bootverbose == 0) + device_quiet(dev); + return(BUS_PROBE_DEFAULT); } @@ -298,9 +301,9 @@ 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 --- a/sys/arm/ti/am335x/am335x_dmtpps.c +++ b/sys/arm/ti/am335x/am335x_dmtpps.c @@ -435,6 +435,8 @@ return (ENXIO); device_set_descf(dev, "AM335x PPS-Capture DMTimer%d", tmr_num); + if (bootverbose == 0) + device_quiet(dev); return(BUS_PROBE_DEFAULT); } @@ -485,9 +487,9 @@ 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 --- a/sys/arm/ti/am335x/am335x_lcd.c +++ b/sys/arm/ti/am335x/am335x_lcd.c @@ -941,6 +941,10 @@ device_set_desc(dev, "AM335x LCD controller"); + if (bootverbose == 0) + device_quiet(dev); + + #ifdef DEV_SC err = sc_probe_unit(device_get_unit(dev), device_get_flags(dev) | SC_AUTODETECT_KBD); @@ -974,10 +978,10 @@ 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); + /* Fixme: Cant find any reference in DTS for dpll_disp_ck for now. */ + 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); } @@ -991,7 +995,8 @@ panel_node = fdt_find_compatible(root, "ti,tilcdc,panel", 1); if (panel_node != 0) { - device_printf(dev, "using static panel info\n"); + if (bootverbose) + device_printf(dev, "using static panel info\n"); if (am335x_read_panel_info(dev, panel_node, &sc->sc_panel)) { device_printf(dev, "failed to read panel info\n"); return (ENXIO); diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c --- a/sys/arm/ti/am335x/am335x_musb.c +++ b/sys/arm/ti/am335x/am335x_musb.c @@ -235,6 +235,9 @@ device_set_desc(dev, "TI AM33xx integrated USB OTG controller"); + if (bootverbose == 0) + device_quiet(dev); + return (BUS_PROBE_DEFAULT); } @@ -251,17 +254,17 @@ sc->sc_otg.sc_id = device_get_unit(dev); /* FIXME: The devicetree needs to be updated to get a handle to the gate - * usbotg_fck@47c. see TRM 8.1.12.2 CM_WKUP CM_CLKDCOLDO_DPLL_PER. + * usbotg_fck. see TRM 8.1.12.2 CM_WKUP CM_CLKDCOLDO_DPLL_PER. */ - err = clk_get_by_name(dev, "usbotg_fck@47c", &clk_usbotg_fck); + err = clk_get_by_name(dev, "usbotg_fck", &clk_usbotg_fck); if (err) { - device_printf(dev, "Can not find usbotg_fck@47c\n"); + device_printf(dev, "Can not find usbotg_fck\n"); return (ENXIO); } err = clk_enable(clk_usbotg_fck); if (err) { - device_printf(dev, "Can not enable usbotg_fck@47c\n"); + device_printf(dev, "Can not enable usbotg_fck\n"); return (ENXIO); } diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c --- a/sys/arm/ti/ti_pruss.c +++ b/sys/arm/ti/ti_pruss.c @@ -116,6 +116,12 @@ struct ts_ring_buf tstamps; }; +static struct ofw_compat_data compat_data[] = { + { "ti,pruss-v1", 1 }, + { "ti,pruss-v2", 1 }, + { NULL, 0 }, +}; + static struct cdevsw ti_pruss_cdevirq = { .d_version = D_VERSION, .d_name = "ti_pruss_irq", @@ -327,8 +333,9 @@ } if (enable) { - sc->sc_irq_devs[irq].sc_pdev = make_dev(&ti_pruss_cdevirq, 0, UID_ROOT, GID_WHEEL, - 0600, "pruss%d.irq%d", device_get_unit(sc->sc_pdev->si_drv1), irq); + sc->sc_irq_devs[irq].sc_pdev = make_dev(&ti_pruss_cdevirq, 0, + UID_ROOT, GID_WHEEL, 0600, + "pruss%d.irq%d", device_get_unit(sc->sc_pdev->si_drv1), irq); sc->sc_irq_devs[irq].sc_pdev->si_drv1 = &sc->sc_irq_devs[irq]; sc->sc_irq_devs[irq].tstamps.ctl.idx = 0; @@ -492,6 +499,7 @@ return (err); } + static int ti_pruss_probe(device_t dev) { @@ -499,13 +507,15 @@ if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (ofw_bus_is_compatible(dev, "ti,pruss-v1") || - ofw_bus_is_compatible(dev, "ti,pruss-v2")) { - device_set_desc(dev, "TI Programmable Realtime Unit Subsystem"); - return (BUS_PROBE_DEFAULT); - } + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "TI Programmable Realtime Unit Subsystem"); + + if (bootverbose == 0) + device_quiet(dev); - return (ENXIO); + return (BUS_PROBE_DEFAULT); } static int @@ -556,9 +566,9 @@ 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); }