svn commit: r343718 - in stable/12/sys: arm64/conf dts/arm/overlays dts/arm64/overlays modules/dtb/rpi

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sun Feb  3 15:34:09 2019
New Revision: 343718
URL: https://svnweb.freebsd.org/changeset/base/343718

Log:
  MFC r343069:
  
  [rpi] Reorganize spigen(4) overlays for Raspberry Pi
  
  - Remove CS=2 entry from spigen-rpi2 since it didn't work
  - Add spigen-rpi3 overlay for Raspberry Pi 3
  - Enable rpi overlay modules for GENERIC kernel on aarch64
  
  PR:		233489
  Submitted by:	bobf at mrp3.com
  Reviewed by:	db
  Differential Revision:	https://reviews.freebsd.org/D16088

Added:
  stable/12/sys/dts/arm64/overlays/spigen-rpi3.dtso
     - copied unchanged from r343069, head/sys/dts/arm64/overlays/spigen-rpi3.dtso
Modified:
  stable/12/sys/arm64/conf/GENERIC
  stable/12/sys/dts/arm/overlays/spigen-rpi2.dtso
  stable/12/sys/modules/dtb/rpi/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm64/conf/GENERIC
==============================================================================
--- stable/12/sys/arm64/conf/GENERIC	Sun Feb  3 14:56:38 2019	(r343717)
+++ stable/12/sys/arm64/conf/GENERIC	Sun Feb  3 15:34:09 2019	(r343718)
@@ -262,4 +262,4 @@ options 	FDT
 device		acpi
 
 # DTBs
-makeoptions	MODULES_EXTRA="dtb/allwinner"
+makeoptions	MODULES_EXTRA="dtb/allwinner dtb/rpi"

Modified: stable/12/sys/dts/arm/overlays/spigen-rpi2.dtso
==============================================================================
--- stable/12/sys/dts/arm/overlays/spigen-rpi2.dtso	Sun Feb  3 14:56:38 2019	(r343717)
+++ stable/12/sys/dts/arm/overlays/spigen-rpi2.dtso	Sun Feb  3 15:34:09 2019	(r343718)
@@ -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 at 7e200000/spi0_cs_pins} {
-	brcm,pins = <8 7 16>;
+	brcm,pins = <8 7>;
 	brcm,function = <4>; /* ALT0 */
-};
-
-&{/soc/gpio at 7e200000/spi0_gpio7} {
-	brcm,pins = <7 8 16 9 10 11>;
 };
 

Copied: stable/12/sys/dts/arm64/overlays/spigen-rpi3.dtso (from r343069, head/sys/dts/arm64/overlays/spigen-rpi3.dtso)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/sys/dts/arm64/overlays/spigen-rpi3.dtso	Sun Feb  3 15:34:09 2019	(r343718, copy of r343069, head/sys/dts/arm64/overlays/spigen-rpi3.dtso)
@@ -0,0 +1,30 @@
+/* $FreeBSD$ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "brcm,bcm2837";
+};
+	
+&{/soc/spi at 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 at 7e200000/spi0_cs_pins} {
+	brcm,pins = <8 7>;
+	brcm,function = <4>; /* ALT0 */
+};
+

Modified: stable/12/sys/modules/dtb/rpi/Makefile
==============================================================================
--- stable/12/sys/modules/dtb/rpi/Makefile	Sun Feb  3 14:56:38 2019	(r343717)
+++ stable/12/sys/modules/dtb/rpi/Makefile	Sun Feb  3 15:34:09 2019	(r343718)
@@ -1,7 +1,12 @@
 # $FreeBSD$
 # DTS files for the Raspberry Pi-B
+.if ${MACHINE_ARCH:Marmv[67]*} != ""
 DTSO=	\
 	spigen-rpi-b.dtso \
-	spigen-rpi2.dtso \
+	spigen-rpi2.dtso
+.elif ${MACHINE_ARCH} == "aarch64"
+DTSO=	\
+	spigen-rpi3.dtso
+.endif
 
 .include <bsd.dtb.mk>