Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/fdt Initialise xhci_softc sc_ios



details:   https://anonhg.NetBSD.org/src/rev/1ac1845ad96f
branches:  trunk
changeset: 940712:1ac1845ad96f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Oct 15 09:32:40 2020 +0000

description:
Initialise xhci_softc sc_ios

diffstat:

 sys/arch/arm/nvidia/tegra_xusb.c       |  5 +++--
 sys/arch/mips/cavium/dev/octeon_xhci.c |  3 ++-
 sys/dev/fdt/dwc3_fdt.c                 |  5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diffs (69 lines):

diff -r 6346aaaffb5a -r 1ac1845ad96f sys/arch/arm/nvidia/tegra_xusb.c
--- a/sys/arch/arm/nvidia/tegra_xusb.c  Thu Oct 15 08:59:57 2020 +0000
+++ b/sys/arch/arm/nvidia/tegra_xusb.c  Thu Oct 15 09:32:40 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.20 2020/08/29 19:06:17 jakllsch Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.21 2020/10/15 09:33:17 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
 #include "opt_tegra.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.20 2020/08/29 19:06:17 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.21 2020/10/15 09:33:17 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -243,6 +243,7 @@
                return;
        }
        DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
+       sc->sc_ios = size;
 
        if (fdtbus_get_reg_byname(faa->faa_phandle, "fpci", &addr, &size) != 0) {
                aprint_error(": couldn't get registers\n");
diff -r 6346aaaffb5a -r 1ac1845ad96f sys/arch/mips/cavium/dev/octeon_xhci.c
--- a/sys/arch/mips/cavium/dev/octeon_xhci.c    Thu Oct 15 08:59:57 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_xhci.c    Thu Oct 15 09:32:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_xhci.c,v 1.2 2020/07/17 08:06:02 simonb Exp $ */
+/*     $NetBSD: octeon_xhci.c,v 1.3 2020/10/15 09:32:40 jmcneill Exp $ */
 /*     $OpenBSD: octxhci.c,v 1.4 2019/09/29 04:32:23 visa Exp $        */
 
 /*
@@ -115,6 +115,7 @@
        sc->sc_bus.ub_hcpriv = sc;
        sc->sc_bus.ub_dmatag = faa->faa_dmat;
        sc->sc_iot = &octxhci_bus_tag;
+       sc->sc_ios = size;
 
        child = of_find_bycompat(phandle, "synopsys,dwc3");
        if (child == -1) {
diff -r 6346aaaffb5a -r 1ac1845ad96f sys/dev/fdt/dwc3_fdt.c
--- a/sys/dev/fdt/dwc3_fdt.c    Thu Oct 15 08:59:57 2020 +0000
+++ b/sys/dev/fdt/dwc3_fdt.c    Thu Oct 15 09:32:40 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc3_fdt.c,v 1.10 2020/03/26 00:21:27 thorpej Exp $ */
+/* $NetBSD: dwc3_fdt.c,v 1.11 2020/10/15 09:33:44 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.10 2020/03/26 00:21:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.11 2020/10/15 09:33:44 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -278,6 +278,7 @@
        sc->sc_dev = self;
        sc->sc_bus.ub_hcpriv = sc;
        sc->sc_bus.ub_dmatag = faa->faa_dmat;
+       sc->sc_ios = size;
        sc->sc_iot = faa->faa_bst;
        if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh) != 0) {
                aprint_error(": couldn't map registers\n");



Home | Main Index | Thread Index | Old Index