imx: add glue to make imx devices attach to fdtbus

This is the first commit of probably a few that will
make the imx drivers attach to our new fdtbus.

The goal is to have nearly everything taken from FDT.

Author: bluerise

sys/arch/armv7/armv7/platform.c

@@ -43,6 +43,11 @@ platform_init()
 	extern struct armv7_platform omap_platform;
 	extern struct armv7_platform sunxi_platform;
 
+	if (fdt_next_node(0)) {
+		platform = &fdt_platform;
+		return;
+	}
+
 	switch (board_id) {
 #if NEXYNOS > 0
 	case BOARD_ID_EXYNOS5_CHROMEBOOK:
@@ -75,9 +80,7 @@ platform_init()
 		break;
 #endif
 	default:
-		if (fdt_next_node(0) == NULL)
-			printf("%s: board type 0x%x unknown", __func__, board_id);
-		platform = &fdt_platform;
+		panic("%s: board type 0x%x unknown", __func__, board_id);
 		break;
 	}
 }

sys/arch/armv7/conf/generic.imx

@@ -3,22 +3,34 @@ imx0		at mainbus?
 
 # iMX on-chip devices
 imxccm*		at imx?			# clock control module
+imxccm*		at fdt?			# clock control module
 imxtemp*	at imx?			# temperature sensor
 imxiomuxc*	at imx?			# iomux controller
+imxiomuxc*	at fdt?			# iomux controller
 imxdog*		at imx?			# watchdog timer
+imxdog*		at fdt?			# watchdog timer
 imxocotp*	at imx?			# on-chip otp controller
+imxocotp*	at fdt?			# on-chip otp controller
 imxgpio*	at imx?			# user-visible GPIO pins?
+imxgpio*	at fdt?			# user-visible GPIO pins?
 imxesdhc*	at imx?			# SDHC controller
+#imxesdhc*	at fdt?			# SDHC controller
 imxenet*	at imx?			# ethernet
+#imxenet*	at fdt?			# ethernet
 imxuart*	at imx?			# onboard uarts
+imxuart*	at fdt?			# onboard uarts
 imxiic*		at imx?			# i2c
+imxiic*		at fdt?			# i2c
 
 #imxpcibr*	at imx?			# PCIe controller host bridge
 #pci*		at imxpcibr?
 
-ahci*		at imx?			# AHCI/SATA
+imxahci*	at imx?			# AHCI/SATA
+ahci*		at imxahci?		# AHCI/SATA
 
-ehci*		at imx?			# EHCI (shim)
+imxehci*	at imx?			# EHCI
+imxehci*	at fdt?			# EHCI
+ehci*		at imxehci?		# EHCI (shim)
 
 sdmmc*		at imxesdhc?		# SD/MMC bus
 

sys/arch/armv7/exynos/exynos.c

@@ -20,12 +20,18 @@
 #include <sys/systm.h>
 
 #include <machine/bus.h>
+#include <machine/fdt.h>
 
 #include <armv7/armv7/armv7var.h>
 
 static int
 exynos_match(struct device *parent, void *cfdata, void *aux)
 {
+	/* If we're running with fdt, do not attach. */
+	/* XXX: Find a better way. */
+	if (fdt_next_node(0))
+		return (0);
+
 	switch (board_id)
 	{
 	case BOARD_ID_EXYNOS5_CHROMEBOOK:

sys/arch/armv7/fdt/fdt_machdep.c

@@ -30,6 +30,7 @@
 #include <armv7/armv7/armv7var.h>
 #include <armv7/armv7/armv7_machdep.h>
 #include <armv7/virt/pl011var.h>
+#include <armv7/imx/imxuartvar.h>
 
 extern int comcnspeed;
 extern int comcnmode;
@@ -45,12 +46,24 @@ static void
 fdt_platform_init_cons(void)
 {
 	void *node;
+	char *stdout_path;
 	struct fdt_memory mem;
 
 	if ((node = fdt_find_compatible("arm,pl011")) != NULL &&
 	    !fdt_get_memory_address(node, 0, &mem))
 		pl011cnattach(&armv7_bs_tag, mem.addr, comcnspeed, comcnmode);
 
+	if ((node = fdt_find_node("/chosen")) == NULL ||
+	    !fdt_node_property(node, "stdout-path", &stdout_path))
+		return;
+
+	if ((node = fdt_find_node(stdout_path)) == NULL)
+		return;
+
+	if (fdt_node_compatible("fsl,imx6q-uart", node) &&
+	    !fdt_get_memory_address(node, 0, &mem))
+		imxuartcnattach(&armv7_bs_tag, mem.addr, comcnspeed, comcnmode);
+
 	comdefaultrate = comcnspeed;
 }
 

sys/arch/armv7/imx/files.imx

@@ -7,49 +7,67 @@ file	arch/armv7/imx/imx_machdep.c		imx	needs-flag
 file	arch/armv7/imx/imx.c			imx
 file	arch/armv7/imx/imx6.c			imx
 
-# serial ports
-device imxuart
-attach	imxuart at imx
-file	arch/armv7/imx/imxuart.c		imxuart
+device imxocotp
+attach imxocotp at imx
+attach imxocotp at fdt with imxocotp_fdt
+file	arch/armv7/imx/imxocotp.c		imxocotp | imxocotp_fdt
 
 device imxccm
 attach imxccm at imx
-file	arch/armv7/imx/imxccm.c		imxccm
+attach imxccm at fdt with imxccm_fdt
+file	arch/armv7/imx/imxccm.c		imxccm | imxccm_fdt
 
 device imxtemp
 attach imxtemp at imx
 file	arch/armv7/imx/imxtemp.c	imxtemp
 
 device imxiomuxc
 attach imxiomuxc at imx
-file	arch/armv7/imx/imxiomuxc.c	imxiomuxc
+attach imxiomuxc at fdt with imxiomuxc_fdt
+file	arch/armv7/imx/imxiomuxc.c	imxiomuxc | imxiomuxc_fdt
 
 device imxdog
 attach imxdog at imx
-file	arch/armv7/imx/imxdog.c		imxdog
+attach imxdog at fdt with imxdog_fdt
+file	arch/armv7/imx/imxdog.c		imxdog | imxdog_fdt
 
-device imxocotp
-attach imxocotp at imx
-file	arch/armv7/imx/imxocotp.c		imxocotp
+# serial ports
+device imxuart
+attach	imxuart at imx
+attach	imxuart at fdt with imxuart_fdt
+file	arch/armv7/imx/imxuart.c		imxuart | imxuart_fdt
 
 device imxgpio
 attach imxgpio at imx
-file	arch/armv7/imx/imxgpio.c		imxgpio
+attach imxgpio at fdt with imxgpio_fdt
+file	arch/armv7/imx/imxgpio.c		imxgpio | imxgpio_fdt
 
 device	imxiic: i2cbus
 attach	imxiic at imx
-file	arch/armv7/imx/imxiic.c		imxiic
+attach	imxiic at fdt with imxiic_fdt
+file	arch/armv7/imx/imxiic.c		imxiic | imxiic_fdt
+
+device imxesdhc: sdmmcbus
+attach imxesdhc at imx
+#attach imxesdhc at fdt with imxesdhc_fdt
+file	arch/armv7/imx/imxesdhc.c		imxesdhc | imxesdhc_fdt
+
+device imxehci {}
+attach imxehci at imx
+attach imxehci at fdt with imxehci_fdt
+attach ehci at imxehci with ehci_imx
+file	arch/armv7/imx/imxehci.c		imxehci | imxehci_fdt
 
 device imxenet: ether, ifnet, mii, ifmedia
 attach imxenet at imx
-file	arch/armv7/imx/imxenet.c		imxenet
+#attach imxenet at fdt with imxenet_fdt
+file	arch/armv7/imx/imxenet.c		imxenet | imxenet_fdt
 
-attach ehci at imx with imxehci
-file	arch/armv7/imx/imxehci.c		imxehci
-
-device imxesdhc: sdmmcbus
-attach imxesdhc at imx
-file	arch/armv7/imx/imxesdhc.c		imxesdhc
+device imxahci {}
+attach imxahci at imx
+attach imxahci at fdt with imxahci_fdt
+attach ahci at imxahci with ahci_imx
+file	arch/armv7/imx/imxahci.c		imxahci | imxahci_fdt
 
 device imxpchb
 attach imxpchb at imx
@@ -71,6 +89,3 @@ file	arch/armv7/imx/maxim7301.c		maxgpio
 #device	imxpcibr {} : pcibus
 #attach	imxpcibr at imx
 #file	arch/armv7/imx/imxpcibr.c		imxpcibr
-
-attach ahci at imx with imxahci
-file	arch/armv7/imx/imxahci.c		imxahci

sys/arch/armv7/imx/imx.c

@@ -20,12 +20,18 @@
 #include <sys/systm.h>
 
 #include <machine/bus.h>
+#include <machine/fdt.h>
 
 #include <armv7/armv7/armv7var.h>
 
 static int
 imx_match(struct device *parent, void *cfdata, void *aux)
 {
+	/* If we're running with fdt, do not attach. */
+	/* XXX: Find a better way. */
+	if (fdt_next_node(0))
+		return (0);
+
 	switch (board_id)
 	{
 	case BOARD_ID_IMX6_CUBOXI:

sys/arch/armv7/imx/imx6.c

@@ -63,15 +63,11 @@
 #define USBPHY1_ADDR		0x020c9000
 #define USBPHY2_ADDR		0x020ca000
 #define USBOTG_ADDR		0x02184000
-#define USBOTG_EHCI_ADDR	0x02184100
 #define USBUH1_ADDR		0x02184200
-#define USBUH1_EHCI_ADDR	0x02184300
 #define USBUH2_ADDR		0x02184400
-#define USBUH2_EHCI_ADDR	0x02184500
 #define USBUH3_ADDR		0x02184600
-#define USBUH3_EHCI_ADDR	0x02184700
 #define USBNC_ADDR		0x02184800
-#define USBx_SIZE		0x100
+#define USBx_SIZE		0x200
 
 #define USBH1_IRQ	40
 #define USBH2_IRQ	41
@@ -313,7 +309,6 @@ struct armv7_dev imx6_devs[] = {
 	{ .name = "ehci",
 	  .unit = 0,
 	  .mem = {
-		  { USBUH1_EHCI_ADDR, USBx_SIZE },
 		  { USBUH1_ADDR, USBx_SIZE },
 		  { USBPHY2_ADDR, USBPHYx_SIZE },
 		  { USBNC_ADDR, USBx_SIZE },
@@ -324,7 +319,6 @@ struct armv7_dev imx6_devs[] = {
 	{ .name = "ehci",
 	  .unit = 1,
 	  .mem = {
-		  { USBOTG_EHCI_ADDR, USBx_SIZE },
 		  { USBOTG_ADDR, USBx_SIZE },
 		  { USBPHY1_ADDR, USBPHYx_SIZE },
 		  { USBNC_ADDR, USBx_SIZE },