svn commit: r280520 - in head/sys: boot/fdt/dts/arm modules/dtb/rpi

[Andrew Turner]

Author: andrew
Date: Wed Mar 25 10:26:07 2015
New Revision: 280520
URL: https://svnweb.freebsd.org/changeset/base/280520

Log:
  Add the Raspberry Pi 2 dtb, based on the existing rpi.dts, but with a
  different base address for the devces.
  
  MFC after:	1 week

Added:
  head/sys/boot/fdt/dts/arm/bcm2836.dtsi
     - copied, changed from r280125, head/sys/boot/fdt/dts/arm/bcm2835.dtsi
  head/sys/boot/fdt/dts/arm/rpi2.dts
     - copied, changed from r280125, head/sys/boot/fdt/dts/arm/rpi.dts
Modified:
  head/sys/modules/dtb/rpi/Makefile

Copied and modified: head/sys/boot/fdt/dts/arm/bcm2836.dtsi (from r280125, head/sys/boot/fdt/dts/arm/bcm2835.dtsi)
==============================================================================
--- head/sys/boot/fdt/dts/arm/bcm2835.dtsi	Sun Mar 15 21:57:44 2015	(r280125, copy source)
+++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi	Wed Mar 25 10:26:07 2015	(r280520)
@@ -29,19 +29,19 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	cpus {
-		cpu at 0 {
-			compatible = "arm,1176jzf-s";
-		};
+	timer {
+		compatible = "arm,armv7-timer";
+		clock-frequency = <19200000>;
+		interrupts = <72 73 75 74>;
+		interrupt-parent = <&intc>;
 	};
 
-
 	SOC: axi {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		reg = <0x20000000 0x01000000>;
-		ranges = <0 0x20000000 0x01000000>;
+		reg = <0x3f000000 0x01000000>;
+		ranges = <0 0x3f000000 0x01000000>;
 
 		intc: interrupt-controller {
 			compatible = "broadcom,bcm2835-armctrl-ic",
@@ -101,30 +101,6 @@
 			 */
 		};
 
-		timer {
-			compatible = "broadcom,bcm2835-system-timer", 
-				     "broadcom,bcm2708-system-timer";
-			reg = <0x3000 0x1000>;
-			interrupts = <8 9 10 11>;
-			interrupt-parent = <&intc>;
-
-			clock-frequency = <1000000>;
-		};
-
-		armtimer {
-			/* Not AMBA compatible */
-			compatible = "broadcom,bcm2835-sp804", "arm,sp804";
-			reg = <0xB400 0x24>;
-			interrupts = <0>;
-			interrupt-parent = <&intc>;
-		};
-
-		watchdog0 {
-			compatible = "broadcom,bcm2835-wdt",
-				     "broadcom,bcm2708-wdt";
-			reg = <0x10001c 0x0c>; /* 0x1c, 0x20, 0x24 */
-		};
-
 		gpio: gpio {
 			compatible = "broadcom,bcm2835-gpio",
 				     "broadcom,bcm2708-gpio";
@@ -397,8 +373,6 @@
 		};
 
 		bsc0 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "broadcom,bcm2835-bsc",
 				     "broadcom,bcm2708-bsc";
 			reg = <0x205000 0x20>;
@@ -407,8 +381,6 @@
 		};
 
 		bsc1 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "broadcom,bcm2835-bsc",
 				     "broadcom,bcm2708-bsc";
 			reg = <0x804000 0x20>;
@@ -459,7 +431,7 @@
 			interrupts = <70>;
 			interrupt-parent = <&intc>;
 
-			clock-frequency = <50000000>;	/* Set by VideoCore */
+			clock-frequency = <2500000000>;	/* Set by VideoCore */
 		};
 
 		uart0: uart0 {

Copied and modified: head/sys/boot/fdt/dts/arm/rpi2.dts (from r280125, head/sys/boot/fdt/dts/arm/rpi.dts)
==============================================================================
--- head/sys/boot/fdt/dts/arm/rpi.dts	Sun Mar 15 21:57:44 2015	(r280125, copy source)
+++ head/sys/boot/fdt/dts/arm/rpi2.dts	Wed Mar 25 10:26:07 2015	(r280520)
@@ -26,12 +26,11 @@
  */
 /dts-v1/;
 
-/include/ "bcm2835.dtsi"
+/include/ "bcm2836.dtsi"
 
 / {
-	model = "Raspberry Pi (BCM2835)";
-	compatible = "raspberrypi,model-a", "raspberrypi,model-b", 
-		     "broadcom,bcm2835-vc", "broadcom,bcm2708-vc";
+	model = "Raspberry Pi 2 Model B";
+	compatible = "brcm,bcm2709";
 
 	memreserve = <0x08000000 0x08000000>;	/* Set by VideoCore */
 
@@ -39,10 +38,10 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		cpu at 0 {
-			compatible = "arm,1176jzf-s";
+			compatible = "arm,cortex-a7";
 			device_type = "cpu";
-			reg = <0>;			/* CPU ID=0 */
-			clock-frequency = <700000000>;	/* 700MHz */
+			reg = <0xf00>;			/* CPU ID=0xf00 */
+			clock-frequency = <800000000>;	/* 800MHz */
 		};
 	};
 
@@ -307,8 +306,6 @@
 			};
 
 		};
-
-
 	};
 
 	display {

Modified: head/sys/modules/dtb/rpi/Makefile
==============================================================================
--- head/sys/modules/dtb/rpi/Makefile	Wed Mar 25 10:25:45 2015	(r280519)
+++ head/sys/modules/dtb/rpi/Makefile	Wed Mar 25 10:26:07 2015	(r280520)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 # DTS files for the Raspberry Pi-B
-DTS=rpi.dts
+DTS=rpi.dts rpi2.dts
 
 .include <bsd.dtb.mk>