svn commit: r269959 - in head/sys/arm: arm at91

[Warner Losh]

Author: imp
Date: Thu Aug 14 04:21:25 2014
New Revision: 269959
URL: http://svnweb.freebsd.org/changeset/base/269959

Log:
  Add support for multipass to Atmel, for both FDT and !FDT cases.

Modified:
  head/sys/arm/arm/nexus.c
  head/sys/arm/at91/at91_aic.c
  head/sys/arm/at91/at91_pit.c
  head/sys/arm/at91/at91_pmc.c
  head/sys/arm/at91/std.atmel

Modified: head/sys/arm/arm/nexus.c
==============================================================================
--- head/sys/arm/arm/nexus.c	Thu Aug 14 04:21:20 2014	(r269958)
+++ head/sys/arm/arm/nexus.c	Thu Aug 14 04:21:25 2014	(r269959)
@@ -362,4 +362,3 @@ nexus_ofw_map_intr(device_t dev, device_
 	return (interrupt);
 }
 #endif
- 

Modified: head/sys/arm/at91/at91_aic.c
==============================================================================
--- head/sys/arm/at91/at91_aic.c	Thu Aug 14 04:21:20 2014	(r269958)
+++ head/sys/arm/at91/at91_aic.c	Thu Aug 14 04:21:25 2014	(r269959)
@@ -176,13 +176,9 @@ static driver_t at91_aic_driver = {
 static devclass_t at91_aic_devclass;
 
 #ifdef FDT
-DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, NULL,
-    NULL);
-#else
-DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, NULL,
-    NULL);
-#endif
-/* not yet
 EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass,
     NULL, NULL, BUS_PASS_INTERRUPT);
-*/
+#else
+EARLY_DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass,
+    NULL, NULL, BUS_PASS_INTERRUPT);
+#endif

Modified: head/sys/arm/at91/at91_pit.c
==============================================================================
--- head/sys/arm/at91/at91_pit.c	Thu Aug 14 04:21:20 2014	(r269958)
+++ head/sys/arm/at91/at91_pit.c	Thu Aug 14 04:21:25 2014	(r269959)
@@ -214,9 +214,9 @@ static driver_t at91_pit_driver = {
 static devclass_t at91_pit_devclass;
 
 #ifdef FDT
-DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, NULL,
-    NULL);
+EARLY_DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass,
+    NULL, NULL, BUS_PASS_TIMER);
 #else
-DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, NULL,
-    NULL);
+EARLY_DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass,
+    NULL, NULL, BUS_PASS_TIMER);
 #endif

Modified: head/sys/arm/at91/at91_pmc.c
==============================================================================
--- head/sys/arm/at91/at91_pmc.c	Thu Aug 14 04:21:20 2014	(r269958)
+++ head/sys/arm/at91/at91_pmc.c	Thu Aug 14 04:21:25 2014	(r269959)
@@ -709,9 +709,9 @@ static driver_t at91_pmc_driver = {
 static devclass_t at91_pmc_devclass;
 
 #ifdef FDT
-DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, NULL,
-    NULL);
+EARLY_DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass,
+    NULL, NULL, BUS_PASS_CPU);
 #else
-DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, NULL,
-    NULL);
+EARLY_DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass,
+    NULL, NULL, BUS_PASS_CPU);
 #endif

Modified: head/sys/arm/at91/std.atmel
==============================================================================
--- head/sys/arm/at91/std.atmel	Thu Aug 14 04:21:20 2014	(r269958)
+++ head/sys/arm/at91/std.atmel	Thu Aug 14 04:21:25 2014	(r269959)
@@ -11,3 +11,5 @@ device		at91sam9x5
 
 # bring in the sam specific timers and such
 device		at91sam9
+
+options		ARM_DEVICE_MULTIPASS