svn commit: r346524 - in stable/11/sys/arm: allwinner cavium/cns11xx freescale/imx freescale/vybrid samsung/exynos ti/usb xilinx

[Ian Lepore]

Author: ian
Date: Mon Apr 22 04:56:41 2019
New Revision: 346524
URL: https://svnweb.freebsd.org/changeset/base/346524

Log:
  MFC r333073-r333074
  
  r333073 by manu:
  arm: Fix duplicate ahci DRIVER_MODULE
  
  Name each ahci driver uniquely.
  This remove the warning printed at each arm boot :
  module_register: cannot register simplebus/ahci from kernel; already loaded from kernel
  
  r333074 by manu:
  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

Modified:
  stable/11/sys/arm/allwinner/a10_ahci.c
  stable/11/sys/arm/allwinner/a10_ehci.c
  stable/11/sys/arm/cavium/cns11xx/ehci_ebus.c
  stable/11/sys/arm/freescale/imx/imx6_ahci.c
  stable/11/sys/arm/freescale/vybrid/vf_ehci.c
  stable/11/sys/arm/samsung/exynos/exynos5_ehci.c
  stable/11/sys/arm/ti/usb/omap_ehci.c
  stable/11/sys/arm/xilinx/zy7_ehci.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/allwinner/a10_ahci.c
==============================================================================
--- stable/11/sys/arm/allwinner/a10_ahci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/allwinner/a10_ahci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -392,4 +392,4 @@ static driver_t ahci_ata_driver = {
         sizeof(struct ahci_controller)
 };
 
-DRIVER_MODULE(ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(a10_ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);

Modified: stable/11/sys/arm/allwinner/a10_ehci.c
==============================================================================
--- stable/11/sys/arm/allwinner/a10_ehci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/allwinner/a10_ehci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -361,5 +361,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(a10_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(a10_ehci, usb, 1, 1, 1);

Modified: stable/11/sys/arm/cavium/cns11xx/ehci_ebus.c
==============================================================================
--- stable/11/sys/arm/cavium/cns11xx/ehci_ebus.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/cavium/cns11xx/ehci_ebus.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -244,5 +244,5 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, econaarm, ehci_driver, ehci_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(ebus_ehci, econaarm, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(ebus_ehci, usb, 1, 1, 1);

Modified: stable/11/sys/arm/freescale/imx/imx6_ahci.c
==============================================================================
--- stable/11/sys/arm/freescale/imx/imx6_ahci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/freescale/imx/imx6_ahci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -353,4 +353,4 @@ static driver_t ahci_ata_driver = {
 	sizeof(struct ahci_controller)
 };
 
-DRIVER_MODULE(ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(imx6_ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);

Modified: stable/11/sys/arm/freescale/vybrid/vf_ehci.c
==============================================================================
--- stable/11/sys/arm/freescale/vybrid/vf_ehci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/freescale/vybrid/vf_ehci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -166,8 +166,8 @@ 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(vybrid_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(vybrid_ehci, usb, 1, 1, 1);
 
 static void
 vybrid_ehci_post_reset(struct ehci_softc *ehci_softc)

Modified: stable/11/sys/arm/samsung/exynos/exynos5_ehci.c
==============================================================================
--- stable/11/sys/arm/samsung/exynos/exynos5_ehci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/samsung/exynos/exynos5_ehci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -131,8 +131,8 @@ 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(exynos_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(exynos_ehci, usb, 1, 1, 1);
 
 /*
  * Public methods

Modified: stable/11/sys/arm/ti/usb/omap_ehci.c
==============================================================================
--- stable/11/sys/arm/ti/usb/omap_ehci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/ti/usb/omap_ehci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -453,4 +453,4 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, omap_uhh, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(omap_ehci, omap_uhh, ehci_driver, ehci_devclass, 0, 0);

Modified: stable/11/sys/arm/xilinx/zy7_ehci.c
==============================================================================
--- stable/11/sys/arm/xilinx/zy7_ehci.c	Mon Apr 22 04:23:49 2019	(r346523)
+++ stable/11/sys/arm/xilinx/zy7_ehci.c	Mon Apr 22 04:56:41 2019	(r346524)
@@ -372,5 +372,5 @@ static driver_t ehci_driver = {
 };
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, NULL, NULL);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(zy7_ehci, simplebus, ehci_driver, ehci_devclass, NULL, NULL);
+MODULE_DEPEND(zy7_ehci, usb, 1, 1, 1);