Page MenuHomeFreeBSD

D16088.id52879.diff
No OneTemporary

D16088.id52879.diff

Index: head/sys/arm64/conf/GENERIC
===================================================================
--- head/sys/arm64/conf/GENERIC
+++ head/sys/arm64/conf/GENERIC
@@ -296,4 +296,4 @@
device acpi
# DTBs
-makeoptions MODULES_EXTRA="dtb/allwinner dtb/rockchip"
+makeoptions MODULES_EXTRA="dtb/allwinner dtb/rockchip dtb/rpi"
Index: head/sys/dts/arm/overlays/spigen-rpi2.dtso
===================================================================
--- head/sys/dts/arm/overlays/spigen-rpi2.dtso
+++ head/sys/dts/arm/overlays/spigen-rpi2.dtso
@@ -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: head/sys/dts/arm64/overlays/spigen-rpi3.dtso
===================================================================
--- head/sys/dts/arm64/overlays/spigen-rpi3.dtso
+++ head/sys/dts/arm64/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: head/sys/modules/dtb/rpi/Makefile
===================================================================
--- head/sys/modules/dtb/rpi/Makefile
+++ head/sys/modules/dtb/rpi/Makefile
@@ -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>

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 3:18 AM (19 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28530368
Default Alt Text
D16088.id52879.diff (2 KB)

Event Timeline