Accepting request 786927 from home:nsaenzjulienne:branches:hardware:boot

- Add rpi4-firware-dma-ranges-overlay.dts which fixes touch input on the
  official 7" display (bsc#1167147)

- Get rid of remove-vmmc-emmc2.patch now that the kernel supports it (bsc#1165954)

OBS-URL: https://build.opensuse.org/request/show/786927
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/raspberrypi-firmware-dt?expand=0&rev=48
This commit is contained in:
Guillaume GARDET 2020-03-23 12:27:58 +00:00 committed by Git OBS Bridge
parent 989ba681d2
commit c5ae7a25f6
4 changed files with 36 additions and 36 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Mar 20 13:58:19 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
- Add rpi4-firware-dma-ranges-overlay.dts which fixes touch input on the
official 7" display (bsc#1167147)
-------------------------------------------------------------------
Fri Mar 13 11:13:45 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
- Get rid of remove-vmmc-emmc2.patch now that the kernel supports it (bsc#1165954)
-------------------------------------------------------------------
Wed Mar 11 17:17:54 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>

View File

@ -29,10 +29,10 @@ Source2: rpi4-cma-overlay.dts
Source3: rpi4-thermal.dts
Source4: rpi4-gpio-names-overlay.dts
Source5: uboot-bcm2835-pl011-overlay.dts
Source6: rpi4-firmware-dma-ranges-overlay.dts
Source100: get-from-git.sh
Patch0: remove-vmmc-emmc2.patch
Patch1: pcie-dma-ranges.patch
Patch2: emmc2bus.patch
Patch0: pcie-dma-ranges.patch
Patch1: emmc2bus.patch
Requires: raspberrypi-firmware
BuildRequires: dtc
BuildRequires: raspberrypi-firmware
@ -47,7 +47,6 @@ for the Raspberry Pi boot process.
%setup
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
SRCDIR=`pwd`
@ -62,7 +61,7 @@ for dts in arch/arm/boot/dts/bcm27*dts arch/arm64/boot/dts/broadcom/bcm27*dts; d
done
export DTC_FLAGS="-R 0 -p 0 -@ -H epapr"
for dts in arch/arm/boot/dts/overlays/*dts %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
for dts in arch/arm/boot/dts/overlays/*dts %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
target=$(basename ${dts%*.dts})
target=${target%*-overlay}
mkdir -p $PPDIR/overlays

View File

@ -1,31 +0,0 @@
From 26e87be7f6c1ed1752ad7ca671375c8d6e0820cf Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Date: Mon, 24 Feb 2020 12:52:08 +0100
Subject: [PATCH] ARM: dts: get rid of emmc2's vmmc-supply regulator
This regulator setup isn't compatible with the upstream kernel. So get
rid of it as it's not really needed.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index e5978243aa9c..a6813785bb0c 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -398,10 +398,6 @@ &sdhost {
status = "disabled";
};
-&emmc2 {
- vmmc-supply = <&sd_vcc_reg>;
-};
-
&phy1 {
led-modes = <0x00 0x08>; /* link/activity link */
};
--
2.25.1

View File

@ -0,0 +1,21 @@
/*
* The firmware bus is virtual and devices have to inherit their DMA
* constraints from the underlying interconnect. So add an empty dma-ranges
* property to the bus node, implying the firmware bus' DMA constraints are
* identical to its parent's.
*
* This was sent upstream and will be removed when available.
*/
/dts-v1/;
/plugin/;
/{
compatible = "brcm,bcm2711";
fragment@0 {
target = <&firmware>;
__overlay__ {
dma-ranges;
};
};
};