PERFORCE change 219934 for review

[Robert Watson]

http://p4web.freebsd.org/@@219934?ac=10

Change 219934 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2013/01/02 09:33:48

	Enable mips4k,cp0 interrupt configuration for the BERI FDT DTS
	file, as well as interrupts on the first JTAG UART.  Move atse
	configuration from device.hints to FDT.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#8 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#6 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#8 (text+ko) ====

@@ -55,7 +55,13 @@
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "simple-bus";
+		#interrupt-cells = <1>;
+
+		/*
+		 * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so
+		 * we use mips4k coprocessor 0 interrupt management directly.
+		 */
+		compatible = "simple-bus", "mips4k,cp0";
 		ranges = <>;
 
 		memory {
@@ -66,7 +72,7 @@
 		serial at 7f000000 {
 			compatible = "altera,jtag_uart-11_0";
 			reg = <0x7f000000 0x40>;
-			// interrupts = <0>;
+			interrupts = <0>;
 		};
 
 		serial at 7f001000 {
@@ -89,12 +95,12 @@
 			reg = <0x7f006000 0x1>;
 		};
 
-/*
 		ethernet at 7f007000 {
 			compatible = "altera,atse";
 			reg = <0x7f007000 0x540>;
 		};
 
+/*
 		touchscreen at 70400000 {
 			compatible = "cambridge,mtl";
 			reg = <0x70400000 0x1000

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#6 (text+ko) ====

@@ -35,9 +35,9 @@
 #
 # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations
 #
-hint.atse.0.at="nexus0"
-hint.atse.0.maddr=0x7f007000
-hint.atse.0.msize=0x540
+#hint.atse.0.at="nexus0"
+#hint.atse.0.maddr=0x7f007000
+#hint.atse.0.msize=0x540
 
 #
 # Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations.