svn commit: r305541 - head/sys/boot/fdt/dts/riscv

[Ruslan Bukin]

Author: br
Date: Wed Sep  7 15:48:44 2016
New Revision: 305541
URL: https://svnweb.freebsd.org/changeset/base/305541

Log:
  o Update QEMU device tree.
  
  QEMU was updated to privileged architecture v1.9
  and we now fully support it.
  
  Sponsored by:	DARPA, AFRL
  Sponsored by:	HEIF5

Modified:
  head/sys/boot/fdt/dts/riscv/qemu.dts

Modified: head/sys/boot/fdt/dts/riscv/qemu.dts
==============================================================================
--- head/sys/boot/fdt/dts/riscv/qemu.dts	Wed Sep  7 15:37:39 2016	(r305540)
+++ head/sys/boot/fdt/dts/riscv/qemu.dts	Wed Sep  7 15:48:44 2016	(r305541)
@@ -37,24 +37,39 @@
 /dts-v1/;
 
 / {
-	model = "QEMU RV64I";
-	compatible = "riscv,rv64i";
+	model = "QEMU RV64";
+	compatible = "riscv,rv64";
 	#address-cells = <1>;
 	#size-cells = <1>;
 	#interrupt-cells = <1>;
 
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu at 0 {
+			device_type = "cpu";
+			compatible = "riscv,rv64";
+			reg = <0x0>;
+		};
+	};
+
 	aliases {
 		console0 = &console0;
 	};
 
 	memory {
+		/*
+		 * This is not used currently.
+		 * We take information from sbi_query_memory.
+		 */
 		device_type = "memory";
-		reg = <0x0 0x40000000>; /* 1GB at 0x0 */
+		reg = <0x80000000 0x40000000>; /* 1GB at 0x80000000 */
 	};
 
 	soc {
-		#address-cells = <2>;
-		#size-cells = <2>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 		#interrupt-cells = <1>;
 
 		compatible = "simple-bus";
@@ -67,7 +82,9 @@
 
 		timer0: timer at 0 {
 			compatible = "riscv,timer";
-			interrupts = < 1 >;
+			reg = < 0x40000000 0x0008 >,	/* rtc */
+			      < 0x40000008 0x1000 >;	/* timecmp */
+			interrupts = < 5 >;
 			interrupt-parent = < &pic0 >;
 			clock-frequency = < 400000000 >;
 		};