svn commit: r266367 - stable/10/sys/boot/fdt/dts/arm

[Ian Lepore]

Author: ian
Date: Sat May 17 22:02:26 2014
New Revision: 266367
URL: http://svnweb.freebsd.org/changeset/base/266367

Log:
  MFC 264428:
  
    Improve the i.MX53 / Digi DTS:
  
    * Fix the IPU address.
    * Fix the PATA definition.
    * Add another I2C.
    * Add more UARTs.
    * Add SATA.

Modified:
  stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
  stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts	Sat May 17 22:01:17 2014	(r266366)
+++ stable/10/sys/boot/fdt/dts/arm/digi-ccwmx53.dts	Sat May 17 22:02:26 2014	(r266367)
@@ -45,7 +45,10 @@
 		       0xB0000000 0x10000000>;
 	};
 
-	localbus at 18000000 {
+	localbus at 10000000 {
+		sata at 10000000 {
+			status = "okay";
+		};
 		ipu3 at 1E000000 {
 			status = "okay";
 		};
@@ -69,13 +72,19 @@
 			timer at 53fa0000 {
 				status = "okay";
 			};
-
 			/* UART1, console */
 			console: serial at 53fbc000 {
 				status = "okay";
 				clock-frequency = <0>; /* won't load w/o this */
 			};
-
+			serial at 53fc0000 {
+				status = "okay";
+				clock-frequency = <0>; /* won't load w/o this */
+			};
+			serial at 53ff0000 {
+				status = "okay";
+				clock-frequency = <0>; /* won't load w/o this */
+			};
 			clock at 53fd4000 {
 				status = "okay";
 			};
@@ -100,6 +109,14 @@
 			wdog at 53f98000 {
 				status = "okay";
 			};
+			i2c at 53fec000 {
+				status = "okay";
+				rtc at 68 {
+					compatible = "dialog,ds9052";
+					reg = <0x48>;
+					interrupts = <0x1 0x1 0 0>;
+				};
+			};
 		};
 		aips at 60000000 {
 			ethernet at 63fec000 {
@@ -118,6 +135,9 @@
 			ide at 63fe0000 {
 				status = "okay";
 			};
+			serial at 63f90000 {
+				status = "okay";
+			};
 		};
 	};
 

Modified: stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi
==============================================================================
--- stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi	Sat May 17 22:01:17 2014	(r266366)
+++ stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi	Sat May 17 22:02:26 2014	(r266367)
@@ -282,7 +282,13 @@
 				/* 50028000 0x4000 SPDIF */
 				/* 91 SPDIF */
 
-				/* 50030000 0x4000 PATA (PORT UDMA) irq70 */
+				pata at 50030000 {
+					compatible = "fsl,imx53-ata";
+					reg = <0x50030000 0x4000>;
+					interrupt-parent = <&tzic>;
+					interrupts = <70>;
+					status = "disabled";
+				};
 
 				/* 50034000 0x4000 SLM */
 				/* 50038000 0x4000 HSI2C */
@@ -444,7 +450,7 @@
 				status = "disabled";
 			};
 
-			/* 53FC0000 0x4000 UART 4 */
+			/* 53FF0000 0x4000 UART 4 */
 			uart4: serial at 53ff0000 {
 				compatible = "fsl,imx53-uart", "fsl,imx-uart";
 				reg = <0x53ff0000 0x4000>;
@@ -469,17 +475,16 @@
 				interrupts = <73 74>;
 				status = "disabled";
 			};
-
-			/* 53FE8000 0x4000 PATA (PORT PIO) */
-			/* 70 PATA Parallel ATA host controller interrupt */
-			ide at 53fe8000 {
-				compatible = "fsl,imx53-ata";
-				reg = <0x83fe0000 0x4000>;
+			i2c at 53fec000 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,imx53-i2c", "fsl,imx1-i2c",
+					   "fsl,imx-i2c";
+				reg = <0x53fec000 0x4000>;
 				interrupt-parent = <&tzic>;
-				interrupts = <70>;
+				interrupts = <64>;
 				status = "disabled";
 			};
-
 		};
 
 		aips at 60000000 { /* AIPS2 */
@@ -489,7 +494,7 @@
     			interrupt-parent = <&tzic>;
 			ranges;
 
-			/* 53FC0000 0x4000 UART 5 */
+			/* 63F90000 0x4000 UART 5 */
 			uart5: serial at 63f90000 {
 				compatible = "fsl,imx53-uart", "fsl,imx-uart";
 				reg = <0x63f90000 0x4000>;
@@ -650,13 +655,20 @@
 		};
 	};
 
-	localbus at 18000000 {
+	localbus at 10000000 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-
 		ranges;
 
+		sata at 10000000 {
+			compatible = "fsl,imx53-ata";
+			reg = <0x10000000 0x4000>;
+			interrupt-parent = <&tzic>;
+			interrupts = <28>;
+			status = "disabled";
+		};
+
 		vga: ipu3 at 1E000000 {
 			compatible = "fsl,ipu3";
 			reg = <