Add device tree support for Altera/Intel Cyclone V

Close #3290.

4 files changed, 44 insertions, 214 deletions

diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h
index dc90322c..13d51ceb 100644
--- a/rtemsbsd/include/bsp/nexus-devices.h
+++ b/rtemsbsd/include/bsp/nexus-devices.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013, 2018 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -104,19 +104,19 @@ SYSINIT_DRIVER_REFERENCE(ukphy, miibus);
 
 #elif defined(LIBBSP_ARM_ALTERA_CYCLONE_V_BSP_H)
 
-#include <bsp/socal/hps.h>
-#include <bsp/irq.h>
+RTEMS_BSD_DEFINE_NEXUS_DEVICE(ofwbus, 0, 0, NULL);
+SYSINIT_DRIVER_REFERENCE(simplebus, ofwbus);
 
-RTEMS_BSD_DRIVER_DWC0((unsigned long) ALT_EMAC1_ADDR,
-		      ALT_INT_INTERRUPT_EMAC1_IRQ);
-RTEMS_BSD_DRIVER_MIPHY;
-RTEMS_BSD_DRIVER_DWCOTG0((unsigned long) ALT_USB1_ADDR,
-			 ALT_INT_INTERRUPT_USB1_IRQ);
-RTEMS_BSD_DRIVER_DWC_MMC;
-RTEMS_BSD_DRIVER_MMC;
+RTEMS_BSD_DRIVER_DW_ETH;
+RTEMS_BSD_DRIVER_PHY_MIC;
+
+RTEMS_BSD_DRIVER_DW_OTG;
 RTEMS_BSD_DRIVER_USB;
 RTEMS_BSD_DRIVER_USB_MASS;
 
+RTEMS_BSD_DRIVER_DW_MMC;
+RTEMS_BSD_DRIVER_MMC;
+
 #elif defined(LIBBSP_ARM_IMX_BSP_H)
 
 RTEMS_BSD_DEFINE_NEXUS_DEVICE(ofwbus, 0, 0, NULL);
diff --git a/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h b/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
index c650918d..ff545dc0 100644
--- a/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
+++ b/rtemsbsd/include/machine/rtems-bsd-nexus-bus.h
@@ -45,11 +45,8 @@
  *   RTEMS_BSD_DRIVER_PC_LEGACY
  *
  *  USB:
- *   RTEMS_BSD_DRIVER_DWCOTG0
- *   RTEMS_BSD_DRIVER_DWCOTG0_BASE_ADDR
- *    RTEMS_BSD_DRIVER_DWCOTG0_IRQ
+ *   RTEMS_BSD_DRIVER_DW_OTG
  *   RTEMS_BSD_DRIVER_LPC32XX_OHCI
- *   RTEMS_BSD_DRIVER_DWC_MMC
  *   RTEMS_BSD_DRIVER_MMC
  *   RTEMS_BSD_DRIVER_USB
  *   RTEMS_BSD_DRIVER_USB_MASS
@@ -79,7 +76,7 @@
  *   RTEMS_BSD_DRIVER_E1000PHY
  *   RTEMS_BSD_DRIVER_ICSPHY
  *   RTEMS_BSD_DRIVER_REPHY
- *   RTEMS_BSD_DRIVER_MIPHY
+ *   RTEMS_BSD_DRIVER_PHY_MIC
  */
 
 #if !defined(RTEMS_BSD_NEXUS_BUS_h)
@@ -179,23 +176,10 @@ extern "C" {
 /*
  * Designware/Synopsys OTG USB Controller.
  */
-#if !defined(RTEMS_BSD_DRIVER_DWCOTG0)
-  #define RTEMS_BSD_DRIVER_DWCOTG0(_base, _irq)                  \
-    static const rtems_bsd_device_resource dwcotg0_res[] = {     \
-      {                                                          \
-        .type = RTEMS_BSD_RES_MEMORY,                            \
-        .start_request = 0,                                      \
-        .start_actual = (_base)                                  \
-      }, {                                                       \
-        .type = RTEMS_BSD_RES_IRQ,                               \
-        .start_request = 0,                                      \
-        .start_actual = (_irq)                                   \
-      }                                                          \
-    };                                                           \
-    RTEMS_BSD_DEFINE_NEXUS_DEVICE(dwcotg, 0,                     \
-                                  RTEMS_ARRAY_SIZE(dwcotg0_res), \
-                                  &dwcotg0_res[0])
-#endif /* RTEMS_BSD_DRIVER_DWCOTG0 */
+#if !defined(RTEMS_BSD_DRIVER_DW_OTG)
+  #define RTEMS_BSD_DRIVER_DW_OTG                                           \
+    SYSINIT_DRIVER_REFERENCE(dwcotg, simplebus)
+#endif /* RTEMS_BSD_DRIVER_DW_OTG */
 
 /*
  * LPC32XX OHCI.
@@ -225,10 +209,10 @@ extern "C" {
 /*
  * Designware/Synopsys MMC.
  */
-#if !defined(RTEMS_BSD_DRIVER_DWC_MMC)
-  #define RTEMS_BSD_DRIVER_DWC_MMC                                \
-    RTEMS_BSD_DEFINE_NEXUS_DEVICE(dw_mmc, 0, 0, NULL)
-#endif /* RTEMS_BSD_DRIVER_DWC_MMC */
+#if !defined(RTEMS_BSD_DRIVER_DW_MMC)
+  #define RTEMS_BSD_DRIVER_DW_MMC                                \
+    SYSINIT_DRIVER_REFERENCE(dw_mmc, simplebus)
+#endif /* RTEMS_BSD_DRIVER_DW_MMC */
 
 /*
  * Atmel Media Card Interface (MCI).
@@ -249,7 +233,7 @@ extern "C" {
     RTEMS_BSD_DEFINE_NEXUS_DEVICE(at91_mci, 0,                     \
                                   RTEMS_ARRAY_SIZE(at91_mci0_res), \
                                   &at91_mci0_res[0])
-#endif /* RTEMS_BSD_DRIVER_DWC0 */
+#endif /* RTEMS_BSD_DRIVER_AT91_MCI0 */
 
 /*
  * MMC Driver.
@@ -391,23 +375,10 @@ extern "C" {
 /*
  * Designware/Synopsys Ethernet MAC Controller.
  */
-#if !defined(RTEMS_BSD_DRIVER_DWC0)
-  #define RTEMS_BSD_DRIVER_DWC0(_base, _irq)                     \
-    static const rtems_bsd_device_resource dwc0_res[] = {        \
-      {                                                          \
-        .type = RTEMS_BSD_RES_MEMORY,                            \
-        .start_request = 0,                                      \
-        .start_actual = (_base)                                  \
-      }, {                                                       \
-        .type = RTEMS_BSD_RES_IRQ,                               \
-        .start_request = 0,                                      \
-        .start_actual = (_irq)                                   \
-      }                                                          \
-    };                                                           \
-    RTEMS_BSD_DEFINE_NEXUS_DEVICE(dwc, 0,                        \
-                                  RTEMS_ARRAY_SIZE(dwc0_res),    \
-                                  &dwc0_res[0])
-#endif /* RTEMS_BSD_DRIVER_DWC0 */
+#if !defined(RTEMS_BSD_DRIVER_DW_ETH)
+  #define RTEMS_BSD_DRIVER_DW_ETH                                   \
+    SYSINIT_DRIVER_REFERENCE(dwc, simplebus);
+#endif /* RTEMS_BSD_DRIVER_DW_ETH */
 
 /*
  * NXP QorIQ Network Driver.
@@ -501,10 +472,10 @@ extern "C" {
 /*
  * MI PHY.
  */
-#if !defined(RTEMS_BSD_DRIVER_MIPHY)
-  #define RTEMS_BSD_DRIVER_MIPHY                  \
+#if !defined(RTEMS_BSD_DRIVER_PHY_MIC)
+  #define RTEMS_BSD_DRIVER_PHY_MIC                  \
     SYSINIT_DRIVER_REFERENCE(micphy, miibus);
-#endif /* RTEMS_BSD_DRIVER_MIPHY */
+#endif /* RTEMS_BSD_DRIVER_PHY_MIC */
 
 #ifdef __cplusplus
 }
diff --git a/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c b/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c
index c493dca7..c4e3130b 100644
--- a/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c
+++ b/rtemsbsd/sys/dev/dw_mmc/dw_mmc.c
@@ -51,6 +51,10 @@
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
 #include <dev/dw_mmc/dw_mmcreg.h>
 
 #include <dev/mmc/bridge.h>
@@ -222,10 +226,21 @@ dw_mmc_fini(struct dw_mmc_softc *sc)
 	WR4(sc, DW_MMC_CTRL, DW_MMC_CTRL_FIFO_RESET | DW_MMC_CTRL_RESET);
 }
 
+static struct ofw_compat_data compat_data[] = {
+	{"altr,socfpga-dw-mshc",	1},
+	{NULL,				0},
+};
+
 static int
 dw_mmc_probe(device_t dev)
 {
 
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
+		return (ENXIO);
+
 	device_set_desc(dev, "DesignWare Mobile Storage Host");
 	return (0);
 }
@@ -1102,6 +1117,6 @@ static driver_t dw_mmc_driver = {
 
 static devclass_t dw_mmc_devclass;
 
-DRIVER_MODULE(dw_mmc, nexus, dw_mmc_driver, dw_mmc_devclass, NULL, NULL);
+DRIVER_MODULE(dw_mmc, simplebus, dw_mmc_driver, dw_mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, dw_mmc, mmc_driver, mmc_devclass, NULL, NULL);
 MODULE_DEPEND(dw_mmc, mmc, 1, 1, 1);
diff --git a/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c b/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c
deleted file mode 100644
index 97be3ad3..00000000
--- a/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * Copyright (c) 2012 Hans Petter Selasky.
- * Copyright (c) 2015 embedded brains GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/rtems-bsd-kernel-space.h>
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/condvar.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/rman.h>
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-
-#include <dev/usb/usb_core.h>
-#include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
-#include <dev/usb/usb_util.h>
-
-#include <dev/usb/usb_controller.h>
-#include <dev/usb/usb_bus.h>
-
-#include <dev/usb/controller/dwc_otg.h>
-
-static device_probe_t dwc_otg_probe;
-static device_detach_t dwc_otg_detach;
-
-static int
-dwc_otg_probe(device_t dev)
-{
-
-	device_set_desc(dev, "DWC OTG 2.0 integrated USB controller");
-
-	return (BUS_PROBE_DEFAULT);
-}
-
-int
-dwc_otg_attach(device_t dev)
-{
-	struct dwc_otg_softc *sc = device_get_softc(dev);
-	char usb_mode[24];
-	int err;
-	int rid;
-
-	/* initialise some bus fields */
-	sc->sc_bus.parent = dev;
-	sc->sc_bus.devices = sc->sc_devices;
-	sc->sc_bus.devices_max = DWC_OTG_MAX_DEVICES;
-	sc->sc_bus.dma_bits = 32;
-
-	/* force USB host mode */
-	sc->sc_mode = DWC_MODE_HOST;
-
-	/* get all DMA memory */
-	if (usb_bus_mem_alloc_all(&sc->sc_bus,
-	    USB_GET_DMA_TAG(dev), NULL)) {
-		return (ENOMEM);
-	}
-	rid = 0;
-	sc->sc_io_res =
-	    bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
-
-	if (!(sc->sc_io_res)) {
-		err = ENOMEM;
-		goto error;
-	}
-	sc->sc_io_tag = rman_get_bustag(sc->sc_io_res);
-	sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
-	sc->sc_io_size = rman_get_size(sc->sc_io_res);
-
-	rid = 0;
-	sc->sc_irq_res =
-	    bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
-	if (sc->sc_irq_res == NULL)
-		goto error;
-
-	sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
-	if (sc->sc_bus.bdev == NULL)
-		goto error;
-
-	device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
-
-	err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY | INTR_MPSAFE,
-	    &dwc_otg_filter_interrupt, &dwc_otg_interrupt, sc, &sc->sc_intr_hdl);
-	if (err) {
-		sc->sc_intr_hdl = NULL;
-		goto error;
-	}
-	err = dwc_otg_init(sc);
-	if (err == 0) {
-		err = device_probe_and_attach(sc->sc_bus.bdev);
-	}
-	if (err)
-		goto error;
-
-
-	return (0);
-
-error:
-	return (ENXIO);
-}
-
-
-static device_method_t dwc_otg_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe, dwc_otg_probe),
-	DEVMETHOD(device_attach, dwc_otg_attach),
-	DEVMETHOD(device_suspend, bus_generic_suspend),
-	DEVMETHOD(device_resume, bus_generic_resume),
-	DEVMETHOD(device_shutdown, bus_generic_shutdown),
-
-	DEVMETHOD_END
-};
-
-driver_t dwc_otg_driver = {
-	.name = "dwcotg",
-	.methods = dwc_otg_methods,
-	.size = sizeof(struct dwc_otg_softc),
-};
-
-static devclass_t dwc_otg_devclass;
-
-DRIVER_MODULE(dwcotg, nexus, dwc_otg_driver, dwc_otg_devclass, 0, 0);
-MODULE_DEPEND(dwcotg, usb, 1, 1, 1);