svn commit: r266362 - in stable/10/sys: arm/include boot/fdt/dts/arm dev/uart

[Ian Lepore]

Author: ian
Date: Sat May 17 21:46:25 2014
New Revision: 266362
URL: http://svnweb.freebsd.org/changeset/base/266362

Log:
  MFC 264203, 264204, 264206, 264218:
  
    Tell VM we now have ARM platforms with physically discontiguous memory.
  
    Define the full 1024M of ram on the imx51 and imx53 boards.
  
    Use a more professional uart device description.

Modified:
  stable/10/sys/arm/include/vmparam.h
  stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
  stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts
  stable/10/sys/dev/uart/uart_dev_imx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/include/vmparam.h
==============================================================================
--- stable/10/sys/arm/include/vmparam.h	Sat May 17 21:35:26 2014	(r266361)
+++ stable/10/sys/arm/include/vmparam.h	Sat May 17 21:46:25 2014	(r266362)
@@ -77,9 +77,9 @@
 #define	VM_PHYSSEG_MAX		32
 
 /*
- * The physical address space is densely populated.
+ * The physical address space may be sparsely populated on some ARM systems.
  */
-#define	VM_PHYSSEG_DENSE
+#define	VM_PHYSSEG_SPARSE
 
 /*
  * Create two free page pools.  Since the ARM kernel virtual address

Modified: stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts	Sat May 17 21:35:26 2014	(r266361)
+++ stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts	Sat May 17 21:46:25 2014	(r266362)
@@ -41,7 +41,8 @@
 
 	memory {
 		/* RAM 512M */
-		reg = <0x70000000 0x20000000>;
+		reg = <0x70000000 0x10000000
+		       0xB0000000 0x10000000>;
 	};
 
 	localbus at 18000000 {

Modified: stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts	Sat May 17 21:35:26 2014	(r266361)
+++ stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts	Sat May 17 21:46:25 2014	(r266362)
@@ -41,8 +41,9 @@
         compatible = "fsl,imx53-qsb", "fsl,imx53";
 
 	memory {
-		/* RAM 512M */
-		reg = <0x70000000 0x20000000>;
+		/* RAM is 2 banks of 512M each. */
+		reg = <0x70000000 0x20000000
+		       0xb0000000 0x20000000>;
 	};
 
 	localbus at 18000000 {

Modified: stable/10/sys/dev/uart/uart_dev_imx.c
==============================================================================
--- stable/10/sys/dev/uart/uart_dev_imx.c	Sat May 17 21:35:26 2014	(r266361)
+++ stable/10/sys/dev/uart/uart_dev_imx.c	Sat May 17 21:46:25 2014	(r266362)
@@ -352,7 +352,7 @@ imx_uart_bus_probe(struct uart_softc *sc
 	sc->sc_rxfifosz = 1;
 	sc->sc_txfifosz = 1;
 
-	device_set_desc(sc->sc_dev, "imx_uart");
+	device_set_desc(sc->sc_dev, "Freescale i.MX UART");
 	return (0);
 }