eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-23 03:19:42 +01:00
Code Issues Releases Wiki Activity

raspberry-pi."4": update poe hat overlay to work with newer kernel

Browse source 
fixes #626

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
Florian Brandes 2023-05-11 21:29:42 +02:00
parent 51559e691f
commit 1ffd9949ee
No known key found for this signature in database
GPG key ID: 074048E893713170
2 changed files with 144 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
raspberry-pi/4/poe-hat.nix
View file

@ -16,7 +16,7 @@ in {
hardware.deviceTree = { hardware.deviceTree = {
overlays = [ overlays = [
# Equivalent to: https://github.com/raspberrypi/linux/blob/rpi-5.15.y/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts # Equivalent to: https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
{ {
name = "rpi-poe-overlay"; name = "rpi-poe-overlay";
dtsText = '' dtsText = ''
@ -27,7 +27,7 @@ in {
/plugin/; /plugin/;
/ { / {
compatible = "brcm,bcm2711"; compatible = "brcm,bcm2835";
fragment@0 { fragment@0 {
target-path = "/"; target-path = "/";
@ -44,7 +44,13 @@ in {
fragment@1 { fragment@1 {
target = <&cpu_thermal>; target = <&cpu_thermal>;
__overlay__ { __overlay__ {
trips { polling-delay = <2000>; /* milliseconds */
};
};
fragment@2 {
target = <&thermal_trips>;
__overlay__ {
trip0: trip0 { trip0: trip0 {
temperature = <40000>; temperature = <40000>;
hysteresis = <2000>; hysteresis = <2000>;
@ -66,7 +72,11 @@ in {
type = "active"; type = "active";
}; };
}; };
cooling-maps { };
fragment@3 {
target = <&cooling_maps>;
__overlay__ {
map0 { map0 {
trip = <&trip0>; trip = <&trip0>;
cooling-device = <&fan 0 1>; cooling-device = <&fan 0 1>;
@ -85,9 +95,8 @@ in {
}; };
}; };
}; };
};
fragment@2 { fragment@4 {
target-path = "/__overrides__"; target-path = "/__overrides__";
params: __overlay__ { params: __overlay__ {
poe_fan_temp0 = <&trip0>,"temperature:0"; poe_fan_temp0 = <&trip0>,"temperature:0";
@ -104,7 +113,7 @@ in {
}; };
}; };
fragment@3 { fragment@5 {
target = <&firmware>; target = <&firmware>;
__overlay__ { __overlay__ {
fwpwm: pwm { fwpwm: pwm {
@ -114,7 +123,7 @@ in {
}; };
}; };
fragment@4 { fragment@6 {
target = <&i2c0>; target = <&i2c0>;
i2c_bus: __overlay__ { i2c_bus: __overlay__ {
#address-cells = <1>; #address-cells = <1>;
@ -135,14 +144,14 @@ in {
}; };
}; };
fragment@5 { fragment@7 {
target = <&i2c0if>; target = <&i2c0if>;
__dormant__ { __dormant__ {
status = "okay"; status = "okay";
}; };
}; };
fragment@6 { fragment@8 {
target = <&i2c0mux>; target = <&i2c0mux>;
__dormant__ { __dormant__ {
status = "okay"; status = "okay";

33
raspberry-pi/4/poe-plus-hat.nix
View file

@ -17,8 +17,8 @@ in {
hardware.deviceTree = { hardware.deviceTree = {
overlays = [ overlays = [
# Combined equivalent to: # Combined equivalent to:
# * https://github.com/raspberrypi/linux/blob/rpi-5.15.y/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts # * https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
# * https://github.com/raspberrypi/linux/blob/rpi-5.15.y/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts # * https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
{ {
name = "rpi-poe-plus-overlay"; name = "rpi-poe-plus-overlay";
dtsText = '' dtsText = ''
@ -29,7 +29,7 @@ in {
/plugin/; /plugin/;
/ { / {
compatible = "brcm,bcm2711"; compatible = "brcm,bcm2835";
fragment@0 { fragment@0 {
target-path = "/"; target-path = "/";
@ -46,7 +46,13 @@ in {
fragment@1 { fragment@1 {
target = <&cpu_thermal>; target = <&cpu_thermal>;
__overlay__ { __overlay__ {
trips { polling-delay = <2000>; /* milliseconds */
};
};
fragment@2 {
target = <&thermal_trips>;
__overlay__ {
trip0: trip0 { trip0: trip0 {
temperature = <40000>; temperature = <40000>;
hysteresis = <2000>; hysteresis = <2000>;
@ -68,7 +74,11 @@ in {
type = "active"; type = "active";
}; };
}; };
cooling-maps { };
fragment@3 {
target = <&cooling_maps>;
__overlay__ {
map0 { map0 {
trip = <&trip0>; trip = <&trip0>;
cooling-device = <&fan 0 1>; cooling-device = <&fan 0 1>;
@ -87,9 +97,8 @@ in {
}; };
}; };
}; };
};
fragment@2 { fragment@4 {
target-path = "/__overrides__"; target-path = "/__overrides__";
params: __overlay__ { params: __overlay__ {
poe_fan_temp0 = <&trip0>,"temperature:0"; poe_fan_temp0 = <&trip0>,"temperature:0";
@ -106,7 +115,7 @@ in {
}; };
}; };
fragment@3 { fragment@5 {
target = <&firmware>; target = <&firmware>;
__overlay__ { __overlay__ {
fwpwm: pwm { fwpwm: pwm {
@ -116,7 +125,7 @@ in {
}; };
}; };
fragment@4 { fragment@6 {
target = <&i2c0>; target = <&i2c0>;
i2c_bus: __overlay__ { i2c_bus: __overlay__ {
#address-cells = <1>; #address-cells = <1>;
@ -137,14 +146,14 @@ in {
}; };
}; };
fragment@5 { fragment@7 {
target = <&i2c0if>; target = <&i2c0if>;
__dormant__ { __dormant__ {
status = "okay"; status = "okay";
}; };
}; };
fragment@6 { fragment@8 {
target = <&i2c0mux>; target = <&i2c0mux>;
__dormant__ { __dormant__ {
status = "okay"; status = "okay";
@ -172,7 +181,7 @@ in {
// Overlay for the Raspberry Pi PoE+ HAT. // Overlay for the Raspberry Pi PoE+ HAT.
/ { / {
compatible = "brcm,bcm2711"; compatible = "brcm,bcm2835";
fragment@10 { fragment@10 {
target-path = "/"; target-path = "/";