PERFORCE change 219962 for review

[Robert Watson]

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

Change 219962 by rwatson at rwatson_cinnamon on 2013/01/12 16:03:36

	Use the OFW compatible string "mips,mips4k" rather than
	"mips4k,cp0" for interrupt control using MIPS4k CP0.
	
	Suggested by:	thompsa

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beri-sim.dts#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#12 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-tpad.dts#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_mips.c#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beri-sim.dts#3 (text+ko) ====

@@ -58,10 +58,10 @@
 		#interrupt-cells = <1>;
 
 		/*
-		 * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so
+		 * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so
 		 * we use mips4k coprocessor 0 interrupt management directly.
 		 */
-		compatible = "simple-bus", "mips4k,cp0";
+		compatible = "simple-bus", "mips,mips4k";
 		ranges = <>;
 
 		memory {

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

@@ -58,10 +58,10 @@
 		#interrupt-cells = <1>;
 
 		/*
-		 * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so
+		 * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so
 		 * we use mips4k coprocessor 0 interrupt management directly.
 		 */
-		compatible = "simple-bus", "mips4k,cp0";
+		compatible = "simple-bus", "mips,mips4k";
 		ranges = <>;
 
 		memory {

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

@@ -58,10 +58,10 @@
 		#interrupt-cells = <1>;
 
 		/*
-		 * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so
+		 * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so
 		 * we use mips4k coprocessor 0 interrupt management directly.
 		 */
-		compatible = "simple-bus", "mips4k,cp0";
+		compatible = "simple-bus", "mips,mips4k";
 		ranges = <>;
 
 		/*

==== //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_mips.c#3 (text+ko) ====

@@ -58,7 +58,7 @@
     int *trig, int *pol)
 {
 
-	if (!fdt_is_compatible(node, "mips4k,cp0"))
+	if (!fdt_is_compatible(node, "mips,mips4k"))
 		return (ENXIO);
 
 	*interrupt = fdt32_to_cpu(intr[0]);