Author: manu
Date: Fri Jun 19 18:27:22 2020
New Revision: 362404
URL: https://svnweb.freebsd.org/changeset/base/362404
Log:
MFC r360013, r360018, r360021
r360013:
arm: Fix duplicate ehci DRIVER_MODULE
Name each ehci driver uniquely.
This remove the warning printed at each arm boot :
module_register: cannot register simplebus/ehci from kernel; already loaded
from kernel
A similar fix was done in r333074 but imx_ehci wasn't renamed and
generic_ehci wasn't
present at that time.
r360018:
arm: Fix duplicate pcib DRIVER_MODULE
Name each pcib driver uniquely.
This remove the warning printed at each arm boot :
module_register: cannot register simplebus/pcib from kernel; already loaded
from kernel
r360021:
arm: nvidia: pcie: Rename class name to pcib
Reported by: jhb
Modified:
stable/12/sys/arm/mv/mv_pci.c
stable/12/sys/arm/nvidia/tegra_pcie.c
stable/12/sys/dev/usb/controller/ehci_imx.c
stable/12/sys/dev/usb/controller/generic_ehci_fdt.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm/mv/mv_pci.c
==============================================================================
--- stable/12/sys/arm/mv/mv_pci.c Fri Jun 19 18:25:27 2020
(r362403)
+++ stable/12/sys/arm/mv/mv_pci.c Fri Jun 19 18:27:22 2020
(r362404)
@@ -409,8 +409,8 @@ static driver_t mv_pcib_driver = {
devclass_t pcib_devclass;
-DRIVER_MODULE(pcib, ofwbus, mv_pcib_driver, pcib_devclass, 0, 0);
-DRIVER_MODULE(pcib, pcib_ctrl, mv_pcib_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(mv_pcib, ofwbus, mv_pcib_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(mv_pcib, pcib_ctrl, mv_pcib_driver, pcib_devclass, 0, 0);
static struct mtx pcicfg_mtx;
Modified: stable/12/sys/arm/nvidia/tegra_pcie.c
==============================================================================
--- stable/12/sys/arm/nvidia/tegra_pcie.c Fri Jun 19 18:25:27 2020
(r362403)
+++ stable/12/sys/arm/nvidia/tegra_pcie.c Fri Jun 19 18:27:22 2020
(r362404)
@@ -1632,5 +1632,5 @@ static device_method_t tegra_pcib_methods[] = {
static devclass_t pcib_devclass;
DEFINE_CLASS_1(pcib, tegra_pcib_driver, tegra_pcib_methods,
sizeof(struct tegra_pcib_softc), ofw_pci_driver);
-DRIVER_MODULE(pcib, simplebus, tegra_pcib_driver, pcib_devclass,
+DRIVER_MODULE(tegra_pcib, simplebus, tegra_pcib_driver, pcib_devclass,
NULL, NULL);
Modified: stable/12/sys/dev/usb/controller/ehci_imx.c
==============================================================================
--- stable/12/sys/dev/usb/controller/ehci_imx.c Fri Jun 19 18:25:27 2020
(r362403)
+++ stable/12/sys/dev/usb/controller/ehci_imx.c Fri Jun 19 18:27:22 2020
(r362404)
@@ -510,5 +510,5 @@ static driver_t ehci_driver = {
static devclass_t ehci_devclass;
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(imx_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(imx_ehci, usb, 1, 1, 1);
Modified: stable/12/sys/dev/usb/controller/generic_ehci_fdt.c
==============================================================================
--- stable/12/sys/dev/usb/controller/generic_ehci_fdt.c Fri Jun 19 18:25:27
2020 (r362403)
+++ stable/12/sys/dev/usb/controller/generic_ehci_fdt.c Fri Jun 19 18:27:22
2020 (r362404)
@@ -251,5 +251,5 @@ DEFINE_CLASS_1(ehci, ehci_fdt_driver, ehci_fdt_methods
static devclass_t ehci_fdt_devclass;
-DRIVER_MODULE(ehci, simplebus, ehci_fdt_driver, ehci_fdt_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(generic_ehci, simplebus, ehci_fdt_driver, ehci_fdt_devclass, 0,
0);
+MODULE_DEPEND(generic_ehci, usb, 1, 1, 1);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
