Mon Jul 31 04:59:47 2023 UTC ()
dw2c_fdt: Terminate statements by ; instead of , (from Mori Hiroki)
No binary changes.


(rin)
diff -r1.12 -r1.13 src/sys/dev/fdt/dwc2_fdt.c
cvs diff -r1.12 -r1.13 src/sys/dev/fdt/dwc2_fdt.c (expand / switch to unified diff)

--- src/sys/dev/fdt/dwc2_fdt.c 2021/08/07 16:19:10 1.12
+++ src/sys/dev/fdt/dwc2_fdt.c 2023/07/31 04:59:47 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: dwc2_fdt.c,v 1.12 2021/08/07 16:19:10 thorpej Exp $ */ 1/* $NetBSD: dwc2_fdt.c,v 1.13 2023/07/31 04:59:47 rin Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Nick Hudson 8 * by Nick Hudson
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.12 2021/08/07 16:19:10 thorpej Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.13 2023/07/31 04:59:47 rin Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/mutex.h> 38#include <sys/mutex.h>
39#include <sys/bus.h> 39#include <sys/bus.h>
40#include <sys/workqueue.h> 40#include <sys/workqueue.h>
41 41
42#include <dev/fdt/fdtvar.h> 42#include <dev/fdt/fdtvar.h>
43 43
44#include <dev/usb/usb.h> 44#include <dev/usb/usb.h>
45#include <dev/usb/usbdi.h> 45#include <dev/usb/usbdi.h>
46#include <dev/usb/usbdivar.h> 46#include <dev/usb/usbdivar.h>
@@ -205,33 +205,33 @@ dwc2_fdt_deferred(device_t self) @@ -205,33 +205,33 @@ dwc2_fdt_deferred(device_t self)
205 } 205 }
206 sc->sc_dwc2.sc_child = config_found(sc->sc_dwc2.sc_dev, 206 sc->sc_dwc2.sc_child = config_found(sc->sc_dwc2.sc_dev,
207 &sc->sc_dwc2.sc_bus, usbctlprint, CFARGS_NONE); 207 &sc->sc_dwc2.sc_bus, usbctlprint, CFARGS_NONE);
208} 208}
209 209
210static void 210static void
211dwc2_fdt_amlogic_params(struct dwc2_fdt_softc *sc, struct dwc2_core_params *params) 211dwc2_fdt_amlogic_params(struct dwc2_fdt_softc *sc, struct dwc2_core_params *params)
212{ 212{
213 dwc2_set_all_params(params, -1); 213 dwc2_set_all_params(params, -1);
214 214
215 params->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; 215 params->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
216 params->speed = DWC2_SPEED_PARAM_HIGH; 216 params->speed = DWC2_SPEED_PARAM_HIGH;
217 params->dma_enable = 1; 217 params->dma_enable = 1;
218 params->enable_dynamic_fifo = 1, 218 params->enable_dynamic_fifo = 1;
219 params->host_rx_fifo_size = 512; 219 params->host_rx_fifo_size = 512;
220 params->host_nperio_tx_fifo_size = 500; 220 params->host_nperio_tx_fifo_size = 500;
221 params->host_perio_tx_fifo_size = 500; 221 params->host_perio_tx_fifo_size = 500;
222 params->host_channels = 16; 222 params->host_channels = 16;
223 params->phy_type = DWC2_PHY_TYPE_PARAM_UTMI; 223 params->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
224 params->reload_ctl = 1, 224 params->reload_ctl = 1;
225 params->ahbcfg = GAHBCFG_HBSTLEN_INCR8 << GAHBCFG_HBSTLEN_SHIFT; 225 params->ahbcfg = GAHBCFG_HBSTLEN_INCR8 << GAHBCFG_HBSTLEN_SHIFT;
226#ifdef DWC2_POWER_DOWN_PARAM_NONE 226#ifdef DWC2_POWER_DOWN_PARAM_NONE
227 params->power_down = DWC2_POWER_DOWN_PARAM_NONE; 227 params->power_down = DWC2_POWER_DOWN_PARAM_NONE;
228#endif 228#endif
229} 229}
230 230
231static void 231static void
232dwc2_fdt_rockchip_params(struct dwc2_fdt_softc *sc, struct dwc2_core_params *params) 232dwc2_fdt_rockchip_params(struct dwc2_fdt_softc *sc, struct dwc2_core_params *params)
233{ 233{
234 dwc2_set_all_params(params, -1); 234 dwc2_set_all_params(params, -1);
235 235
236 params->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; 236 params->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
237 params->host_rx_fifo_size = 525; 237 params->host_rx_fifo_size = 525;