Accepting request 919732 from home:Guillaume_G:branches:hardware:boot

- Update to 2425833c7ff5 (2021-09-17)
  * Switch to 5.14 branch
  * Drop upstream-overlay-rpi-poe.patch

OBS-URL: https://build.opensuse.org/request/show/919732
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/raspberrypi-firmware-dt?expand=0&rev=81
This commit is contained in:
Guillaume GARDET 2021-10-06 08:58:49 +00:00 committed by Git OBS Bridge
parent 4f09c69bca
commit db153c1b53
6 changed files with 13 additions and 99 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
LINUX_BRANCH=rpi-5.10.y
LINUX_BRANCH=rpi-5.14.y
# this is a huge hunk of stuff, so reuse the local repo if possible
if [ -d linux/.git ]; then

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a14f74cbc95a2880c10778a12c8de0158eb1208fdb2dda021120dc71ea05baca
size 7168132

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32974aea2627a5b99d851cebc55541c6eb7057ea3461064bb3f2fc642787821a
size 7407884

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 17 10:11:30 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 2425833c7ff5 (2021-09-17)
* Switch to 5.14 branch
* Drop upstream-overlay-rpi-poe.patch
-------------------------------------------------------------------
Fri Apr 9 10:30:10 UTC 2021 - Matthias Brugger <mbrugger@suse.com>

View File

@ -17,7 +17,7 @@
Name: raspberrypi-firmware-dt
Version: 2021.03.15
Version: 2021.09.17
Release: 0
Summary: Device trees for the Raspberry Pi firmware loader
License: GPL-2.0-only
@ -30,7 +30,6 @@ Source3: disable-v3d-overlay.dts
Source4: enable-bt-overlay.dts
Source5: smbios-overlay.dts
Source100: get-from-git.sh
Patch0: upstream-overlay-rpi-poe.patch
Requires: raspberrypi-firmware
BuildRequires: dtc
BuildRequires: raspberrypi-firmware
@ -43,8 +42,7 @@ This package provides additional device tree base files as well as overlays
for the Raspberry Pi boot process.
%prep
%setup
%patch0 -p1
%setup -q
%build
SRCDIR=`pwd`

View File

@ -1,91 +0,0 @@
From 8945b3da73f895c85f5616d45e5d5962c62df99a Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Date: Thu, 26 Nov 2020 12:48:29 +0100
Subject: [PATCH] overlays: Update rpi-poe overlay to use upstream driver
The new upstream driver provides the same functionality. So use it.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
.../arm/boot/dts/overlays/rpi-poe-overlay.dts | 34 ++++++++++++-------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
index 544038b614e1..aa5ec4318802 100644
--- a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
+++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
@@ -8,21 +8,28 @@ / {
compatible = "brcm,bcm2835";
fragment@0 {
+ target = <&firmware>;
+ __overlay__ {
+ fwpwm: pwm {
+ compatible = "raspberrypi,firmware-poe-pwm";
+ #pwm-cells = <2>;
+ };
+ };
+ };
+
+ fragment@1 {
target-path = "/";
__overlay__ {
- fan0: rpi-poe-fan@0 {
- compatible = "raspberrypi,rpi-poe-fan";
- firmware = <&firmware>;
- cooling-min-state = <0>;
- cooling-max-state = <4>;
- #cooling-cells = <2>;
+ fan: pwm-fan {
+ compatible = "pwm-fan";
cooling-levels = <0 31 63 150 255>;
- status = "okay";
+ #cooling-cells = <2>;
+ pwms = <&fwpwm 0 80000>;
};
};
};
- fragment@1 {
+ fragment@2 {
target = <&cpu_thermal>;
__overlay__ {
trips {
@@ -47,28 +54,29 @@ trip3: trip3 {
type = "active";
};
};
+
cooling-maps {
map0 {
trip = <&trip0>;
- cooling-device = <&fan0 0 1>;
+ cooling-device = <&fan 0 1>;
};
map1 {
trip = <&trip1>;
- cooling-device = <&fan0 1 2>;
+ cooling-device = <&fan 1 2>;
};
map2 {
trip = <&trip2>;
- cooling-device = <&fan0 2 3>;
+ cooling-device = <&fan 2 3>;
};
map3 {
trip = <&trip3>;
- cooling-device = <&fan0 3 4>;
+ cooling-device = <&fan 3 4>;
};
};
};
};
- fragment@2 {
+ fragment@3 {
target-path = "/__overrides__";
__overlay__ {
poe_fan_temp0 = <&trip0>,"temperature:0";
--
2.29.2