From 6e77d616a471e9200ab442caeaacfe9f5fef1df9 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 07 2019 17:29:34 +0000
Subject: Use upstream (4.20.14) kernel DTBs for F-29, config.txt tweaks


---

diff --git a/bcm2837-rpi-3-a-plus.dtb b/bcm2837-rpi-3-a-plus.dtb
new file mode 100644
index 0000000..c7b5077
Binary files /dev/null and b/bcm2837-rpi-3-a-plus.dtb differ
diff --git a/bcm2837-rpi-3-b-plus.dtb b/bcm2837-rpi-3-b-plus.dtb
new file mode 100644
index 0000000..66337b1
Binary files /dev/null and b/bcm2837-rpi-3-b-plus.dtb differ
diff --git a/bcm2837-rpi-3-b.dtb b/bcm2837-rpi-3-b.dtb
new file mode 100644
index 0000000..91105c1
Binary files /dev/null and b/bcm2837-rpi-3-b.dtb differ
diff --git a/bcm2837-rpi-cm3-io3.dtb b/bcm2837-rpi-cm3-io3.dtb
new file mode 100644
index 0000000..9601bb5
Binary files /dev/null and b/bcm2837-rpi-cm3-io3.dtb differ
diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index 5446a1e..1442c7e 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -8,7 +8,7 @@
 
 Name:          bcm283x-firmware
 Version:       20190212
-Release:       1.%{gitshort}%{?dist}
+Release:       2.%{gitshort}%{?dist}
 Summary:       Broadcom bcm283x firmware for the Raspberry Pi
 # see LICENSE.broadcom
 # DT Overlays covered under Linux Kernel GPLv2
@@ -28,6 +28,11 @@ Source0:       %{name}-%{gitshort}.tar.xz
 Source1:       config.txt
 Source2:       config-64.txt
 
+Source5:       bcm2837-rpi-3-a-plus.dtb
+Source6:       bcm2837-rpi-3-b.dtb
+Source7:       bcm2837-rpi-3-b-plus.dtb
+Source8:       bcm2837-rpi-cm3-io3.dtb
+
 %description
 Firmware for the Broadcom bcm283x SoC as shipped in devices such as the
 Raspberry Pi.
@@ -48,7 +53,14 @@ install -p %{SOURCE2} %{buildroot}%{efi_esp_root}/config.txt
 install -p *bin %{buildroot}%{efi_esp_root}
 install -p *dat %{buildroot}%{efi_esp_root}
 install -p *elf %{buildroot}%{efi_esp_root}
+%if 0%{?fedora} > 29
 install -p *dtb %{buildroot}%{efi_esp_root}
+%else
+install -p %{SOURCE5} %{buildroot}%{efi_esp_root}
+install -p %{SOURCE6} %{buildroot}%{efi_esp_root}
+install -p %{SOURCE7} %{buildroot}%{efi_esp_root}
+install -p %{SOURCE8} %{buildroot}%{efi_esp_root}
+%endif
 install -p overlays/README %{buildroot}%{efi_esp_root}/overlays
 install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
 
@@ -71,6 +83,10 @@ fi
 %{efi_esp_root}/*.dtb
 
 %changelog
+* Thu Mar  7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190212-2.83977fe
+- Use upstream kernel DTBs for F-29
+- Minor config updates
+
 * Thu Feb 14 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190212-1.83977fe
 - Latest firmware update
 - config.txt updates for HAT/overlay support
diff --git a/config-64.txt b/config-64.txt
index 4681dc3..faa74c2 100644
--- a/config-64.txt
+++ b/config-64.txt
@@ -36,6 +36,9 @@ upstream_kernel=1
 dtoverlay=upstream
 # dtoverlay=rpi-sense
 
+# Allow OS rather than firmware control CEC
+mask_gpu_interrupt1=0x100
+
 # Without this sdram runs at 400mhz, instead of 450
 # https://github.com/Hexxeh/rpi-firmware/issues/172
 audio_pwm_mode=0
diff --git a/config.txt b/config.txt
index abcb915..41c4f4b 100644
--- a/config.txt
+++ b/config.txt
@@ -37,6 +37,9 @@ upstream_kernel=1
 dtoverlay=upstream
 # dtoverlay=rpi-sense
 
+# Allow OS rather than firmware control CEC
+mask_gpu_interrupt1=0x100
+
 # Without this sdram runs at 400mhz, instead of 450
 # https://github.com/Hexxeh/rpi-firmware/issues/172
 audio_pwm_mode=0