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

[Emmanuel Vadot]

Author: manu
Date: Sat Aug 19 14:27:11 2017
New Revision: 322694
URL: https://svnweb.freebsd.org/changeset/base/322694

Log:
  RPI DTS: Add value previously set by VideoCore and DTB links
  
  Using latest U-Boot for RPI 1 or 2 the DTB loaded by the firmware is discarded.
  The DTB was previously patched by the firmware to contain the DMA channel mask.
  DTB provided by the rpi firmware or DTS in the Linux tree contain the raw value
  directly. Do the same for our DTS as we cannot switch to the upstream ones yet.
  Not having the DMA channel mask setup properly cause mmc not to be detected
  (and probably other problems on driver using DMA).
  
  Also, add links for rpi dtb to the name used by u-boot. This way the dtb can be
  loaded by ubldr using the U-Boot env variable fdtfile.
  
  Tested On: RPI B Rev2, RPI Zero, RPI 2 v1.1 RPI 2 v1.2
  
  Thanks to Sylvain Garrigues <sylvain at sylvaingarrigues.com> for the help.
  
  PR:		218344

Modified:
  head/sys/boot/fdt/dts/arm/bcm2835.dtsi
  head/sys/boot/fdt/dts/arm/bcm2836.dtsi
  head/sys/modules/dtb/rpi/Makefile

Modified: head/sys/boot/fdt/dts/arm/bcm2835.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/bcm2835.dtsi	Sat Aug 19 12:14:46 2017	(r322693)
+++ head/sys/boot/fdt/dts/arm/bcm2835.dtsi	Sat Aug 19 14:27:11 2017	(r322694)
@@ -439,7 +439,7 @@
 			interrupts = <24 25 26 27 28 29 30 31 32 33 34 35 36>;
 			interrupt-parent = <&intc>;
 
-			broadcom,channels = <0>;	/* Set by VideoCore */
+			broadcom,channels = <0x7f35>;
 		};
 
 		vc_mbox: mbox {

Modified: head/sys/boot/fdt/dts/arm/bcm2836.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/bcm2836.dtsi	Sat Aug 19 12:14:46 2017	(r322693)
+++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi	Sat Aug 19 14:27:11 2017	(r322694)
@@ -432,7 +432,7 @@
 			interrupts = <24 25 26 27 28 29 30 31 32 33 34 35 36>;
 			interrupt-parent = <&intc>;
 
-			broadcom,channels = <0>;	/* Set by VideoCore */
+			broadcom,channels = <0x7f35>;
 		};
 
 		vc_mbox: mbox {

Modified: head/sys/modules/dtb/rpi/Makefile
==============================================================================
--- head/sys/modules/dtb/rpi/Makefile	Sat Aug 19 12:14:46 2017	(r322693)
+++ head/sys/modules/dtb/rpi/Makefile	Sat Aug 19 14:27:11 2017	(r322694)
@@ -2,4 +2,11 @@
 # DTS files for the Raspberry Pi-B
 DTS=rpi.dts rpi2.dts
 
+LINKS= \
+	${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b.dtb \
+	${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b-rev2.dtb \
+	${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b-plus.dtb \
+	${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-zero.dtb \
+	${DTBDIR}/rpi2.dtb ${DTBDIR}/bcm2836-rpi-2-b.dtb
+
 .include <bsd.dtb.mk>