svn commit: r316664 - head/sys/arm/freescale/imx

[Ian Lepore]

Author: ian
Date: Sun Apr  9 20:59:12 2017
New Revision: 316664
URL: https://svnweb.freebsd.org/changeset/base/316664

Log:
  Add code/constants for detecting imx6ul (ultralite) chips, a species of
  imx6 based on a single cortex-a7 core.  Other changes to imx6 drivers
  and support code are needed to fully support the imx6ul.
  
  Also fix an indentation glitch committed in the prior change.

Modified:
  head/sys/arm/freescale/imx/imx6_machdep.c
  head/sys/arm/freescale/imx/imx_machdep.h

Modified: head/sys/arm/freescale/imx/imx6_machdep.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_machdep.c	Sun Apr  9 20:54:33 2017	(r316663)
+++ head/sys/arm/freescale/imx/imx6_machdep.c	Sun Apr  9 20:59:12 2017	(r316664)
@@ -106,8 +106,8 @@ fix_fdt_interrupt_data(void)
 	gicnode = OF_finddevice("/soc/interrupt-controller at 00a01000");
 	if (gicnode == -1) {
 		gicnode = OF_finddevice("/interrupt-controller at 00a01000");
-	if (gicnode == -1)
-		return;
+		if (gicnode == -1)
+			return;
 	}
 	gicxref = OF_xref_from_node(gicnode);
 
@@ -234,6 +234,7 @@ imx_soc_type(void)
 #define	HWSOC_MX6DL	0x61
 #define	HWSOC_MX6SOLO	0x62
 #define	HWSOC_MX6Q	0x63
+#define	HWSOC_MX6UL	0x64
 
 	if (soctype != 0)
 		return (soctype);
@@ -272,6 +273,9 @@ imx_soc_type(void)
 	case HWSOC_MX6Q :
 		soctype = IMXSOC_6Q;
 		break;
+	case HWSOC_MX6UL:
+		soctype = IMXSOC_6UL;
+		break;
 	default:
 		printf("imx_soc_type: Don't understand hwsoc 0x%02x, "
 		    "digprog 0x%08x; assuming IMXSOC_6Q\n", hwsoc, digprog);
@@ -323,3 +327,4 @@ static platform_method_t imx6_methods[] 
 FDT_PLATFORM_DEF2(imx6, imx6s, "i.MX6 Solo", 0, "fsl,imx6s", 0);
 FDT_PLATFORM_DEF2(imx6, imx6d, "i.MX6 Dual", 0, "fsl,imx6dl", 0);
 FDT_PLATFORM_DEF2(imx6, imx6q, "i.MX6 Quad", 0, "fsl,imx6q", 0);
+FDT_PLATFORM_DEF2(imx6, imx6ul, "i.MX6 UltraLite", 0, "fsl,imx6ul", 0);

Modified: head/sys/arm/freescale/imx/imx_machdep.h
==============================================================================
--- head/sys/arm/freescale/imx/imx_machdep.h	Sun Apr  9 20:54:33 2017	(r316663)
+++ head/sys/arm/freescale/imx/imx_machdep.h	Sun Apr  9 20:59:12 2017	(r316664)
@@ -55,6 +55,7 @@ void imx_wdog_init_last_reset(vm_offset_
 #define	IMXSOC_6DL	0x61000000
 #define	IMXSOC_6S	0x62000000
 #define	IMXSOC_6Q	0x63000000
+#define	IMXSOC_6UL	0x64000000
 #define	IMXSOC_FAMSHIFT	28
 
 u_int imx_soc_type(void);