Index: sys/dts/arm/overlays/spigen-rpi2.dtso
===================================================================
--- sys/dts/arm/overlays/spigen-rpi2.dtso
+++ sys/dts/arm/overlays/spigen-rpi2.dtso
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/dts/arm/overlays/spigen-rpi2.dtso 335592 2018-06-23 22:55:22Z ian $ */
+/* $FreeBSD:$ */
 
 /dts-v1/;
 /plugin/;
@@ -12,6 +12,7 @@
 	spigen0: spigen0 {
 		compatible = "freebsd,spigen";
 		reg = <0>;
+		spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */
 		status = "okay";
 	};
 	spigen1: spigen1 {
@@ -20,20 +21,10 @@
 		spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */
 		status = "okay";
 	};
-	spigen2: spigen2 {
-		compatible = "freebsd,spigen";
-		reg = <2>;
-		spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */
-		status = "okay";
-	};
 };
 
 &{/soc/gpio@7e200000/spi0_cs_pins} {
-	brcm,pins = <8 7 16>;
+	brcm,pins = <8 7>;
 	brcm,function = <4>; /* ALT0 */
 };
 
-&{/soc/gpio@7e200000/spi0_gpio7} {
-	brcm,pins = <7 8 16 9 10 11>;
-};
-
Index: sys/dts/arm/overlays/spigen-rpi3.dtso
===================================================================
--- sys/dts/arm/overlays/spigen-rpi3.dtso
+++ sys/dts/arm/overlays/spigen-rpi3.dtso
@@ -0,0 +1,30 @@
+/* $FreeBSD:$ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "brcm,bcm2837";
+};
+	
+&{/soc/spi@7e204000} {
+	status = "okay";
+	spigen0: spigen0 {
+		compatible = "freebsd,spigen";
+		reg = <0>;
+		spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */
+		status = "okay";
+	};
+	spigen1: spigen1 {
+		compatible = "freebsd,spigen";
+		reg = <1>;
+		spi-max-frequency = <500000>; /* Req'd property, override with spi(8) */
+		status = "okay";
+	};
+};
+
+&{/soc/gpio@7e200000/spi0_cs_pins} {
+	brcm,pins = <8 7>;
+	brcm,function = <4>; /* ALT0 */
+};
+
Index: sys/modules/dtb/rpi/Makefile
===================================================================
--- sys/modules/dtb/rpi/Makefile
+++ sys/modules/dtb/rpi/Makefile
@@ -5,6 +5,7 @@
 DTSO=	\
 	spigen-rpi-b.dtso \
 	spigen-rpi2.dtso \
+	spigen-rpi3.dtso \
 
 LINKS= \
 	${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b.dtb \