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

- Introduce upstream-overlay-rpi-poe.patch to adapt the overlay to our driver (jsc#SLE-16543)

OBS-URL: https://build.opensuse.org/request/show/851072
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/raspberrypi-firmware-dt?expand=0&rev=63
This commit is contained in:
Guillaume GARDET 2020-11-27 14:24:04 +00:00 committed by Git OBS Bridge
parent c0e4b0eae6
commit e2d651d1c5
3 changed files with 99 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 26 12:54:35 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
- Introduce upstream-overlay-rpi-poe.patch to adapt the overlay to our driver (jsc#SLE-16543)
-------------------------------------------------------------------
Thu Oct 29 16:35:31 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
- Update to 2dc96ad40979 (2020-10-26):

View File

@ -27,6 +27,7 @@ Source: raspberrypi-firmware-dt-%{version}.tar.xz
Source1: disable-vc4-overlay.dts
Source2: uboot-bcm2835-pl011-overlay.dts
Source100: get-from-git.sh
Patch0: upstream-overlay-rpi-poe.patch
Requires: raspberrypi-firmware
BuildRequires: dtc
BuildRequires: raspberrypi-firmware
@ -40,6 +41,7 @@ for the Raspberry Pi boot process.
%prep
%setup
%patch0 -p1
%build
SRCDIR=`pwd`

View File

@ -0,0 +1,91 @@
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